This is an automated email from the ASF dual-hosted git repository. kenn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git.
from 6318750 [BEAM-4276] Add missing scope line add a9d9516 Replace project and filter with calc add cbd53c0 Disable CalcRemoveRule new ce3571a Merge pull request #5544: [BEAM-4449] Replace project and filter with calc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...sion.java => BeamSqlExpressionEnvironment.java} | 35 +++-- .../interpreter/BeamSqlExpressionEnvironments.java | 147 +++++++++++++++++++ .../interpreter/BeamSqlExpressionExecutor.java | 4 +- .../sql/impl/interpreter/BeamSqlFnExecutor.java | 72 ++++++---- .../operator/BeamSqlCaseExpression.java | 11 +- .../operator/BeamSqlCastExpression.java | 31 ++-- .../operator/BeamSqlCorrelVariableExpression.java | 14 +- .../operator/BeamSqlDefaultExpression.java | 4 +- .../interpreter/operator/BeamSqlDotExpression.java | 8 +- .../interpreter/operator/BeamSqlExpression.java | 8 +- .../operator/BeamSqlInputRefExpression.java | 4 +- ...ression.java => BeamSqlLocalRefExpression.java} | 22 +-- .../operator/BeamSqlOperatorExpression.java | 6 +- .../interpreter/operator/BeamSqlPrimitive.java | 15 +- .../interpreter/operator/BeamSqlUdfExpression.java | 6 +- .../operator/BeamSqlWindowEndExpression.java | 4 +- .../operator/BeamSqlWindowExpression.java | 6 +- .../operator/BeamSqlWindowStartExpression.java | 4 +- .../arithmetic/BeamSqlArithmeticExpression.java | 8 +- .../operator/array/BeamSqlArrayExpression.java | 6 +- .../operator/array/BeamSqlArrayItemExpression.java | 8 +- .../collection/BeamSqlCardinalityExpression.java | 6 +- .../collection/BeamSqlSingleElementExpression.java | 6 +- .../comparison/BeamSqlCompareExpression.java | 8 +- .../comparison/BeamSqlIsNotNullExpression.java | 6 +- .../comparison/BeamSqlIsNullExpression.java | 6 +- .../date/BeamSqlCurrentDateExpression.java | 4 +- .../date/BeamSqlCurrentTimeExpression.java | 4 +- .../date/BeamSqlCurrentTimestampExpression.java | 4 +- .../operator/date/BeamSqlDateCeilExpression.java | 8 +- .../operator/date/BeamSqlDateFloorExpression.java | 8 +- .../date/BeamSqlDatetimeMinusExpression.java | 5 +- .../date/BeamSqlDatetimePlusExpression.java | 18 ++- .../operator/date/BeamSqlExtractExpression.java | 8 +- .../date/BeamSqlIntervalMultiplyExpression.java | 10 +- .../BeamSqlTimestampMinusIntervalExpression.java | 8 +- .../BeamSqlTimestampMinusTimestampExpression.java | 10 +- .../operator/logical/BeamSqlAndExpression.java | 6 +- .../operator/logical/BeamSqlNotExpression.java | 6 +- .../operator/logical/BeamSqlOrExpression.java | 7 +- .../operator/map/BeamSqlMapExpression.java | 8 +- .../operator/map/BeamSqlMapItemExpression.java | 8 +- .../operator/math/BeamSqlMathBinaryExpression.java | 7 +- .../operator/math/BeamSqlMathUnaryExpression.java | 6 +- .../operator/math/BeamSqlPiExpression.java | 4 +- .../operator/math/BeamSqlRandExpression.java | 6 +- .../math/BeamSqlRandIntegerExpression.java | 8 +- .../reinterpret/BeamSqlReinterpretExpression.java | 6 +- .../operator/row/BeamSqlFieldAccessExpression.java | 6 +- .../extensions/sql/impl/planner/BeamRuleSets.java | 45 ++++-- .../sdk/extensions/sql/impl/rel/BeamCalcRel.java | 124 ++++++++++++++++ .../sdk/extensions/sql/impl/rel/BeamFilterRel.java | 72 ---------- .../sql/impl/rel/BeamLogicalConvention.java | 9 +- .../extensions/sql/impl/rel/BeamProjectRel.java | 87 ----------- .../sdk/extensions/sql/impl/rel/BeamUnnestRel.java | 19 ++- .../{BeamProjectRule.java => BeamCalcRule.java} | 38 ++--- .../extensions/sql/impl/rule/BeamFilterRule.java | 47 ------ .../impl/transform/BeamAggregationTransforms.java | 12 +- .../sql/impl/transform/BeamSqlFilterFn.java | 60 -------- .../sql/impl/transform/BeamSqlProjectFn.java | 73 ---------- .../beam/sdk/extensions/sql/BeamSqlCliTest.java | 11 +- .../impl/interpreter/BeamSqlFnExecutorTest.java | 79 ---------- ...rssionTest.java => BeamNullExpressionTest.java} | 16 ++- .../operator/BeamSqlAndOrExpressionTest.java | 18 ++- .../operator/BeamSqlCaseExpressionTest.java | 14 +- .../operator/BeamSqlCastExpressionTest.java | 22 +-- .../operator/BeamSqlCompareExpressionTest.java | 44 ++++-- .../operator/BeamSqlDotExpressionTest.java | 9 +- .../operator/BeamSqlInputRefExpressionTest.java | 22 ++- .../interpreter/operator/BeamSqlPrimitiveTest.java | 17 ++- .../operator/BeamSqlReinterpretExpressionTest.java | 4 +- .../operator/BeamSqlUdfExpressionTest.java | 5 +- .../BeamSqlArithmeticExpressionTest.java | 103 +++++++++---- .../operator/array/BeamSqlArrayExpressionTest.java | 6 +- .../array/BeamSqlArrayItemExpressionTest.java | 14 +- .../BeamSqlCardinalityExpressionTest.java | 14 +- .../BeamSqlSingleElementExpressionTest.java | 13 +- .../date/BeamSqlCurrentDateExpressionTest.java | 4 +- .../date/BeamSqlCurrentTimeExpressionTest.java | 4 +- .../BeamSqlCurrentTimestampExpressionTest.java | 4 +- .../date/BeamSqlDateCeilExpressionTest.java | 6 +- .../date/BeamSqlDateFloorExpressionTest.java | 10 +- .../date/BeamSqlDatetimeMinusExpressionTest.java | 6 +- .../date/BeamSqlDatetimePlusExpressionTest.java | 4 +- .../date/BeamSqlExtractExpressionTest.java | 16 +-- .../BeamSqlIntervalMultiplyExpressionTest.java | 5 +- ...eamSqlTimestampMinusIntervalExpressionTest.java | 4 +- ...amSqlTimestampMinusTimestampExpressionTest.java | 6 +- .../operator/logical/BeamSqlNotExpressionTest.java | 14 +- .../math/BeamSqlMathBinaryExpressionTest.java | 94 +++++++++--- .../math/BeamSqlMathUnaryExpressionTest.java | 160 +++++++++++++++------ .../row/BeamSqlFieldAccessExpressionTest.java | 14 +- 92 files changed, 1079 insertions(+), 889 deletions(-) copy sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/{operator/math/BeamSqlPiExpression.java => BeamSqlExpressionEnvironment.java} (57%) create mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlExpressionEnvironments.java copy sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/{BeamSqlInputRefExpression.java => BeamSqlLocalRefExpression.java} (69%) create mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRel.java delete mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamFilterRel.java delete mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamProjectRel.java rename sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/{BeamProjectRule.java => BeamCalcRule.java} (53%) delete mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamFilterRule.java delete mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlFilterFn.java delete mode 100644 sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamSqlProjectFn.java rename sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/{BeamNullExperssionTest.java => BeamNullExpressionTest.java} (76%) -- To stop receiving notification emails like this one, please contact k...@apache.org.