This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git.
from 864268c [CALCITE-4991] Improve RuleEventLogger to also print input
rels in FULL_PLAN mode
add bf56743 [CALCITE-4885] Fluent test fixtures so that dependent
projects can write parser, validator and rules tests
No new revisions were added by this update.
Summary of changes:
.../org/apache/calcite/test/BabelParserTest.java | 95 +-
.../java/org/apache/calcite/test/BabelTest.java | 32 +
.../org/apache/calcite/test}/package-info.java | 4 +-
.../apache/calcite/jdbc/CalciteConnectionImpl.java | 23 +-
.../java/org/apache/calcite/plan/RelOptUtil.java | 4 +-
.../apache/calcite/prepare/CalcitePrepareImpl.java | 13 +-
.../org/apache/calcite/prepare/PlannerImpl.java | 2 +-
.../org/apache/calcite/rel/RelValidityChecker.java | 65 +
.../calcite/rel/type/RelDataTypeSystemImpl.java | 4 -
.../java/org/apache/calcite/sql/SqlDialect.java | 44 +-
.../org/apache/calcite/sql/SqlUnnestOperator.java | 2 +-
.../apache/calcite/sql/parser/StringAndPos.java | 18 +
.../apache/calcite/sql/validate/OrderByScope.java | 2 +-
.../apache/calcite/sql/validate/SqlValidator.java | 23 +-
.../calcite/sql/validate/SqlValidatorImpl.java | 28 +-
.../apache/calcite/sql2rel/SqlToRelConverter.java | 10 +-
.../calcite/sql2rel/StandardConvertletTable.java | 2 +-
.../java/org/apache/calcite/tools/RelRunner.java | 8 +-
.../java/org/apache/calcite/util/JdbcType.java | 53 +
.../java/org/apache/calcite/util/JdbcTypeImpl.java | 118 +
.../main/java/org/apache/calcite/util/Sarg.java | 18 +-
.../org/apache/calcite/util/TryThreadLocal.java | 59 +-
.../calcite/jdbc/CalciteRemoteDriverTest.java | 46 +-
.../org/apache/calcite/plan/RelWriterTest.java | 2 +-
.../plan/volcano/MultipleTraitConversionTest.java | 2 +-
.../calcite/plan/volcano/VolcanoPlannerTest.java | 2 +-
.../RelMetadataHandlerGeneratorUtilTest.java | 55 +-
.../calcite/rel/rel2sql/RelToSqlConverterTest.java | 22 +-
.../apache/calcite/sql/parser/SqlUnParserTest.java | 9 +-
.../ExtensionSqlParserTest.java | 7 +-
.../apache/calcite/sql/test/DocumentationTest.java | 2 +-
.../apache/calcite/sql/test/SqlAdvisorTest.java | 1210 +--
.../calcite/sql/test/SqlOperatorBaseTest.java | 10490 -------------------
.../apache/calcite/sql/test/SqlOperatorTest.java | 36 -
.../calcite/sql/test/SqlPrettyWriterFixture.java | 185 +
.../calcite/sql/test/SqlPrettyWriterTest.java | 149 +-
.../apache/calcite/sql/type/SqlTypeUtilTest.java | 4 +-
.../calcite/sql/validate/SqlValidatorUtilTest.java | 10 +-
.../calcite/test/CalciteSqlOperatorTest.java | 11 +-
.../apache/calcite/test/CoreSqlOperatorTest.java | 11 +-
.../org/apache/calcite/test/HepPlannerTest.java | 82 +-
.../org/apache/calcite/test/InterpreterTest.java | 18 +-
.../org/apache/calcite/test/JdbcAdapterTest.java | 2 +-
.../java/org/apache/calcite/test/JdbcTest.java | 45 +-
.../calcite/test/MaterializedViewFixture.java | 115 +
.../test/MaterializedViewRelOptRulesTest.java | 313 +-
.../MaterializedViewSubstitutionVisitorTest.java | 275 +-
...edViewTest.java => MaterializedViewTester.java} | 162 +-
.../org/apache/calcite/test/MutableRelTest.java | 19 +-
...ratorTest.java => ProxyingRelMetadataTest.java} | 14 +-
.../org/apache/calcite/test/RelBuilderTest.java | 1 -
.../org/apache/calcite/test/RelMetadataTest.java | 2956 ++----
.../org/apache/calcite/test/RelOptRulesTest.java | 758 +-
.../org/apache/calcite/test/RelOptTestBase.java | 345 -
.../apache/calcite/test/RexTransformerTest.java | 4 +-
.../calcite/test/RuleMatchVisualizerTest.java | 24 +-
.../apache/calcite/test/ScannableTableTest.java | 2 +-
.../apache/calcite/test/SqlHintsConverterTest.java | 195 +-
.../org/apache/calcite/test/SqlLimitsTest.java | 35 +-
.../java/org/apache/calcite/test/SqlTestGen.java | 120 +-
.../apache/calcite/test/SqlToRelConverterTest.java | 594 +-
.../org/apache/calcite/test/SqlToRelTestBase.java | 1107 --
.../apache/calcite/test/SqlValidatorDynamicTest.kt | 21 +-
.../calcite/test/SqlValidatorFeatureTest.java | 8 +-
.../org/apache/calcite/test/SqlValidatorTest.java | 1024 +-
.../org/apache/calcite/test/TCatalogReader.java | 81 +
.../org/apache/calcite/test/TopDownOptTest.java | 601 +-
.../calcite/test/TypeCoercionConverterTest.java | 53 +-
.../org/apache/calcite/test/TypeCoercionTest.java | 956 +-
.../EnumerableBatchNestedLoopJoinTest.java | 6 +-
.../test/enumerable/EnumerableCalcTest.java | 2 -
.../test/enumerable/EnumerableCorrelateTest.java | 3 -
.../test/enumerable/EnumerableHashJoinTest.java | 3 +-
.../test/enumerable/EnumerableJoinTest.java | 8 +-
.../EnumerableRepeatUnionHierarchyTest.java | 1 -
.../test/enumerable/EnumerableRepeatUnionTest.java | 6 -
.../enumerable/EnumerableStringComparisonTest.java | 4 -
.../java/org/apache/calcite/tools/PlannerTest.java | 2 +-
.../java/org/apache/calcite/util/UtilTest.java | 37 +
core/src/test/resources/log4j2-test.xml | 2 +-
.../org/apache/calcite/test/RelOptRulesTest.xml | 52 +-
.../apache/calcite/test/SqlHintsConverterTest.xml | 31 +
.../apache/calcite/test/SqlToRelConverterTest.xml | 38 +-
.../org/apache/calcite/test/DruidAdapter2IT.java | 39 +-
.../org/apache/calcite/test/DruidAdapterIT.java | 19 +-
.../adapter/elasticsearch/AggregationTest.java | 121 +-
.../adapter/elasticsearch/BooleanLogicTest.java | 41 +-
.../elasticsearch/ElasticSearchAdapterTest.java | 92 +-
.../calcite/adapter/elasticsearch/MatchTest.java | 42 +-
.../adapter/elasticsearch/Projection2Test.java | 112 +-
.../adapter/elasticsearch/ProjectionTest.java | 83 +-
.../adapter/elasticsearch/ScrollingTest.java | 22 +-
.../adapter/geode/rel/GeodeAllDataTypesTest.java | 27 +-
.../adapter/geode/rel/GeodeBookstoreTest.java | 24 +-
.../calcite/adapter/geode/rel/GeodeZipsTest.java | 34 +-
.../org/apache/calcite/test/ServerParserTest.java | 7 +-
.../java/org/apache/calcite/test/ServerTest.java | 2 +-
.../apache/calcite/test/ServerUnParserTest.java | 11 +-
testkit/build.gradle.kts | 3 +
.../calcite/sql/parser/SqlParserFixture.java | 212 +
.../calcite/sql/parser/SqlParserListFixture.java | 62 +
.../apache/calcite/sql/parser/SqlParserTest.java | 857 +-
.../apache/calcite/sql/test/AbstractSqlTester.java | 645 +-
.../apache/calcite/sql/test/ResultCheckers.java | 320 +
.../calcite/sql/test/SqlOperatorFixture.java | 644 ++
.../apache/calcite/sql/test/SqlTestFactory.java | 405 +-
.../org/apache/calcite/sql/test/SqlTester.java | 394 +-
.../java/org/apache/calcite/sql/test/SqlTests.java | 267 +-
.../calcite/sql/test/SqlValidatorTester.java | 31 +-
.../org/apache/calcite/test/CalciteAssert.java | 417 +-
.../apache/calcite/test/ConnectionFactories.java | 222 +
.../org/apache/calcite/test/ConnectionFactory.java | 51 +
.../org/apache/calcite/test/DiffRepository.java | 41 +-
.../java/org/apache/calcite/test/Fixtures.java | 59 +
.../java/org/apache/calcite/test/Matchers.java | 96 +-
.../org/apache/calcite/test/MockRelOptPlanner.java | 35 +-
.../apache/calcite/test/RelMetadataFixture.java | 597 ++
.../org/apache/calcite/test/RelOptFixture.java | 438 +
.../org/apache/calcite/test/RelOptTestBase.java | 28 +-
.../java/org/apache/calcite/test/RelSupplier.java | 138 +
.../calcite/test/SqlOperatorFixtureImpl.java | 275 +
.../org/apache/calcite/test/SqlOperatorTest.java | 8839 ++++++++++++++++
.../org/apache/calcite}/test/SqlRuntimeTester.java | 50 +-
.../org/apache/calcite/test/SqlToRelFixture.java | 206 +
.../org/apache/calcite/test/SqlToRelTestBase.java | 103 +
.../apache/calcite/test/SqlValidatorFixture.java | 435 +
.../apache/calcite/test/SqlValidatorTestCase.java | 427 +-
.../calcite/test/catalog/MockCatalogReader.java | 6 +-
.../test/catalog/MockCatalogReaderDynamic.java | 15 +-
.../test/catalog/MockCatalogReaderExtended.java | 15 +-
.../test/catalog/MockCatalogReaderSimple.java | 15 +-
.../apache/calcite/testlib/annotations/WithLex.kt | 25 -
.../java/org/apache/calcite/test/FixtureTest.java | 232 +
.../org/apache/calcite/test/FixtureTest.xml | 56 +
134 files changed, 19960 insertions(+), 20382 deletions(-)
copy {core/src/main/java/org/apache/calcite/config =>
babel/src/test/java/org/apache/calcite/test}/package-info.java (95%)
create mode 100644
core/src/main/java/org/apache/calcite/rel/RelValidityChecker.java
create mode 100644 core/src/main/java/org/apache/calcite/util/JdbcType.java
create mode 100644 core/src/main/java/org/apache/calcite/util/JdbcTypeImpl.java
delete mode 100644
core/src/test/java/org/apache/calcite/sql/test/SqlOperatorBaseTest.java
delete mode 100644
core/src/test/java/org/apache/calcite/sql/test/SqlOperatorTest.java
create mode 100644
core/src/test/java/org/apache/calcite/sql/test/SqlPrettyWriterFixture.java
copy testkit/src/main/java/org/apache/calcite/test/package-info.java =>
core/src/test/java/org/apache/calcite/test/CoreSqlOperatorTest.java (76%)
create mode 100644
core/src/test/java/org/apache/calcite/test/MaterializedViewFixture.java
rename
core/src/test/java/org/apache/calcite/test/{AbstractMaterializedViewTest.java
=> MaterializedViewTester.java} (57%)
copy core/src/test/java/org/apache/calcite/test/{CalciteSqlOperatorTest.java
=> ProxyingRelMetadataTest.java} (71%)
delete mode 100644
core/src/test/java/org/apache/calcite/test/RelOptTestBase.java
delete mode 100644
core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java
create mode 100644
core/src/test/java/org/apache/calcite/test/TCatalogReader.java
create mode 100644
testkit/src/main/java/org/apache/calcite/sql/parser/SqlParserFixture.java
create mode 100644
testkit/src/main/java/org/apache/calcite/sql/parser/SqlParserListFixture.java
create mode 100644
testkit/src/main/java/org/apache/calcite/sql/test/ResultCheckers.java
create mode 100644
testkit/src/main/java/org/apache/calcite/sql/test/SqlOperatorFixture.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/ConnectionFactories.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/ConnectionFactory.java
rename {core/src/test =>
testkit/src/main}/java/org/apache/calcite/test/DiffRepository.java (96%)
create mode 100644 testkit/src/main/java/org/apache/calcite/test/Fixtures.java
rename {core/src/test =>
testkit/src/main}/java/org/apache/calcite/test/MockRelOptPlanner.java (88%)
create mode 100644
testkit/src/main/java/org/apache/calcite/test/RelMetadataFixture.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/RelOptFixture.java
copy server/src/test/java/org/apache/calcite/test/ServerUnParserTest.java =>
testkit/src/main/java/org/apache/calcite/test/RelOptTestBase.java (54%)
create mode 100644
testkit/src/main/java/org/apache/calcite/test/RelSupplier.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/SqlOperatorFixtureImpl.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
rename {core/src/test/java/org/apache/calcite/sql =>
testkit/src/main/java/org/apache/calcite}/test/SqlRuntimeTester.java (63%)
create mode 100644
testkit/src/main/java/org/apache/calcite/test/SqlToRelFixture.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/SqlToRelTestBase.java
create mode 100644
testkit/src/main/java/org/apache/calcite/test/SqlValidatorFixture.java
delete mode 100644
testkit/src/main/kotlin/org/apache/calcite/testlib/annotations/WithLex.kt
create mode 100644
testkit/src/test/java/org/apache/calcite/test/FixtureTest.java
create mode 100644
testkit/src/test/resources/org/apache/calcite/test/FixtureTest.xml