From ba493f85a5a18665cd6ae4eb61e0a86fab1a6c07 Mon Sep 17 00:00:00 2001 From: James Xu Date: Sun, 30 Jul 2017 23:39:37 +0800 Subject: [PATCH 1/3] move dsls/sql to sdks/java/extensions/sql --- dsls/pom.xml | 60 ------------------- pom.xml | 1 - sdks/java/extensions/pom.xml | 1 + {dsls => sdks/java/extensions}/sql/pom.xml | 6 +- .../org/apache/beam/dsls/sql/BeamSql.java | 0 .../org/apache/beam/dsls/sql/BeamSqlCli.java | 0 .../org/apache/beam/dsls/sql/BeamSqlEnv.java | 0 .../beam/dsls/sql/example/BeamSqlExample.java | 0 .../beam/dsls/sql/example/package-info.java | 0 .../BeamSqlExpressionExecutor.java | 0 .../sql/interpreter/BeamSqlFnExecutor.java | 0 .../operator/BeamSqlCaseExpression.java | 0 .../operator/BeamSqlCastExpression.java | 0 .../operator/BeamSqlExpression.java | 0 .../operator/BeamSqlInputRefExpression.java | 0 .../operator/BeamSqlPrimitive.java | 0 .../BeamSqlReinterpretExpression.java | 0 .../operator/BeamSqlUdfExpression.java | 0 .../operator/BeamSqlWindowEndExpression.java | 0 .../operator/BeamSqlWindowExpression.java | 0 .../BeamSqlWindowStartExpression.java | 0 .../BeamSqlArithmeticExpression.java | 0 .../arithmetic/BeamSqlDivideExpression.java | 0 .../arithmetic/BeamSqlMinusExpression.java | 0 .../arithmetic/BeamSqlModExpression.java | 0 .../arithmetic/BeamSqlMultiplyExpression.java | 0 .../arithmetic/BeamSqlPlusExpression.java | 0 .../operator/arithmetic/package-info.java | 0 .../comparison/BeamSqlCompareExpression.java | 0 .../comparison/BeamSqlEqualsExpression.java | 0 .../BeamSqlGreaterThanExpression.java | 0 .../BeamSqlGreaterThanOrEqualsExpression.java | 0 .../BeamSqlIsNotNullExpression.java | 0 .../comparison/BeamSqlIsNullExpression.java | 0 .../comparison/BeamSqlLessThanExpression.java | 0 .../BeamSqlLessThanOrEqualsExpression.java | 0 .../BeamSqlNotEqualsExpression.java | 0 .../operator/comparison/package-info.java | 0 .../date/BeamSqlCurrentDateExpression.java | 0 .../date/BeamSqlCurrentTimeExpression.java | 0 .../BeamSqlCurrentTimestampExpression.java | 0 .../date/BeamSqlDateCeilExpression.java | 0 .../date/BeamSqlDateFloorExpression.java | 0 .../date/BeamSqlExtractExpression.java | 0 .../operator/date/package-info.java | 0 .../logical/BeamSqlAndExpression.java | 0 .../logical/BeamSqlLogicalExpression.java | 0 .../logical/BeamSqlNotExpression.java | 0 .../operator/logical/BeamSqlOrExpression.java | 0 .../operator/logical/package-info.java | 0 .../operator/math/BeamSqlAbsExpression.java | 0 .../operator/math/BeamSqlAcosExpression.java | 0 .../operator/math/BeamSqlAsinExpression.java | 0 .../operator/math/BeamSqlAtan2Expression.java | 0 .../operator/math/BeamSqlAtanExpression.java | 0 .../operator/math/BeamSqlCeilExpression.java | 0 .../operator/math/BeamSqlCosExpression.java | 0 .../operator/math/BeamSqlCotExpression.java | 0 .../math/BeamSqlDegreesExpression.java | 0 .../operator/math/BeamSqlExpExpression.java | 0 .../operator/math/BeamSqlFloorExpression.java | 0 .../operator/math/BeamSqlLnExpression.java | 0 .../operator/math/BeamSqlLogExpression.java | 0 .../math/BeamSqlMathBinaryExpression.java | 0 .../math/BeamSqlMathUnaryExpression.java | 0 .../operator/math/BeamSqlPiExpression.java | 0 .../operator/math/BeamSqlPowerExpression.java | 0 .../math/BeamSqlRadiansExpression.java | 0 .../operator/math/BeamSqlRandExpression.java | 0 .../math/BeamSqlRandIntegerExpression.java | 0 .../operator/math/BeamSqlRoundExpression.java | 0 .../operator/math/BeamSqlSignExpression.java | 0 .../operator/math/BeamSqlSinExpression.java | 0 .../operator/math/BeamSqlTanExpression.java | 0 .../math/BeamSqlTruncateExpression.java | 0 .../operator/math/package-info.java | 0 .../interpreter/operator/package-info.java | 0 .../string/BeamSqlCharLengthExpression.java | 0 .../string/BeamSqlConcatExpression.java | 0 .../string/BeamSqlInitCapExpression.java | 0 .../string/BeamSqlLowerExpression.java | 0 .../string/BeamSqlOverlayExpression.java | 0 .../string/BeamSqlPositionExpression.java | 0 .../string/BeamSqlStringUnaryExpression.java | 0 .../string/BeamSqlSubstringExpression.java | 0 .../string/BeamSqlTrimExpression.java | 0 .../string/BeamSqlUpperExpression.java | 0 .../operator/string/package-info.java | 0 .../dsls/sql/interpreter/package-info.java | 0 .../apache/beam/dsls/sql/package-info.java | 0 .../dsls/sql/planner/BeamQueryPlanner.java | 0 .../sql/planner/BeamRelDataTypeSystem.java | 0 .../beam/dsls/sql/planner/BeamRuleSets.java | 0 .../beam/dsls/sql/planner/package-info.java | 0 .../beam/dsls/sql/rel/BeamAggregationRel.java | 0 .../beam/dsls/sql/rel/BeamFilterRel.java | 0 .../beam/dsls/sql/rel/BeamIOSinkRel.java | 0 .../beam/dsls/sql/rel/BeamIOSourceRel.java | 0 .../beam/dsls/sql/rel/BeamIntersectRel.java | 0 .../apache/beam/dsls/sql/rel/BeamJoinRel.java | 0 .../dsls/sql/rel/BeamLogicalConvention.java | 0 .../beam/dsls/sql/rel/BeamMinusRel.java | 0 .../beam/dsls/sql/rel/BeamProjectRel.java | 0 .../apache/beam/dsls/sql/rel/BeamRelNode.java | 0 .../dsls/sql/rel/BeamSetOperatorRelBase.java | 0 .../apache/beam/dsls/sql/rel/BeamSortRel.java | 0 .../beam/dsls/sql/rel/BeamSqlRelUtils.java | 0 .../beam/dsls/sql/rel/BeamUnionRel.java | 0 .../beam/dsls/sql/rel/BeamValuesRel.java | 0 .../beam/dsls/sql/rel/package-info.java | 0 .../dsls/sql/rule/BeamAggregationRule.java | 0 .../beam/dsls/sql/rule/BeamFilterRule.java | 0 .../beam/dsls/sql/rule/BeamIOSinkRule.java | 0 .../beam/dsls/sql/rule/BeamIOSourceRule.java | 0 .../beam/dsls/sql/rule/BeamIntersectRule.java | 0 .../beam/dsls/sql/rule/BeamJoinRule.java | 0 .../beam/dsls/sql/rule/BeamMinusRule.java | 0 .../beam/dsls/sql/rule/BeamProjectRule.java | 0 .../beam/dsls/sql/rule/BeamSortRule.java | 0 .../beam/dsls/sql/rule/BeamUnionRule.java | 0 .../beam/dsls/sql/rule/BeamValuesRule.java | 0 .../beam/dsls/sql/rule/package-info.java | 0 .../beam/dsls/sql/schema/BaseBeamTable.java | 0 .../beam/dsls/sql/schema/BeamIOType.java | 0 .../dsls/sql/schema/BeamPCollectionTable.java | 0 .../beam/dsls/sql/schema/BeamSqlRow.java | 0 .../beam/dsls/sql/schema/BeamSqlRowCoder.java | 0 .../beam/dsls/sql/schema/BeamSqlRowType.java | 0 .../beam/dsls/sql/schema/BeamSqlTable.java | 0 .../beam/dsls/sql/schema/BeamSqlUdaf.java | 0 .../beam/dsls/sql/schema/BeamSqlUdf.java | 0 .../beam/dsls/sql/schema/BeamTableUtils.java | 0 .../sql/schema/kafka/BeamKafkaCSVTable.java | 0 .../dsls/sql/schema/kafka/BeamKafkaTable.java | 0 .../dsls/sql/schema/kafka/package-info.java | 0 .../beam/dsls/sql/schema/package-info.java | 0 .../sql/schema/text/BeamTextCSVTable.java | 0 .../schema/text/BeamTextCSVTableIOReader.java | 0 .../schema/text/BeamTextCSVTableIOWriter.java | 0 .../dsls/sql/schema/text/BeamTextTable.java | 0 .../dsls/sql/schema/text/package-info.java | 0 .../transform/BeamAggregationTransforms.java | 0 .../transform/BeamBuiltinAggregations.java | 0 .../sql/transform/BeamJoinTransforms.java | 0 .../transform/BeamSetOperatorsTransforms.java | 0 .../dsls/sql/transform/BeamSqlFilterFn.java | 0 .../transform/BeamSqlOutputToConsoleFn.java | 0 .../dsls/sql/transform/BeamSqlProjectFn.java | 0 .../beam/dsls/sql/transform/package-info.java | 0 .../beam/dsls/sql/utils/CalciteUtils.java | 0 .../beam/dsls/sql/utils/package-info.java | 0 .../sql/src/main/resources/log4j.properties | 0 .../beam/dsls/sql/BeamSqlApiSurfaceTest.java | 0 .../dsls/sql/BeamSqlDslAggregationTest.java | 0 .../apache/beam/dsls/sql/BeamSqlDslBase.java | 0 .../beam/dsls/sql/BeamSqlDslFilterTest.java | 0 .../beam/dsls/sql/BeamSqlDslJoinTest.java | 0 .../beam/dsls/sql/BeamSqlDslProjectTest.java | 0 .../beam/dsls/sql/BeamSqlDslUdfUdafTest.java | 0 .../org/apache/beam/dsls/sql/TestUtils.java | 0 ...SqlArithmeticOperatorsIntegrationTest.java | 0 ...qlBuiltinFunctionsIntegrationTestBase.java | 0 ...SqlComparisonOperatorsIntegrationTest.java | 0 ...qlConditionalFunctionsIntegrationTest.java | 0 .../BeamSqlDateFunctionsIntegrationTest.java | 0 ...eamSqlLogicalFunctionsIntegrationTest.java | 0 .../BeamSqlMathFunctionsIntegrationTest.java | 0 ...BeamSqlStringFunctionsIntegrationTest.java | 0 .../interpreter/BeamSqlFnExecutorTest.java | 0 .../BeamSqlFnExecutorTestBase.java | 0 .../operator/BeamNullExperssionTest.java | 0 .../operator/BeamSqlAndOrExpressionTest.java | 0 .../operator/BeamSqlCaseExpressionTest.java | 0 .../operator/BeamSqlCastExpressionTest.java | 0 .../BeamSqlCompareExpressionTest.java | 0 .../BeamSqlInputRefExpressionTest.java | 0 .../operator/BeamSqlPrimitiveTest.java | 0 .../BeamSqlReinterpretExpressionTest.java | 0 .../operator/BeamSqlUdfExpressionTest.java | 0 .../BeamSqlArithmeticExpressionTest.java | 0 .../BeamSqlCurrentDateExpressionTest.java | 0 .../BeamSqlCurrentTimeExpressionTest.java | 0 ...BeamSqlCurrentTimestampExpressionTest.java | 0 .../date/BeamSqlDateCeilExpressionTest.java | 0 .../date/BeamSqlDateExpressionTestBase.java | 0 .../date/BeamSqlDateFloorExpressionTest.java | 0 .../date/BeamSqlExtractExpressionTest.java | 0 .../logical/BeamSqlNotExpressionTest.java | 0 .../math/BeamSqlMathBinaryExpressionTest.java | 0 .../math/BeamSqlMathUnaryExpressionTest.java | 0 .../BeamSqlCharLengthExpressionTest.java | 0 .../string/BeamSqlConcatExpressionTest.java | 0 .../string/BeamSqlInitCapExpressionTest.java | 0 .../string/BeamSqlLowerExpressionTest.java | 0 .../string/BeamSqlOverlayExpressionTest.java | 0 .../string/BeamSqlPositionExpressionTest.java | 0 .../BeamSqlStringUnaryExpressionTest.java | 0 .../BeamSqlSubstringExpressionTest.java | 0 .../string/BeamSqlTrimExpressionTest.java | 0 .../string/BeamSqlUpperExpressionTest.java | 0 .../dsls/sql/mock/MockedBoundedTable.java | 0 .../beam/dsls/sql/mock/MockedTable.java | 0 .../dsls/sql/mock/MockedUnboundedTable.java | 0 .../dsls/sql/rel/BeamIntersectRelTest.java | 0 .../rel/BeamJoinRelBoundedVsBoundedTest.java | 0 .../BeamJoinRelUnboundedVsBoundedTest.java | 0 .../BeamJoinRelUnboundedVsUnboundedTest.java | 0 .../beam/dsls/sql/rel/BeamMinusRelTest.java | 0 .../sql/rel/BeamSetOperatorRelBaseTest.java | 0 .../beam/dsls/sql/rel/BeamSortRelTest.java | 0 .../beam/dsls/sql/rel/BeamUnionRelTest.java | 0 .../beam/dsls/sql/rel/BeamValuesRelTest.java | 0 .../apache/beam/dsls/sql/rel/CheckSize.java | 0 .../dsls/sql/schema/BeamSqlRowCoderTest.java | 0 .../schema/kafka/BeamKafkaCSVTableTest.java | 0 .../sql/schema/text/BeamTextCSVTableTest.java | 0 .../BeamAggregationTransformTest.java | 0 .../transform/BeamTransformBaseTest.java | 0 218 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 dsls/pom.xml rename {dsls => sdks/java/extensions}/sql/pom.xml (97%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java (100%) rename {dsls => sdks/java/extensions}/sql/src/main/resources/log4j.properties (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java (100%) rename {dsls => sdks/java/extensions}/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java (100%) diff --git a/dsls/pom.xml b/dsls/pom.xml deleted file mode 100644 index d0beca11ba613..0000000000000 --- a/dsls/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 4.0.0 - - - org.apache.beam - beam-parent - 2.2.0-SNAPSHOT - ../pom.xml - - - beam-dsls-parent - pom - Apache Beam :: DSLs - - - sql - - - - - release - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - - diff --git a/pom.xml b/pom.xml index a86a680ba4334..803d30cb937da 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,6 @@ sdks/java/build-tools sdks runners - dsls examples sdks/java/javadoc diff --git a/sdks/java/extensions/pom.xml b/sdks/java/extensions/pom.xml index 1222476ec904f..5465cf0683f65 100644 --- a/sdks/java/extensions/pom.xml +++ b/sdks/java/extensions/pom.xml @@ -37,6 +37,7 @@ join-library protobuf sorter + sql diff --git a/dsls/sql/pom.xml b/sdks/java/extensions/sql/pom.xml similarity index 97% rename from dsls/sql/pom.xml rename to sdks/java/extensions/sql/pom.xml index ac0748977b130..b4aa223a08f26 100644 --- a/dsls/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -23,13 +23,13 @@ org.apache.beam - beam-dsls-parent + beam-sdks-java-extensions-parent 2.2.0-SNAPSHOT ../pom.xml - beam-dsls-sql - Apache Beam :: DSLs :: SQL + beam-sdks-java-extensions-sql + Apache Beam :: SDKs :: Java :: Extensions :: SQL Beam SQL provides a new interface to generate a Beam pipeline from SQL statement jar diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java similarity index 100% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java diff --git a/dsls/sql/src/main/resources/log4j.properties b/sdks/java/extensions/sql/src/main/resources/log4j.properties similarity index 100% rename from dsls/sql/src/main/resources/log4j.properties rename to sdks/java/extensions/sql/src/main/resources/log4j.properties diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java diff --git a/dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java similarity index 100% rename from dsls/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java From c1b5482d3fb13a14926f0ffc23d0810b3105ed24 Mon Sep 17 00:00:00 2001 From: James Xu Date: Sun, 30 Jul 2017 23:58:02 +0800 Subject: [PATCH 2/3] rename package org.apache.beam.dsls.sql to org.apache.beam.sdk.extensions.sql --- .../{dsls => sdk/extensions}/sql/BeamSql.java | 14 +- .../extensions}/sql/BeamSqlCli.java | 6 +- .../extensions}/sql/BeamSqlEnv.java | 15 +- .../sql/example/BeamSqlExample.java | 12 +- .../extensions}/sql/example/package-info.java | 2 +- .../BeamSqlExpressionExecutor.java | 4 +- .../sql/interpreter/BeamSqlFnExecutor.java | 138 +++++++++--------- .../operator/BeamSqlCaseExpression.java | 5 +- .../operator/BeamSqlCastExpression.java | 5 +- .../operator/BeamSqlExpression.java | 4 +- .../operator/BeamSqlInputRefExpression.java | 4 +- .../operator/BeamSqlPrimitive.java | 4 +- .../BeamSqlReinterpretExpression.java | 5 +- .../operator/BeamSqlUdfExpression.java | 4 +- .../operator/BeamSqlWindowEndExpression.java | 4 +- .../operator/BeamSqlWindowExpression.java | 4 +- .../BeamSqlWindowStartExpression.java | 4 +- .../BeamSqlArithmeticExpression.java | 8 +- .../arithmetic/BeamSqlDivideExpression.java | 4 +- .../arithmetic/BeamSqlMinusExpression.java | 4 +- .../arithmetic/BeamSqlModExpression.java | 4 +- .../arithmetic/BeamSqlMultiplyExpression.java | 4 +- .../arithmetic/BeamSqlPlusExpression.java | 4 +- .../operator/arithmetic/package-info.java | 2 +- .../comparison/BeamSqlCompareExpression.java | 8 +- .../comparison/BeamSqlEqualsExpression.java | 4 +- .../BeamSqlGreaterThanExpression.java | 4 +- .../BeamSqlGreaterThanOrEqualsExpression.java | 4 +- .../BeamSqlIsNotNullExpression.java | 8 +- .../comparison/BeamSqlIsNullExpression.java | 8 +- .../comparison/BeamSqlLessThanExpression.java | 4 +- .../BeamSqlLessThanOrEqualsExpression.java | 4 +- .../BeamSqlNotEqualsExpression.java | 4 +- .../operator/comparison/package-info.java | 2 +- .../date/BeamSqlCurrentDateExpression.java | 9 +- .../date/BeamSqlCurrentTimeExpression.java | 9 +- .../BeamSqlCurrentTimestampExpression.java | 9 +- .../date/BeamSqlDateCeilExpression.java | 9 +- .../date/BeamSqlDateFloorExpression.java | 9 +- .../date/BeamSqlExtractExpression.java | 8 +- .../operator/date/package-info.java | 2 +- .../logical/BeamSqlAndExpression.java | 9 +- .../logical/BeamSqlLogicalExpression.java | 5 +- .../logical/BeamSqlNotExpression.java | 9 +- .../operator/logical/BeamSqlOrExpression.java | 9 +- .../operator/logical/package-info.java | 2 +- .../operator/math/BeamSqlAbsExpression.java | 6 +- .../operator/math/BeamSqlAcosExpression.java | 7 +- .../operator/math/BeamSqlAsinExpression.java | 7 +- .../operator/math/BeamSqlAtan2Expression.java | 7 +- .../operator/math/BeamSqlAtanExpression.java | 7 +- .../operator/math/BeamSqlCeilExpression.java | 7 +- .../operator/math/BeamSqlCosExpression.java | 7 +- .../operator/math/BeamSqlCotExpression.java | 7 +- .../math/BeamSqlDegreesExpression.java | 7 +- .../operator/math/BeamSqlExpExpression.java | 7 +- .../operator/math/BeamSqlFloorExpression.java | 7 +- .../operator/math/BeamSqlLnExpression.java | 7 +- .../operator/math/BeamSqlLogExpression.java | 7 +- .../math/BeamSqlMathBinaryExpression.java | 9 +- .../math/BeamSqlMathUnaryExpression.java | 8 +- .../operator/math/BeamSqlPiExpression.java | 8 +- .../operator/math/BeamSqlPowerExpression.java | 7 +- .../math/BeamSqlRadiansExpression.java | 7 +- .../operator/math/BeamSqlRandExpression.java | 8 +- .../math/BeamSqlRandIntegerExpression.java | 8 +- .../operator/math/BeamSqlRoundExpression.java | 7 +- .../operator/math/BeamSqlSignExpression.java | 6 +- .../operator/math/BeamSqlSinExpression.java | 7 +- .../operator/math/BeamSqlTanExpression.java | 7 +- .../math/BeamSqlTruncateExpression.java | 7 +- .../operator/math/package-info.java | 2 +- .../interpreter/operator/package-info.java | 2 +- .../string/BeamSqlCharLengthExpression.java | 9 +- .../string/BeamSqlConcatExpression.java | 9 +- .../string/BeamSqlInitCapExpression.java | 9 +- .../string/BeamSqlLowerExpression.java | 9 +- .../string/BeamSqlOverlayExpression.java | 9 +- .../string/BeamSqlPositionExpression.java | 9 +- .../string/BeamSqlStringUnaryExpression.java | 5 +- .../string/BeamSqlSubstringExpression.java | 9 +- .../string/BeamSqlTrimExpression.java | 8 +- .../string/BeamSqlUpperExpression.java | 9 +- .../operator/string/package-info.java | 2 +- .../sql/interpreter/package-info.java | 2 +- .../extensions}/sql/package-info.java | 2 +- .../sql/planner/BeamQueryPlanner.java | 12 +- .../sql/planner/BeamRelDataTypeSystem.java | 2 +- .../extensions}/sql/planner/BeamRuleSets.java | 26 ++-- .../extensions}/sql/planner/package-info.java | 4 +- .../sql/rel/BeamAggregationRel.java | 14 +- .../extensions}/sql/rel/BeamFilterRel.java | 16 +- .../extensions}/sql/rel/BeamIOSinkRel.java | 8 +- .../extensions}/sql/rel/BeamIOSourceRel.java | 12 +- .../extensions}/sql/rel/BeamIntersectRel.java | 6 +- .../extensions}/sql/rel/BeamJoinRel.java | 14 +- .../sql/rel/BeamLogicalConvention.java | 2 +- .../extensions}/sql/rel/BeamMinusRel.java | 6 +- .../extensions}/sql/rel/BeamProjectRel.java | 16 +- .../extensions}/sql/rel/BeamRelNode.java | 6 +- .../sql/rel/BeamSetOperatorRelBase.java | 8 +- .../extensions}/sql/rel/BeamSortRel.java | 10 +- .../extensions}/sql/rel/BeamSqlRelUtils.java | 3 +- .../extensions}/sql/rel/BeamUnionRel.java | 6 +- .../extensions}/sql/rel/BeamValuesRel.java | 14 +- .../extensions}/sql/rel/package-info.java | 2 +- .../sql/rule/BeamAggregationRule.java | 6 +- .../extensions}/sql/rule/BeamFilterRule.java | 6 +- .../extensions}/sql/rule/BeamIOSinkRule.java | 7 +- .../sql/rule/BeamIOSourceRule.java | 6 +- .../sql/rule/BeamIntersectRule.java | 7 +- .../extensions}/sql/rule/BeamJoinRule.java | 6 +- .../extensions}/sql/rule/BeamMinusRule.java | 7 +- .../extensions}/sql/rule/BeamProjectRule.java | 6 +- .../extensions}/sql/rule/BeamSortRule.java | 7 +- .../extensions}/sql/rule/BeamUnionRule.java | 6 +- .../extensions}/sql/rule/BeamValuesRule.java | 6 +- .../extensions}/sql/rule/package-info.java | 4 +- .../extensions}/sql/schema/BaseBeamTable.java | 2 +- .../extensions}/sql/schema/BeamIOType.java | 2 +- .../sql/schema/BeamPCollectionTable.java | 2 +- .../extensions}/sql/schema/BeamSqlRow.java | 4 +- .../sql/schema/BeamSqlRowCoder.java | 4 +- .../sql/schema/BeamSqlRowType.java | 2 +- .../extensions}/sql/schema/BeamSqlTable.java | 2 +- .../extensions}/sql/schema/BeamSqlUdaf.java | 2 +- .../extensions}/sql/schema/BeamSqlUdf.java | 2 +- .../sql/schema/BeamTableUtils.java | 4 +- .../sql/schema/kafka/BeamKafkaCSVTable.java | 14 +- .../sql/schema/kafka/BeamKafkaTable.java | 10 +- .../sql/schema/kafka/package-info.java | 2 +- .../extensions}/sql/schema/package-info.java | 2 +- .../sql/schema/text/BeamTextCSVTable.java | 6 +- .../schema/text/BeamTextCSVTableIOReader.java | 11 +- .../schema/text/BeamTextCSVTableIOWriter.java | 11 +- .../sql/schema/text/BeamTextTable.java | 9 +- .../sql/schema/text/package-info.java | 2 +- .../transform/BeamAggregationTransforms.java | 14 +- .../transform/BeamBuiltinAggregations.java | 4 +- .../sql/transform/BeamJoinTransforms.java | 6 +- .../transform/BeamSetOperatorsTransforms.java | 7 +- .../sql/transform/BeamSqlFilterFn.java | 8 +- .../transform/BeamSqlOutputToConsoleFn.java | 4 +- .../sql/transform/BeamSqlProjectFn.java | 12 +- .../sql/transform/package-info.java | 2 +- .../extensions}/sql/utils/CalciteUtils.java | 4 +- .../extensions}/sql/utils/package-info.java | 2 +- .../sql/BeamSqlApiSurfaceTest.java | 8 +- .../sql/BeamSqlDslAggregationTest.java | 6 +- .../extensions}/sql/BeamSqlDslBase.java | 8 +- .../extensions}/sql/BeamSqlDslFilterTest.java | 4 +- .../extensions}/sql/BeamSqlDslJoinTest.java | 12 +- .../sql/BeamSqlDslProjectTest.java | 6 +- .../sql/BeamSqlDslUdfUdafTest.java | 12 +- .../extensions}/sql/TestUtils.java | 6 +- ...SqlArithmeticOperatorsIntegrationTest.java | 2 +- ...qlBuiltinFunctionsIntegrationTestBase.java | 14 +- ...SqlComparisonOperatorsIntegrationTest.java | 10 +- ...qlConditionalFunctionsIntegrationTest.java | 2 +- .../BeamSqlDateFunctionsIntegrationTest.java | 6 +- ...eamSqlLogicalFunctionsIntegrationTest.java | 2 +- .../BeamSqlMathFunctionsIntegrationTest.java | 2 +- ...BeamSqlStringFunctionsIntegrationTest.java | 2 +- .../interpreter/BeamSqlFnExecutorTest.java | 68 ++++----- .../BeamSqlFnExecutorTestBase.java | 16 +- .../operator/BeamNullExperssionTest.java | 8 +- .../operator/BeamSqlAndOrExpressionTest.java | 9 +- .../operator/BeamSqlCaseExpressionTest.java | 5 +- .../operator/BeamSqlCastExpressionTest.java | 5 +- .../BeamSqlCompareExpressionTest.java | 18 +-- .../BeamSqlInputRefExpressionTest.java | 4 +- .../operator/BeamSqlPrimitiveTest.java | 4 +- .../BeamSqlReinterpretExpressionTest.java | 6 +- .../operator/BeamSqlUdfExpressionTest.java | 4 +- .../BeamSqlArithmeticExpressionTest.java | 8 +- .../BeamSqlCurrentDateExpressionTest.java | 13 +- .../BeamSqlCurrentTimeExpressionTest.java | 5 +- ...BeamSqlCurrentTimestampExpressionTest.java | 5 +- .../date/BeamSqlDateCeilExpressionTest.java | 21 +-- .../date/BeamSqlDateExpressionTestBase.java | 5 +- .../date/BeamSqlDateFloorExpressionTest.java | 7 +- .../date/BeamSqlExtractExpressionTest.java | 29 ++-- .../logical/BeamSqlNotExpressionTest.java | 9 +- .../math/BeamSqlMathBinaryExpressionTest.java | 56 ++++--- .../math/BeamSqlMathUnaryExpressionTest.java | 9 +- .../BeamSqlCharLengthExpressionTest.java | 9 +- .../string/BeamSqlConcatExpressionTest.java | 13 +- .../string/BeamSqlInitCapExpressionTest.java | 9 +- .../string/BeamSqlLowerExpressionTest.java | 9 +- .../string/BeamSqlOverlayExpressionTest.java | 19 ++- .../string/BeamSqlPositionExpressionTest.java | 9 +- .../BeamSqlStringUnaryExpressionTest.java | 7 +- .../BeamSqlSubstringExpressionTest.java | 9 +- .../string/BeamSqlTrimExpressionTest.java | 18 +-- .../string/BeamSqlUpperExpressionTest.java | 9 +- .../sql/mock/MockedBoundedTable.java | 12 +- .../extensions}/sql/mock/MockedTable.java | 8 +- .../sql/mock/MockedUnboundedTable.java | 18 +-- .../sql/rel/BeamIntersectRelTest.java | 12 +- .../rel/BeamJoinRelBoundedVsBoundedTest.java | 12 +- .../BeamJoinRelUnboundedVsBoundedTest.java | 16 +- .../BeamJoinRelUnboundedVsUnboundedTest.java | 14 +- .../extensions}/sql/rel/BeamMinusRelTest.java | 12 +- .../sql/rel/BeamSetOperatorRelBaseTest.java | 12 +- .../extensions}/sql/rel/BeamSortRelTest.java | 12 +- .../extensions}/sql/rel/BeamUnionRelTest.java | 12 +- .../sql/rel/BeamValuesRelTest.java | 12 +- .../extensions}/sql/rel/CheckSize.java | 4 +- .../sql/schema/BeamSqlRowCoderTest.java | 5 +- .../schema/kafka/BeamKafkaCSVTableTest.java | 10 +- .../sql/schema/text/BeamTextCSVTableTest.java | 10 +- .../BeamAggregationTransformTest.java | 14 +- .../transform/BeamTransformBaseTest.java | 10 +- 213 files changed, 880 insertions(+), 946 deletions(-) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSql.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlCli.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlEnv.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/example/BeamSqlExample.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/example/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/BeamSqlExpressionExecutor.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/BeamSqlFnExecutor.java (67%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlCaseExpression.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlCastExpression.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlExpression.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlInputRefExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlPrimitive.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlReinterpretExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlUdfExpression.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlWindowEndExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlWindowExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlWindowStartExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/comparison/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlExtractExpression.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/package-info.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/BeamSqlAndExpression.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/BeamSqlNotExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/BeamSqlOrExpression.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlAbsExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlAcosExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlAsinExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlAtan2Expression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlAtanExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlCeilExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlCosExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlCotExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlDegreesExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlExpExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlFloorExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlLnExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlLogExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlPiExpression.java (80%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlPowerExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlRadiansExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlRandExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlRoundExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlSignExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlSinExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlTanExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlTruncateExpression.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/package-info.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/package-info.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java (81%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlConcatExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlInitCapExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlLowerExpression.java (81%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlOverlayExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlPositionExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlSubstringExpression.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlTrimExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlUpperExpression.java (81%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/package-info.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/package-info.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/planner/BeamQueryPlanner.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/planner/BeamRelDataTypeSystem.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/planner/BeamRuleSets.java (74%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/planner/package-info.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamAggregationRel.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamFilterRel.java (81%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamIOSinkRel.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamIOSourceRel.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamIntersectRel.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamJoinRel.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamLogicalConvention.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamMinusRel.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamProjectRel.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamRelNode.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamSetOperatorRelBase.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamSortRel.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamSqlRelUtils.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamUnionRel.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamValuesRel.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamAggregationRule.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamFilterRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamIOSinkRule.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamIOSourceRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamIntersectRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamJoinRule.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamMinusRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamProjectRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamSortRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamUnionRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/BeamValuesRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/rule/package-info.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BaseBeamTable.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamIOType.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamPCollectionTable.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlRow.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlRowCoder.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlRowType.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlTable.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlUdaf.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlUdf.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamTableUtils.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/kafka/BeamKafkaCSVTable.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/kafka/BeamKafkaTable.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/kafka/package-info.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/BeamTextCSVTable.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/BeamTextCSVTableIOReader.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/BeamTextCSVTableIOWriter.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/BeamTextTable.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/package-info.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamAggregationTransforms.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamBuiltinAggregations.java (99%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamJoinTransforms.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamSetOperatorsTransforms.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamSqlFilterFn.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamSqlOutputToConsoleFn.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/BeamSqlProjectFn.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/transform/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/utils/CalciteUtils.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/{dsls => sdk/extensions}/sql/utils/package-info.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlApiSurfaceTest.java (86%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslAggregationTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslBase.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslFilterTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslJoinTest.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslProjectTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/BeamSqlDslUdfUdafTest.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/TestUtils.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java (99%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java (99%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/BeamSqlFnExecutorTest.java (81%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/BeamSqlFnExecutorTestBase.java (86%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamNullExperssionTest.java (84%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java (86%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlCaseExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlCastExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlCompareExpressionTest.java (84%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlPrimitiveTest.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java (95%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/BeamSqlUdfExpressionTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java (75%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java (68%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java (88%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java (71%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java (84%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java (75%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java (81%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java (85%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java (85%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java (81%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java (87%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java (88%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java (88%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java (81%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/mock/MockedBoundedTable.java (90%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/mock/MockedTable.java (85%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/mock/MockedUnboundedTable.java (86%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamIntersectRelTest.java (90%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamJoinRelBoundedVsBoundedTest.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamMinusRelTest.java (90%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamSetOperatorRelBaseTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamSortRelTest.java (95%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamUnionRelTest.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/BeamValuesRelTest.java (90%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/rel/CheckSize.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/BeamSqlRowCoderTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/kafka/BeamKafkaCSVTableTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/text/BeamTextCSVTableTest.java (95%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/transform/BeamAggregationTransformTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/{dsls => sdk/extensions}/sql/schema/transform/BeamTransformBaseTest.java (92%) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java index d902f42bc754f..d64ae41ffd248 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSql.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import com.google.auto.value.AutoValue; -import org.apache.beam.dsls.sql.rel.BeamRelNode; -import org.apache.beam.dsls.sql.schema.BeamPCollectionTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlUdaf; -import org.apache.beam.dsls.sql.schema.BeamSqlUdf; import org.apache.beam.sdk.annotations.Experimental; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.schema.BeamPCollectionTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdf; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java index 50da244ec1a20..714e1024fd3e9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlCli.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; -import org.apache.beam.dsls.sql.rel.BeamRelNode; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.annotations.Experimental; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java index 0e1ac989b0392..ca73b13d736c6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/BeamSqlEnv.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java @@ -15,16 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.io.Serializable; - -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.schema.BeamSqlUdaf; -import org.apache.beam.dsls.sql.schema.BeamSqlUdf; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdf; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.calcite.DataContext; import org.apache.calcite.linq4j.Enumerable; import org.apache.calcite.rel.type.RelDataType; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java index 4e364e1dd0ad5..21e02a7cea218 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.example; +package org.apache.beam.sdk.extensions.sql.example; import java.sql.Types; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.BeamSql; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.BeamSql; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.transforms.Create; @@ -41,7 +41,7 @@ *

Run the example with * 

  * mvn -pl dsls/sql compile exec:java \
- *  -Dexec.mainClass=org.apache.beam.dsls.sql.example.BeamSqlExample \
+ *  -Dexec.mainClass=BeamSqlExample \
  *   -Dexec.args="--runner=DirectRunner" -Pdirect-runner
  *
* diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/package-info.java index 52a9fcea91342..f15691789068a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/example/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/package-info.java @@ -20,4 +20,4 @@ * examples on how to use BeamSQL. * */ -package org.apache.beam.dsls.sql.example; +package org.apache.beam.sdk.extensions.sql.example; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java index 3732933c07a3b..28f83e427e0df 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlExpressionExecutor.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.interpreter; import java.io.Serializable; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; /** * {@code BeamSqlExpressionExecutor} fills the gap between relational diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java similarity index 67% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java index aee0e4abb1622..3084cd5a0b4ee 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutor.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java @@ -15,80 +15,80 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.interpreter; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlCaseExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlCastExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlReinterpretExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlUdfExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlWindowEndExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlWindowExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlWindowStartExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlModExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlDateCeilExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlDateFloorExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlExtractExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlNotExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlOrExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlAbsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlAcosExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlAsinExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlAtan2Expression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlAtanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlCeilExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlCosExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlCotExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlDegreesExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlExpExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlFloorExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlLnExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlLogExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlPiExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlPowerExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlRadiansExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlRandExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlRandIntegerExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlRoundExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlSignExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlSinExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlTanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.math.BeamSqlTruncateExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlCharLengthExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlConcatExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlInitCapExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlLowerExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlOverlayExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlPositionExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlSubstringExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlTrimExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlUpperExpression; -import org.apache.beam.dsls.sql.rel.BeamFilterRel; -import org.apache.beam.dsls.sql.rel.BeamProjectRel; -import org.apache.beam.dsls.sql.rel.BeamRelNode; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCaseExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCastExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlReinterpretExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlUdfExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowEndExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowStartExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlModExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateCeilExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateFloorExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlExtractExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlNotExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAbsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAcosExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAsinExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAtan2Expression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAtanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCeilExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCosExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCotExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlDegreesExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlExpExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlFloorExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlLnExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlLogExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlPiExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlPowerExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRadiansExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRandExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRandIntegerExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRoundExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlSignExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlSinExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlTanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlTruncateExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlCharLengthExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlConcatExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlInitCapExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlLowerExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlOverlayExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlPositionExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlSubstringExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlTrimExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlUpperExpression; +import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexInputRef; import org.apache.calcite.rex.RexLiteral; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java index a30916b7bdcaa..bfbb33e242f2e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.List; - -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java index 524d1dfadb09c..08abcc61f80c2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.sql.Date; import java.sql.Timestamp; import java.util.List; - -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; import org.joda.time.format.DateTimeFormat; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java index 9d2815c850e2f..cb8baacf4af29 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.io.Serializable; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java index 710460b5a9d1a..7ba4a46393c28 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java index 51724bbe200a8..6a8216bf2f313 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitive.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.math.BigDecimal; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.util.NlsString; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java index efdb2df247a4e..7b4894a27ffbe 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; - -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java index e389ef9411ee8..42e511dec3c0e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java index ecc69395e46ee..76f602ce6d516 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowEndExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.Date; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java index 71f06729e3621..21ec6dcdbcb7b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.Date; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java index f3aba2ea1a0c8..a38fd12ff46c2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlWindowStartExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.Date; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java index d62123c6b5f09..67a35fc9c4bc4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java index c5fe02b255503..fbe3fc46fdf4b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * '/' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java index fe088709e0105..0241574bd8d52 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * '-' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java index 11ecf252f9308..fc137dacceaf9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * '%' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java index e16d3cbddbf5d..7ea974cd8e01f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * '*' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java index 5804279b65884..3ce806fb07d86 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * '+' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java index b8f2175a11697..5f8d6492baaa1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java @@ -19,4 +19,4 @@ /** * Arithmetic operators. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java index 80f0853d9ec19..9b6b52796b88e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java index 40b015e78f919..b9767e37ff2fc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code =} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java index 8bfa511c8d171..5fdf27b6fa262 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code >} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java index 54faa35f9b606..ae22054b1f5c4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code >=} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java index 6d93c5d462f2b..78660cb0627c8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java index 4450f3a6b1042..013d8d7339bf0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java index 7ae6dadfab821..a6e5cd99be71f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java index 4a2cef26dd056..52a604c57bbcc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <=} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java index e02df3dca98f9..1c5b072c1e9b5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <>} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java index eea18ff8a9d2b..94ed7278ba91c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/comparison/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java @@ -19,4 +19,4 @@ /** * Comparison operators. */ -package org.apache.beam.dsls.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java index c7df5ab68f5d5..e3d6cc8834350 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Collections; import java.util.Date; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java index 46e5a435dd471..edabe53c71853 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java index 303846d220add..73174b3e943cd 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Date; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java index 59e3e9c836779..e575d6e85ef81 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Date; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java index 64234f572a2c4..4bad353dd3600 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Date; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java index d41a249536195..a7f30717327c8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java index d3cc98f497fb7..1ccd9d6b69ec9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/date/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java @@ -19,4 +19,4 @@ /** * date functions. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java index 5f6abe0d4cefe..eca945b27de90 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlAndExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java @@ -15,13 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java index c9ff186536bdb..3d2e05022a6f1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java index 6df52aa620c91..521b34020b269 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java index 450638c54d63b..a9d8e8aef13ed 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlOrExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java @@ -15,13 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java index 786204500d28b..b7ef1ba23e148 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/logical/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java @@ -19,4 +19,4 @@ /** * Logical operators. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java index e5636341c77c4..0a68563bdb4e7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAbsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java index 14b2a27f9cd0d..a49d72a44e5f1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAcosExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java index ed515b50a9527..557ec8d470851 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAsinExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java index 2254f99000f04..4e11b42841d6f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtan2Expression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java index 3a14d5461a4dd..099125227dc3d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlAtanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java index c32c4febff1ae..a3cb9c824365a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCeilExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java index d7fdc5fd8091b..6ddd079e0e058 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCosExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java index a62f756aeb92e..9dfbd904ffb68 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlCotExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java index e4404794dc3cd..b41f090b8947b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlDegreesExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java index d34726d653334..f7a8f116b3613 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlExpExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java index 47d7441696005..87a4ed345c199 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlFloorExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java index 7cc18bfe03de2..d7c3115e734c3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLnExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java index 7253a1efb56b6..c29f9a7e6c903 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlLogExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java index 05250c03c47d6..991cb68c270f6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java index 5429057bc35f6..c0906ea7bff40 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java similarity index 80% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java index cf797dd126dc0..ed89c49c60559 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPiExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java index b1a882033529f..e2bdd059c68d0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlPowerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java index 3a77634b1a76f..d2d04c3da75ca 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRadiansExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java index 944936b609e22..8df6f67cad9e7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; import java.util.Random; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java index 02e464ffa8b59..dfd76b86e7a84 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; import java.util.Random; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java index a712c85d7e55d..9349ce5c7c15a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlRoundExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java @@ -15,13 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.math.BigDecimal; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java index 3f2d9af58a671..b26ef91af8d7a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSignExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java index 3459cd3f5a4c1..1b8023ee5e928 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlSinExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java index d874217d70353..c86f8b95d54ca 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java index 187f79656ac13..820136090de94 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlTruncateExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java index a7a5d0e3d173d..09c0780c18d18 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/math/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java @@ -19,4 +19,4 @@ /** * MATH functions/operators. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java index 9b0a9a72e122a..f913d7fbb2339 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java @@ -19,4 +19,4 @@ /** * Implementation for operators in {@link org.apache.calcite.sql.fun.SqlStdOperatorTable}. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java similarity index 81% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java index 7c61061b73b3b..44ab804c84db9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java index 93e1f7110b332..bd298fcae30b8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java index 7726e27617ec0..79cd26fd05fe3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java similarity index 81% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java index cb198ece2bd38..384c012873c1b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java index cb6a523906ec8..44e4624fbaff6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java index 144acbf4a0a5c..683902ce00c6c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java index d931db9f2fa80..d6099ab6aab34 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java index 8b331257b0acb..759bfa3cb1430 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java index 5e6c2bbedf296..19d411b584cc2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.fun.SqlTrimFunction; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java similarity index 81% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java index efa9c952dcb32..cf27597597e65 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java index f2c63f399a874..8b550348f553f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/operator/string/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java @@ -19,4 +19,4 @@ /** * String operators. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java index 178d35f977917..af3634a6823f2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/interpreter/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java @@ -19,4 +19,4 @@ /** * interpreter generate runnable 'code' to execute SQL relational expressions. */ -package org.apache.beam.dsls.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.interpreter; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/package-info.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/package-info.java index b26e8c4666f5a..bae08b3332db9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/package-info.java @@ -19,4 +19,4 @@ /** * BeamSQL provides a new interface to run a SQL statement with Beam. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java index 93f9a2ff5374d..ba6235ff6544d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.planner; +package org.apache.beam.sdk.extensions.sql.planner; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; -import org.apache.beam.dsls.sql.rel.BeamRelNode; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.calcite.adapter.java.JavaTypeFactory; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java index c89a740bc87ab..fba4638129888 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRelDataTypeSystem.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.planner; +package org.apache.beam.sdk.extensions.sql.planner; import org.apache.calcite.rel.type.RelDataTypeSystem; import org.apache.calcite.rel.type.RelDataTypeSystemImpl; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java similarity index 74% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java index 552ff8fc986c6..e907321c0a4e8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamRuleSets.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.planner; +package org.apache.beam.sdk.extensions.sql.planner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.Iterator; -import org.apache.beam.dsls.sql.rel.BeamRelNode; -import org.apache.beam.dsls.sql.rule.BeamAggregationRule; -import org.apache.beam.dsls.sql.rule.BeamFilterRule; -import org.apache.beam.dsls.sql.rule.BeamIOSinkRule; -import org.apache.beam.dsls.sql.rule.BeamIOSourceRule; -import org.apache.beam.dsls.sql.rule.BeamIntersectRule; -import org.apache.beam.dsls.sql.rule.BeamJoinRule; -import org.apache.beam.dsls.sql.rule.BeamMinusRule; -import org.apache.beam.dsls.sql.rule.BeamProjectRule; -import org.apache.beam.dsls.sql.rule.BeamSortRule; -import org.apache.beam.dsls.sql.rule.BeamUnionRule; -import org.apache.beam.dsls.sql.rule.BeamValuesRule; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.rule.BeamAggregationRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamFilterRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamIOSinkRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamIOSourceRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamIntersectRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamJoinRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamMinusRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamProjectRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamSortRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamUnionRule; +import org.apache.beam.sdk.extensions.sql.rule.BeamValuesRule; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.rel.RelNode; import org.apache.calcite.tools.RuleSet; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java index 0506c5ba9896a..680ccbdce4f9a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/planner/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java @@ -17,8 +17,8 @@ */ /** - * {@link org.apache.beam.dsls.sql.planner.BeamQueryPlanner} is the main interface. + * {@link org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner} is the main interface. * It defines data sources, validate a SQL statement, and convert it as a Beam * pipeline. */ -package org.apache.beam.dsls.sql.planner; +package org.apache.beam.sdk.extensions.sql.planner; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java index 9dcb07993f9b9..66ab892bf852b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.transform.BeamAggregationTransforms; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.transform.BeamAggregationTransforms; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.WithKeys; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java similarity index 81% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java index f802104342ece..f1da29f9cc938 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutor; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.transform.BeamSqlFilterFn; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.transform.BeamSqlFilterFn; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java index d70f94a53ba61..ce941a01864c3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import com.google.common.base.Joiner; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.calcite.plan.RelOptCluster; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java index 6754991f6a86c..85f0bc86b377c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import com.google.common.base.Joiner; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.TupleTag; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java index 7cab171eacec7..ae73a0d831ec0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIntersectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.calcite.plan.RelOptCluster; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java index 3ebf152f4dae5..3d9c9cd74308f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.transform.BeamJoinTransforms; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.transform.BeamJoinTransforms; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.View; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java index 704a374d4c1ee..58b90ca5dba15 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamLogicalConvention.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.ConventionTraitDef; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java index b558f4ba89095..8cef971b397cf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamMinusRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.calcite.plan.RelOptCluster; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java index 8f8e5ce406d49..8f81038c27d8e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutor; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.transform.BeamSqlProjectFn; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.transform.BeamSqlProjectFn; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java index d4c98a382843b..80a4b84c001da 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.calcite.rel.RelNode; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java index 939c9c86f840a..7f80eb0c4d74b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.io.Serializable; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.transform.BeamSetOperatorsTransforms; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.transform.BeamSetOperatorsTransforms; import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.join.CoGbkResult; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java index ba344df961175..363c0a9a312bb 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.io.Serializable; import java.lang.reflect.Type; @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.ListCoder; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.Flatten; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java index 9f1f7030e272d..cc503d0a40e8a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java @@ -15,10 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.concurrent.atomic.AtomicInteger; - import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.plan.volcano.RelSubset; import org.apache.calcite.rel.RelNode; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java index c661585c692c9..695521d66878f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamUnionRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.windowing.WindowFn; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java index 43b74c3940a7c..f3bf3a3b83ff2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.schema.BeamTableUtils; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java index 77d6204591c8d..fb0a8e212e1b9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rel/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java @@ -20,4 +20,4 @@ * BeamSQL specified nodes, to replace {@link org.apache.calcite.rel.RelNode}. * */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java index 6e843d47d3371..17e3f805125cb 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamAggregationRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; import com.google.common.collect.ImmutableList; import java.util.GregorianCalendar; import java.util.List; -import org.apache.beam.dsls.sql.rel.BeamAggregationRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamAggregationRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.beam.sdk.transforms.windowing.AfterProcessingTime; import org.apache.beam.sdk.transforms.windowing.AfterWatermark; import org.apache.beam.sdk.transforms.windowing.FixedWindows; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java index 414b6665c9238..b30a9d9e5e9ed 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamFilterRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamFilterRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java index 4cc4ef59f691e..54079b0345602 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSinkRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java @@ -15,12 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; import java.util.List; - -import org.apache.beam.dsls.sql.rel.BeamIOSinkRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamIOSinkRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptTable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java index 85a69ffcfb928..496b977a546b8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIOSourceRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamIOSourceRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamIOSourceRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java index 70716c509ef00..6fdbd9b3bdd16 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamIntersectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; import java.util.List; - -import org.apache.beam.dsls.sql.rel.BeamIntersectRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamIntersectRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java index 78253fe716c30..147932e199fec 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamJoinRel; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamJoinRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java index ca93c714985bf..363cf3be6f5be 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamMinusRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; import java.util.List; - -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; -import org.apache.beam.dsls.sql.rel.BeamMinusRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamMinusRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java index 6dc3b57ed267a..4f2f8c9dc595b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamProjectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; -import org.apache.beam.dsls.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java index d802e9d913a67..e104d3739f5ae 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamSortRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; - -import org.apache.beam.dsls.sql.rel.BeamSortRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamSortRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java index b8430b9f7e55d..975ccbcadb7cd 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamUnionRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; -import org.apache.beam.dsls.sql.rel.BeamUnionRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamUnionRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java index 4ea9e609ba15b..86a8f72ed2860 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/BeamValuesRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; -import org.apache.beam.dsls.sql.rel.BeamLogicalConvention; -import org.apache.beam.dsls.sql.rel.BeamValuesRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.rel.BeamValuesRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java index 5d3264784eef1..f57cdee1ab4e3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/rule/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java @@ -18,6 +18,6 @@ /** * {@link org.apache.calcite.plan.RelOptRule} to generate - * {@link org.apache.beam.dsls.sql.rel.BeamRelNode}. + * {@link org.apache.beam.sdk.extensions.sql.rel.BeamRelNode}. */ -package org.apache.beam.dsls.sql.rule; +package org.apache.beam.sdk.extensions.sql.rule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BaseBeamTable.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BaseBeamTable.java index dfa2785f0a593..bf41c957b3c1e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BaseBeamTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BaseBeamTable.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.Serializable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamIOType.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamIOType.java index 502e8c1583700..bda3ca1c072f2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamIOType.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamIOType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.Serializable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamPCollectionTable.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamPCollectionTable.java index 5b637808d42dc..5bbb8fd51ada5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamPCollectionTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamPCollectionTable.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.transforms.PTransform; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java index d78944677ceb4..616e9f3ecda2c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRow.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.Serializable; import java.math.BigDecimal; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.transforms.windowing.IntervalWindow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java index f14864a01317b..39e2fd3efe6b0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoder.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.IOException; import java.io.InputStream; @@ -23,7 +23,6 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.BigDecimalCoder; import org.apache.beam.sdk.coders.BigEndianIntegerCoder; import org.apache.beam.sdk.coders.BigEndianLongCoder; @@ -35,6 +34,7 @@ import org.apache.beam.sdk.coders.InstantCoder; import org.apache.beam.sdk.coders.ListCoder; import org.apache.beam.sdk.coders.StringUtf8Coder; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; /** * A {@link Coder} encodes {@link BeamSqlRow}. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowType.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowType.java index 1129bddc0acfe..018fe816d6249 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlRowType.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import com.google.auto.value.AutoValue; import java.io.Serializable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlTable.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlTable.java index d419473bd75da..c1799359a87da 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlTable.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.transforms.PTransform; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdaf.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdaf.java index 9582ffaea8985..2f785869579d9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdaf.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdaf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.Serializable; import java.lang.reflect.ParameterizedType; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdf.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdf.java index 2066353447e84..191b78e695719 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamSqlUdf.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlUdf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.Serializable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java index 4b7e76b45e164..53e8483ddcfc9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/BeamTableUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; import java.math.BigDecimal; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.util.NlsString; import org.apache.commons.csv.CSVFormat; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTable.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTable.java index a18f3de8f8d34..2a509471105db 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTable.java @@ -15,14 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.kafka; - -import static org.apache.beam.dsls.sql.schema.BeamTableUtils.beamSqlRow2CsvLine; -import static org.apache.beam.dsls.sql.schema.BeamTableUtils.csvLine2BeamSqlRow; +package org.apache.beam.sdk.extensions.sql.schema.kafka; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.transforms.ParDo; @@ -78,7 +76,7 @@ public PCollection expand(PCollection> input) { @ProcessElement public void processElement(ProcessContext c) { String rowInString = new String(c.element().getValue()); - c.output(csvLine2BeamSqlRow(format, rowInString, rowType)); + c.output(BeamTableUtils.csvLine2BeamSqlRow(format, rowInString, rowType)); } })); } @@ -103,7 +101,7 @@ public PCollection> expand(PCollection input) { @ProcessElement public void processElement(ProcessContext c) { BeamSqlRow in = c.element(); - c.output(KV.of(new byte[] {}, beamSqlRow2CsvLine(in, format).getBytes())); + c.output(KV.of(new byte[] {}, BeamTableUtils.beamSqlRow2CsvLine(in, format).getBytes())); } })); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaTable.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaTable.java index faa2706a1aacb..2cc664fd9d103 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaTable.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.kafka; +package org.apache.beam.sdk.extensions.sql.schema.kafka; import static com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamIOType; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.coders.ByteArrayCoder; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamIOType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.io.kafka.KafkaIO; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.KV; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/package-info.java index 041837288eef3..f0ddeb6380777 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/kafka/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/kafka/package-info.java @@ -19,4 +19,4 @@ /** * table schema for KafkaIO. */ -package org.apache.beam.dsls.sql.schema.kafka; +package org.apache.beam.sdk.extensions.sql.schema.kafka; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/package-info.java index 4c418268a20df..9655ebd90f5ef 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/package-info.java @@ -19,4 +19,4 @@ * define table schema, to map with Beam IO components. * */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTable.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTable.java index 9ed56b4ab6943..c44faab79dbcc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTable.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.text; +package org.apache.beam.sdk.extensions.sql.schema.text; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.io.TextIO; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PBegin; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOReader.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOReader.java index 874c3e459a080..06109c31301b6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOReader.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOReader.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.text; - -import static org.apache.beam.dsls.sql.schema.BeamTableUtils.csvLine2BeamSqlRow; +package org.apache.beam.sdk.extensions.sql.schema.text; import java.io.Serializable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.transforms.ParDo; @@ -52,7 +51,7 @@ public PCollection expand(PCollection input) { @ProcessElement public void processElement(ProcessContext ctx) { String str = ctx.element(); - ctx.output(csvLine2BeamSqlRow(csvFormat, str, beamSqlRowType)); + ctx.output(BeamTableUtils.csvLine2BeamSqlRow(csvFormat, str, beamSqlRowType)); } })); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOWriter.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOWriter.java index f61bb71eb6aac..1684b3780a117 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableIOWriter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableIOWriter.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.text; - -import static org.apache.beam.dsls.sql.schema.BeamTableUtils.beamSqlRow2CsvLine; +package org.apache.beam.sdk.extensions.sql.schema.text; import java.io.Serializable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; import org.apache.beam.sdk.io.TextIO; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.PTransform; @@ -52,7 +51,7 @@ public BeamTextCSVTableIOWriter(BeamSqlRowType beamSqlRowType, String filePatter @ProcessElement public void processElement(ProcessContext ctx) { BeamSqlRow row = ctx.element(); - ctx.output(beamSqlRow2CsvLine(row, csvFormat)); + ctx.output(BeamTableUtils.beamSqlRow2CsvLine(row, csvFormat)); } })).apply(TextIO.write().to(filePattern)); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextTable.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextTable.java index 6dc6cd0abfe03..e85608d76614a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/BeamTextTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextTable.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.text; +package org.apache.beam.sdk.extensions.sql.schema.text; import java.io.Serializable; - -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamIOType; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamIOType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; /** * {@code BeamTextTable} represents a text file/directory(backed by {@code TextIO}). diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/package-info.java index f48f2fe5c250c..f914e2e733731 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/schema/text/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/text/package-info.java @@ -19,4 +19,4 @@ /** * Table schema for text files. */ -package org.apache.beam.dsls.sql.schema.text; +package org.apache.beam.sdk.extensions.sql.schema.text; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java index 5b217655bc897..6a27da8dc50b9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamAggregationTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.io.IOException; import java.io.InputStream; @@ -25,12 +25,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.schema.BeamSqlUdaf; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.BigDecimalCoder; import org.apache.beam.sdk.coders.CannotProvideCoderException; import org.apache.beam.sdk.coders.Coder; @@ -38,6 +32,12 @@ import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.CustomCoder; import org.apache.beam.sdk.coders.VarIntCoder; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Combine.CombineFn; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java similarity index 99% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java index fab26667e2e9f..1183668ed5c48 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamBuiltinAggregations.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java @@ -15,12 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.math.BigDecimal; import java.util.Date; import java.util.Iterator; -import org.apache.beam.dsls.sql.schema.BeamSqlUdaf; import org.apache.beam.sdk.coders.BigDecimalCoder; import org.apache.beam.sdk.coders.ByteCoder; import org.apache.beam.sdk.coders.CannotProvideCoderException; @@ -31,6 +30,7 @@ import org.apache.beam.sdk.coders.SerializableCoder; import org.apache.beam.sdk.coders.VarIntCoder; import org.apache.beam.sdk.coders.VarLongCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; import org.apache.beam.sdk.values.KV; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java index 9ea4376d1641e..d8194218d111d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamJoinTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.SimpleFunction; import org.apache.beam.sdk.values.KV; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java index a983cf5d7abca..854616040702f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSetOperatorsTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.util.Iterator; - -import org.apache.beam.dsls.sql.rel.BeamSetOperatorRelBase; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.rel.BeamSetOperatorRelBase; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.SimpleFunction; import org.apache.beam.sdk.transforms.join.CoGbkResult; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java index d4dbc6a0d2dff..372c38cd809a2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlFilterFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.dsls.sql.rel.BeamFilterRel; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java index d8a2a63528c31..9221947c34da4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlOutputToConsoleFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java index 886ddcf26ded7..af398eabee25f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/BeamSqlProjectFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.dsls.sql.rel.BeamProjectRel; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.schema.BeamTableUtils; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java index 5169749890afa..7797ddf84eee8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/transform/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java @@ -19,4 +19,4 @@ /** * {@link org.apache.beam.sdk.transforms.PTransform} used in a BeamSql pipeline. */ -package org.apache.beam.dsls.sql.transform; +package org.apache.beam.sdk.extensions.sql.transform; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java index 4b8696b311c48..997095589e625 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/CalciteUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.utils; +package org.apache.beam.sdk.extensions.sql.utils; import java.sql.Types; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java index b5c861ae68b09..e4d6148b3dc70 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/dsls/sql/utils/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java @@ -19,4 +19,4 @@ /** * Utility classes. */ -package org.apache.beam.dsls.sql.utils; +package org.apache.beam.sdk.extensions.sql.utils; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlApiSurfaceTest.java similarity index 86% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlApiSurfaceTest.java index 922931c56a10e..08678d108f87d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlApiSurfaceTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlApiSurfaceTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import static org.apache.beam.sdk.util.ApiSurface.containsOnlyPackages; import static org.junit.Assert.assertThat; @@ -47,11 +47,11 @@ public void testSdkApiSurface() throws Exception { .ofClass(BeamSqlCli.class) .includingClass(BeamSql.class) .includingClass(BeamSqlEnv.class) - .includingPackage("org.apache.beam.dsls.sql.schema", + .includingPackage("org.apache.beam.sdk.extensions.sql.schema", getClass().getClassLoader()) .pruningPrefix("java") - .pruningPattern("org[.]apache[.]beam[.]dsls[.]sql[.].*Test") - .pruningPattern("org[.]apache[.]beam[.]dsls[.]sql[.].*TestBase"); + .pruningPattern("org[.]apache[.]beam[.]sdk[.]extensions[.]sql[.].*Test") + .pruningPattern("org[.]apache[.]beam[.]sdk[.]extensions[.]sql[.].*TestBase"); assertThat(surface, containsOnlyPackages(allowed)); } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java index a142514050659..e6ca18f399a1c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslAggregationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.sql.Types; import java.util.Arrays; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java index a5d92e7268622..0c1ce1c401281 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.math.BigDecimal; import java.sql.Types; @@ -25,9 +25,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.testing.TestStream; import org.apache.beam.sdk.transforms.Create; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslFilterTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslFilterTest.java index b4b50c1b378d8..16b6426e873fe 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslFilterTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslFilterTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java index e010915c28a60..363ab8f31154f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslJoinTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; -import static org.apache.beam.dsls.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS1; -import static org.apache.beam.dsls.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS2; +import static org.apache.beam.sdk.extensions.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS1; +import static org.apache.beam.sdk.extensions.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS2; import java.sql.Types; import java.util.Arrays; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslProjectTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslProjectTest.java index ab5a6390c92a0..6468011319d93 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslProjectTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslProjectTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.sql.Types; import java.util.Arrays; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java index 726f6583cd086..46cab093a66d4 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/BeamSqlDslUdfUdafTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.sql.Types; import java.util.Arrays; import java.util.Iterator; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.schema.BeamSqlUdaf; -import org.apache.beam.dsls.sql.schema.BeamSqlUdf; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdf; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; @@ -130,7 +130,7 @@ public Integer result(Integer accumulator) { /** * A example UDF for test. */ - public static class CubicInteger implements BeamSqlUdf{ + public static class CubicInteger implements BeamSqlUdf { public static Integer eval(Integer input){ return input * input * input; } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java index a6696352ddbbf..9995b0affe54e 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/TestUtils.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql; +package org.apache.beam.sdk.extensions.sql; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.transforms.DoFn; /** diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java similarity index 99% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java index 947660a17dc05..5e626a2ac1a79 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java similarity index 93% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java index b9ce9b4938332..ffc68337ac8b6 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import com.google.common.base.Joiner; import java.math.BigDecimal; @@ -29,12 +29,12 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import org.apache.beam.dsls.sql.BeamSql; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.BeamSql; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java index 5502ad46a1b91..14de5b673c726 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import java.math.BigDecimal; import java.sql.Types; import java.util.Arrays; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.values.PCollection; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java index 6233aeb25ff7f..f4416ce923917 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlConditionalFunctionsIntegrationTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java similarity index 94% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java index bd0d3ba377941..181c991798e5c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Date; import java.util.Iterator; -import org.apache.beam.dsls.sql.BeamSql; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSql; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java index 4ed1f863bda18..b408d78118465 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlLogicalFunctionsIntegrationTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java similarity index 99% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java index 9f7d9170ff44e..995caafb313a2 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlMathFunctionsIntegrationTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import java.math.BigDecimal; import java.util.Random; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java index e28581f2c042e..7a51a95de5680 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlStringFunctionsIntegrationTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.integrationtest; +package org.apache.beam.sdk.extensions.sql.integrationtest; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java similarity index 81% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java index 15d5a5271ba0c..2843e411df1be 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.interpreter; import static org.junit.Assert.assertTrue; @@ -24,39 +24,39 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlCaseExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlModExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; -import org.apache.beam.dsls.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlDateCeilExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlDateFloorExpression; -import org.apache.beam.dsls.sql.interpreter.operator.date.BeamSqlExtractExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlNotExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlOrExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlCharLengthExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlConcatExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlInitCapExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlLowerExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlOverlayExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlPositionExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlSubstringExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlTrimExpression; -import org.apache.beam.dsls.sql.interpreter.operator.string.BeamSqlUpperExpression; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.rel.BeamFilterRel; -import org.apache.beam.dsls.sql.rel.BeamProjectRel; -import org.apache.beam.dsls.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCaseExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlModExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateCeilExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateFloorExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlExtractExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlNotExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlCharLengthExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlConcatExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlInitCapExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlLowerExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlOverlayExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlPositionExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlSubstringExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlTrimExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlUpperExpression; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java similarity index 86% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java index d7b54c7ee6051..c6478a6bccc0b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/BeamSqlFnExecutorTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.interpreter; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.planner.BeamRelDataTypeSystem; -import org.apache.beam.dsls.sql.planner.BeamRuleSets; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.planner.BeamRelDataTypeSystem; +import org.apache.beam.sdk.extensions.sql.planner.BeamRuleSets; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.config.Lex; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java similarity index 84% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java index 8ff105ef9f9eb..7bfbe208b4620 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamNullExperssionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java similarity index 86% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java index 01c57a86be17c..b6f65a13e6953 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java @@ -15,14 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.dsls.sql.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java index 39eec76941824..28ed9203292b2 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCaseExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,8 +24,7 @@ import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java index c2fd68d750f54..feefc455a739a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCastExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Calendar; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Before; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java similarity index 84% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java index 50f1b784c30cd..ed77ffb813620 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlCompareExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.Arrays; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlCompareExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.dsls.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlCompareExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java similarity index 93% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java index 76e7a5a490ae6..7dc9cc4c96305 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java similarity index 93% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java index eb51b6b57e584..a1b41ed686931 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlPrimitiveTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java similarity index 95% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java index 897a351fa3662..a48498f8fc502 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java @@ -16,8 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; - +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -27,8 +26,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java index e1660b413d755..23119580d06e6 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/BeamSqlUdfExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.interpreter.operator; import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java index a34f1094eeab4..b3ae3f6a9fb8c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java similarity index 75% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java index 951fc8d9395a8..1fe7a210ce114 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; - -import static org.junit.Assert.assertEquals; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; +import org.junit.Assert; import org.junit.Test; /** @@ -29,7 +29,10 @@ public class BeamSqlCurrentDateExpressionTest extends BeamSqlDateExpressionTestBase { @Test public void test() { - assertEquals(SqlTypeName.DATE, - new BeamSqlCurrentDateExpression().evaluate(record).getOutputType()); + Assert.assertEquals( + SqlTypeName.DATE, + new BeamSqlCurrentDateExpression() + .evaluate(BeamSqlFnExecutorTestBase.record).getOutputType() + ); } } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java index ddf0a2213d609..ca79635617876 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java index a1554f1b7b5c7..bac8809296507 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java similarity index 68% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java index 8fc21782ab530..ef675cd324831 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java @@ -16,17 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; - -import static org.junit.Assert.assertEquals; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; +import org.junit.Assert; import org.junit.Test; /** @@ -39,11 +38,13 @@ public class BeamSqlDateCeilExpressionTest extends BeamSqlDateExpressionTestBase str2DateTime("2017-05-22 09:10:11"))); // YEAR operands.add(BeamSqlPrimitive.of(SqlTypeName.SYMBOL, TimeUnitRange.YEAR)); - assertEquals(str2DateTime("2018-01-01 00:00:00"), - new BeamSqlDateCeilExpression(operands).evaluate(record).getDate()); + Assert.assertEquals(str2DateTime("2018-01-01 00:00:00"), + new BeamSqlDateCeilExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getDate()); operands.set(1, BeamSqlPrimitive.of(SqlTypeName.SYMBOL, TimeUnitRange.MONTH)); - assertEquals(str2DateTime("2017-06-01 00:00:00"), - new BeamSqlDateCeilExpression(operands).evaluate(record).getDate()); + Assert.assertEquals(str2DateTime("2017-06-01 00:00:00"), + new BeamSqlDateCeilExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getDate()); } } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java index bc906df6329d6..1ec6c25495b00 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; /** * Base class for all date related expression test. diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java similarity index 88% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java index 3207d349febab..0cb2e730bcc20 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java similarity index 71% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java index 88909a0e92559..6d1dc28acc158 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; @@ -42,7 +42,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(2017L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // MONTH operands.clear(); @@ -50,7 +51,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(5L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // DAY operands.clear(); @@ -58,7 +60,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(22L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // DAY_OF_WEEK operands.clear(); @@ -66,7 +69,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(2L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // DAY_OF_YEAR operands.clear(); @@ -74,7 +78,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(142L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // WEEK operands.clear(); @@ -82,7 +87,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(21L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); // QUARTER operands.clear(); @@ -90,7 +96,8 @@ public class BeamSqlExtractExpressionTest extends BeamSqlDateExpressionTestBase operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, time)); assertEquals(2L, - new BeamSqlExtractExpression(operands).evaluate(record).getValue()); + new BeamSqlExtractExpression(operands) + .evaluate(BeamSqlFnExecutorTestBase.record).getValue()); } } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java similarity index 84% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java index 1dd602ba47182..050138daa1a10 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java similarity index 75% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java index ddb27a953ca94..10496328dbb03 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java @@ -16,17 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; - -import static org.junit.Assert.assertEquals; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; @@ -70,60 +67,60 @@ public class BeamSqlMathBinaryExpressionTest extends BeamSqlFnExecutorTestBase { // round(double, double) => double operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.0)); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 4.0)); - assertEquals(2.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(integer,integer) => integer operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); - assertEquals(2, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(long,long) => long operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 5L)); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 3L)); - assertEquals(5L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(5L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(short) => short operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.SMALLINT, new Short("4"))); - assertEquals(SqlFunctions.toShort(4), + Assert.assertEquals(SqlFunctions.toShort(4), new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(long,long) => long operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 2L)); - assertEquals(2L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(double, long) => double operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 1.1)); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 1L)); - assertEquals(1.1, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(1.1, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.368768)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); - assertEquals(2.37, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2.37, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 3.78683686458)); - assertEquals(4.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(4.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 378.683686458)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, -2)); - assertEquals(400.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(400.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 378.683686458)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, -1)); - assertEquals(380.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(380.0, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // round(integer, double) => integer operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.2)); - assertEquals(2, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); // operand with a BeamSqlInputRefExpression // to select a column value from row of a record @@ -132,7 +129,7 @@ public class BeamSqlMathBinaryExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(ref0); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 2L)); - assertEquals(1234567L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(1234567L, new BeamSqlRoundExpression(operands).evaluate(record).getValue()); } @Test public void testPowerFunction() { @@ -147,36 +144,36 @@ public class BeamSqlMathBinaryExpressionTest extends BeamSqlFnExecutorTestBase { operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); - assertEquals(4.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(4.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); // power(integer,long) => long operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 3L)); - assertEquals(8.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(8.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); // power(long,long) => long operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 2L)); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 2L)); - assertEquals(4.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(4.0, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); // power(double, int) => double operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 1.1)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 1)); - assertEquals(1.1, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(1.1, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); // power(double, long) => double operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 1.1)); operands.add(BeamSqlPrimitive.of(SqlTypeName.BIGINT, 1L)); - assertEquals(1.1, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(1.1, new BeamSqlPowerExpression(operands).evaluate(record).getValue()); // power(integer, double) => double operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 2)); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.2)); - assertEquals(Math.pow(2, 2.2), + Assert.assertEquals(Math.pow(2, 2.2), new BeamSqlPowerExpression(operands).evaluate(record).getValue()); } @@ -184,19 +181,20 @@ public class BeamSqlMathBinaryExpressionTest extends BeamSqlFnExecutorTestBase { List operands = new ArrayList<>(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.0)); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 4.0)); - assertEquals(2.0, new BeamSqlTruncateExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2.0, new BeamSqlTruncateExpression(operands).evaluate(record).getValue()); // truncate(double, integer) => double operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 2.80685)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 4)); - assertEquals(2.8068, new BeamSqlTruncateExpression(operands).evaluate(record).getValue()); + Assert.assertEquals(2.8068, + new BeamSqlTruncateExpression(operands).evaluate(record).getValue()); } @Test public void testForAtan2() { List operands = new ArrayList<>(); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 0.875)); operands.add(BeamSqlPrimitive.of(SqlTypeName.DOUBLE, 0.56)); - assertEquals(Math.atan2(0.875, 0.56), + Assert.assertEquals(Math.atan2(0.875, 0.56), new BeamSqlAtan2Expression(operands).evaluate(record).getValue()); } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java index 71c98d492167d..2fbd0d2750b3e 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java similarity index 81% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java index b749099f8f124..fe3b21f43e24c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java similarity index 85% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java index c77e1e623c8c3..a6f950036b9fa 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java @@ -16,19 +16,18 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; +import org.junit.Assert; import org.junit.Test; /** @@ -60,7 +59,7 @@ public class BeamSqlConcatExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "hello")); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, " world")); - assertEquals("hello world", + Assert.assertEquals("hello world", new BeamSqlConcatExpression(operands).evaluate(record).getValue()); } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java similarity index 85% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java index 557f235a7fb42..4602a9bb81064 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java similarity index 81% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java index 9abbfd89ed9c2..136840afc8183 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java similarity index 87% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java index e98fd62602a8f..2ca0a98716800 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java @@ -16,18 +16,17 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; +import org.junit.Assert; import org.junit.Test; /** @@ -57,7 +56,7 @@ public class BeamSqlOverlayExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "w3333333rce")); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "resou")); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 3)); - assertEquals("w3resou3rce", + Assert.assertEquals("w3resou3rce", new BeamSqlOverlayExpression(operands).evaluate(record).getValue()); operands.clear(); @@ -65,7 +64,7 @@ public class BeamSqlOverlayExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "resou")); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 3)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 4)); - assertEquals("w3resou33rce", + Assert.assertEquals("w3resou33rce", new BeamSqlOverlayExpression(operands).evaluate(record).getValue()); operands.clear(); @@ -73,7 +72,7 @@ public class BeamSqlOverlayExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "resou")); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 3)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 5)); - assertEquals("w3resou3rce", + Assert.assertEquals("w3resou3rce", new BeamSqlOverlayExpression(operands).evaluate(record).getValue()); operands.clear(); @@ -81,7 +80,7 @@ public class BeamSqlOverlayExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "resou")); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 3)); operands.add(BeamSqlPrimitive.of(SqlTypeName.INTEGER, 7)); - assertEquals("w3resouce", + Assert.assertEquals("w3resouce", new BeamSqlOverlayExpression(operands).evaluate(record).getValue()); } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java index 4627610ffa256..a8e3dd2e55730 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,10 +24,9 @@ import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java similarity index 88% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java index 9bb553f2609b5..f23a18ddab075 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java index 8d545225fd616..ea929a42693d4 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java @@ -16,17 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java similarity index 88% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java index 9ae9212f7f8fe..8b2570e7bab6c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,12 +24,12 @@ import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.fun.SqlTrimFunction; import org.apache.calcite.sql.type.SqlTypeName; +import org.junit.Assert; import org.junit.Test; /** @@ -61,26 +61,26 @@ public class BeamSqlTrimExpressionTest extends BeamSqlFnExecutorTestBase { operands.add(BeamSqlPrimitive.of(SqlTypeName.SYMBOL, SqlTrimFunction.Flag.LEADING)); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "he")); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "hehe__hehe")); - assertEquals("__hehe", + Assert.assertEquals("__hehe", new BeamSqlTrimExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.SYMBOL, SqlTrimFunction.Flag.TRAILING)); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "he")); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "hehe__hehe")); - assertEquals("hehe__", + Assert.assertEquals("hehe__", new BeamSqlTrimExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.SYMBOL, SqlTrimFunction.Flag.BOTH)); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "he")); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "__")); - assertEquals("__", + Assert.assertEquals("__", new BeamSqlTrimExpression(operands).evaluate(record).getValue()); operands.clear(); operands.add(BeamSqlPrimitive.of(SqlTypeName.VARCHAR, " hello ")); - assertEquals("hello", + Assert.assertEquals("hello", new BeamSqlTrimExpression(operands).evaluate(record).getValue()); } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java similarity index 81% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java index 1a734bc18919f..a225cd6503954 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java @@ -16,16 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; - -import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.dsls.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedBoundedTable.java similarity index 90% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedBoundedTable.java index 6c1dcb2905b7d..c7c26eb63c3d6 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedBoundedTable.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedBoundedTable.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.mock; +package org.apache.beam.sdk.extensions.sql.mock; -import static org.apache.beam.dsls.sql.TestUtils.buildBeamSqlRowType; -import static org.apache.beam.dsls.sql.TestUtils.buildRows; +import static org.apache.beam.sdk.extensions.sql.TestUtils.buildBeamSqlRowType; +import static org.apache.beam.sdk.extensions.sql.TestUtils.buildRows; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.beam.dsls.sql.schema.BeamIOType; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.schema.BeamIOType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.PTransform; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedTable.java similarity index 85% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedTable.java index 858ae88f9d946..6017ee7b14249 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedTable.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedTable.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.mock; +package org.apache.beam.sdk.extensions.sql.mock; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.beam.dsls.sql.schema.BaseBeamTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PDone; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedUnboundedTable.java similarity index 86% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedUnboundedTable.java index ee6eb229cc32a..f9ea2ac3a76c8 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/mock/MockedUnboundedTable.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/mock/MockedUnboundedTable.java @@ -16,19 +16,17 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.mock; - -import static org.apache.beam.dsls.sql.TestUtils.buildBeamSqlRowType; -import static org.apache.beam.dsls.sql.TestUtils.buildRows; +package org.apache.beam.sdk.extensions.sql.mock; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.schema.BeamIOType; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.schema.BeamIOType; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.testing.TestStream; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.TimestampedValue; @@ -62,7 +60,7 @@ private MockedUnboundedTable(BeamSqlRowType beamSqlRowType) { * } */ public static MockedUnboundedTable of(final Object... args){ - return new MockedUnboundedTable(buildBeamSqlRowType(args)); + return new MockedUnboundedTable(TestUtils.buildBeamSqlRowType(args)); } public MockedUnboundedTable timestampColumnIndex(int idx) { @@ -85,7 +83,7 @@ public MockedUnboundedTable timestampColumnIndex(int idx) { * } */ public MockedUnboundedTable addRows(Duration duration, Object... args) { - List rows = buildRows(getRowType(), Arrays.asList(args)); + List rows = TestUtils.buildRows(getRowType(), Arrays.asList(args)); // record the watermark + rows this.timestampedRows.add(Pair.of(duration, rows)); return this; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java similarity index 90% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java index 3b3714304c1ad..7b8d9a49adc74 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamIntersectRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java similarity index 94% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java index 24a3256077252..2acee82bba87b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelBoundedVsBoundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java similarity index 94% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java index 3f0c98e567169..e226b708cfb64 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; import java.util.Date; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.mock.MockedUnboundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.transform.BeamSqlOutputToConsoleFn; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.mock.MockedUnboundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java similarity index 94% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java index d76e8755628aa..c366a6e6858ec 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; import java.util.Date; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedUnboundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.transform.BeamSqlOutputToConsoleFn; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedUnboundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java similarity index 90% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java index 80da8fba8647f..f2ed1321dca02 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamMinusRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java index d0b01dfa6f545..65dd8af297e05 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBaseTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; import java.util.Date; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java similarity index 95% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java index 1067926444d4d..9e38bb694d28a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamSortRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; import java.util.Date; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java index cad32901981dc..54524df9075ff 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamUnionRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java similarity index 90% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java index 9d13f9b2c37a6..ace1a3e521a39 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/BeamValuesRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; import java.sql.Types; -import org.apache.beam.dsls.sql.BeamSqlCli; -import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.TestUtils; -import org.apache.beam.dsls.sql.mock.MockedBoundedTable; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.BeamSqlCli; +import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java index ce532df5806ce..f369076b5fad7 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/rel/CheckSize.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.rel; +package org.apache.beam.sdk.extensions.sql.rel; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.SerializableFunction; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java index e41e3419ed4ed..553420b20d379 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/BeamSqlRowCoderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema; +package org.apache.beam.sdk.extensions.sql.schema; import java.math.BigDecimal; import java.util.Date; import java.util.GregorianCalendar; - -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.CoderProperties; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.type.RelDataType; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java index 01cd9606be8ba..4eccc440c8acb 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/kafka/BeamKafkaCSVTableTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.kafka; +package org.apache.beam.sdk.extensions.sql.schema.kafka; import java.io.Serializable; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Create; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java similarity index 95% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java index b6e11e5664be8..9dc599fe03b43 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/text/BeamTextCSVTableTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.text; +package org.apache.beam.sdk.extensions.sql.schema.text; import java.io.File; import java.io.FileOutputStream; @@ -31,10 +31,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java index 5d5d4fccf2389..571c8efff6748 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamAggregationTransformTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.transform; +package org.apache.beam.sdk.extensions.sql.schema.transform; import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.transform.BeamAggregationTransforms; -import org.apache.beam.dsls.sql.utils.CalciteUtils; import org.apache.beam.sdk.coders.IterableCoder; import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.transform.BeamAggregationTransforms; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Combine; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java index 4045bc8e2a01c..b2aa6c4b3e857 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/dsls/sql/schema/transform/BeamTransformBaseTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.schema.transform; +package org.apache.beam.sdk.extensions.sql.schema.transform; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamQueryPlanner; -import org.apache.beam.dsls.sql.schema.BeamSqlRow; -import org.apache.beam.dsls.sql.schema.BeamSqlRowType; -import org.apache.beam.dsls.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; +import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; +import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.values.KV; import org.apache.calcite.rel.type.RelDataTypeFactory.FieldInfoBuilder; import org.apache.calcite.sql.type.SqlTypeName; From febd044ae306a28fa3797a1663e54c1d7fbe43ce Mon Sep 17 00:00:00 2001 From: James Xu Date: Mon, 31 Jul 2017 17:11:53 +0800 Subject: [PATCH 3/3] move all implementation classes/packages into impl package --- .../beam/sdk/extensions/sql/BeamSql.java | 2 +- .../beam/sdk/extensions/sql/BeamSqlCli.java | 2 +- .../beam/sdk/extensions/sql/BeamSqlEnv.java | 4 +- .../BeamSqlExpressionExecutor.java | 2 +- .../interpreter/BeamSqlFnExecutor.java | 136 +++++++++--------- .../operator/BeamSqlCaseExpression.java | 2 +- .../operator/BeamSqlCastExpression.java | 2 +- .../operator/BeamSqlExpression.java | 2 +- .../operator/BeamSqlInputRefExpression.java | 2 +- .../operator/BeamSqlPrimitive.java | 2 +- .../BeamSqlReinterpretExpression.java | 2 +- .../operator/BeamSqlUdfExpression.java | 2 +- .../operator/BeamSqlWindowEndExpression.java | 2 +- .../operator/BeamSqlWindowExpression.java | 2 +- .../BeamSqlWindowStartExpression.java | 2 +- .../BeamSqlArithmeticExpression.java | 6 +- .../arithmetic/BeamSqlDivideExpression.java | 4 +- .../arithmetic/BeamSqlMinusExpression.java | 4 +- .../arithmetic/BeamSqlModExpression.java | 4 +- .../arithmetic/BeamSqlMultiplyExpression.java | 4 +- .../arithmetic/BeamSqlPlusExpression.java | 4 +- .../operator/arithmetic/package-info.java | 2 +- .../comparison/BeamSqlCompareExpression.java | 6 +- .../comparison/BeamSqlEqualsExpression.java | 4 +- .../BeamSqlGreaterThanExpression.java | 4 +- .../BeamSqlGreaterThanOrEqualsExpression.java | 4 +- .../BeamSqlIsNotNullExpression.java | 6 +- .../comparison/BeamSqlIsNullExpression.java | 6 +- .../comparison/BeamSqlLessThanExpression.java | 4 +- .../BeamSqlLessThanOrEqualsExpression.java | 4 +- .../BeamSqlNotEqualsExpression.java | 4 +- .../operator/comparison/package-info.java | 2 +- .../date/BeamSqlCurrentDateExpression.java | 6 +- .../date/BeamSqlCurrentTimeExpression.java | 6 +- .../BeamSqlCurrentTimestampExpression.java | 6 +- .../date/BeamSqlDateCeilExpression.java | 6 +- .../date/BeamSqlDateFloorExpression.java | 6 +- .../date/BeamSqlExtractExpression.java | 6 +- .../operator/date/package-info.java | 2 +- .../logical/BeamSqlAndExpression.java | 6 +- .../logical/BeamSqlLogicalExpression.java | 4 +- .../logical/BeamSqlNotExpression.java | 6 +- .../operator/logical/BeamSqlOrExpression.java | 6 +- .../operator/logical/package-info.java | 2 +- .../operator/math/BeamSqlAbsExpression.java | 6 +- .../operator/math/BeamSqlAcosExpression.java | 6 +- .../operator/math/BeamSqlAsinExpression.java | 6 +- .../operator/math/BeamSqlAtan2Expression.java | 6 +- .../operator/math/BeamSqlAtanExpression.java | 6 +- .../operator/math/BeamSqlCeilExpression.java | 6 +- .../operator/math/BeamSqlCosExpression.java | 6 +- .../operator/math/BeamSqlCotExpression.java | 6 +- .../math/BeamSqlDegreesExpression.java | 6 +- .../operator/math/BeamSqlExpExpression.java | 6 +- .../operator/math/BeamSqlFloorExpression.java | 6 +- .../operator/math/BeamSqlLnExpression.java | 6 +- .../operator/math/BeamSqlLogExpression.java | 6 +- .../math/BeamSqlMathBinaryExpression.java | 6 +- .../math/BeamSqlMathUnaryExpression.java | 6 +- .../operator/math/BeamSqlPiExpression.java | 6 +- .../operator/math/BeamSqlPowerExpression.java | 6 +- .../math/BeamSqlRadiansExpression.java | 6 +- .../operator/math/BeamSqlRandExpression.java | 6 +- .../math/BeamSqlRandIntegerExpression.java | 6 +- .../operator/math/BeamSqlRoundExpression.java | 6 +- .../operator/math/BeamSqlSignExpression.java | 6 +- .../operator/math/BeamSqlSinExpression.java | 6 +- .../operator/math/BeamSqlTanExpression.java | 6 +- .../math/BeamSqlTruncateExpression.java | 6 +- .../operator/math/package-info.java | 2 +- .../interpreter/operator/package-info.java | 2 +- .../string/BeamSqlCharLengthExpression.java | 6 +- .../string/BeamSqlConcatExpression.java | 6 +- .../string/BeamSqlInitCapExpression.java | 6 +- .../string/BeamSqlLowerExpression.java | 6 +- .../string/BeamSqlOverlayExpression.java | 6 +- .../string/BeamSqlPositionExpression.java | 6 +- .../string/BeamSqlStringUnaryExpression.java | 4 +- .../string/BeamSqlSubstringExpression.java | 6 +- .../string/BeamSqlTrimExpression.java | 6 +- .../string/BeamSqlUpperExpression.java | 6 +- .../operator/string/package-info.java | 2 +- .../{ => impl}/interpreter/package-info.java | 2 +- .../{ => impl}/planner/BeamQueryPlanner.java | 6 +- .../planner/BeamRelDataTypeSystem.java | 2 +- .../sql/{ => impl}/planner/BeamRuleSets.java | 26 ++-- .../sql/{ => impl}/planner/package-info.java | 4 +- .../{ => impl}/rel/BeamAggregationRel.java | 6 +- .../sql/{ => impl}/rel/BeamFilterRel.java | 10 +- .../sql/{ => impl}/rel/BeamIOSinkRel.java | 2 +- .../sql/{ => impl}/rel/BeamIOSourceRel.java | 4 +- .../sql/{ => impl}/rel/BeamIntersectRel.java | 2 +- .../sql/{ => impl}/rel/BeamJoinRel.java | 6 +- .../{ => impl}/rel/BeamLogicalConvention.java | 2 +- .../sql/{ => impl}/rel/BeamMinusRel.java | 2 +- .../sql/{ => impl}/rel/BeamProjectRel.java | 10 +- .../sql/{ => impl}/rel/BeamRelNode.java | 2 +- .../rel/BeamSetOperatorRelBase.java | 4 +- .../sql/{ => impl}/rel/BeamSortRel.java | 4 +- .../sql/{ => impl}/rel/BeamSqlRelUtils.java | 2 +- .../sql/{ => impl}/rel/BeamUnionRel.java | 2 +- .../sql/{ => impl}/rel/BeamValuesRel.java | 4 +- .../sql/{ => impl}/rel/package-info.java | 2 +- .../{ => impl}/rule/BeamAggregationRule.java | 6 +- .../sql/{ => impl}/rule/BeamFilterRule.java | 6 +- .../sql/{ => impl}/rule/BeamIOSinkRule.java | 6 +- .../sql/{ => impl}/rule/BeamIOSourceRule.java | 6 +- .../{ => impl}/rule/BeamIntersectRule.java | 6 +- .../sql/{ => impl}/rule/BeamJoinRule.java | 6 +- .../sql/{ => impl}/rule/BeamMinusRule.java | 6 +- .../sql/{ => impl}/rule/BeamProjectRule.java | 6 +- .../sql/{ => impl}/rule/BeamSortRule.java | 6 +- .../sql/{ => impl}/rule/BeamUnionRule.java | 6 +- .../sql/{ => impl}/rule/BeamValuesRule.java | 6 +- .../sql/{ => impl}/rule/package-info.java | 4 +- .../transform/BeamAggregationTransforms.java | 8 +- .../transform/BeamBuiltinAggregations.java | 2 +- .../transform/BeamJoinTransforms.java | 2 +- .../transform/BeamSetOperatorsTransforms.java | 4 +- .../{ => impl}/transform/BeamSqlFilterFn.java | 6 +- .../transform/BeamSqlOutputToConsoleFn.java | 2 +- .../transform/BeamSqlProjectFn.java | 6 +- .../{ => impl}/transform/package-info.java | 2 +- .../sql/{ => impl}/utils/CalciteUtils.java | 2 +- .../sql/{ => impl}/utils/package-info.java | 2 +- .../sdk/extensions/sql/schema/BeamSqlRow.java | 2 +- .../sql/schema/BeamSqlRowCoder.java | 2 +- .../extensions/sql/schema/BeamTableUtils.java | 2 +- .../extensions/sql/BeamSqlDslJoinTest.java | 4 +- .../interpreter/BeamSqlFnExecutorTest.java | 68 ++++----- .../BeamSqlFnExecutorTestBase.java | 12 +- .../operator/BeamNullExperssionTest.java | 8 +- .../operator/BeamSqlAndOrExpressionTest.java | 8 +- .../operator/BeamSqlCaseExpressionTest.java | 4 +- .../operator/BeamSqlCastExpressionTest.java | 4 +- .../BeamSqlCompareExpressionTest.java | 18 +-- .../BeamSqlInputRefExpressionTest.java | 4 +- .../operator/BeamSqlPrimitiveTest.java | 4 +- .../BeamSqlReinterpretExpressionTest.java | 4 +- .../operator/BeamSqlUdfExpressionTest.java | 4 +- .../BeamSqlArithmeticExpressionTest.java | 8 +- .../BeamSqlCurrentDateExpressionTest.java | 4 +- .../BeamSqlCurrentTimeExpressionTest.java | 4 +- ...BeamSqlCurrentTimestampExpressionTest.java | 4 +- .../date/BeamSqlDateCeilExpressionTest.java | 8 +- .../date/BeamSqlDateExpressionTestBase.java | 4 +- .../date/BeamSqlDateFloorExpressionTest.java | 6 +- .../date/BeamSqlExtractExpressionTest.java | 8 +- .../logical/BeamSqlNotExpressionTest.java | 8 +- .../math/BeamSqlMathBinaryExpressionTest.java | 10 +- .../math/BeamSqlMathUnaryExpressionTest.java | 8 +- .../BeamSqlCharLengthExpressionTest.java | 8 +- .../string/BeamSqlConcatExpressionTest.java | 8 +- .../string/BeamSqlInitCapExpressionTest.java | 8 +- .../string/BeamSqlLowerExpressionTest.java | 8 +- .../string/BeamSqlOverlayExpressionTest.java | 8 +- .../string/BeamSqlPositionExpressionTest.java | 8 +- .../BeamSqlStringUnaryExpressionTest.java | 6 +- .../BeamSqlSubstringExpressionTest.java | 8 +- .../string/BeamSqlTrimExpressionTest.java | 8 +- .../string/BeamSqlUpperExpressionTest.java | 8 +- .../{ => impl}/rel/BeamIntersectRelTest.java | 2 +- .../rel/BeamJoinRelBoundedVsBoundedTest.java | 2 +- .../BeamJoinRelUnboundedVsBoundedTest.java | 4 +- .../BeamJoinRelUnboundedVsUnboundedTest.java | 4 +- .../sql/{ => impl}/rel/BeamMinusRelTest.java | 2 +- .../rel/BeamSetOperatorRelBaseTest.java | 2 +- .../sql/{ => impl}/rel/BeamSortRelTest.java | 2 +- .../sql/{ => impl}/rel/BeamUnionRelTest.java | 2 +- .../sql/{ => impl}/rel/BeamValuesRelTest.java | 2 +- .../sql/{ => impl}/rel/CheckSize.java | 2 +- .../sql/schema/BeamSqlRowCoderTest.java | 2 +- .../schema/kafka/BeamKafkaCSVTableTest.java | 4 +- .../sql/schema/text/BeamTextCSVTableTest.java | 4 +- .../BeamAggregationTransformTest.java | 6 +- .../transform/BeamTransformBaseTest.java | 4 +- 176 files changed, 533 insertions(+), 533 deletions(-) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/BeamSqlExpressionExecutor.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/BeamSqlFnExecutor.java (66%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlCaseExpression.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlCastExpression.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlExpression.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlInputRefExpression.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlPrimitive.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlReinterpretExpression.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlUdfExpression.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlWindowEndExpression.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlWindowExpression.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlWindowStartExpression.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlDivideExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlMinusExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlModExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlPlusExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlCompareExpression.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlEqualsExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlIsNullExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlLessThanExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/comparison/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentDateExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentTimeExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlDateCeilExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlDateFloorExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlExtractExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/BeamSqlAndExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/BeamSqlLogicalExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/BeamSqlNotExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/BeamSqlOrExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlAbsExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlAcosExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlAsinExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlAtan2Expression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlAtanExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlCeilExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlCosExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlCotExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlDegreesExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlExpExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlFloorExpression.java (86%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlLnExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlLogExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlMathBinaryExpression.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlMathUnaryExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlPiExpression.java (83%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlPowerExpression.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlRadiansExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlRandExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlRandIntegerExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlRoundExpression.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlSignExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlSinExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlTanExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlTruncateExpression.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/package-info.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlCharLengthExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlConcatExpression.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlInitCapExpression.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlLowerExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlOverlayExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlPositionExpression.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlStringUnaryExpression.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlSubstringExpression.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlTrimExpression.java (92%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlUpperExpression.java (84%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/package-info.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/package-info.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/planner/BeamQueryPlanner.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/planner/BeamRelDataTypeSystem.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/planner/BeamRuleSets.java (72%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/planner/package-info.java (85%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamAggregationRel.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamFilterRel.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamIOSinkRel.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamIOSourceRel.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamIntersectRel.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamJoinRel.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamLogicalConvention.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamMinusRel.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamProjectRel.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamRelNode.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamSetOperatorRelBase.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamSortRel.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamSqlRelUtils.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamUnionRel.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamValuesRel.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/package-info.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamAggregationRule.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamFilterRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamIOSinkRule.java (94%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamIOSourceRule.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamIntersectRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamJoinRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamMinusRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamProjectRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamSortRule.java (90%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamUnionRule.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/BeamValuesRule.java (89%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rule/package-info.java (87%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamAggregationTransforms.java (97%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamBuiltinAggregations.java (99%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamJoinTransforms.java (99%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamSetOperatorsTransforms.java (96%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamSqlFilterFn.java (88%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamSqlOutputToConsoleFn.java (95%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/BeamSqlProjectFn.java (91%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/transform/package-info.java (93%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/utils/CalciteUtils.java (98%) rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/{ => impl}/utils/package-info.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/BeamSqlFnExecutorTest.java (80%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/BeamSqlFnExecutorTestBase.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamNullExperssionTest.java (84%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlAndOrExpressionTest.java (85%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlCaseExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlCastExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlCompareExpressionTest.java (83%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlInputRefExpressionTest.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlPrimitiveTest.java (93%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlReinterpretExpressionTest.java (94%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/BeamSqlUdfExpressionTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java (96%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java (88%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java (89%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java (85%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlDateExpressionTestBase.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java (88%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/date/BeamSqlExtractExpressionTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/logical/BeamSqlNotExpressionTest.java (83%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java (95%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java (97%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java (80%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlConcatExpressionTest.java (87%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlInitCapExpressionTest.java (84%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlLowerExpressionTest.java (80%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlOverlayExpressionTest.java (91%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlPositionExpressionTest.java (90%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java (87%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlSubstringExpressionTest.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlTrimExpressionTest.java (92%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/interpreter/operator/string/BeamSqlUpperExpressionTest.java (80%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamIntersectRelTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamJoinRelBoundedVsBoundedTest.java (99%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamJoinRelUnboundedVsBoundedTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamJoinRelUnboundedVsUnboundedTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamMinusRelTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamSetOperatorRelBaseTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamSortRelTest.java (99%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamUnionRelTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/BeamValuesRelTest.java (98%) rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/{ => impl}/rel/CheckSize.java (96%) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java index d64ae41ffd248..e0d7a7819d106 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSql.java @@ -19,7 +19,7 @@ import com.google.auto.value.AutoValue; import org.apache.beam.sdk.annotations.Experimental; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.beam.sdk.extensions.sql.schema.BeamPCollectionTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java index 714e1024fd3e9..3bea46ab5c23d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlCli.java @@ -19,7 +19,7 @@ import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.annotations.Experimental; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java index ca73b13d736c6..be0b0afda912b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/BeamSqlEnv.java @@ -18,12 +18,12 @@ package org.apache.beam.sdk.extensions.sql; import java.io.Serializable; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdf; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.calcite.DataContext; import org.apache.calcite.linq4j.Enumerable; import org.apache.calcite.rel.type.RelDataType; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlExpressionExecutor.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlExpressionExecutor.java index 28f83e427e0df..1ae6bb3a43baa 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlExpressionExecutor.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlExpressionExecutor.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.impl.interpreter; import java.io.Serializable; import java.util.List; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java similarity index 66% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java index 3084cd5a0b4ee..1f9e0e34b5d3d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutor.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java @@ -15,79 +15,79 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.impl.interpreter; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCaseExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCastExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlReinterpretExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlUdfExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowEndExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlWindowStartExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlModExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateCeilExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateFloorExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlExtractExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlNotExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAbsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAcosExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAsinExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAtan2Expression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlAtanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCeilExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCosExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlCotExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlDegreesExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlExpExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlFloorExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlLnExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlLogExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlPiExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlPowerExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRadiansExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRandExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRandIntegerExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlRoundExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlSignExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlSinExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlTanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.math.BeamSqlTruncateExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlCharLengthExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlConcatExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlInitCapExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlLowerExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlOverlayExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlPositionExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlSubstringExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlTrimExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlUpperExpression; -import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlCaseExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlCastExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlReinterpretExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlUdfExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlWindowEndExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlWindowExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlWindowStartExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlDivideExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlMinusExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlModExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlPlusExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlGreaterThanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlIsNotNullExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlIsNullExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlNotEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentDateExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimeExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimestampExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlDateCeilExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlDateFloorExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlExtractExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlNotExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlAbsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlAcosExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlAsinExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlAtan2Expression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlAtanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlCeilExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlCosExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlCotExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlDegreesExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlExpExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlFloorExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlLnExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlLogExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlPiExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlPowerExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlRadiansExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlRandExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlRandIntegerExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlRoundExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlSignExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlSinExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlTanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math.BeamSqlTruncateExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlCharLengthExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlConcatExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlInitCapExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlLowerExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlOverlayExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlPositionExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlSubstringExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlTrimExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlUpperExpression; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexInputRef; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpression.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpression.java index bfbb33e242f2e..61e8aae112200 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpression.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.List; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java index 08abcc61f80c2..c98c10ddf192b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.sql.Date; import java.sql.Timestamp; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlExpression.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlExpression.java index cb8baacf4af29..dc5db8181bd4f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.io.Serializable; import java.util.List; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpression.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpression.java index 7ba4a46393c28..7aba024d68ccf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java index 6a8216bf2f313..6380af93d883a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitive.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.math.BigDecimal; import java.util.Date; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpression.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpression.java index 7b4894a27ffbe..243baaa7e5de1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpression.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.Date; import java.util.GregorianCalendar; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpression.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpression.java index 42e511dec3c0e..eebb97c1d2eac 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowEndExpression.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowEndExpression.java index 76f602ce6d516..0bd68dfabfe4f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowEndExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowEndExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.Date; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowExpression.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowExpression.java index 21ec6dcdbcb7b..b560ef8aac5dc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.Date; import java.util.List; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowStartExpression.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowStartExpression.java index a38fd12ff46c2..e2c1b34d68457 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlWindowStartExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlWindowStartExpression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.Date; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java index 67a35fc9c4bc4..b07b28fea0319 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlDivideExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlDivideExpression.java index fbe3fc46fdf4b..d62a3f8997cab 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlDivideExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlDivideExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * '/' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMinusExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMinusExpression.java index 0241574bd8d52..4fc6a4bef0463 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMinusExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMinusExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * '-' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlModExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlModExpression.java index fc137dacceaf9..5c55bf487d9f8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlModExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlModExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * '%' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java index 7ea974cd8e01f..e6cd35d6dd99a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlMultiplyExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * '*' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlPlusExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlPlusExpression.java index 3ce806fb07d86..87ccfe4ac76a1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlPlusExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlPlusExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * '+' operator. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/package-info.java index 5f8d6492baaa1..78ec610d3201b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/package-info.java @@ -19,4 +19,4 @@ /** * Arithmetic operators. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlCompareExpression.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlCompareExpression.java index 9b6b52796b88e..811b5828cc186 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlCompareExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlCompareExpression.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlEqualsExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlEqualsExpression.java index b9767e37ff2fc..9b275cea1739b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code =} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java index 5fdf27b6fa262..4add258a631c5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code >} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java index ae22054b1f5c4..99c4c890d2f3b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlGreaterThanOrEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code >=} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java index 78660cb0627c8..88dc73f55e1a9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNotNullExpression.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.Arrays; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNullExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNullExpression.java index 013d8d7339bf0..b626ce79b4b79 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlIsNullExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlIsNullExpression.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.Arrays; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanExpression.java index a6e5cd99be71f..2122d930466a7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java index 52a604c57bbcc..8cd44020260df 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLessThanOrEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <=} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java index 1c5b072c1e9b5..3733a26b26011 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotEqualsExpression.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; /** * {@code BeamSqlExpression} for {@code <>} operation. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/package-info.java index 94ed7278ba91c..2a400f7726f95 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/comparison/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/package-info.java @@ -19,4 +19,4 @@ /** * Comparison operators. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpression.java index e3d6cc8834350..d5793d5f7e731 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Collections; import java.util.Date; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpression.java index edabe53c71853..99eea95cbfbec 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpression.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java index 73174b3e943cd..09a3c60d3a609 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Date; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpression.java index e575d6e85ef81..55b6fcddf0eb6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Date; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpression.java index 4bad353dd3600..f031c31d4237f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Date; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpression.java index a7f30717327c8..2740f821eff3e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpression.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.avatica.util.DateTimeUtils; import org.apache.calcite.avatica.util.TimeUnitRange; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/package-info.java index 1ccd9d6b69ec9..30372963c16ea 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/package-info.java @@ -19,4 +19,4 @@ /** * date functions. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlAndExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlAndExpression.java index eca945b27de90..0c8854cfc0929 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlAndExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlAndExpression.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlLogicalExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlLogicalExpression.java index 3d2e05022a6f1..5691e3336ea18 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlLogicalExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlLogicalExpression.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpression.java index 521b34020b269..65634b07b3790 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlOrExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlOrExpression.java index a9d8e8aef13ed..da15c34f44a2b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlOrExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlOrExpression.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/package-info.java index b7ef1ba23e148..42df66c694e69 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/package-info.java @@ -19,4 +19,4 @@ /** * Logical operators. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java index 0a68563bdb4e7..01b4cc7a2e3e3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAbsExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAcosExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAcosExpression.java index a49d72a44e5f1..3bc10ae3ad348 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAcosExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAcosExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAsinExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAsinExpression.java index 557ec8d470851..950a9ee241e08 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAsinExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAsinExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtan2Expression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtan2Expression.java index 4e11b42841d6f..33fa3b6e70c3d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtan2Expression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtan2Expression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtanExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtanExpression.java index 099125227dc3d..2f750dd90570b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlAtanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAtanExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCeilExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCeilExpression.java index a3cb9c824365a..c9ca2b026be63 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCeilExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCeilExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCosExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCosExpression.java index 6ddd079e0e058..e06e9262d54e9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCosExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCosExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCotExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCotExpression.java index 9dfbd904ffb68..68d56b559abe0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlCotExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlCotExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlDegreesExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlDegreesExpression.java index b41f090b8947b..de4eac2182514 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlDegreesExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlDegreesExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlExpExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlExpExpression.java index f7a8f116b3613..a789355b65cdb 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlExpExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlExpExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlFloorExpression.java similarity index 86% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlFloorExpression.java index 87a4ed345c199..def50f954b4f0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlFloorExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlFloorExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLnExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLnExpression.java index d7c3115e734c3..ea46044c162af 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLnExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLnExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLogExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLogExpression.java index c29f9a7e6c903..9a99b614a0e6b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlLogExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlLogExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpression.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpression.java index 991cb68c270f6..c12b72581d717 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpression.java index c0906ea7bff40..163c40ed2a4ff 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPiExpression.java similarity index 83% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPiExpression.java index ed89c49c60559..dfaf546761adf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPiExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPiExpression.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPowerExpression.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPowerExpression.java index e2bdd059c68d0..cc5867997f534 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlPowerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlPowerExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRadiansExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRadiansExpression.java index d2d04c3da75ca..74c633d6fa7bf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRadiansExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRadiansExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandExpression.java index 8df6f67cad9e7..f2d7a47e891eb 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; import java.util.Random; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandIntegerExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandIntegerExpression.java index dfd76b86e7a84..b2e65cecea902 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRandIntegerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRandIntegerExpression.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; import java.util.Random; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRoundExpression.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRoundExpression.java index 9349ce5c7c15a..1725dbbcf04e8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlRoundExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlRoundExpression.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.math.BigDecimal; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSignExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSignExpression.java index b26ef91af8d7a..6be8102033a61 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSignExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSignExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSinExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSinExpression.java index 1b8023ee5e928..25dc11990047c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlSinExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlSinExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTanExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTanExpression.java index c86f8b95d54ca..4edd570400db8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTanExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTanExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTruncateExpression.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTruncateExpression.java index 820136090de94..1060a63a5e8d9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlTruncateExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlTruncateExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/package-info.java index 09c0780c18d18..740e1b5ee87ab 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/package-info.java @@ -19,4 +19,4 @@ /** * MATH functions/operators. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/package-info.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/package-info.java index f913d7fbb2339..c4203612767b3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/package-info.java @@ -19,4 +19,4 @@ /** * Implementation for operators in {@link org.apache.calcite.sql.fun.SqlStdOperatorTable}. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpression.java index 44ab804c84db9..580d747e4d72a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpression.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpression.java index bd298fcae30b8..772ad41c95e6a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpression.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpression.java index 79cd26fd05fe3..dc893e788827e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpression.java index 384c012873c1b..fd9d7aa4cf438 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpression.java index 44e4624fbaff6..8d38efb2fdbaf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpression.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpression.java index 683902ce00c6c..ea5f7498c714b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpression.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpression.java index d6099ab6aab34..1e1b553886e4a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpression.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpression.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpression.java index 759bfa3cb1430..25f205a3e0282 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpression.java similarity index 92% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpression.java index 19d411b584cc2..9493e2436becc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.fun.SqlTrimFunction; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpression.java similarity index 84% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpression.java index cf27597597e65..9769c0e94a062 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpression.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpression.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/package-info.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/package-info.java index 8b550348f553f..f8fc4beb4461a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/package-info.java @@ -19,4 +19,4 @@ /** * String operators. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/package-info.java index af3634a6823f2..3e58a0842e16b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/interpreter/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/package-info.java @@ -19,4 +19,4 @@ /** * interpreter generate runnable 'code' to execute SQL relational expressions. */ -package org.apache.beam.sdk.extensions.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.impl.interpreter; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java index ba6235ff6544d..dd01a87984ded 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamQueryPlanner.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.planner; +package org.apache.beam.sdk.extensions.sql.impl.planner; import java.util.ArrayList; import java.util.Collections; @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java index fba4638129888..5734653c4f936 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRelDataTypeSystem.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.planner; +package org.apache.beam.sdk.extensions.sql.impl.planner; import org.apache.calcite.rel.type.RelDataTypeSystem; import org.apache.calcite.rel.type.RelDataTypeSystemImpl; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java similarity index 72% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java index e907321c0a4e8..d3c987171bf1e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/BeamRuleSets.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.planner; +package org.apache.beam.sdk.extensions.sql.impl.planner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.Iterator; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; -import org.apache.beam.sdk.extensions.sql.rule.BeamAggregationRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamFilterRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamIOSinkRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamIOSourceRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamIntersectRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamJoinRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamMinusRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamProjectRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamSortRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamUnionRule; -import org.apache.beam.sdk.extensions.sql.rule.BeamValuesRule; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamAggregationRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamFilterRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamIOSinkRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamIOSourceRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamIntersectRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamJoinRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamMinusRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamProjectRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamSortRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamUnionRule; +import org.apache.beam.sdk.extensions.sql.impl.rule.BeamValuesRule; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.rel.RelNode; import org.apache.calcite.tools.RuleSet; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/package-info.java similarity index 85% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/package-info.java index 680ccbdce4f9a..a5552b35d0971 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/planner/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/package-info.java @@ -17,8 +17,8 @@ */ /** - * {@link org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner} is the main interface. + * {@link org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner} is the main interface. * It defines data sources, validate a SQL statement, and convert it as a Beam * pipeline. */ -package org.apache.beam.sdk.extensions.sql.planner; +package org.apache.beam.sdk.extensions.sql.impl.planner; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java index 66ab892bf852b..8e786845fb5d9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamAggregationRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.ArrayList; import java.util.List; import org.apache.beam.sdk.coders.KvCoder; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamAggregationTransforms; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.transform.BeamAggregationTransforms; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.WithKeys; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamFilterRel.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamFilterRel.java index f1da29f9cc938..b453db46bfbab 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamFilterRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamFilterRel.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSqlFilterFn; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; -import org.apache.beam.sdk.extensions.sql.transform.BeamSqlFilterFn; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java index ce941a01864c3..d5eb210adf3ce 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSinkRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import com.google.common.base.Joiner; import java.util.List; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java index 85f0bc86b377c..5179eba20c322 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIOSourceRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import com.google.common.base.Joiner; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BaseBeamTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.TupleTag; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java index ae73a0d831ec0..d6ab52df3185d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java index 3d9c9cd74308f..2de2a89021f8c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.ArrayList; import java.util.List; @@ -25,11 +25,11 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.KvCoder; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamJoinTransforms; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.transform.BeamJoinTransforms; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.View; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java index 58b90ca5dba15..11e4f5e861677 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamLogicalConvention.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.ConventionTraitDef; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java index 8cef971b397cf..0075d3abdf79e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamProjectRel.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamProjectRel.java index 8f81038c27d8e..6ccb156cc3106 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamProjectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamProjectRel.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutor; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSqlProjectFn; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; -import org.apache.beam.sdk.extensions.sql.transform.BeamSqlProjectFn; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java index 80a4b84c001da..8a51cc74c99d2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamRelNode.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java index 7f80eb0c4d74b..44e4338cc25fe 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBase.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.io.Serializable; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSetOperatorsTransforms; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; -import org.apache.beam.sdk.extensions.sql.transform.BeamSetOperatorsTransforms; import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.join.CoGbkResult; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java index 363c0a9a312bb..4ea12ca390ac2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.io.Serializable; import java.lang.reflect.Type; @@ -26,9 +26,9 @@ import java.util.List; import org.apache.beam.sdk.coders.ListCoder; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.Flatten; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java index cc503d0a40e8a..6467d9fe78a1b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamSqlRelUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.concurrent.atomic.AtomicInteger; import org.apache.calcite.plan.RelOptUtil; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java index 695521d66878f..d35fa679ed743 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java index f3bf3a3b83ff2..f12cbbc0097ea 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java index fb0a8e212e1b9..76b335dda8fab 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rel/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java @@ -20,4 +20,4 @@ * BeamSQL specified nodes, to replace {@link org.apache.calcite.rel.RelNode}. * */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java index 17e3f805125cb..cdf6712524dfb 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamAggregationRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; import com.google.common.collect.ImmutableList; import java.util.GregorianCalendar; import java.util.List; -import org.apache.beam.sdk.extensions.sql.rel.BeamAggregationRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamAggregationRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.transforms.windowing.AfterProcessingTime; import org.apache.beam.sdk.transforms.windowing.AfterWatermark; import org.apache.beam.sdk.transforms.windowing.FixedWindows; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamFilterRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamFilterRule.java index b30a9d9e5e9ed..bc25085f8a492 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamFilterRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamFilterRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java similarity index 94% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java index 54079b0345602..77f4bddd18dbe 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSinkRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; import java.util.List; -import org.apache.beam.sdk.extensions.sql.rel.BeamIOSinkRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIOSinkRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptTable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSourceRule.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSourceRule.java index 496b977a546b8..a257d3d6df524 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIOSourceRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSourceRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamIOSourceRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIOSourceRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java index 6fdbd9b3bdd16..03d712915ebc5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamIntersectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; import java.util.List; -import org.apache.beam.sdk.extensions.sql.rel.BeamIntersectRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIntersectRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinRule.java index 147932e199fec..4d9dd20207b02 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamJoinRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java index 363cf3be6f5be..9efdf70444cc9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamMinusRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; import java.util.List; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamMinusRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamMinusRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamProjectRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamProjectRule.java index 4f2f8c9dc595b..d19a01da09ab5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamProjectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamProjectRule.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamProjectRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java similarity index 90% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java index e104d3739f5ae..36a7c1b66849b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamSortRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamSortRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSortRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java index 975ccbcadb7cd..6065b726346a0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamUnionRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamUnionRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamUnionRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java similarity index 89% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java index 86a8f72ed2860..b5dc30cc09c1d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/BeamValuesRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; -import org.apache.beam.sdk.extensions.sql.rel.BeamLogicalConvention; -import org.apache.beam.sdk.extensions.sql.rel.BeamValuesRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamValuesRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java similarity index 87% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java index f57cdee1ab4e3..fa32b44a0bfde 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/rule/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java @@ -18,6 +18,6 @@ /** * {@link org.apache.calcite.plan.RelOptRule} to generate - * {@link org.apache.beam.sdk.extensions.sql.rel.BeamRelNode}. + * {@link org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode}. */ -package org.apache.beam.sdk.extensions.sql.rule; +package org.apache.beam.sdk.extensions.sql.impl.rule; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java similarity index 97% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java index 6a27da8dc50b9..095875ff1edf4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamAggregationTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.io.IOException; import java.io.InputStream; @@ -32,12 +32,12 @@ import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.CustomCoder; import org.apache.beam.sdk.coders.VarIntCoder; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlUdaf; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Combine.CombineFn; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java similarity index 99% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java index 1183668ed5c48..1fc8cf6e33bae 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamBuiltinAggregations.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.math.BigDecimal; import java.util.Date; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java similarity index 99% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java index d8194218d111d..e0898d10b27f8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamJoinTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.util.ArrayList; import java.util.Iterator; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSetOperatorsTransforms.java similarity index 96% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSetOperatorsTransforms.java index 854616040702f..326b328db4c76 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSetOperatorsTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSetOperatorsTransforms.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.util.Iterator; -import org.apache.beam.sdk.extensions.sql.rel.BeamSetOperatorRelBase; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSetOperatorRelBase; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.SimpleFunction; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlFilterFn.java similarity index 88% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlFilterFn.java index 372c38cd809a2..855de7a9b1ae7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlFilterFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlFilterFn.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamFilterRel; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlOutputToConsoleFn.java similarity index 95% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlOutputToConsoleFn.java index 9221947c34da4..b40cfa6c106a0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlOutputToConsoleFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlOutputToConsoleFn.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.DoFn; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlProjectFn.java similarity index 91% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlProjectFn.java index af398eabee25f..b3f7ce5a71db2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/BeamSqlProjectFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlProjectFn.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlExpressionExecutor; -import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionExecutor; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamProjectRel; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; import org.apache.beam.sdk.extensions.sql.schema.BeamTableUtils; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/package-info.java index 7797ddf84eee8..bc90e5b881648 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/transform/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/package-info.java @@ -19,4 +19,4 @@ /** * {@link org.apache.beam.sdk.transforms.PTransform} used in a BeamSql pipeline. */ -package org.apache.beam.sdk.extensions.sql.transform; +package org.apache.beam.sdk.extensions.sql.impl.transform; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java similarity index 98% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java index 997095589e625..b80e0454e5d72 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/CalciteUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.utils; +package org.apache.beam.sdk.extensions.sql.impl.utils; import java.sql.Types; import java.util.ArrayList; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/package-info.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/package-info.java index e4d6148b3dc70..b00ed0c313bbf 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/utils/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/package-info.java @@ -19,4 +19,4 @@ /** * Utility classes. */ -package org.apache.beam.sdk.extensions.sql.utils; +package org.apache.beam.sdk.extensions.sql.impl.utils; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java index 616e9f3ecda2c..2e0efe8ce0fc0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRow.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.transforms.windowing.IntervalWindow; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java index 39e2fd3efe6b0..bf097d437ae4e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoder.java @@ -34,7 +34,7 @@ import org.apache.beam.sdk.coders.InstantCoder; import org.apache.beam.sdk.coders.ListCoder; import org.apache.beam.sdk.coders.StringUtf8Coder; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; /** * A {@link Coder} encodes {@link BeamSqlRow}. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java index 53e8483ddcfc9..c76992891e29f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/schema/BeamTableUtils.java @@ -22,7 +22,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.math.BigDecimal; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.util.NlsString; import org.apache.commons.csv.CSVFormat; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java index 363ab8f31154f..d75af9b68dc52 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslJoinTest.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.extensions.sql; -import static org.apache.beam.sdk.extensions.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS1; -import static org.apache.beam.sdk.extensions.sql.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS2; +import static org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS1; +import static org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRelBoundedVsBoundedTest.ORDER_DETAILS2; import java.sql.Types; import java.util.Arrays; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java similarity index 80% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java index 2843e411df1be..f3500874aa437 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.impl.interpreter; import static org.junit.Assert.assertTrue; @@ -24,39 +24,39 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlCaseExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlDivideExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMinusExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlModExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic.BeamSqlPlusExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentDateExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimeExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlCurrentTimestampExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateCeilExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlDateFloorExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.date.BeamSqlExtractExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlNotExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlCharLengthExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlConcatExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlInitCapExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlLowerExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlOverlayExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlPositionExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlSubstringExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlTrimExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.string.BeamSqlUpperExpression; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; -import org.apache.beam.sdk.extensions.sql.rel.BeamFilterRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamProjectRel; -import org.apache.beam.sdk.extensions.sql.rel.BeamRelNode; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlCaseExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlDivideExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlMinusExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlModExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlMultiplyExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic.BeamSqlPlusExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentDateExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimeExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimestampExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlDateCeilExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlDateFloorExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlExtractExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlNotExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlCharLengthExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlConcatExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlInitCapExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlLowerExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlOverlayExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlPositionExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlSubstringExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlTrimExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string.BeamSqlUpperExpression; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamFilterRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamProjectRel; +import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java index c6478a6bccc0b..388c5564d3bdc 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/BeamSqlFnExecutorTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter; +package org.apache.beam.sdk.extensions.sql.impl.interpreter; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; -import org.apache.beam.sdk.extensions.sql.planner.BeamRelDataTypeSystem; -import org.apache.beam.sdk.extensions.sql.planner.BeamRuleSets; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamRelDataTypeSystem; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamRuleSets; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.config.Lex; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamNullExperssionTest.java similarity index 84% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamNullExperssionTest.java index 7bfbe208b4620..5278871bda1de 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamNullExperssionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamNullExperssionTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNotNullExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlIsNullExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlIsNotNullExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlIsNullExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlAndOrExpressionTest.java similarity index 85% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlAndOrExpressionTest.java index b6f65a13e6953..f6e33b5c71006 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlAndOrExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlAndOrExpressionTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlAndExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.logical.BeamSqlOrExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlAndExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical.BeamSqlOrExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpressionTest.java index 28ed9203292b2..068f04132d492 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCaseExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCaseExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpressionTest.java index feefc455a739a..0c0aaa549c635 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCastExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpressionTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Before; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java similarity index 83% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java index ed77ffb813620..ae3a12f807c2e 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlCompareExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.Arrays; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlCompareExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.comparison.BeamSqlNotEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlCompareExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlGreaterThanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlNotEqualsExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java similarity index 93% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java index 7dc9cc4c96305..c78f9c080c87b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlInputRefExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java similarity index 93% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java index a1b41ed686931..c4e3d3f3b4e5b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlPrimitiveTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpressionTest.java similarity index 94% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpressionTest.java index a48498f8fc502..2e01737192c21 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlReinterpretExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlReinterpretExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,7 +26,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpressionTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpressionTest.java index 23119580d06e6..c4732f54eed8f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/BeamSqlUdfExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlUdfExpressionTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java index b3ae3f6a9fb8c..44001f91ce96a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.arithmetic; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.arithmetic; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java similarity index 88% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java index 1fe7a210ce114..cd390c4ac651b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentDateExpressionTest.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java index ca79635617876..416df0137fd16 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimeExpressionTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java similarity index 89% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java index bac8809296507..d44b6c115dc04 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlCurrentTimestampExpressionTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java similarity index 85% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java index ef675cd324831..5bc99e81ddd47 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateCeilExpressionTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateExpressionTestBase.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateExpressionTestBase.java index 1ec6c25495b00..0e57404f74924 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateExpressionTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateExpressionTestBase.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; /** * Base class for all date related expression test. diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java similarity index 88% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java index 0cb2e730bcc20..ecab54b0b964d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlDateFloorExpressionTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpressionTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpressionTest.java index 6d1dc28acc158..0ca7e3ef8ddaf 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/date/BeamSqlExtractExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlExtractExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.date; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpressionTest.java similarity index 83% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpressionTest.java index 050138daa1a10..a437db72c2073 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/logical/BeamSqlNotExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/logical/BeamSqlNotExpressionTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.logical; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.logical; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java similarity index 95% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java index 10496328dbb03..d42164e2c3ebc 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathBinaryExpressionTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlInputRefExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlInputRefExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.runtime.SqlFunctions; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java similarity index 97% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java index 2fbd0d2750b3e..3f3326bd152ec 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlMathUnaryExpressionTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.math; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java similarity index 80% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java index fe3b21f43e24c..118097f4fed68 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlCharLengthExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpressionTest.java similarity index 87% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpressionTest.java index a6f950036b9fa..c3f8041f05b7a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlConcatExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlConcatExpressionTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpressionTest.java similarity index 84% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpressionTest.java index 4602a9bb81064..24f9945a25d0f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlInitCapExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlInitCapExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpressionTest.java similarity index 80% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpressionTest.java index 136840afc8183..e34fcc037cb2f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlLowerExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlLowerExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpressionTest.java similarity index 91% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpressionTest.java index 2ca0a98716800..09bbdc873c2af 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlOverlayExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlOverlayExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpressionTest.java similarity index 90% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpressionTest.java index a8e3dd2e55730..4c21a71af4ded 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlPositionExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlPositionExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java similarity index 87% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java index f23a18ddab075..b999ca15e7915 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlStringUnaryExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpressionTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpressionTest.java index ea929a42693d4..2fb451ef7a34b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlSubstringExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlSubstringExpressionTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpressionTest.java similarity index 92% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpressionTest.java index 8b2570e7bab6c..6f9c706a79a84 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlTrimExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlTrimExpressionTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.fun.SqlTrimFunction; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpressionTest.java similarity index 80% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpressionTest.java index a225cd6503954..e69a3a5c16e4f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/interpreter/operator/string/BeamSqlUpperExpressionTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/string/BeamSqlUpperExpressionTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.interpreter.operator.string; +package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.string; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.beam.sdk.extensions.sql.interpreter.BeamSqlFnExecutorTestBase; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlExpression; -import org.apache.beam.sdk.extensions.sql.interpreter.operator.BeamSqlPrimitive; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression; +import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive; import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java index 7b8d9a49adc74..5a3f65d81cf6c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamIntersectRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelBoundedVsBoundedTest.java similarity index 99% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelBoundedVsBoundedTest.java index 2acee82bba87b..c4f635010202d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelBoundedVsBoundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelBoundedVsBoundedTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsBoundedTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsBoundedTest.java index e226b708cfb64..1dbd8b44517db 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsBoundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsBoundedTest.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import java.util.Date; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.extensions.sql.mock.MockedBoundedTable; import org.apache.beam.sdk.extensions.sql.mock.MockedUnboundedTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; -import org.apache.beam.sdk.extensions.sql.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsUnboundedTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsUnboundedTest.java index c366a6e6858ec..5e5e41626e91d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamJoinRelUnboundedVsUnboundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRelUnboundedVsUnboundedTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import java.util.Date; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; import org.apache.beam.sdk.extensions.sql.BeamSqlEnv; import org.apache.beam.sdk.extensions.sql.TestUtils; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.extensions.sql.mock.MockedUnboundedTable; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; -import org.apache.beam.sdk.extensions.sql.transform.BeamSqlOutputToConsoleFn; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.ParDo; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java index f2ed1321dca02..9149dd41f7f69 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamMinusRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBaseTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBaseTest.java index 65dd8af297e05..36538c08d4f95 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSetOperatorRelBaseTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBaseTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import java.util.Date; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java similarity index 99% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java index 9e38bb694d28a..15e3b8963d862 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamSortRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import java.util.Date; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java index 54524df9075ff..c232b30442026 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamUnionRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java similarity index 98% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java index ace1a3e521a39..e5fa8648ecf4b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/BeamValuesRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import java.sql.Types; import org.apache.beam.sdk.extensions.sql.BeamSqlCli; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/CheckSize.java similarity index 96% rename from sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java rename to sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/CheckSize.java index f369076b5fad7..8cdf2cdd19f8d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/rel/CheckSize.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/CheckSize.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.rel; +package org.apache.beam.sdk.extensions.sql.impl.rel; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java index 553420b20d379..ddff819a97c10 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/BeamSqlRowCoderTest.java @@ -21,7 +21,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.GregorianCalendar; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.testing.CoderProperties; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.type.RelDataType; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java index 4eccc440c8acb..05af36cb3b71c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/kafka/BeamKafkaCSVTableTest.java @@ -19,10 +19,10 @@ package org.apache.beam.sdk.extensions.sql.schema.kafka; import java.io.Serializable; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Create; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java index 9dc599fe03b43..79e3d6d8049d7 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/text/BeamTextCSVTableTest.java @@ -31,10 +31,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java index 571c8efff6748..821abc9323660 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamAggregationTransformTest.java @@ -23,12 +23,12 @@ import java.util.List; import org.apache.beam.sdk.coders.IterableCoder; import org.apache.beam.sdk.coders.KvCoder; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.transform.BeamAggregationTransforms; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowCoder; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.transform.BeamAggregationTransforms; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Combine; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java index b2aa6c4b3e857..af7ec23f0d379 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/schema/transform/BeamTransformBaseTest.java @@ -22,10 +22,10 @@ import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; -import org.apache.beam.sdk.extensions.sql.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.planner.BeamQueryPlanner; +import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRow; import org.apache.beam.sdk.extensions.sql.schema.BeamSqlRowType; -import org.apache.beam.sdk.extensions.sql.utils.CalciteUtils; import org.apache.beam.sdk.values.KV; import org.apache.calcite.rel.type.RelDataTypeFactory.FieldInfoBuilder; import org.apache.calcite.sql.type.SqlTypeName;