liurenjie1024 commented on code in PR #317: URL: https://github.com/apache/iceberg-rust/pull/317#discussion_r1554520971
########## crates/iceberg/src/expr/accessor.rs: ########## @@ -0,0 +1,119 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 crate::spec::{Datum, Literal, PrimitiveType, Struct}; +use serde_derive::{Deserialize, Serialize}; +use std::sync::Arc; + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +enum InnerOrType { + Inner(Box<StructAccessor>), + Type(PrimitiveType), +} + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +pub struct StructAccessor { + position: usize, + r#type: PrimitiveType, + inner: Option<Box<StructAccessor>>, +} + +pub(crate) type StructAccessorRef = Arc<StructAccessor>; + +impl StructAccessor { + pub(crate) fn new(position: usize, r#type: PrimitiveType) -> Self { + StructAccessor { + position, + r#type, + inner: None, + } + } + + pub(crate) fn wrap(position: usize, inner: Box<StructAccessor>) -> Self { + StructAccessor { + position, + r#type: inner.r#type().clone(), + inner: Some(inner), + } + } + + pub(crate) fn position(&self) -> usize { + self.position + } + + pub(crate) fn r#type(&self) -> &PrimitiveType { + &self.r#type + } + + pub(crate) fn get<'a>(&'a self, container: &'a Struct) -> Datum { + match &self.inner { + None => { + let Literal::Primitive(literal) = &container[self.position] else { + panic!("Expected Literal to be Primitive"); + }; + + Datum::new(self.r#type().clone(), literal.clone()) + } + Some(inner) => { + let Literal::Struct(wrapped) = &container[self.position] else { + panic!("Nested accessor should only be wrapping a Struct"); Review Comment: Ditto. ########## crates/iceberg/src/spec/schema.rs: ########## @@ -137,9 +142,55 @@ impl SchemaBuilder { name_to_id, lowercase_name_to_id, id_to_name, + + field_id_to_accessor, }) } + fn build_accessors(&self) -> HashMap<i32, Arc<StructAccessor>> { Review Comment: > Will do, re SchemaVisitor. Sorry Renjie, not sure what you mean with the second comment though? Sorry, I mean adding some unit test and example code in api to demonstrate its usage, like what python does here: https://github.com/apache/iceberg-python/blob/d3db8401cd006fcbacf1d9a2502248ce4228ff06/pyiceberg/schema.py#L1162 ########## crates/iceberg/src/expr/accessor.rs: ########## @@ -0,0 +1,119 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 crate::spec::{Datum, Literal, PrimitiveType, Struct}; +use serde_derive::{Deserialize, Serialize}; +use std::sync::Arc; + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +enum InnerOrType { Review Comment: Should we remove this? ########## crates/iceberg/src/expr/accessor.rs: ########## @@ -0,0 +1,114 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 crate::spec::{Literal, Struct, Type}; +use serde_derive::{Deserialize, Serialize}; +use std::sync::Arc; + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +enum InnerOrType { + Inner(Arc<StructAccessor>), + Type(Type), +} + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +pub struct StructAccessor { Review Comment: This is `WrappedPositionAccessor` in java, and it's only used to access struct. Sounds reasonable to me, thanks for explaination. ########## crates/iceberg/src/spec/schema.rs: ########## @@ -137,9 +142,55 @@ impl SchemaBuilder { name_to_id, lowercase_name_to_id, id_to_name, + + field_id_to_accessor, }) } + fn build_accessors(&self) -> HashMap<i32, Arc<StructAccessor>> { Review Comment: > SchemaVisitor won't work for this without some modifications. We need to know the index within Schema.fields for each field to create its accessor, and visit_struct does not provide this at the moment. Sorry, I don't get your point, following code would work? ```rust fn visit_struct(&self, struct: &Struct, field_results: Vec<Option<StructAccessor>>) { struct.fields.zip(field_result).enumerate().map(|(index, (field, field_result)|) {} } ``` ########## crates/iceberg/src/expr/accessor.rs: ########## @@ -0,0 +1,119 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 crate::spec::{Datum, Literal, PrimitiveType, Struct}; +use serde_derive::{Deserialize, Serialize}; +use std::sync::Arc; + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +enum InnerOrType { + Inner(Box<StructAccessor>), + Type(PrimitiveType), +} + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +pub struct StructAccessor { + position: usize, + r#type: PrimitiveType, + inner: Option<Box<StructAccessor>>, +} + +pub(crate) type StructAccessorRef = Arc<StructAccessor>; + +impl StructAccessor { + pub(crate) fn new(position: usize, r#type: PrimitiveType) -> Self { + StructAccessor { + position, + r#type, + inner: None, + } + } + + pub(crate) fn wrap(position: usize, inner: Box<StructAccessor>) -> Self { + StructAccessor { + position, + r#type: inner.r#type().clone(), + inner: Some(inner), + } + } + + pub(crate) fn position(&self) -> usize { + self.position + } + + pub(crate) fn r#type(&self) -> &PrimitiveType { + &self.r#type + } + + pub(crate) fn get<'a>(&'a self, container: &'a Struct) -> Datum { + match &self.inner { + None => { + let Literal::Primitive(literal) = &container[self.position] else { + panic!("Expected Literal to be Primitive"); Review Comment: I think we should return error rather than panic here? The invalid input may come from malformed file, and it should not crash the program. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
