feat: add parquet nested leaf projection

src/catalog/src/process_manager.rs

@@ -395,7 +395,7 @@ impl SlowQueryTimer {
 
 impl Drop for SlowQueryTimer {
     fn drop(&mut self) {
-        // Calculate the elaspsed duration since the timer is created.
+        // Calculate the elapsed duration since the timer is created.
         let elapsed = self.start.elapsed();
         if elapsed > self.threshold {
             // Only capture a portion of slow queries based on sample_ratio.

src/mito2/src/sst/parquet.rs

@@ -31,6 +31,7 @@ pub mod format;
 pub(crate) mod helper;
 pub(crate) mod metadata;
 pub mod prefilter;
+pub mod read_columns;
 pub mod reader;
 pub mod row_group;
 pub mod row_selection;

src/mito2/src/sst/parquet/read_columns.rs

@@ -0,0 +1,285 @@
+// Copyright 2023 Greptime Team
+//
+// 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 std::collections::HashMap;
+
+use parquet::schema::types::SchemaDescriptor;
+
+/// A nested field access path inside one parquet root column.
+pub type ParquetNestedPath = Vec<String>;
+
+/// The parquet columns to read.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ParquetReadColumns {
+    cols: Vec<ParquetReadColumn>,
+}
+
+impl ParquetReadColumns {
+    /// Builds root-column projections from root indices that are already
+    /// deduplicated.
+    ///
+    /// Note: this constructor does not check for duplicates.
+    pub fn from_deduped_root_indices(root_indices: impl IntoIterator<Item = usize>) -> Self {
+        let cols = root_indices
+            .into_iter()
+            .map(ParquetReadColumn::new)
+            .collect();
+        Self { cols }
+    }
+
+    pub fn columns(&self) -> &[ParquetReadColumn] {
+        &self.cols
+    }
+}
+
+/// Read requirement for a single parquet root column.
+///
+/// `root_index` identifies the root column in the parquet schema.
+///
+/// If `nested_paths` is empty, the whole root column is read. Otherwise, only
+/// leaves under the specified nested paths are read.
+///
+/// To construct a [`ParquetReadColumn`]:
+/// - `ParquetReadColumn::new(0)` reads the whole root column at index `0`.
+/// - `ParquetReadColumn::new(0).with_nested_paths(vec![vec!["j".into(), "b".into()]])`
+///   reads only leaves under `j.b`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ParquetReadColumn {
+    /// Root field index in the parquet schema.
+    root_index: usize,
+    /// Nested paths to read under this root column.
+    ///
+    /// Each path includes the root column itself. For example, for a root
+    /// column `j`, path `["j", "a", "b"]` refers to `j.a.b`.
+    ///
+    /// If empty, the whole root column is read.
+    nested_paths: Vec<ParquetNestedPath>,
+}
+
+impl ParquetReadColumn {
+    pub fn new(root_index: usize) -> Self {
+        Self {
+            root_index,
+            nested_paths: vec![],
+        }
+    }
+
+    pub fn with_nested_paths(self, nested_paths: Vec<ParquetNestedPath>) -> Self {
+        Self {
+            nested_paths,
+            ..self
+        }
+    }
+
+    pub fn root_index(&self) -> usize {
+        self.root_index
+    }
+
+    pub fn nested_paths(&self) -> &[ParquetNestedPath] {
+        &self.nested_paths
+    }
+}
+
+/// Builds parquet leaf-column indices from parquet read columns.
+pub fn build_parquet_leaves_indices(
+    parquet_schema_desc: &SchemaDescriptor,
+    projection: &ParquetReadColumns,
+) -> Vec<usize> {
+    let mut map = HashMap::new();
+    for col in &projection.cols {
+        map.insert(col.root_index, &col.nested_paths);
+    }
+
+    let mut leaf_indices = Vec::new();
+    for (leaf_idx, leaf_col) in parquet_schema_desc.columns().iter().enumerate() {
+        let root_idx = parquet_schema_desc.get_column_root_idx(leaf_idx);
+        let Some(nested_paths) = map.get(&root_idx) else {
+            continue;
+        };
+        if nested_paths.is_empty() {
+            leaf_indices.push(leaf_idx);
+            continue;
+        }
+
+        let leaf_path = leaf_col.path().parts();
+        if nested_paths
+            .iter()
+            .any(|nested_path| leaf_path.starts_with(nested_path))
+        {
+            leaf_indices.push(leaf_idx);
+        }
+    }
+    leaf_indices
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use parquet::basic::Repetition;
+    use parquet::schema::types::Type;
+
+    use super::*;
+
+    #[test]
+    fn test_reads_whole_root() {
+        let parquet_schema_desc = build_test_nested_parquet_schema();
+
+        let projection = ParquetReadColumns {
+            cols: vec![ParquetReadColumn {
+                root_index: 0,
+                nested_paths: vec![],
+            }],
+        };
+
+        assert_eq!(
+            vec![0, 1, 2],
+            build_parquet_leaves_indices(&parquet_schema_desc, &projection)
+        );
+    }
+
+    #[test]
+    fn test_filters_nested_paths() {
+        let parquet_schema_desc = build_test_nested_parquet_schema();
+
+        let projection = ParquetReadColumns {
+            cols: vec![
+                ParquetReadColumn {
+                    root_index: 0,
+                    nested_paths: vec![vec!["j".to_string(), "b".to_string()]],
+                },
+                ParquetReadColumn {
+                    root_index: 1,
+                    nested_paths: vec![],
+                },
+            ],
+        };
+
+        assert_eq!(
+            vec![1, 2, 3],
+            build_parquet_leaves_indices(&parquet_schema_desc, &projection)
+        );
+    }
+
+    #[test]
+    fn test_reads_middle_level_path() {
+        let parquet_schema_desc = build_test_nested_parquet_schema();
+
+        let projection = ParquetReadColumns {
+            cols: vec![ParquetReadColumn {
+                root_index: 0,
+                nested_paths: vec![vec!["j".to_string(), "b".to_string()]],
+            }],
+        };
+
+        assert_eq!(
+            vec![1, 2],
+            build_parquet_leaves_indices(&parquet_schema_desc, &projection)
+        );
+    }
+
+    #[test]
+    fn test_reads_leaf_level_path() {
+        let parquet_schema_desc = build_test_nested_parquet_schema();
+
+        let projection = ParquetReadColumns {
+            cols: vec![ParquetReadColumn {
+                root_index: 0,
+                nested_paths: vec![vec!["j".to_string(), "b".to_string(), "c".to_string()]],
+            }],
+        };
+
+        assert_eq!(
+            vec![1],
+            build_parquet_leaves_indices(&parquet_schema_desc, &projection)
+        );
+    }
+
+    #[test]
+    fn test_merges_mixed_paths() {
+        let parquet_schema_desc = build_test_nested_parquet_schema();
+
+        let projection = ParquetReadColumns {
+            cols: vec![ParquetReadColumn {
+                root_index: 0,
+                nested_paths: vec![
+                    vec!["j".to_string(), "a".to_string()],
+                    vec!["j".to_string(), "b".to_string(), "d".to_string()],
+                ],
+            }],
+        };
+
+        assert_eq!(
+            vec![0, 2],
+            build_parquet_leaves_indices(&parquet_schema_desc, &projection)
+        );
+    }
+
+    // Test schema:
+    // schema
+    // |- j
+    // |  |- a: INT64
+    // |  `- b
+    // |     |- c: INT64
+    // |     `- d: INT64
+    // `- k: INT64
+    fn build_test_nested_parquet_schema() -> SchemaDescriptor {
+        let leaf_a = Arc::new(
+            Type::primitive_type_builder("a", parquet::basic::Type::INT64)
+                .with_repetition(Repetition::REQUIRED)
+                .build()
+                .unwrap(),
+        );
+        let leaf_c = Arc::new(
+            Type::primitive_type_builder("c", parquet::basic::Type::INT64)
+                .with_repetition(Repetition::REQUIRED)
+                .build()
+                .unwrap(),
+        );
+        let leaf_d = Arc::new(
+            Type::primitive_type_builder("d", parquet::basic::Type::INT64)
+                .with_repetition(Repetition::REQUIRED)
+                .build()
+                .unwrap(),
+        );
+        let group_b = Arc::new(
+            Type::group_type_builder("b")
+                .with_repetition(Repetition::REQUIRED)
+                .with_fields(vec![leaf_c, leaf_d])
+                .build()
+                .unwrap(),
+        );
+        let root_j = Arc::new(
+            Type::group_type_builder("j")
+                .with_repetition(Repetition::REQUIRED)
+                .with_fields(vec![leaf_a, group_b])
+                .build()
+                .unwrap(),
+        );
+        let root_k = Arc::new(
+            Type::primitive_type_builder("k", parquet::basic::Type::INT64)
+                .with_repetition(Repetition::REQUIRED)
+                .build()
+                .unwrap(),
+        );
+        let schema = Arc::new(
+            Type::group_type_builder("schema")
+                .with_fields(vec![root_j, root_k])
+                .build()
+                .unwrap(),
+        );
+
+        SchemaDescriptor::new(schema)
+    }
+}

src/mito2/src/sst/parquet/reader.rs

@@ -79,6 +79,7 @@ use crate::sst::parquet::metadata::MetadataLoader;
 use crate::sst::parquet::prefilter::{
     PrefilterContextBuilder, execute_prefilter, is_usable_primary_key_filter,
 };
+use crate::sst::parquet::read_columns::{ParquetReadColumns, build_parquet_leaves_indices};
 use crate::sst::parquet::row_group::ParquetFetchMetrics;
 use crate::sst::parquet::row_selection::RowGroupSelection;
 use crate::sst::parquet::stats::RowGroupPruningStats;
@@ -420,10 +421,12 @@ impl ParquetReaderBuilder {
 
         // Computes the projection mask.
         let parquet_schema_desc = parquet_meta.file_metadata().schema_descr();
-        let indices = read_format.projection_indices();
-        // Now we assumes we don't have nested schemas.
-        // TODO(yingwen): Revisit this if we introduce nested types such as JSON type.
-        let projection_mask = ProjectionMask::roots(parquet_schema_desc, indices.iter().copied());
+        let parquet_projection = ParquetReadColumns::from_deduped_root_indices(
+            read_format.projection_indices().iter().copied(),
+        );
+        let leaf_indices = build_parquet_leaves_indices(parquet_schema_desc, &parquet_projection);
+        let projection_mask =
+            ProjectionMask::leaves(parquet_schema_desc, leaf_indices.iter().copied());
         let selection = self
             .row_groups_to_read(&read_format, &parquet_meta, &mut metrics.filter_metrics)
             .await;