You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2020/06/04 11:47:28 UTC
[ignite] branch ignite-13021 updated (01205d8 -> bc76978)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-13021
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 01205d8 WIP. debug.
add 142af58 IGNITE-13117: Calcite integration. Update Calcite version to 1.23.0
new bc76978 Merge branch 'ignite-12248' into ignite-13021
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
modules/calcite/pom.xml | 2 +-
.../query/calcite/CalciteQueryProcessor.java | 14 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 6 +-
.../query/calcite/exec/LogicalRelImplementor.java | 16 +-
.../query/calcite/exec/exp/ExpressionFactory.java | 2 +-
.../calcite/exec/exp/ExpressionFactoryImpl.java | 10 +-
...rsFactoryImpl.java => AccumulatorsFactory.java} | 254 +++++-------
.../query/calcite/exec/rel/AggregateNode.java | 8 +-
.../query/calcite/externalize/RelJson.java | 53 ++-
.../query/calcite/externalize/RelJsonReader.java | 8 +
.../query/calcite/externalize/RelJsonWriter.java | 8 +
.../metadata/IgniteMdDerivedDistribution.java | 194 ----------
.../calcite/metadata/IgniteMdDistribution.java | 36 +-
.../query/calcite/metadata/IgniteMetadata.java | 15 -
.../query/calcite/metadata/RelMetadataQueryEx.java | 25 --
.../query/calcite/prepare/IgnitePlanner.java | 139 +++----
.../query/calcite/prepare/IgnitePrograms.java | 21 -
.../query/calcite/prepare/IgniteSqlValidator.java | 8 +-
.../query/calcite/prepare/MultiStepDmlPlan.java | 2 +-
.../query/calcite/prepare/MultiStepQueryPlan.java | 2 +-
.../query/calcite/prepare/PlannerPhase.java | 17 +-
.../query/calcite/prepare/PlanningContext.java | 6 +-
.../processors/query/calcite/prepare/Splitter.java | 10 +-
.../query/calcite/rel/IgniteAggregate.java | 169 +++++++-
.../query/calcite/rel/IgniteConvention.java | 8 +
.../query/calcite/rel/IgniteExchange.java | 42 +-
.../processors/query/calcite/rel/IgniteFilter.java | 25 +-
.../processors/query/calcite/rel/IgniteJoin.java | 284 +++++++++++++-
.../query/calcite/rel/IgniteMapAggregate.java | 48 ++-
.../query/calcite/rel/IgniteProject.java | 127 +++++-
.../query/calcite/rel/IgniteReceiver.java | 40 +-
.../query/calcite/rel/IgniteReduceAggregate.java | 10 +-
.../processors/query/calcite/rel/IgniteRel.java | 27 +-
.../processors/query/calcite/rel/IgniteSender.java | 15 +
.../processors/query/calcite/rel/IgniteSort.java | 34 +-
.../query/calcite/rel/IgniteTableModify.java | 9 +-
.../query/calcite/rel/IgniteTableScan.java | 16 +-
.../query/calcite/rel/IgniteTrimExchange.java | 36 +-
.../query/calcite/rel/IgniteUnionAll.java | 58 ++-
.../processors/query/calcite/rel/IgniteValues.java | 5 +-
...rRule.java => AbstractIgniteConverterRule.java} | 48 +--
.../query/calcite/rule/AggregateConverterRule.java | 23 +-
.../rule/AggregateTraitsPropagationRule.java | 94 -----
.../query/calcite/rule/FilterConverterRule.java | 20 +-
.../calcite/rule/FilterTraitsPropagationRule.java | 57 ---
.../query/calcite/rule/JoinConverterRule.java | 24 +-
.../calcite/rule/JoinTraitsPropagationRule.java | 77 ----
.../query/calcite/rule/ProjectConverterRule.java | 20 +-
.../query/calcite/rule/PushFilterIntoScanRule.java | 32 +-
...PropagationRule.java => RegisterIndexRule.java} | 53 +--
.../processors/query/calcite/rule/RuleUtils.java | 198 ----------
.../query/calcite/rule/SortConverterRule.java | 21 +-
.../calcite/rule/SortTraitsPropagationRule.java | 60 ---
.../calcite/rule/TableModifyConverterRule.java | 30 +-
.../query/calcite/rule/UnionConverterRule.java | 34 +-
.../calcite/rule/UnionTraitsPropagationRule.java | 69 ----
.../query/calcite/rule/ValuesConverterRule.java | 24 +-
.../query/calcite/schema/IgniteSchema.java | 14 -
.../query/calcite/schema/IgniteTableImpl.java | 7 +-
.../query/calcite/schema/SchemaHolderImpl.java | 2 +-
.../query/calcite/trait/DistributionFunction.java | 3 +-
.../query/calcite/trait/DistributionTraitDef.java | 34 +-
.../query/calcite/trait/IgniteDistributions.java | 424 ---------------------
.../processors/query/calcite/trait/TraitUtils.java | 246 ++++++++++++
.../processors/query/calcite/util/Commons.java | 147 -------
.../query/calcite/util/IgniteMethod.java | 2 -
.../CalciteBasicSecondaryIndexIntegrationTest.java | 37 +-
.../processors/query/calcite/PlannerTest.java | 21 +-
.../query/calcite/exec/rel/ExecutionTest.java | 53 +--
69 files changed, 1641 insertions(+), 2042 deletions(-)
rename modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/agg/{WrappersFactoryImpl.java => AccumulatorsFactory.java} (69%)
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/IgniteMdDerivedDistribution.java
copy modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/{FilterConverterRule.java => AbstractIgniteConverterRule.java} (52%)
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/AggregateTraitsPropagationRule.java
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/FilterTraitsPropagationRule.java
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/JoinTraitsPropagationRule.java
rename modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/{ProjectTraitsPropagationRule.java => RegisterIndexRule.java} (50%)
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/RuleUtils.java
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/SortTraitsPropagationRule.java
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/UnionTraitsPropagationRule.java
create mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/TraitUtils.java
[ignite] 01/01: Merge branch 'ignite-12248' into ignite-13021
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13021
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit bc769781e70db6612a458b91c151c6abfdbfd1f8
Merge: 01205d8 142af58
Author: Andrey V. Mashenkov <an...@gmail.com>
AuthorDate: Thu Jun 4 14:47:08 2020 +0300
Merge branch 'ignite-12248' into ignite-13021
# Conflicts:
# modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteTableScan.java
modules/calcite/pom.xml | 2 +-
.../query/calcite/CalciteQueryProcessor.java | 14 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 6 +-
.../query/calcite/exec/LogicalRelImplementor.java | 16 +-
.../query/calcite/exec/exp/ExpressionFactory.java | 2 +-
.../calcite/exec/exp/ExpressionFactoryImpl.java | 10 +-
...rsFactoryImpl.java => AccumulatorsFactory.java} | 254 +++++-------
.../query/calcite/exec/rel/AggregateNode.java | 8 +-
.../query/calcite/externalize/RelJson.java | 53 ++-
.../query/calcite/externalize/RelJsonReader.java | 8 +
.../query/calcite/externalize/RelJsonWriter.java | 8 +
.../metadata/IgniteMdDerivedDistribution.java | 194 ----------
.../calcite/metadata/IgniteMdDistribution.java | 36 +-
.../query/calcite/metadata/IgniteMetadata.java | 15 -
.../query/calcite/metadata/RelMetadataQueryEx.java | 25 --
.../query/calcite/prepare/IgnitePlanner.java | 139 +++----
.../query/calcite/prepare/IgnitePrograms.java | 21 -
.../query/calcite/prepare/IgniteSqlValidator.java | 8 +-
.../query/calcite/prepare/MultiStepDmlPlan.java | 2 +-
.../query/calcite/prepare/MultiStepQueryPlan.java | 2 +-
.../query/calcite/prepare/PlannerPhase.java | 17 +-
.../query/calcite/prepare/PlanningContext.java | 6 +-
.../processors/query/calcite/prepare/Splitter.java | 10 +-
.../query/calcite/rel/IgniteAggregate.java | 169 +++++++-
.../query/calcite/rel/IgniteConvention.java | 8 +
.../query/calcite/rel/IgniteExchange.java | 42 +-
.../processors/query/calcite/rel/IgniteFilter.java | 25 +-
.../processors/query/calcite/rel/IgniteJoin.java | 284 +++++++++++++-
.../query/calcite/rel/IgniteMapAggregate.java | 48 ++-
.../query/calcite/rel/IgniteProject.java | 127 +++++-
.../query/calcite/rel/IgniteReceiver.java | 40 +-
.../query/calcite/rel/IgniteReduceAggregate.java | 10 +-
.../processors/query/calcite/rel/IgniteRel.java | 27 +-
.../processors/query/calcite/rel/IgniteSender.java | 15 +
.../processors/query/calcite/rel/IgniteSort.java | 34 +-
.../query/calcite/rel/IgniteTableModify.java | 9 +-
.../query/calcite/rel/IgniteTableScan.java | 16 +-
.../query/calcite/rel/IgniteTrimExchange.java | 36 +-
.../query/calcite/rel/IgniteUnionAll.java | 58 ++-
.../processors/query/calcite/rel/IgniteValues.java | 5 +-
...rRule.java => AbstractIgniteConverterRule.java} | 48 +--
.../query/calcite/rule/AggregateConverterRule.java | 23 +-
.../rule/AggregateTraitsPropagationRule.java | 94 -----
.../query/calcite/rule/FilterConverterRule.java | 20 +-
.../calcite/rule/FilterTraitsPropagationRule.java | 57 ---
.../query/calcite/rule/JoinConverterRule.java | 24 +-
.../calcite/rule/JoinTraitsPropagationRule.java | 77 ----
.../query/calcite/rule/ProjectConverterRule.java | 20 +-
.../query/calcite/rule/PushFilterIntoScanRule.java | 32 +-
...PropagationRule.java => RegisterIndexRule.java} | 53 +--
.../processors/query/calcite/rule/RuleUtils.java | 198 ----------
.../query/calcite/rule/SortConverterRule.java | 21 +-
.../calcite/rule/SortTraitsPropagationRule.java | 60 ---
.../calcite/rule/TableModifyConverterRule.java | 30 +-
.../query/calcite/rule/UnionConverterRule.java | 34 +-
.../calcite/rule/UnionTraitsPropagationRule.java | 69 ----
.../query/calcite/rule/ValuesConverterRule.java | 24 +-
.../query/calcite/schema/IgniteSchema.java | 14 -
.../query/calcite/schema/IgniteTableImpl.java | 7 +-
.../query/calcite/schema/SchemaHolderImpl.java | 2 +-
.../query/calcite/trait/DistributionFunction.java | 3 +-
.../query/calcite/trait/DistributionTraitDef.java | 34 +-
.../query/calcite/trait/IgniteDistributions.java | 424 ---------------------
.../processors/query/calcite/trait/TraitUtils.java | 246 ++++++++++++
.../processors/query/calcite/util/Commons.java | 147 -------
.../query/calcite/util/IgniteMethod.java | 2 -
.../CalciteBasicSecondaryIndexIntegrationTest.java | 37 +-
.../processors/query/calcite/PlannerTest.java | 21 +-
.../query/calcite/exec/rel/ExecutionTest.java | 53 +--
69 files changed, 1641 insertions(+), 2042 deletions(-)
diff --cc modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlannerPhase.java
index 220081b,7936253..dddf93b
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlannerPhase.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlannerPhase.java
@@@ -41,12 -37,9 +37,10 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.query.calcite.rule.logical.FilterJoinRule;
import org.apache.ignite.internal.processors.query.calcite.rule.logical.LogicalFilterMergeRule;
import org.apache.ignite.internal.processors.query.calcite.rule.logical.LogicalFilterProjectTransposeRule;
+import org.apache.ignite.internal.processors.query.calcite.rule.logical.LogicalOrToUnionRule;
import static org.apache.ignite.internal.processors.query.calcite.prepare.IgnitePrograms.cbo;
- import static org.apache.ignite.internal.processors.query.calcite.prepare.IgnitePrograms.decorrelate;
import static org.apache.ignite.internal.processors.query.calcite.prepare.IgnitePrograms.hep;
- import static org.apache.ignite.internal.processors.query.calcite.prepare.IgnitePrograms.sequence;
/**
* Represents a planner phase with its description and a used rule set.
@@@ -89,11 -79,8 +80,9 @@@ public enum PlannerPhase
TableModifyConverterRule.INSTANCE,
PushFilterIntoScanRule.FILTER_INTO_SCAN,
ProjectFilterTransposeRule.INSTANCE,
+ LogicalOrToUnionRule.INSTANCE,
UnionMergeRule.INSTANCE,
UnionConverterRule.INSTANCE,
- UnionTraitsPropagationRule.INSTANCE,
SortConverterRule.INSTANCE,
SortRemoveRule.INSTANCE);
}