refactor: change blocking pruning process to non-blocking channel

src/query/catalog/src/plan/partition.rs

@@ -301,37 +301,10 @@ impl StealablePartitions {
         self.disable_steal = true;
     }
 
-    pub fn steal_one(&self, idx: usize) -> Option<PartInfoPtr> {
+    pub fn steal(&self, idx: usize, max_size: usize) -> Option<Vec<PartInfoPtr>> {
         let mut partitions = self.partitions.write();
         if partitions.is_empty() {
-            return self.ctx.get_partition();
-        }
-
-        let idx = if idx >= partitions.len() {
-            idx % partitions.len()
-        } else {
-            idx
-        };
-
-        for step in 0..partitions.len() {
-            let index = (idx + step) % partitions.len();
-            if !partitions[index].is_empty() {
-                return partitions[index].pop_front();
-            }
-
-            if self.disable_steal {
-                break;
-            }
-        }
-
-        drop(partitions);
-        self.ctx.get_partition()
-    }
-
-    pub fn steal(&self, idx: usize, max_size: usize) -> Vec<PartInfoPtr> {
-        let mut partitions = self.partitions.write();
-        if partitions.is_empty() {
-            return self.ctx.get_partitions(max_size);
+            return None;
         }
 
         let idx = if idx >= partitions.len() {
@@ -346,7 +319,7 @@ impl StealablePartitions {
             if !partitions[index].is_empty() {
                 let ps = &mut partitions[index];
                 let size = ps.len().min(max_size);
-                return ps.drain(..size).collect();
+                return Some(ps.drain(..size).collect());
             }
 
             if self.disable_steal {
@@ -355,7 +328,8 @@ impl StealablePartitions {
         }
 
         drop(partitions);
-        self.ctx.get_partitions(max_size)
+
+        None
     }
 }
 

src/query/storages/fuse/src/operations/read/block_partition_meta.rs

@@ -0,0 +1,44 @@
+// Copyright 2021 Datafuse Labs
+//
+// 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::fmt::Debug;
+use std::fmt::Formatter;
+
+use databend_common_catalog::plan::PartInfoPtr;
+use databend_common_expression::local_block_meta_serde;
+use databend_common_expression::BlockMetaInfo;
+use databend_common_expression::BlockMetaInfoPtr;
+
+pub struct BlockPartitionMeta {
+    pub part_ptr: Vec<PartInfoPtr>,
+}
+
+impl BlockPartitionMeta {
+    pub fn create(part_ptr: Vec<PartInfoPtr>) -> BlockMetaInfoPtr {
+        Box::new(BlockPartitionMeta { part_ptr })
+    }
+}
+
+impl Debug for BlockPartitionMeta {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("BlockPartitionMeta")
+            .field("part_ptr", &self.part_ptr)
+            .finish()
+    }
+}
+
+local_block_meta_serde!(BlockPartitionMeta);
+
+#[typetag::serde(name = "block_partition_meta")]
+impl BlockMetaInfo for BlockPartitionMeta {}

src/query/storages/fuse/src/operations/read/block_partition_receiver_source.rs

@@ -0,0 +1,66 @@
+// Copyright 2021 Datafuse Labs
+//
+// 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::sync::Arc;
+
+use async_channel::Receiver;
+use databend_common_catalog::plan::PartInfoPtr;
+use databend_common_catalog::table_context::TableContext;
+use databend_common_exception::Result;
+use databend_common_expression::DataBlock;
+use databend_common_pipeline_core::processors::OutputPort;
+use databend_common_pipeline_core::processors::ProcessorPtr;
+use databend_common_pipeline_sources::AsyncSource;
+use databend_common_pipeline_sources::AsyncSourcer;
+
+use crate::operations::read::block_partition_meta::BlockPartitionMeta;
+
+pub struct BlockPartitionReceiverSource {
+    pub meta_receiver: Receiver<Result<PartInfoPtr>>,
+}
+
+impl BlockPartitionReceiverSource {
+    pub fn create(
+        ctx: Arc<dyn TableContext>,
+        receiver: Receiver<Result<PartInfoPtr>>,
+        output_port: Arc<OutputPort>,
+    ) -> Result<ProcessorPtr> {
+        AsyncSourcer::create(ctx, output_port, Self {
+            meta_receiver: receiver,
+        })
+    }
+}
+
+#[async_trait::async_trait]
+impl AsyncSource for BlockPartitionReceiverSource {
+    const NAME: &'static str = "BlockPartitionReceiverSource";
+    const SKIP_EMPTY_DATA_BLOCK: bool = false;
+
+    #[async_backtrace::framed]
+    async fn generate(&mut self) -> Result<Option<DataBlock>> {
+        match self.meta_receiver.recv().await {
+            Ok(Ok(part)) => Ok(Some(DataBlock::empty_with_meta(
+                BlockPartitionMeta::create(vec![part]),
+            ))),
+            Ok(Err(e)) => Err(
+                // The error is occurred in pruning process
+                e,
+            ),
+            Err(_) => {
+                // The channel is closed, we should return None to stop generating
+                Ok(None)
+            }
+        }
+    }
+}

src/query/storages/fuse/src/operations/read/block_partition_source.rs

@@ -0,0 +1,60 @@
+// Copyright 2021 Datafuse Labs
+//
+// 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::sync::Arc;
+
+use databend_common_catalog::plan::StealablePartitions;
+use databend_common_catalog::table_context::TableContext;
+use databend_common_expression::DataBlock;
+use databend_common_pipeline_core::processors::OutputPort;
+use databend_common_pipeline_core::processors::ProcessorPtr;
+use databend_common_pipeline_sources::SyncSource;
+use databend_common_pipeline_sources::SyncSourcer;
+
+use crate::operations::read::block_partition_meta::BlockPartitionMeta;
+
+pub struct BlockPartitionSource {
+    id: usize,
+    partitions: StealablePartitions,
+    max_batch_size: usize,
+}
+
+impl BlockPartitionSource {
+    pub fn create(
+        id: usize,
+        partitions: StealablePartitions,
+        max_batch_size: usize,
+        ctx: Arc<dyn TableContext>,
+        output_port: Arc<OutputPort>,
+    ) -> databend_common_exception::Result<ProcessorPtr> {
+        SyncSourcer::create(ctx, output_port, BlockPartitionSource {
+            id,
+            partitions,
+            max_batch_size,
+        })
+    }
+}
+
+impl SyncSource for BlockPartitionSource {
+    const NAME: &'static str = "BlockPartitionSource";
+
+    fn generate(&mut self) -> databend_common_exception::Result<Option<DataBlock>> {
+        match self.partitions.steal(self.id, self.max_batch_size) {
+            None => Ok(None),
+            Some(parts) => Ok(Some(DataBlock::empty_with_meta(
+                BlockPartitionMeta::create(parts),
+            ))),
+        }
+    }
+}