This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git
from 7fe7e1627d5 Merge branch 'master' into cache_dumps add 9f70c2a048b IGNITE-20136 SQL Calcite: Add FORCE_INDEX/NO_INDEX hints - Fixes #10902. add 66bd852a89f IGNITE-19880 Fixed negative duration in the SQL query system view (#10958) add 4d555e9f6a3 Merge branch 'master' into cache_dumps No new revisions were added by this update. Summary of changes: .../query/calcite/CalciteQueryProcessor.java | 12 +- .../query/calcite/hint/HintDefinition.java | 86 ++++++ .../query/calcite/hint/HintOptionsChecker.java} | 17 +- .../processors/query/calcite/hint/HintUtils.java | 175 +++++++++++++ .../processors/query/calcite/hint/HintsConfig.java | 85 ++++++ .../query/calcite/prepare/IgnitePlanner.java | 6 +- .../query/calcite/prepare/PlannerHelper.java | 40 ++- .../query/calcite/rel/AbstractIndexScan.java | 5 +- .../query/calcite/rel/IgniteIndexScan.java | 3 +- .../rel/logical/IgniteLogicalIndexScan.java | 3 +- .../rel/logical/IgniteLogicalTableScan.java | 23 +- .../calcite/rule/HashAggregateConverterRule.java | 2 +- .../calcite/rule/SortAggregateConverterRule.java | 2 +- .../calcite/rule/logical/ExposeIndexRule.java | 63 +++++ .../calcite/rule/logical/FilterScanMergeRule.java | 2 +- .../calcite/rule/logical/LogicalOrToUnionRule.java | 1 + .../calcite/rule/logical/ProjectScanMergeRule.java | 1 + .../query/calcite/schema/CacheTableImpl.java | 3 +- .../query/calcite/schema/SystemViewIndexImpl.java | 3 +- .../query/calcite/schema/SystemViewTableImpl.java | 3 +- .../processors/query/calcite/util/HintUtils.java | 60 ----- .../integration/IndexScanlIntegrationTest.java | 78 ++++++ .../query/calcite/planner/AbstractPlannerTest.java | 6 +- .../query/calcite/planner/TestTable.java | 3 +- .../planner/hints/CommonHintsPlannerTest.java | 118 +++++++++ .../planner/hints/ForceIndexHintPlannerTest.java | 208 +++++++++++++++ .../calcite/planner/hints/HintsTestSuite.java} | 11 +- .../planner/hints/NoIndexHintPlannerTest.java | 288 +++++++++++++++++++++ .../apache/ignite/testsuites/PlannerTestSuite.java | 3 + .../query/running/QueryHistoryTracker.java | 3 +- .../query/running/RunningQueryManager.java | 6 +- .../processors/query/SqlSystemViewsSelfTest.java | 21 ++ 32 files changed, 1222 insertions(+), 118 deletions(-) create mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintDefinition.java copy modules/{core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteReplacer.java => calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintOptionsChecker.java} (70%) create mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintUtils.java create mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintsConfig.java delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/util/HintUtils.java create mode 100644 modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/CommonHintsPlannerTest.java create mode 100644 modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/ForceIndexHintPlannerTest.java copy modules/{slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java => calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/HintsTestSuite.java} (80%) create mode 100644 modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/NoIndexHintPlannerTest.java