This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.
from 6eb8605 Merge pull request #9645 from robertwb/no-grpc
add 899f45c [BEAM-5820] Switch Beam SQL to vendored Calcite
add 0d9972f not include shadow direct runner dependency in nexmark
add 031b378 [BEAM-5820] Use vendored calcite
No new revisions were added by this update.
Summary of changes:
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 1 +
.../src/main/resources/beam/checkstyle.xml | 8 ++
sdks/java/extensions/sql/build.gradle | 119 +++++----------------
sdks/java/extensions/sql/datacatalog/build.gradle | 3 +-
.../sql/example/BeamSqlDataCatalogExample.java | 2 +-
.../datacatalog/DataCatalogTableProvider.java | 4 +-
.../sql/meta/provider/datacatalog/SchemaUtils.java | 4 +-
.../sql/meta/provider/datacatalog/TableUtils.java | 2 +-
sdks/java/extensions/sql/hcatalog/build.gradle | 2 +-
sdks/java/extensions/sql/jdbc/build.gradle | 2 +-
sdks/java/extensions/sql/shell/build.gradle | 4 +-
.../extensions/sql/src/main/codegen/config.fmpp | 10 +-
.../beam/sdk/extensions/sql/SqlTransform.java | 4 +-
.../extensions/sql/TableNameExtractionUtils.java | 14 +--
.../sdk/extensions/sql/impl/BeamCalciteSchema.java | 17 +--
.../sql/impl/BeamCalciteSchemaFactory.java | 20 ++--
.../sdk/extensions/sql/impl/BeamCalciteTable.java | 30 +++---
.../beam/sdk/extensions/sql/impl/BeamSqlEnv.java | 14 +--
.../sql/impl/BeamSqlPipelineOptionsRegistrar.java | 2 +-
.../extensions/sql/impl/BeamTableStatistics.java | 14 +--
.../sql/impl/CalciteConnectionWrapper.java | 16 +--
.../extensions/sql/impl/CalciteFactoryWrapper.java | 24 ++---
.../extensions/sql/impl/CalciteQueryPlanner.java | 72 ++++++-------
.../sdk/extensions/sql/impl/JdbcConnection.java | 8 +-
.../beam/sdk/extensions/sql/impl/JdbcDriver.java | 30 +++---
.../beam/sdk/extensions/sql/impl/JdbcFactory.java | 36 ++++---
.../beam/sdk/extensions/sql/impl/QueryPlanner.java | 2 +-
.../extensions/sql/impl/ScalarFunctionImpl.java | 55 +++++-----
.../extensions/sql/impl/TableResolutionUtils.java | 6 +-
.../beam/sdk/extensions/sql/impl/UdafImpl.java | 12 +--
.../beam/sdk/extensions/sql/impl/UdfImpl.java | 12 ++-
.../sql/impl/UdfImplReflectiveFunctionBase.java | 19 ++--
.../sql/impl/parser/SqlCheckConstraint.java | 18 ++--
.../sql/impl/parser/SqlColumnDeclaration.java | 20 ++--
.../sql/impl/parser/SqlCreateExternalTable.java | 30 +++---
.../extensions/sql/impl/parser/SqlDdlNodes.java | 20 ++--
.../extensions/sql/impl/parser/SqlDropObject.java | 24 ++---
.../extensions/sql/impl/parser/SqlDropTable.java | 10 +-
.../sql/impl/parser/SqlSetOptionBeam.java | 20 ++--
.../extensions/sql/impl/planner/BeamCostModel.java | 11 +-
.../sql/impl/planner/BeamJavaTypeFactory.java | 12 +--
.../sql/impl/planner/BeamRelDataTypeSystem.java | 4 +-
.../extensions/sql/impl/planner/BeamRuleSets.java | 56 +++++-----
.../sql/impl/planner/NodeStatsMetadata.java | 12 +--
.../sql/impl/planner/RelMdNodeStats.java | 12 +--
.../sql/impl/rel/BeamAggregationRel.java | 20 ++--
.../sdk/extensions/sql/impl/rel/BeamCalcRel.java | 68 ++++++------
.../extensions/sql/impl/rel/BeamCoGBKJoinRel.java | 14 +--
.../sql/impl/rel/BeamEnumerableConverter.java | 40 +++----
.../sdk/extensions/sql/impl/rel/BeamIOSinkRel.java | 22 ++--
.../extensions/sql/impl/rel/BeamIOSourceRel.java | 14 +--
.../extensions/sql/impl/rel/BeamIntersectRel.java | 14 +--
.../sdk/extensions/sql/impl/rel/BeamJoinRel.java | 34 +++---
.../sql/impl/rel/BeamLogicalConvention.java | 12 +--
.../sdk/extensions/sql/impl/rel/BeamMinusRel.java | 14 +--
.../sdk/extensions/sql/impl/rel/BeamRelNode.java | 12 ++-
.../sql/impl/rel/BeamSetOperatorRelBase.java | 2 +-
.../sql/impl/rel/BeamSideInputJoinRel.java | 14 +--
.../sql/impl/rel/BeamSideInputLookupJoinRel.java | 14 +--
.../sdk/extensions/sql/impl/rel/BeamSortRel.java | 30 +++---
.../extensions/sql/impl/rel/BeamSqlRelUtils.java | 6 +-
.../extensions/sql/impl/rel/BeamUncollectRel.java | 14 +--
.../sdk/extensions/sql/impl/rel/BeamUnionRel.java | 14 +--
.../sdk/extensions/sql/impl/rel/BeamUnnestRel.java | 24 ++---
.../sdk/extensions/sql/impl/rel/BeamValuesRel.java | 20 ++--
.../sdk/extensions/sql/impl/rel/package-info.java | 5 +-
.../sql/impl/rule/BeamAggregationRule.java | 24 ++---
.../sql/impl/rule/BeamBasicAggregationRule.java | 14 +--
.../sdk/extensions/sql/impl/rule/BeamCalcRule.java | 14 +--
.../sql/impl/rule/BeamCoGBKJoinRule.java | 12 +--
.../sql/impl/rule/BeamEnumerableConverterRule.java | 8 +-
.../extensions/sql/impl/rule/BeamIOSinkRule.java | 6 +-
.../sql/impl/rule/BeamIntersectRule.java | 10 +-
.../sql/impl/rule/BeamJoinAssociateRule.java | 15 +--
.../sql/impl/rule/BeamJoinPushThroughJoinRule.java | 19 ++--
.../extensions/sql/impl/rule/BeamMinusRule.java | 10 +-
.../sql/impl/rule/BeamSideInputJoinRule.java | 12 +--
.../sql/impl/rule/BeamSideInputLookupJoinRule.java | 12 +--
.../sdk/extensions/sql/impl/rule/BeamSortRule.java | 10 +-
.../sql/impl/rule/BeamUncollectRule.java | 8 +-
.../extensions/sql/impl/rule/BeamUnionRule.java | 13 +--
.../extensions/sql/impl/rule/BeamUnnestRule.java | 24 ++---
.../extensions/sql/impl/rule/BeamValuesRule.java | 10 +-
.../sql/impl/rule/JoinRelOptRuleCall.java | 14 +--
.../sdk/extensions/sql/impl/rule/package-info.java | 4 +-
.../extensions/sql/impl/schema/BeamTableUtils.java | 2 +-
.../impl/transform/BeamBuiltinAggregations.java | 2 +-
.../sql/impl/transform/BeamJoinTransforms.java | 10 +-
.../impl/transform/BeamSetOperatorsTransforms.java | 2 +-
.../transform/agg/AggregationCombineFnAdapter.java | 4 +-
.../sql/impl/transform/agg/CovarianceFn.java | 4 +-
.../sql/impl/transform/agg/VarianceFn.java | 2 +-
.../sql/impl/udf/BuiltinStringFunctions.java | 2 +-
.../sql/impl/utils/BigDecimalConverter.java | 2 +-
.../extensions/sql/impl/utils/CalciteUtils.java | 16 +--
.../sql/impl/utils/SerializableRexFieldAccess.java | 4 +-
.../sql/impl/utils/SerializableRexInputRef.java | 2 +-
.../sql/impl/utils/SerializableRexNode.java | 6 +-
.../sql/meta/provider/ReadOnlyTableProvider.java | 2 +-
.../sql/meta/provider/bigquery/BigQueryTable.java | 2 +-
.../provider/bigquery/BigQueryTableProvider.java | 2 +-
.../sql/meta/provider/kafka/BeamKafkaTable.java | 2 +-
.../sql/meta/provider/test/TestTableProvider.java | 2 +-
.../sql/meta/provider/test/TestTableUtils.java | 2 +-
.../sql/meta/provider/test/TestUnboundedTable.java | 2 +-
.../sql/meta/provider/text/TextTableProvider.java | 8 +-
.../sql/meta/store/InMemoryMetaStore.java | 2 +-
.../extensions/sql/zetasql/BeamBuiltinMethods.java | 2 +-
.../sdk/extensions/sql/zetasql/DateTimeUtils.java | 6 +-
.../sdk/extensions/sql/zetasql/SqlAnalyzer.java | 12 +--
.../zetasql/SqlCaseWithValueOperatorRewriter.java | 8 +-
.../sql/zetasql/SqlCoalesceOperatorRewriter.java | 10 +-
.../SqlExtractTimestampOperatorRewriter.java | 6 +-
.../sql/zetasql/SqlIfNullOperatorRewriter.java | 8 +-
.../sql/zetasql/SqlNullIfOperatorRewriter.java | 8 +-
.../sql/zetasql/SqlOperatorRewriter.java | 4 +-
.../sdk/extensions/sql/zetasql/SqlOperators.java | 38 +++----
.../sql/zetasql/SqlStdOperatorMappingTable.java | 4 +-
.../extensions/sql/zetasql/StringFunctions.java | 4 +-
.../extensions/sql/zetasql/TableResolution.java | 6 +-
.../sql/zetasql/TableResolutionContext.java | 2 +-
.../sdk/extensions/sql/zetasql/TableResolver.java | 4 +-
.../extensions/sql/zetasql/TableResolverImpl.java | 4 +-
.../extensions/sql/zetasql/TimestampFunctions.java | 2 +-
.../beam/sdk/extensions/sql/zetasql/TypeUtils.java | 6 +-
.../sql/zetasql/ZetaSQLCastFunctionImpl.java | 32 +++---
.../extensions/sql/zetasql/ZetaSQLPlannerImpl.java | 48 ++++-----
.../sql/zetasql/ZetaSQLQueryPlanner.java | 38 +++----
.../translation/AggregateScanConverter.java | 18 ++--
.../translation/ArrayScanToJoinConverter.java | 16 +--
.../translation/ArrayScanToUncollectConverter.java | 10 +-
.../sql/zetasql/translation/ConversionContext.java | 4 +-
.../zetasql/translation/ExpressionConverter.java | 32 +++---
.../zetasql/translation/FilterScanConverter.java | 6 +-
.../sql/zetasql/translation/JoinScanConverter.java | 10 +-
.../translation/JoinScanWithRefConverter.java | 6 +-
.../LimitOffsetScanToLimitConverter.java | 10 +-
.../LimitOffsetScanToOrderByLimitConverter.java | 20 ++--
.../OrderByScanUnsupportedConverter.java | 2 +-
.../zetasql/translation/ProjectScanConverter.java | 6 +-
.../translation/QueryStatementConverter.java | 2 +-
.../sql/zetasql/translation/RelConverter.java | 6 +-
.../translation/SetOperationScanConverter.java | 8 +-
.../translation/SingleRowScanConverter.java | 4 +-
.../zetasql/translation/TableScanConverter.java | 30 +++---
.../zetasql/translation/WithRefScanConverter.java | 2 +-
.../sql/zetasql/translation/WithScanConverter.java | 2 +-
..._20_0.org.codehaus.commons.compiler.properties} | 2 +-
.../sdk/extensions/sql/BeamComplexTypeTest.java | 4 +-
.../sql/BeamSqlDslSqlStdOperatorsTest.java | 18 ++--
.../sdk/extensions/sql/BeamSqlDslUdfUdafTest.java | 15 ++-
.../sdk/extensions/sql/BeamSqlExplainTest.java | 6 +-
.../beam/sdk/extensions/sql/BeamSqlMapTest.java | 2 +-
.../extensions/sql/BeamSqlMultipleSchemasTest.java | 2 +-
.../sdk/extensions/sql/PubsubToBigqueryIT.java | 4 +-
.../apache/beam/sdk/extensions/sql/TestUtils.java | 2 +-
.../sdk/extensions/sql/impl/JdbcDriverTest.java | 8 +-
.../sql/impl/parser/BeamDDLNestedTypesTest.java | 2 +-
.../extensions/sql/impl/planner/NodeStatsTest.java | 10 +-
.../sql/impl/rel/BeamAggregationRelTest.java | 2 +-
.../extensions/sql/impl/rel/BeamCalcRelTest.java | 2 +-
.../rel/BeamCoGBKJoinRelBoundedVsBoundedTest.java | 2 +-
.../BeamCoGBKJoinRelUnboundedVsUnboundedTest.java | 2 +-
.../sql/impl/rel/BeamEnumerableConverterTest.java | 24 ++---
.../sql/impl/rel/BeamIOSourceRelTest.java | 4 +-
.../sql/impl/rel/BeamIntersectRelTest.java | 2 +-
.../extensions/sql/impl/rel/BeamMinusRelTest.java | 2 +-
.../sql/impl/rel/BeamSideInputJoinRelTest.java | 2 +-
.../extensions/sql/impl/rel/BeamSortRelTest.java | 2 +-
.../sql/impl/rel/BeamUncollectRelTest.java | 2 +-
.../extensions/sql/impl/rel/BeamUnionRelTest.java | 2 +-
.../extensions/sql/impl/rel/BeamValuesRelTest.java | 2 +-
.../sql/impl/rule/JoinReorderingTest.java | 77 ++++++-------
.../sql/impl/schema/BeamSqlRowCoderTest.java | 8 +-
.../sql/impl/utils/CalciteUtilsTest.java | 10 +-
...BeamSqlBuiltinFunctionsIntegrationTestBase.java | 6 +-
.../BeamSqlDateFunctionsIntegrationTest.java | 2 +-
.../provider/bigquery/BigQueryReadWriteIT.java | 2 +-
.../meta/provider/bigquery/BigQueryRowCountIT.java | 2 +-
.../bigquery/BigQueryTestTableProvider.java | 2 +-
.../meta/provider/kafka/BeamKafkaCSVTableTest.java | 8 +-
.../provider/kafka/KafkaTableProviderTest.java | 2 +-
.../sql/meta/provider/pubsub/PubsubJsonIT.java | 8 +-
.../provider/pubsub/PubsubMessageToRowTest.java | 6 +-
.../meta/provider/text/TextTableProviderTest.java | 2 +-
.../beam/sdk/extensions/sql/utils/RowAsserts.java | 2 +-
.../JoinCompoundIdentifiersTestZetaSQL.java | 12 +--
.../sql/zetasql/ZetaSQLDialectSpecTestZetaSQL.java | 14 +--
sdks/java/testing/nexmark/build.gradle | 3 +-
settings.gradle | 2 +-
190 files changed, 1129 insertions(+), 1155 deletions(-)
rename
sdks/java/extensions/sql/src/main/resources/{org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.commons.compiler.properties
=>
org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.properties}
(90%)
