mirror of
https://github.com/fluencelabs/aquavm
synced 2025-04-24 23:02:16 +00:00
feat(execution-engine): remove stream jvaluable implementation (#576)
* remove JValuable implementation for streams --------- Co-authored-by: Ivan Boldyrev <ivan@fluence.one>
This commit is contained in:
Mike Voronov
GitHub
parent
138501fff9
commit
513d33a1c5
@ -16,10 +16,8 @@
|
||||
|
||||
mod canon_stream;
|
||||
mod cell_vec_resolved_call_result;
|
||||
mod empty_stream;
|
||||
mod iterable_item;
|
||||
mod resolved_call_result;
|
||||
mod stream;
|
||||
|
||||
use super::iterable::IterableItem;
|
||||
use super::ExecutionResult;
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
/*
|
||||
* Copyright 2020 Fluence Labs Limited
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
use super::ExecutionResult;
|
||||
use super::JValuable;
|
||||
use super::LambdaAST;
|
||||
use super::LambdaError::EmptyStream;
|
||||
use crate::execution_step::CatchableError::LambdaApplierError;
|
||||
use crate::execution_step::ExecutionCtx;
|
||||
use crate::execution_step::RcSecurityTetraplets;
|
||||
use crate::JValue;
|
||||
use crate::SecurityTetraplet;
|
||||
|
||||
use std::borrow::Cow;
|
||||
|
||||
impl JValuable for () {
|
||||
fn apply_lambda(&self, _lambda: &LambdaAST<'_>, _exec_ctx: &ExecutionCtx<'_>) -> ExecutionResult<Cow<'_, JValue>> {
|
||||
// applying lambda to an empty stream will produce a join behaviour
|
||||
Err(LambdaApplierError(EmptyStream).into())
|
||||
}
|
||||
|
||||
fn apply_lambda_with_tetraplets(
|
||||
&self,
|
||||
_lambda: &LambdaAST<'_>,
|
||||
_exec_ctx: &ExecutionCtx<'_>,
|
||||
) -> ExecutionResult<(Cow<'_, JValue>, SecurityTetraplet)> {
|
||||
// applying lambda to an empty stream will produce a join behaviour
|
||||
Err(LambdaApplierError(EmptyStream).into())
|
||||
}
|
||||
|
||||
fn as_jvalue(&self) -> Cow<'_, JValue> {
|
||||
Cow::Owned(JValue::Array(vec![]))
|
||||
}
|
||||
|
||||
fn into_jvalue(self: Box<Self>) -> JValue {
|
||||
JValue::Array(vec![])
|
||||
}
|
||||
|
||||
fn as_tetraplets(&self) -> RcSecurityTetraplets {
|
||||
vec![]
|
||||
}
|
||||
}
|
||||
@ -1,109 +0,0 @@
|
||||
/*
|
||||
* Copyright 2021 Fluence Labs Limited
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
use super::select_by_lambda_from_stream;
|
||||
use super::ExecutionResult;
|
||||
use super::JValuable;
|
||||
use crate::execution_step::boxed_value::populate_tetraplet_with_lambda;
|
||||
use crate::execution_step::boxed_value::Generation;
|
||||
use crate::execution_step::boxed_value::Stream;
|
||||
use crate::execution_step::ExecutionCtx;
|
||||
use crate::execution_step::RcSecurityTetraplets;
|
||||
use crate::JValue;
|
||||
use crate::LambdaAST;
|
||||
use crate::SecurityTetraplet;
|
||||
|
||||
use std::borrow::Cow;
|
||||
use std::ops::Deref;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct StreamJvaluableIngredients<'stream> {
|
||||
pub(crate) stream: &'stream Stream,
|
||||
pub(crate) generation: Generation,
|
||||
}
|
||||
|
||||
// TODO: this will be deleted soon, because it would be impossible to use streams without
|
||||
// canonicalization as an arg of a call
|
||||
impl JValuable for StreamJvaluableIngredients<'_> {
|
||||
fn apply_lambda(&self, lambda: &LambdaAST<'_>, exec_ctx: &ExecutionCtx<'_>) -> ExecutionResult<Cow<'_, JValue>> {
|
||||
let iter = self.iter()?.map(|v| v.result.deref());
|
||||
let select_result = select_by_lambda_from_stream(iter, lambda, exec_ctx)?;
|
||||
|
||||
Ok(select_result.result)
|
||||
}
|
||||
|
||||
fn apply_lambda_with_tetraplets(
|
||||
&self,
|
||||
lambda: &LambdaAST<'_>,
|
||||
exec_ctx: &ExecutionCtx<'_>,
|
||||
) -> ExecutionResult<(Cow<'_, JValue>, SecurityTetraplet)> {
|
||||
let iter = self.iter()?.map(|v| v.result.deref());
|
||||
let select_result = select_by_lambda_from_stream(iter, lambda, exec_ctx)?;
|
||||
|
||||
let tetraplet = match select_result.tetraplet_idx {
|
||||
Some(idx) => {
|
||||
let resolved_call = self
|
||||
.iter()?
|
||||
.nth(idx)
|
||||
.expect(crate::execution_step::TETRAPLET_IDX_CORRECT);
|
||||
resolved_call.tetraplet.as_ref().clone()
|
||||
}
|
||||
None => SecurityTetraplet::new(exec_ctx.run_parameters.current_peer_id.to_string(), "", "", ""),
|
||||
};
|
||||
let tetraplet = populate_tetraplet_with_lambda(tetraplet, lambda);
|
||||
|
||||
Ok((select_result.result, tetraplet))
|
||||
}
|
||||
|
||||
fn as_jvalue(&self) -> Cow<'_, JValue> {
|
||||
let jvalue = self.stream.as_jvalue(self.generation).unwrap();
|
||||
Cow::Owned(jvalue)
|
||||
}
|
||||
|
||||
fn into_jvalue(self: Box<Self>) -> JValue {
|
||||
self.stream.as_jvalue(self.generation).unwrap()
|
||||
}
|
||||
|
||||
fn as_tetraplets(&self) -> RcSecurityTetraplets {
|
||||
self.stream
|
||||
.iter(self.generation)
|
||||
.unwrap()
|
||||
.map(|r| r.tetraplet.clone())
|
||||
.collect::<Vec<_>>()
|
||||
}
|
||||
}
|
||||
|
||||
use crate::execution_step::boxed_value::stream::StreamIter;
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl<'stream> StreamJvaluableIngredients<'stream> {
|
||||
pub(crate) fn new(stream: &'stream Stream, generation: Generation) -> Self {
|
||||
Self { stream, generation }
|
||||
}
|
||||
|
||||
pub(self) fn iter(&self) -> ExecutionResult<StreamIter<'_>> {
|
||||
use crate::execution_step::UncatchableError::StreamDontHaveSuchGeneration;
|
||||
|
||||
match self.stream.iter(self.generation) {
|
||||
Some(iter) => Ok(iter),
|
||||
None => Err(StreamDontHaveSuchGeneration {
|
||||
stream: self.stream.clone(),
|
||||
generation: self.generation,
|
||||
}
|
||||
.into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -17,7 +17,6 @@
|
||||
use super::ExecutionResult;
|
||||
use super::ValueAggregate;
|
||||
use crate::ExecutionError;
|
||||
use crate::JValue;
|
||||
use crate::UncatchableError;
|
||||
|
||||
use air_interpreter_data::GenerationIdx;
|
||||
@ -156,15 +155,6 @@ impl Stream {
|
||||
self.values.iter().all(|v| v.is_empty())
|
||||
}
|
||||
|
||||
pub(crate) fn as_jvalue(&self, generation: Generation) -> Option<JValue> {
|
||||
use std::ops::Deref;
|
||||
|
||||
let iter = self.iter(generation)?;
|
||||
let jvalue_array = iter.map(|r| r.result.deref().clone()).collect::<Vec<_>>();
|
||||
|
||||
Some(JValue::Array(jvalue_array))
|
||||
}
|
||||
|
||||
pub(crate) fn iter(&self, generation: Generation) -> Option<StreamIter<'_>> {
|
||||
let iter: Box<dyn Iterator<Item = &ValueAggregate>> = match generation {
|
||||
Generation::Nth(generation) if generation >= self.generations_count() => return None,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user