This is an automated email from the ASF dual-hosted git repository. kenn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit a13c7d9177c34017955cbfbfc29a7f4a698047c1 Merge: a957246 c4ac00a Author: Kenn Knowles <[email protected]> AuthorDate: Wed Feb 7 09:47:56 2018 -0800 Merge pull request #4628: [BEAM-3582] Rename BeamRecord -> Row, BeamRecordType -> RowType .../coders/{BeamRecordCoder.java => RowCoder.java} | 44 +++---- .../beam/sdk/values/{BeamRecord.java => Row.java} | 54 ++++----- .../values/{BeamRecordType.java => RowType.java} | 26 ++-- .../org/apache/beam/sdk/values/BeamRecordTest.java | 113 ----------------- .../java/org/apache/beam/sdk/values/RowTest.java | 113 +++++++++++++++++ .../{BeamRecordTypeTest.java => RowTypeTest.java} | 38 +++--- .../apache/beam/sdk/extensions/sql/BeamSql.java | 18 +-- .../apache/beam/sdk/extensions/sql/BeamSqlCli.java | 8 +- .../sdk/extensions/sql/BeamSqlSeekableTable.java | 6 +- .../beam/sdk/extensions/sql/BeamSqlTable.java | 10 +- .../{BeamSqlRecordHelper.java => RowHelper.java} | 6 +- .../{BeamRecordSqlType.java => RowSqlType.java} | 20 +-- .../beam/sdk/extensions/sql/SqlTypeCoder.java | 14 +-- .../sdk/extensions/sql/example/BeamSqlExample.java | 30 ++--- .../beam/sdk/extensions/sql/impl/BeamSqlEnv.java | 6 +- .../interpreter/BeamSqlExpressionExecutor.java | 6 +- .../sql/impl/interpreter/BeamSqlFnExecutor.java | 6 +- .../operator/BeamSqlCaseExpression.java | 4 +- .../operator/BeamSqlCastExpression.java | 4 +- .../interpreter/operator/BeamSqlExpression.java | 8 +- .../operator/BeamSqlInputRefExpression.java | 4 +- .../interpreter/operator/BeamSqlPrimitive.java | 6 +- .../interpreter/operator/BeamSqlUdfExpression.java | 4 +- .../operator/BeamSqlWindowEndExpression.java | 4 +- .../operator/BeamSqlWindowExpression.java | 4 +- .../operator/BeamSqlWindowStartExpression.java | 4 +- .../arithmetic/BeamSqlArithmeticExpression.java | 4 +- .../comparison/BeamSqlCompareExpression.java | 4 +- .../comparison/BeamSqlIsNotNullExpression.java | 4 +- .../comparison/BeamSqlIsNullExpression.java | 4 +- .../date/BeamSqlCurrentDateExpression.java | 4 +- .../date/BeamSqlCurrentTimeExpression.java | 4 +- .../date/BeamSqlCurrentTimestampExpression.java | 4 +- .../operator/date/BeamSqlDateCeilExpression.java | 4 +- .../operator/date/BeamSqlDateFloorExpression.java | 4 +- .../date/BeamSqlDatetimeMinusExpression.java | 4 +- .../date/BeamSqlDatetimePlusExpression.java | 8 +- .../operator/date/BeamSqlExtractExpression.java | 4 +- .../date/BeamSqlIntervalMultiplyExpression.java | 4 +- .../BeamSqlTimestampMinusIntervalExpression.java | 4 +- .../BeamSqlTimestampMinusTimestampExpression.java | 4 +- .../operator/logical/BeamSqlAndExpression.java | 4 +- .../operator/logical/BeamSqlNotExpression.java | 4 +- .../operator/logical/BeamSqlOrExpression.java | 4 +- .../operator/math/BeamSqlMathBinaryExpression.java | 4 +- .../operator/math/BeamSqlMathUnaryExpression.java | 4 +- .../operator/math/BeamSqlPiExpression.java | 4 +- .../operator/math/BeamSqlRandExpression.java | 6 +- .../math/BeamSqlRandIntegerExpression.java | 8 +- .../reinterpret/BeamSqlReinterpretExpression.java | 4 +- .../string/BeamSqlCharLengthExpression.java | 4 +- .../operator/string/BeamSqlConcatExpression.java | 4 +- .../operator/string/BeamSqlInitCapExpression.java | 4 +- .../operator/string/BeamSqlLowerExpression.java | 4 +- .../operator/string/BeamSqlOverlayExpression.java | 4 +- .../operator/string/BeamSqlPositionExpression.java | 4 +- .../string/BeamSqlSubstringExpression.java | 4 +- .../operator/string/BeamSqlTrimExpression.java | 4 +- .../operator/string/BeamSqlUpperExpression.java | 4 +- .../sql/impl/planner/BeamQueryPlanner.java | 4 +- .../sql/impl/rel/BeamAggregationRel.java | 50 ++++---- .../sdk/extensions/sql/impl/rel/BeamFilterRel.java | 14 ++- .../sdk/extensions/sql/impl/rel/BeamIOSinkRel.java | 6 +- .../extensions/sql/impl/rel/BeamIOSourceRel.java | 12 +- .../extensions/sql/impl/rel/BeamIntersectRel.java | 4 +- .../sdk/extensions/sql/impl/rel/BeamJoinRel.java | 90 +++++++------- .../sdk/extensions/sql/impl/rel/BeamMinusRel.java | 4 +- .../extensions/sql/impl/rel/BeamProjectRel.java | 10 +- .../sdk/extensions/sql/impl/rel/BeamRelNode.java | 4 +- .../sql/impl/rel/BeamSetOperatorRelBase.java | 16 +-- .../sdk/extensions/sql/impl/rel/BeamSortRel.java | 18 +-- .../sdk/extensions/sql/impl/rel/BeamUnionRel.java | 4 +- .../sdk/extensions/sql/impl/rel/BeamValuesRel.java | 22 ++-- .../sql/impl/rule/AggregateWindowField.java | 6 +- .../extensions/sql/impl/schema/BaseBeamTable.java | 12 +- .../sql/impl/schema/BeamPCollectionTable.java | 16 +-- .../extensions/sql/impl/schema/BeamTableUtils.java | 22 ++-- .../impl/transform/BeamAggregationTransforms.java | 72 +++++------ .../sql/impl/transform/BeamJoinTransforms.java | 110 ++++++++--------- .../impl/transform/BeamSetOperatorsTransforms.java | 26 ++-- .../sql/impl/transform/BeamSqlFilterFn.java | 6 +- .../impl/transform/BeamSqlOutputToConsoleFn.java | 4 +- .../sql/impl/transform/BeamSqlProjectFn.java | 16 +-- .../extensions/sql/impl/utils/CalciteUtils.java | 24 ++-- .../extensions/sql/meta/provider/MetaUtils.java | 12 +- .../sql/meta/provider/kafka/BeamKafkaCSVTable.java | 52 ++++---- .../sql/meta/provider/kafka/BeamKafkaTable.java | 24 ++-- .../meta/provider/kafka/KafkaTableProvider.java | 8 +- .../sql/meta/provider/text/BeamTextCSVTable.java | 18 +-- .../provider/text/BeamTextCSVTableIOReader.java | 20 +-- .../provider/text/BeamTextCSVTableIOWriter.java | 22 ++-- .../sql/meta/provider/text/BeamTextTable.java | 6 +- .../sql/meta/provider/text/TextTableProvider.java | 8 +- .../sdk/extensions/sql/BeamSqlApiSurfaceTest.java | 4 +- .../sql/BeamSqlDslAggregationCovarianceTest.java | 14 +-- .../extensions/sql/BeamSqlDslAggregationTest.java | 134 ++++++++++----------- .../sql/BeamSqlDslAggregationVarianceTest.java | 16 +-- .../beam/sdk/extensions/sql/BeamSqlDslBase.java | 40 +++--- .../sdk/extensions/sql/BeamSqlDslFilterTest.java | 24 ++-- .../sdk/extensions/sql/BeamSqlDslJoinTest.java | 28 ++--- .../sdk/extensions/sql/BeamSqlDslProjectTest.java | 72 +++++------ .../sdk/extensions/sql/BeamSqlDslUdfUdafTest.java | 28 ++--- .../sdk/extensions/sql/BeamSqlNonAsciiTest.java | 10 +- .../apache/beam/sdk/extensions/sql/TestUtils.java | 60 ++++----- .../interpreter/BeamSqlFnExecutorTestBase.java | 10 +- .../operator/BeamNullExperssionTest.java | 8 +- .../operator/BeamSqlAndOrExpressionTest.java | 8 +- .../operator/BeamSqlCaseExpressionTest.java | 6 +- .../operator/BeamSqlCastExpressionTest.java | 20 +-- .../operator/BeamSqlCompareExpressionTest.java | 24 ++-- .../operator/BeamSqlInputRefExpressionTest.java | 12 +- .../interpreter/operator/BeamSqlPrimitiveTest.java | 10 +- .../operator/BeamSqlReinterpretExpressionTest.java | 4 +- .../operator/BeamSqlUdfExpressionTest.java | 2 +- .../BeamSqlArithmeticExpressionTest.java | 50 ++++---- .../date/BeamSqlCurrentDateExpressionTest.java | 2 +- .../date/BeamSqlCurrentTimeExpressionTest.java | 2 +- .../BeamSqlCurrentTimestampExpressionTest.java | 2 +- .../date/BeamSqlDateCeilExpressionTest.java | 4 +- .../date/BeamSqlDateFloorExpressionTest.java | 4 +- .../date/BeamSqlDatetimeMinusExpressionTest.java | 4 +- .../date/BeamSqlDatetimePlusExpressionTest.java | 4 +- .../date/BeamSqlExtractExpressionTest.java | 14 +-- .../BeamSqlIntervalMultiplyExpressionTest.java | 4 +- ...eamSqlTimestampMinusIntervalExpressionTest.java | 4 +- ...amSqlTimestampMinusTimestampExpressionTest.java | 4 +- .../operator/logical/BeamSqlNotExpressionTest.java | 6 +- .../math/BeamSqlMathBinaryExpressionTest.java | 46 +++---- .../math/BeamSqlMathUnaryExpressionTest.java | 78 ++++++------ .../string/BeamSqlCharLengthExpressionTest.java | 2 +- .../string/BeamSqlConcatExpressionTest.java | 2 +- .../string/BeamSqlInitCapExpressionTest.java | 6 +- .../string/BeamSqlLowerExpressionTest.java | 2 +- .../string/BeamSqlOverlayExpressionTest.java | 8 +- .../string/BeamSqlPositionExpressionTest.java | 6 +- .../string/BeamSqlSubstringExpressionTest.java | 14 +-- .../operator/string/BeamSqlTrimExpressionTest.java | 8 +- .../string/BeamSqlUpperExpressionTest.java | 2 +- .../sdk/extensions/sql/impl/rel/BaseRelTest.java | 4 +- .../sql/impl/rel/BeamIntersectRelTest.java | 6 +- .../impl/rel/BeamJoinRelBoundedVsBoundedTest.java | 10 +- .../rel/BeamJoinRelUnboundedVsBoundedTest.java | 26 ++-- .../rel/BeamJoinRelUnboundedVsUnboundedTest.java | 10 +- .../extensions/sql/impl/rel/BeamMinusRelTest.java | 6 +- .../sql/impl/rel/BeamSetOperatorRelBaseTest.java | 4 +- .../extensions/sql/impl/rel/BeamSortRelTest.java | 14 +-- .../extensions/sql/impl/rel/BeamUnionRelTest.java | 6 +- .../extensions/sql/impl/rel/BeamValuesRelTest.java | 8 +- .../sdk/extensions/sql/impl/rel/CheckSize.java | 8 +- .../sql/impl/schema/BeamSqlRowCoderTest.java | 16 +-- .../transform/BeamAggregationTransformTest.java | 72 +++++------ .../schema/transform/BeamTransformBaseTest.java | 12 +- ...BeamSqlBuiltinFunctionsIntegrationTestBase.java | 28 ++--- .../BeamSqlComparisonOperatorsIntegrationTest.java | 12 +- .../BeamSqlDateFunctionsIntegrationTest.java | 12 +- .../meta/provider/kafka/BeamKafkaCSVTableTest.java | 20 +-- .../meta/provider/text/BeamTextCSVTableTest.java | 28 ++--- .../sql/meta/store/InMemoryMetaStoreTest.java | 4 +- .../extensions/sql/mock/MockedBoundedTable.java | 24 ++-- .../beam/sdk/extensions/sql/mock/MockedTable.java | 8 +- .../extensions/sql/mock/MockedUnboundedTable.java | 16 +-- .../{BeamRecordAsserts.java => RowAsserts.java} | 26 ++-- .../sql/{BeamRecordSize.java => RowSize.java} | 46 +++---- .../model/sql/{ToBeamRecord.java => ToRow.java} | 24 ++-- .../model/sql/adapter/ModelAdaptersMapping.java | 8 +- .../model/sql/adapter/ModelFieldsAdapter.java | 14 +-- .../nexmark/model/sql/adapter/package-info.java | 2 +- .../sdk/nexmark/queries/sql/NexmarkSqlQuery.java | 14 +-- .../beam/sdk/nexmark/queries/sql/SqlQuery0.java | 36 +++--- .../beam/sdk/nexmark/queries/sql/SqlQuery1.java | 22 ++-- .../beam/sdk/nexmark/queries/sql/SqlQuery2.java | 22 ++-- .../beam/sdk/nexmark/queries/sql/SqlQuery3.java | 36 +++--- .../{BeamRecordSizeTest.java => RowSizeTest.java} | 38 +++--- .../sql/{ToBeamRecordTest.java => ToRowTest.java} | 30 ++--- .../sql/adapter/ModelAdaptersMappingTest.java | 22 ++-- .../sdk/nexmark/queries/sql/SqlQuery0Test.java | 16 +-- .../sdk/nexmark/queries/sql/SqlQuery1Test.java | 16 +-- .../sdk/nexmark/queries/sql/SqlQuery2Test.java | 28 ++--- .../sdk/nexmark/queries/sql/SqlQuery3Test.java | 26 ++-- 179 files changed, 1521 insertions(+), 1515 deletions(-) diff --cc sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/BeamTextCSVTable.java index 559f4cb,6a050e4..24b1406 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/BeamTextCSVTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/BeamTextCSVTable.java @@@ -24,9 -24,11 +24,9 @@@ import org.apache.beam.sdk.transforms.P import org.apache.beam.sdk.values.PBegin; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PDone; + import org.apache.beam.sdk.values.Row; + import org.apache.beam.sdk.values.RowType; import org.apache.commons.csv.CSVFormat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * {@code BeamTextCSVTable} is a {@code BeamTextTable} which formatted in CSV. -- To stop receiving notification emails like this one, please contact [email protected].
