korlov42 commented on code in PR #6374:
URL: https://github.com/apache/ignite-3/pull/6374#discussion_r2266719045
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/FragmentPrinter.java:
##########
@@ -50,7 +52,7 @@ public final class FragmentPrinter {
static String FRAGMENT_PREFIX = "Fragment#";
- private final boolean verbose;
Review Comment:
why did you remove `final`?
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/Cloner.java:
##########
@@ -47,4 +54,58 @@ public static IgniteRel clone(IgniteRel root, RelOptCluster
cluster) {
private IgniteRel visit(IgniteRel rel) {
return rel.clone(cluster, Commons.transform(rel.getInputs(), rel0 ->
visit((IgniteRel) rel0)));
}
+
+
+ /**
+ * Clones and assigns source ids to all source relations.
+ *
+ * @param root Plan.
+ * @param cluster Cluster.
+ * @return The number of source relations in the given plan and the plan
itself.
+ */
+ public static IntObjectPair<IgniteRel> cloneAndAssignSourceId(IgniteRel
root, RelOptCluster cluster) {
+ CloneAndAssignIds assigner = new CloneAndAssignIds(cluster);
+ IgniteRel result = assigner.visit(root);
+ int numSources = assigner.sourceIndex;
+
+ return new IntObjectImmutablePair<>(numSources, result);
+ }
+
+ private static class CloneAndAssignIds extends IgniteRelShuttle {
+
+ private final RelOptCluster cluster;
+
+ private int sourceIndex;
+
+ private CloneAndAssignIds(RelOptCluster cluster) {
+ this.cluster = cluster;
+ }
+
+ @Override
+ public IgniteRel visit(IgniteRel rel) {
+ if (rel instanceof SourceAwareIgniteRel && !(rel instanceof
IgniteTrimExchange)) {
Review Comment:
why do you skip TrimExchange?
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/pruning/PartitionPruner.java:
##########
@@ -32,5 +32,5 @@ public interface PartitionPruner {
*
* @return New list of mapped fragments, if partition pruning was applied.
Otherwise returns `mappedFragments`.
*/
- List<MappedFragment> apply(List<MappedFragment> mappedFragments, Object[]
dynamicParameters);
+ List<MappedFragment> apply(List<MappedFragment> mappedFragments, Object[]
dynamicParameters, PartitionPruningMetadata metadata);
Review Comment:
please add new param to javadoc
##########
modules/sql-engine/src/test/resources/mapping/test_partition_pruning.test:
##########
@@ -360,3 +389,92 @@ Fragment#3 correlated
projection: [true]
est: (rows=1)
---
+
+N0
+SELECT id, c1 FROM (SELECT id, c1 FROM t1_n1n2n3 EXCEPT ALL SELECT id, c1 FROM
t1_n1n2n3 WHERE id IN (1, 1, 3, 3)) tmp ORDER BY id ASC
+---
+Fragment#2 root
+ distribution: single
+ executionNodes: [N0]
+ exchangeSourceNodes: {3=[N1, N2, N3]}
+ colocationGroup[-1]: {nodes=[N0], sourceIds=[-1, 3], assignments={},
partitionsWithConsistencyTokens={N0=[]}}
+ colocationGroup[3]: {nodes=[N0], sourceIds=[-1, 3], assignments={},
partitionsWithConsistencyTokens={N0=[]}}
+ tree:
+ Receiver
+ fieldNames: [ID, C1]
+ sourceFragmentId: 3
+ est: (rows=1)
+
+Fragment#3
+ distribution: table PUBLIC.T1_N1N2N3 in zone ZONE_1
+ executionNodes: [N1, N2, N3]
+ targetNodes: [N0]
+ colocationGroup[0]: {nodes=[N1, N2, N3], sourceIds=[0],
assignments={part_0=N1:3, part_1=N2:3, part_2=N3:3},
partitionsWithConsistencyTokens={N1=[part_0:3], N2=[part_1:3], N3=[part_2:3]}}
+ colocationGroup[1]: {nodes=[N2], sourceIds=[1], assignments={part_1=N2:3},
partitionsWithConsistencyTokens={N2=[part_1:3]}}
+ partitions: [T1_N1N2N3=[N1={0}, N2={1}, N3={2}]]
+ tree:
+ Sender
+ distribution: single
+ targetFragmentId: 2
+ est: (rows=71577)
+ Sort
+ collation: [ID ASC]
+ est: (rows=71577)
+ ColocatedMinus
+ all: true
+ est: (rows=71577)
+ TableScan
+ table: PUBLIC.T1_N1N2N3
+ fieldNames: [ID, C1]
+ est: (rows=100001)
+ TableScan
+ table: PUBLIC.T1_N1N2N3
+ predicate: SEARCH(ID, Sarg[1, 3])
+ fieldNames: [ID, C1]
+ est: (rows=56847)
+---
+
+N0
+SELECT id, c1 FROM (SELECT id, c1 FROM t1_n1n2n3 WHERE id IN (1, 1, 3, 3)
EXCEPT ALL SELECT id, c1 FROM t1_n1n2n3 WHERE id IN (1, 1, 3, 3)) tmp ORDER BY
id ASC
+---
+Fragment#2 root
+ distribution: single
+ executionNodes: [N0]
+ exchangeSourceNodes: {3=[N2]}
+ colocationGroup[-1]: {nodes=[N0], sourceIds=[-1, 3], assignments={},
partitionsWithConsistencyTokens={N0=[]}}
+ colocationGroup[3]: {nodes=[N0], sourceIds=[-1, 3], assignments={},
partitionsWithConsistencyTokens={N0=[]}}
+ tree:
+ Receiver
+ fieldNames: [ID, C1]
+ sourceFragmentId: 3
+ est: (rows=1)
+
+Fragment#3
+ distribution: table PUBLIC.T1_N1N2N3 in zone ZONE_1
+ executionNodes: [N2]
+ targetNodes: [N0]
+ colocationGroup[0]: {nodes=[N2], sourceIds=[0], assignments={part_1=N2:3},
partitionsWithConsistencyTokens={N2=[part_1:3]}}
+ colocationGroup[1]: {nodes=[N2], sourceIds=[1], assignments={part_1=N2:3},
partitionsWithConsistencyTokens={N2=[part_1:3]}}
+ partitions: [T1_N1N2N3=[N2={1}]]
+ tree:
+ Sender
+ distribution: single
+ targetFragmentId: 2
+ est: (rows=28424)
+ Sort
+ collation: [ID ASC]
+ est: (rows=28424)
+ ColocatedMinus
+ all: true
+ est: (rows=28424)
+ TableScan
+ table: PUBLIC.T1_N1N2N3
+ predicate: SEARCH(ID, Sarg[1, 3])
+ fieldNames: [ID, C1]
+ est: (rows=56847)
+ TableScan
+ table: PUBLIC.T1_N1N2N3
+ predicate: SEARCH(ID, Sarg[1, 3])
+ fieldNames: [ID, C1]
+ est: (rows=56847)
+---
Review Comment:
empty line is missed
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/MappingServiceImpl.java:
##########
@@ -360,14 +362,21 @@ private static ExecutionTarget
buildTargetForSystemView(ExecutionTargetFactory f
: factory.allOf(nodes);
}
- private List<MappedFragment> applyPartitionPruning(List<MappedFragment>
mappedFragments, MappingParameters parameters) {
- return partitionPruner.apply(mappedFragments,
parameters.dynamicParameters());
+ private List<MappedFragment> applyPartitionPruning(
+ List<MappedFragment> mappedFragments,
+ MappingParameters parameters,
+ @Nullable PartitionPruningMetadata partitionPruningMetadata
+ ) {
+ if (partitionPruningMetadata == null) {
+ return mappedFragments;
+ }
+ return partitionPruner.apply(mappedFragments,
parameters.dynamicParameters(), partitionPruningMetadata);
}
private FragmentsTemplate getOrCreateTemplate(MultiStepPlan plan) {
// QuerySplitter is deterministic, thus we can cache result in order
to reuse it next time
return templatesCache.get(plan.id(), key -> {
- IdGenerator idGenerator = new IdGenerator(0);
+ IdGenerator idGenerator = new IdGenerator(plan.numSources());
Review Comment:
why can't we keep it `0`?
--
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: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
