Skip to content

Commit cfbd0eb

Browse files
committed
update
1 parent 1b612e9 commit cfbd0eb

34 files changed

Lines changed: 88 additions & 100 deletions

src/coordinator/plan/logical_plan_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ use crate::coordinator::statement::{
4040
use crate::coordinator::tool::ConnectorOptions;
4141
use crate::sql::analysis::{StreamSchemaProvider, maybe_add_key_extension_to_sink, rewrite_sinks};
4242
use crate::sql::common::with_option_keys as opt;
43-
use crate::sql::extensions::sink::StreamEgressNode;
4443
use crate::sql::functions::{is_json_union, serialize_outgoing_json};
4544
use crate::sql::logical_node::logical::{LogicalProgram, ProgramConfig};
45+
use crate::sql::logical_node::sink::StreamEgressNode;
4646
use crate::sql::logical_planner::optimizers::{ChainingOptimizer, produce_optimized_plan};
4747
use crate::sql::logical_planner::planner::PlanToGraphVisitor;
4848
use crate::sql::rewrite_plan;

src/sql/analysis/aggregate_rewriter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use datafusion::prelude::col;
1818
use std::sync::Arc;
1919

2020
use crate::sql::analysis::streaming_window_analzer::StreamingWindowAnalzer;
21-
use crate::sql::extensions::aggregate::StreamWindowAggregateNode;
22-
use crate::sql::extensions::key_calculation::{KeyExtractionNode, KeyExtractionStrategy};
21+
use crate::sql::logical_node::aggregate::StreamWindowAggregateNode;
22+
use crate::sql::logical_node::key_calculation::{KeyExtractionNode, KeyExtractionStrategy};
2323
use crate::sql::schema::StreamSchemaProvider;
2424
use crate::sql::types::{
2525
QualifiedField, TIMESTAMP_FIELD, WindowBehavior, WindowType, build_df_schema_with_metadata,

src/sql/analysis/async_udf_rewriter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// limitations under the License.
1212

1313
use crate::sql::common::constants::sql_field;
14-
use crate::sql::extensions::AsyncFunctionExecutionNode;
15-
use crate::sql::extensions::remote_table::RemoteTableBoundaryNode;
14+
use crate::sql::logical_node::AsyncFunctionExecutionNode;
15+
use crate::sql::logical_node::remote_table::RemoteTableBoundaryNode;
1616
use crate::sql::schema::StreamSchemaProvider;
1717
use datafusion::common::tree_node::{Transformed, TreeNode, TreeNodeRewriter};
1818
use datafusion::common::{Column, Result as DFResult, TableReference, plan_err};

src/sql/analysis/join_rewriter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use crate::sql::analysis::streaming_window_analzer::StreamingWindowAnalzer;
1414
use crate::sql::common::TIMESTAMP_FIELD;
1515
use crate::sql::common::constants::mem_exec_join_side;
16-
use crate::sql::extensions::join::StreamingJoinNode;
17-
use crate::sql::extensions::key_calculation::KeyExtractionNode;
16+
use crate::sql::logical_node::join::StreamingJoinNode;
17+
use crate::sql::logical_node::key_calculation::KeyExtractionNode;
1818
use crate::sql::schema::StreamSchemaProvider;
1919
use crate::sql::types::{WindowType, build_df_schema_with_metadata, extract_qualified_fields};
2020
use datafusion::common::tree_node::{Transformed, TreeNodeRewriter};

src/sql/analysis/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ use datafusion::error::DataFusionError;
4242
use datafusion::logical_expr::{Extension, LogicalPlan, UserDefinedLogicalNodeCore};
4343
use tracing::{debug, info, instrument};
4444

45-
use crate::sql::extensions::StreamingOperatorBlueprint;
46-
use crate::sql::extensions::key_calculation::{KeyExtractionNode, KeyExtractionStrategy};
47-
use crate::sql::extensions::projection::StreamProjectionNode;
48-
use crate::sql::extensions::sink::StreamEgressNode;
45+
use crate::sql::logical_node::StreamingOperatorBlueprint;
46+
use crate::sql::logical_node::key_calculation::{KeyExtractionNode, KeyExtractionStrategy};
47+
use crate::sql::logical_node::projection::StreamProjectionNode;
48+
use crate::sql::logical_node::sink::StreamEgressNode;
4949
use crate::sql::logical_planner::planner::NamedNode;
5050

5151
fn duration_from_sql_expr(

src/sql/analysis/sink_input_rewriter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// See the License for the specific language governing permissions and
1111
// limitations under the License.
1212

13-
use crate::sql::extensions::StreamingOperatorBlueprint;
14-
use crate::sql::extensions::sink::StreamEgressNode;
13+
use crate::sql::logical_node::StreamingOperatorBlueprint;
14+
use crate::sql::logical_node::sink::StreamEgressNode;
1515
use crate::sql::logical_planner::planner::NamedNode;
1616
use datafusion::common::Result as DFResult;
1717
use datafusion::common::tree_node::{Transformed, TreeNodeRecursion, TreeNodeRewriter};

src/sql/analysis/source_metadata_visitor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// See the License for the specific language governing permissions and
1111
// limitations under the License.
1212

13-
use crate::sql::extensions::sink::{STREAM_EGRESS_NODE_NAME, StreamEgressNode};
14-
use crate::sql::extensions::table_source::{STREAM_INGESTION_NODE_NAME, StreamIngestionNode};
13+
use crate::sql::logical_node::sink::{STREAM_EGRESS_NODE_NAME, StreamEgressNode};
14+
use crate::sql::logical_node::table_source::{STREAM_INGESTION_NODE_NAME, StreamIngestionNode};
1515
use crate::sql::schema::StreamSchemaProvider;
1616
use datafusion::common::Result as DFResult;
1717
use datafusion::common::tree_node::{TreeNodeRecursion, TreeNodeVisitor};

src/sql/analysis/source_rewriter.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ use datafusion::logical_expr::{
2121
};
2222

2323
use crate::sql::common::UPDATING_META_FIELD;
24-
use crate::sql::extensions::debezium::UnrollDebeziumPayloadNode;
25-
use crate::sql::extensions::remote_table::RemoteTableBoundaryNode;
26-
use crate::sql::extensions::table_source::StreamIngestionNode;
27-
use crate::sql::extensions::watermark_node::EventTimeWatermarkNode;
24+
use crate::sql::logical_node::debezium::UnrollDebeziumPayloadNode;
25+
use crate::sql::logical_node::remote_table::RemoteTableBoundaryNode;
26+
use crate::sql::logical_node::table_source::StreamIngestionNode;
27+
use crate::sql::logical_node::watermark_node::EventTimeWatermarkNode;
2828
use crate::sql::schema::ColumnDescriptor;
2929
use crate::sql::schema::StreamSchemaProvider;
3030
use crate::sql::schema::source_table::SourceTable;

src/sql/analysis/stream_rewriter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use crate::sql::analysis::{
1919
aggregate_rewriter::AggregateRewriter, join_rewriter::JoinRewriter,
2020
window_function_rewriter::WindowFunctionRewriter,
2121
};
22-
use crate::sql::extensions::StreamingOperatorBlueprint;
23-
use crate::sql::extensions::remote_table::RemoteTableBoundaryNode;
22+
use crate::sql::logical_node::StreamingOperatorBlueprint;
23+
use crate::sql::logical_node::remote_table::RemoteTableBoundaryNode;
2424
use crate::sql::schema::utils::{add_timestamp_field, has_timestamp_field};
2525
use crate::sql::types::{QualifiedField, TIMESTAMP_FIELD};
2626
use datafusion::common::tree_node::{Transformed, TreeNodeRewriter};

src/sql/analysis/streaming_window_analzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use datafusion::common::tree_node::{TreeNodeRecursion, TreeNodeVisitor};
1717
use datafusion::common::{Column, DFSchema, DataFusionError, Result};
1818
use datafusion::logical_expr::{Expr, Extension, LogicalPlan, expr::Alias};
1919

20-
use crate::sql::extensions::aggregate::{STREAM_AGG_EXTENSION_NAME, StreamWindowAggregateNode};
21-
use crate::sql::extensions::join::STREAM_JOIN_NODE_TYPE;
20+
use crate::sql::logical_node::aggregate::{STREAM_AGG_EXTENSION_NAME, StreamWindowAggregateNode};
21+
use crate::sql::logical_node::join::STREAM_JOIN_NODE_TYPE;
2222
use crate::sql::types::{
2323
QualifiedField, WindowBehavior, WindowType, extract_qualified_fields, extract_window_type,
2424
};

0 commit comments

Comments
 (0)