This is an automated email from the ASF dual-hosted git repository.
apilloud pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.
from bb4ba7c Merge pull request #15453 from angoenka/website-2.32
add aca8816
s/org.apache.beam.vendor.calcite.v1_20_0/org.apache.beam.vendor.calcite.v1_26_0/g
add 3a3dd5b [BEAM-9379] Update to vendored Calcite to 1.26.0
add 82d43a8 Fix flattened rows
add b4e163c Fix DDL
add 098218b Handle BeamRelNode in RelSubset
add 81dd514 Fix BeamIOPushDown
add bea14a6 [BEAM-9190] Update BeamBigQuerySqlDialect
add 410b454 Remap IN to Search
add b542de1 [BEAM-9379] Use byte[] instead of ByteString for (VAR)BINARY
in UDFs.
add a4a6fac [BEAM-9379] Update UDF NULL type mismatch test since there is
stricter typechecking in Calcite 1.24+.
add 841ef2c Fix ZetaSQL window function mapping
add cfcde44 Fix Bigtable tests that depend on SQL types
add 6c5c04b Workaround CALCITE-4759 in JoinPushThroughJoinRule
add bd9fc41 Disable nested bytes tests, sorry!
add 6411537 SqlLine is rotting, Just CAST types for now
add 85aae76 Update CHANGES.md
add 41fa6fd Up spotbug stack size
add 4a8a651 Fix BeamMatchRel copy
add 4c00192 partitionKey everywhere
add 6f4333b Make it functional
add c520eff Update CreateFunction
add 2b43c32 No tpcds dependency
add 965154a Fix default time types
new cff331b Merge pull request #14729: [BEAM-9379] Update calcite to 1.26
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:
.gitignore | 4 +
CHANGES.md | 2 +
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 3 +-
sdks/java/extensions/sql/build.gradle | 10 +-
.../sql/example/BeamSqlDataCatalogExample.java | 2 +-
.../datacatalog/DataCatalogTableProvider.java | 2 +-
.../sql/meta/provider/datacatalog/SchemaUtils.java | 4 +-
.../sdk/extensions/sql/jdbc/BeamSqlLineTest.java | 18 +-
.../provider/bigquery/BigQueryIOPushDownIT.java | 6 +-
.../extensions/sql/src/main/codegen/config.fmpp | 88 ++++++--
.../sql/src/main/codegen/includes/parserImpls.ftl | 13 +-
.../beam/sdk/extensions/sql/SqlTransform.java | 6 +-
.../extensions/sql/TableNameExtractionUtils.java | 14 +-
.../sdk/extensions/sql/impl/BeamCalciteSchema.java | 16 +-
.../sql/impl/BeamCalciteSchemaFactory.java | 20 +-
.../sdk/extensions/sql/impl/BeamCalciteTable.java | 30 +--
.../beam/sdk/extensions/sql/impl/BeamSqlEnv.java | 20 +-
.../sql/impl/BeamSqlPipelineOptionsRegistrar.java | 2 +-
.../extensions/sql/impl/BeamTableStatistics.java | 20 +-
.../sql/impl/CalciteConnectionWrapper.java | 16 +-
.../extensions/sql/impl/CalciteFactoryWrapper.java | 24 +-
.../extensions/sql/impl/CalciteQueryPlanner.java | 83 ++++---
.../sdk/extensions/sql/impl/JavaUdfLoader.java | 2 +-
.../sdk/extensions/sql/impl/JdbcConnection.java | 8 +-
.../beam/sdk/extensions/sql/impl/JdbcDriver.java | 35 ++-
.../beam/sdk/extensions/sql/impl/JdbcFactory.java | 36 +--
.../beam/sdk/extensions/sql/impl/QueryPlanner.java | 8 +-
.../extensions/sql/impl/ScalarFunctionImpl.java | 46 ++--
.../extensions/sql/impl/TableResolutionUtils.java | 6 +-
.../beam/sdk/extensions/sql/impl/UdafImpl.java | 12 +-
.../beam/sdk/extensions/sql/impl/UdfImpl.java | 10 +-
.../sql/impl/UdfImplReflectiveFunctionBase.java | 16 +-
...SqlUserDefinedSQLNativeTableValuedFunction.java | 14 +-
.../beam/sdk/extensions/sql/impl/cep/CEPCall.java | 10 +-
.../sdk/extensions/sql/impl/cep/CEPFieldRef.java | 2 +-
.../sdk/extensions/sql/impl/cep/CEPLiteral.java | 2 +-
.../sdk/extensions/sql/impl/cep/CEPOperation.java | 8 +-
.../sdk/extensions/sql/impl/cep/CEPOperator.java | 4 +-
.../sdk/extensions/sql/impl/cep/CEPPattern.java | 2 +-
.../beam/sdk/extensions/sql/impl/cep/CEPUtils.java | 23 +-
.../beam/sdk/extensions/sql/impl/cep/OrderKey.java | 2 +-
.../extensions/sql/impl/parser/BeamSqlParser.java | 54 +++++
.../sql/impl/parser/SqlCheckConstraint.java | 18 +-
.../sql/impl/parser/SqlColumnDeclaration.java | 20 +-
.../sql/impl/parser/SqlCreateExternalTable.java | 31 ++-
.../sql/impl/parser/SqlCreateFunction.java | 43 ++--
.../extensions/sql/impl/parser/SqlDdlNodes.java | 20 +-
.../extensions/sql/impl/parser/SqlDropObject.java | 25 +--
.../extensions/sql/impl/parser/SqlDropTable.java | 10 +-
.../sql/impl/parser/SqlSetOptionBeam.java | 21 +-
.../extensions/sql/impl/planner/BeamCostModel.java | 8 +-
.../sql/impl/planner/BeamJavaTypeFactory.java | 18 +-
.../sql/impl/planner/BeamRelDataTypeSystem.java | 22 +-
.../extensions/sql/impl/planner/BeamRuleSets.java | 85 +++----
.../sql/impl/planner/NodeStatsMetadata.java | 12 +-
.../sql/impl/planner/RelMdNodeStats.java | 29 +--
.../sql/impl/rel/AbstractBeamCalcRel.java | 18 +-
.../sql/impl/rel/BeamAggregationRel.java | 20 +-
.../sdk/extensions/sql/impl/rel/BeamCalcRel.java | 68 +++---
.../extensions/sql/impl/rel/BeamCoGBKJoinRel.java | 16 +-
.../sql/impl/rel/BeamEnumerableConverter.java | 38 ++--
.../sdk/extensions/sql/impl/rel/BeamIOSinkRel.java | 22 +-
.../extensions/sql/impl/rel/BeamIOSourceRel.java | 20 +-
.../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/BeamMatchRel.java | 77 ++++---
.../sdk/extensions/sql/impl/rel/BeamMinusRel.java | 14 +-
.../sql/impl/rel/BeamPushDownIOSourceRel.java | 16 +-
.../sdk/extensions/sql/impl/rel/BeamRelNode.java | 10 +-
.../sql/impl/rel/BeamSetOperatorRelBase.java | 2 +-
.../sql/impl/rel/BeamSideInputJoinRel.java | 16 +-
.../sql/impl/rel/BeamSideInputLookupJoinRel.java | 14 +-
.../sdk/extensions/sql/impl/rel/BeamSortRel.java | 33 +--
.../extensions/sql/impl/rel/BeamSqlRelUtils.java | 17 +-
.../sql/impl/rel/BeamTableFunctionScanRel.java | 26 +--
.../extensions/sql/impl/rel/BeamUncollectRel.java | 17 +-
.../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/BeamWindowRel.java | 24 +-
.../extensions/sql/impl/rel/CalcRelSplitter.java | 54 ++---
.../sdk/extensions/sql/impl/rel/package-info.java | 2 +-
.../impl/rule/BeamAggregateProjectMergeRule.java | 20 +-
.../sql/impl/rule/BeamAggregationRule.java | 24 +-
.../sql/impl/rule/BeamBasicAggregationRule.java | 26 +--
.../sql/impl/rule/BeamCalcMergeRule.java | 11 +-
.../sdk/extensions/sql/impl/rule/BeamCalcRule.java | 18 +-
.../sql/impl/rule/BeamCalcSplittingRule.java | 14 +-
.../sql/impl/rule/BeamCoGBKJoinRule.java | 12 +-
.../sql/impl/rule/BeamEnumerableConverterRule.java | 8 +-
.../sql/impl/rule/BeamIOPushDownRule.java | 49 +++--
.../extensions/sql/impl/rule/BeamIOSinkRule.java | 6 +-
.../sql/impl/rule/BeamIntersectRule.java | 10 +-
.../sql/impl/rule/BeamJoinAssociateRule.java | 12 +-
.../sql/impl/rule/BeamJoinPushThroughJoinRule.java | 46 ++--
.../extensions/sql/impl/rule/BeamMatchRule.java | 10 +-
.../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/BeamTableFunctionScanRule.java | 12 +-
.../sql/impl/rule/BeamUncollectRule.java | 8 +-
.../extensions/sql/impl/rule/BeamUnionRule.java | 12 +-
.../extensions/sql/impl/rule/BeamUnnestRule.java | 26 +--
.../extensions/sql/impl/rule/BeamValuesRule.java | 10 +-
.../extensions/sql/impl/rule/BeamWindowRule.java | 10 +-
.../sql/impl/rule/JoinRelOptRuleCall.java | 23 +-
.../sql/impl/rule/LogicalCalcMergeRule.java | 13 +-
.../sdk/extensions/sql/impl/rule/package-info.java | 2 +-
.../extensions/sql/impl/schema/BeamTableUtils.java | 4 +-
.../impl/transform/BeamBuiltinAggregations.java | 2 +-
.../transform/BeamBuiltinAnalyticFunctions.java | 2 +-
.../sql/impl/transform/BeamJoinTransforms.java | 8 +-
.../transform/agg/AggregationCombineFnAdapter.java | 4 +-
.../sql/impl/transform/agg/CovarianceFn.java | 4 +-
.../sql/impl/transform/agg/VarianceFn.java | 2 +-
.../sql/impl/udf/BuiltinHashFunctions.java | 2 +-
.../sql/impl/udf/BuiltinStringFunctions.java | 2 +-
.../sql/impl/utils/BigDecimalConverter.java | 2 +-
.../extensions/sql/impl/utils/CalciteUtils.java | 21 +-
.../sql/impl/utils/SerializableRexFieldAccess.java | 4 +-
.../sql/impl/utils/SerializableRexInputRef.java | 2 +-
.../sql/impl/utils/SerializableRexNode.java | 6 +-
.../sdk/extensions/sql/meta/BaseBeamTable.java | 2 +-
.../beam/sdk/extensions/sql/meta/BeamSqlTable.java | 2 +-
.../extensions/sql/meta/BeamSqlTableFilter.java | 4 +-
.../extensions/sql/meta/DefaultTableFilter.java | 2 +-
.../sql/meta/provider/ReadOnlyTableProvider.java | 2 +-
.../provider/bigquery/BeamBigQuerySqlDialect.java | 205 +----------------
.../provider/bigquery/BeamSqlUnparseContext.java | 55 +++--
.../sql/meta/provider/bigquery/BigQueryFilter.java | 34 +--
.../sql/meta/provider/bigquery/BigQueryTable.java | 14 +-
.../provider/bigquery/BigQueryTableProvider.java | 2 +-
.../sql/meta/provider/bigtable/BigtableFilter.java | 10 +-
.../sql/meta/provider/bigtable/BigtableTable.java | 2 +-
.../sql/meta/provider/kafka/BeamKafkaTable.java | 2 +-
.../sql/meta/provider/mongodb/MongoDbTable.java | 20 +-
.../sql/meta/provider/test/TestTableFilter.java | 14 +-
.../sql/meta/provider/test/TestTableProvider.java | 12 +-
.../sql/meta/provider/test/TestTableUtils.java | 2 +-
.../sql/meta/provider/test/TestUnboundedTable.java | 2 +-
.../sql/meta/provider/text/TextTableProvider.java | 6 +-
.../sql/meta/store/InMemoryMetaStore.java | 2 +-
..._26_0.org.codehaus.commons.compiler.properties} | 2 +-
.../sdk/extensions/sql/BeamComplexTypeTest.java | 66 +++---
.../extensions/sql/BeamSqlDslAggregationTest.java | 2 +-
.../sdk/extensions/sql/BeamSqlDslArrayTest.java | 10 +-
.../extensions/sql/BeamSqlDslNestedRowsTest.java | 59 ++---
.../sql/BeamSqlDslSqlStdOperatorsTest.java | 244 +++++++++++----------
.../sdk/extensions/sql/BeamSqlDslUdfUdafTest.java | 10 +-
.../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 +-
.../extensions/sql/TypedCombineFnDelegateTest.java | 10 +-
.../sdk/extensions/sql/impl/JdbcDriverTest.java | 8 +-
.../sql/impl/LazyAggregateCombineFnTest.java | 12 +-
.../sql/impl/parser/BeamDDLNestedTypesTest.java | 2 +-
.../extensions/sql/impl/parser/BeamDDLTest.java | 20 +-
.../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 +-
.../rule/BeamAggregateProjectMergeRuleTest.java | 11 +
.../sql/impl/rule/IOPushDownRuleTest.java | 28 +--
.../sql/impl/rule/JoinReorderingTest.java | 82 +++----
.../sql/impl/schema/BeamSqlRowCoderTest.java | 8 +-
.../sql/impl/utils/CalciteUtilsTest.java | 10 +-
...BeamSqlBuiltinFunctionsIntegrationTestBase.java | 6 +-
.../BeamSqlDateFunctionsIntegrationTest.java | 4 +-
.../sql/meta/CustomTableResolverTest.java | 4 +-
.../provider/bigquery/BigQueryReadWriteIT.java | 2 +-
.../meta/provider/bigquery/BigQueryRowCountIT.java | 2 +-
.../bigquery/BigQueryTestTableProvider.java | 2 +-
.../provider/bigtable/BigtableTableFlatTest.java | 4 +-
.../provider/bigtable/BigtableTableTestUtils.java | 24 +-
.../bigtable/BigtableTableWithRowsTest.java | 6 +-
.../provider/datastore/DataStoreReadWriteIT.java | 2 +-
.../provider/mongodb/MongoDbTableProviderTest.java | 2 +-
.../provider/pubsub/PubsubTableProviderIT.java | 8 +-
.../meta/provider/test/TestTableProviderTest.java | 2 +-
...tTableProviderWithFilterAndProjectPushDown.java | 22 +-
.../test/TestTableProviderWithFilterPushDown.java | 24 +-
.../test/TestTableProviderWithProjectPushDown.java | 22 +-
.../meta/provider/text/TextTableProviderTest.java | 2 +-
.../beam/sdk/extensions/sql/utils/RowAsserts.java | 2 +-
sdks/java/extensions/sql/zetasql/build.gradle | 4 +-
.../extensions/sql/zetasql/BeamCalcRelType.java | 35 ++-
.../sql/zetasql/BeamJavaUdfCalcRule.java | 2 +-
.../sql/zetasql/BeamZetaSqlCalcMergeRule.java | 11 +-
.../extensions/sql/zetasql/BeamZetaSqlCalcRel.java | 26 +--
.../sql/zetasql/BeamZetaSqlCalcRule.java | 2 +-
.../extensions/sql/zetasql/BeamZetaSqlCatalog.java | 18 +-
.../extensions/sql/zetasql/BeamZetaSqlRelType.java | 22 +-
.../sdk/extensions/sql/zetasql/DateTimeUtils.java | 2 +-
.../extensions/sql/zetasql/TableResolution.java | 8 +-
.../extensions/sql/zetasql/ZetaSQLPlannerImpl.java | 30 +--
.../sql/zetasql/ZetaSQLQueryPlanner.java | 58 ++---
.../zetasql/ZetaSqlCalciteTranslationUtils.java | 22 +-
.../translation/AggregateScanConverter.java | 22 +-
.../translation/ArrayScanColumnRefToUncollect.java | 23 +-
.../ArrayScanLiteralToUncollectConverter.java | 7 +-
.../translation/ArrayScanToJoinConverter.java | 34 ++-
.../sql/zetasql/translation/ConversionContext.java | 6 +-
.../zetasql/translation/ExpressionConverter.java | 36 +--
.../zetasql/translation/FilterScanConverter.java | 6 +-
.../sql/zetasql/translation/JoinScanConverter.java | 11 +-
.../LimitOffsetScanToLimitConverter.java | 14 +-
.../LimitOffsetScanToOrderByLimitConverter.java | 25 ++-
.../OrderByScanUnsupportedConverter.java | 2 +-
.../zetasql/translation/ProjectScanConverter.java | 9 +-
.../translation/QueryStatementConverter.java | 2 +-
.../sql/zetasql/translation/RelConverter.java | 16 +-
.../translation/SetOperationScanConverter.java | 8 +-
.../translation/SingleRowScanConverter.java | 2 +-
.../SqlCaseWithValueOperatorRewriter.java | 8 +-
.../translation/SqlCoalesceOperatorRewriter.java | 10 +-
.../translation/SqlIfNullOperatorRewriter.java | 8 +-
...torRewriter.java => SqlInOperatorRewriter.java} | 36 ++-
.../translation/SqlNullIfOperatorRewriter.java | 8 +-
.../translation/SqlOperatorMappingTable.java | 12 +-
.../zetasql/translation/SqlOperatorRewriter.java | 4 +-
.../sql/zetasql/translation/SqlOperators.java | 54 ++---
.../translation/SqlWindowTableFunction.java | 28 +--
.../sql/zetasql/translation/TVFScanConverter.java | 6 +-
.../zetasql/translation/TableScanConverter.java | 34 +--
.../zetasql/translation/WithRefScanConverter.java | 2 +-
.../sql/zetasql/translation/WithScanConverter.java | 2 +-
.../translation/ZetaSqlScalarFunctionImpl.java | 10 +-
.../translation/impl/BeamBuiltinMethods.java | 2 +-
.../zetasql/translation/impl/CastFunctionImpl.java | 24 +-
.../zetasql/translation/impl/StringFunctions.java | 4 +-
.../translation/impl/TimestampFunctions.java | 2 +-
.../zetasql/unnest/BeamZetaSqlUncollectRel.java | 12 +-
.../zetasql/unnest/BeamZetaSqlUncollectRule.java | 6 +-
.../sql/zetasql/unnest/BeamZetaSqlUnnestRel.java | 22 +-
.../sql/zetasql/unnest/BeamZetaSqlUnnestRule.java | 22 +-
.../sql/zetasql/unnest/ZetaSqlUnnest.java | 28 +--
.../sql/zetasql/BeamJavaUdfCalcRuleTest.java | 6 +-
.../sql/zetasql/BeamZetaSqlCatalogTest.java | 2 +-
.../sql/zetasql/TableResolutionTest.java | 4 +-
.../sql/zetasql/ZetaSQLPushDownTest.java | 16 +-
.../extensions/sql/zetasql/ZetaSqlJavaUdfTest.java | 27 +--
.../sql/zetasql/ZetaSqlJavaUdfTypeTest.java | 4 +-
.../extensions/sql/zetasql/ZetaSqlTestBase.java | 10 +-
.../sql/zetasql/ZetaSqlTimeFunctionsTest.java | 14 +-
.../io/gcp/bigtable/BeamRowToBigtableMutation.java | 3 +-
.../sdk/io/gcp/bigtable/BigtableRowToBeamRow.java | 7 +-
.../io/gcp/bigtable/BigtableRowToBeamRowFlat.java | 2 +-
.../io/gcp/bigtable/BigtableRowToBeamRowFn.java | 4 +-
.../beam/sdk/io/gcp/bigtable/CellValueParser.java | 23 +-
.../sdk/io/gcp/bigtable/CellValueParserTest.java | 25 ++-
sdks/java/testing/tpcds/build.gradle | 2 +-
.../org/apache/beam/sdk/tpcds/QueryReader.java | 6 +-
.../apache/beam/sdk/tpcds/SqlTransformRunner.java | 4 +-
.../beam/sdk/tpcds/TpcdsOptionsRegistrar.java | 2 +-
268 files changed, 2196 insertions(+), 2164 deletions(-)
create mode 100644
sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamSqlParser.java
rename
sdks/java/extensions/sql/src/main/resources/{org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.properties
=>
org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.commons.compiler.properties}
(93%)
copy
sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/{SqlIfNullOperatorRewriter.java
=> SqlInOperatorRewriter.java} (55%)
