You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by re...@apache.org on 2018/07/31 20:15:38 UTC

[beam] 01/01: Merge pull request #5956: [BEAM-4794] Move SQL and SQL Nexmark to the schema framework

This is an automated email from the ASF dual-hosted git repository.

reuvenlax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 06128f27d1780f25c23ca65cc7ace693a78dac80
Merge: eb0b611 1c969b4
Author: reuvenlax <re...@google.com>
AuthorDate: Tue Jul 31 13:15:33 2018 -0700

    Merge pull request #5956: [BEAM-4794] Move SQL and SQL Nexmark to the schema framework

 .../reflect => schemas}/FieldValueGetter.java      |   4 +-
 .../FieldValueGetterFactory.java                   |  10 +-
 .../reflect => schemas}/FieldValueSetter.java      |   4 +-
 .../FieldValueSetterFactory.java                   |  10 +-
 .../sdk/schemas/GetterBasedSchemaProvider.java     |  15 +-
 .../apache/beam/sdk/schemas/JavaBeanSchema.java    |   6 +-
 .../apache/beam/sdk/schemas/JavaFieldSchema.java   |   6 +-
 .../java/org/apache/beam/sdk/schemas/Schema.java   |  42 ++--
 .../org/apache/beam/sdk/schemas/SchemaCoder.java   |   7 +
 .../beam/sdk/schemas/transforms/Convert.java       |   3 +-
 .../beam/sdk/schemas/utils/ByteBuddyUtils.java     |   4 +-
 .../utils}/JavaBeanGetterFactory.java              |   5 +-
 .../utils}/JavaBeanSetterFactory.java              |   5 +-
 .../beam/sdk/schemas/utils/JavaBeanUtils.java      |   4 +-
 .../apache/beam/sdk/schemas/utils/POJOUtils.java   |   8 +-
 .../utils}/PojoValueGetterFactory.java             |   5 +-
 .../utils}/PojoValueSetterFactory.java             |   5 +-
 .../org/apache/beam/sdk/testing/TestStream.java    |  11 ++
 .../org/apache/beam/sdk/transforms/JsonToRow.java  |   2 +-
 .../java/org/apache/beam/sdk/transforms/ParDo.java |  26 ++-
 .../org/apache/beam/sdk/values/PCollection.java    |  14 ++
 .../main/java/org/apache/beam/sdk/values/Row.java  |   2 +-
 .../org/apache/beam/sdk/values/RowWithGetters.java |   4 +-
 .../beam/sdk/values/reflect/ByteBuddyUtils.java    |  96 ---------
 .../sdk/values/reflect/DefaultSchemaFactory.java   |  92 ---------
 .../sdk/values/reflect/GeneratedGetterFactory.java | 106 ----------
 .../beam/sdk/values/reflect/GetterFactory.java     |  31 ---
 .../beam/sdk/values/reflect/InferredRowCoder.java  | 121 ------------
 .../beam/sdk/values/reflect/ReflectionGetter.java  |  59 ------
 .../values/reflect/ReflectionGetterFactory.java    |  57 ------
 .../beam/sdk/values/reflect/ReflectionUtils.java   |  66 -------
 .../apache/beam/sdk/values/reflect/RowFactory.java | 140 -------------
 .../beam/sdk/values/reflect/SchemaFactory.java     |  41 ----
 .../beam/sdk/values/reflect/SchemaGetters.java     |  51 -----
 .../beam/sdk/values/reflect/package-info.java      |  20 --
 .../beam/sdk/schemas/utils/JavaBeanUtilsTest.java  |   4 +-
 .../beam/sdk/schemas/utils/POJOUtilsTest.java      |   4 +-
 .../apache/beam/sdk/transforms/JsonToRowTest.java  |   2 +-
 .../beam/sdk/transforms/ParDoSchemaTest.java       |  15 ++
 .../values/reflect/DefaultSchemaFactoryTest.java   |  94 ---------
 .../values/reflect/GeneratedGetterFactoryTest.java |  97 ---------
 .../sdk/values/reflect/InferredRowCoderTest.java   |  90 ---------
 .../reflect/ReflectionGetterFactoryTest.java       |  97 ---------
 .../sdk/values/reflect/ReflectionGetterTest.java   |  90 ---------
 .../beam/sdk/values/reflect/RowFactoryTest.java    | 135 -------------
 .../beam/sdk/values/reflect/SchemaGettersTest.java |  41 ----
 .../beam/sdk/extensions/sql/SchemaHelper.java      |  66 -------
 .../beam/sdk/extensions/sql/SqlTransform.java      |   9 +-
 .../sdk/extensions/sql/example/BeamSqlExample.java |   7 +-
 .../extensions/sql/example/BeamSqlPojoExample.java |  45 ++---
 .../sdk/extensions/sql/example/model/Customer.java |  17 ++
 .../sdk/extensions/sql/example/model/Order.java    |  13 ++
 .../operator/BeamSqlCastExpression.java            |   3 +-
 .../sql/impl/rel/BeamAggregationRel.java           |   8 +-
 .../sdk/extensions/sql/impl/rel/BeamCalcRel.java   |   9 +-
 .../sdk/extensions/sql/impl/rel/BeamJoinRel.java   |  10 +-
 .../sdk/extensions/sql/impl/rel/BeamSortRel.java   |   8 +-
 .../extensions/sql/impl/rel/BeamUncollectRel.java  |   4 +-
 .../sdk/extensions/sql/impl/rel/BeamUnnestRel.java |   2 +-
 .../sdk/extensions/sql/impl/rel/BeamValuesRel.java |   2 +-
 .../sql/impl/schema/BeamPCollectionTable.java      |  15 +-
 .../sql/impl/transform/BeamJoinTransforms.java     |  64 +++---
 .../meta/provider/bigquery/BeamBigQueryTable.java  |   3 +-
 .../sql/meta/provider/kafka/BeamKafkaCSVTable.java |  26 +--
 .../sql/meta/provider/kafka/BeamKafkaTable.java    |   3 +-
 .../meta/provider/pubsub/PubsubIOJsonTable.java    |   3 +-
 .../sql/meta/provider/test/TestTableProvider.java  |   7 +-
 .../sql/meta/provider/text/TextTableProvider.java  |  20 +-
 .../sql/BeamSqlDslAggregationCovarianceTest.java   |   7 +-
 .../extensions/sql/BeamSqlDslAggregationTest.java  |  15 +-
 .../sql/BeamSqlDslAggregationVarianceTest.java     |   7 +-
 .../sdk/extensions/sql/BeamSqlDslArrayTest.java    | 177 +++++++++--------
 .../beam/sdk/extensions/sql/BeamSqlDslBase.java    |  30 ++-
 .../sdk/extensions/sql/BeamSqlDslJoinTest.java     |  13 +-
 .../extensions/sql/BeamSqlDslNestedRowsTest.java   | 140 ++++++-------
 .../beam/sdk/extensions/sql/BeamSqlMapTest.java    |  30 +--
 ...erSqlTest.java => InferredJavaBeanSqlTest.java} |  99 +++++-----
 .../sdk/extensions/sql/SqlSchemaFactoryTest.java   | 109 -----------
 .../apache/beam/sdk/extensions/sql/TestUtils.java  |   5 +-
 .../sql/impl/schema/BeamSqlRowCoderTest.java       |   8 +-
 .../transform/BeamAggregationTransformTest.java    |  25 ++-
 ...BeamSqlBuiltinFunctionsIntegrationTestBase.java |  11 +-
 .../BeamSqlComparisonOperatorsIntegrationTest.java |   2 +-
 .../provider/bigquery/BigQueryReadWriteIT.java     |   6 +-
 .../sql/meta/provider/pubsub/PubsubJsonIT.java     |   5 +-
 .../extensions/sql/mock/MockedBoundedTable.java    |   4 +-
 .../extensions/sql/mock/MockedUnboundedTable.java  |  12 +-
 .../org/apache/beam/sdk/nexmark/model/Auction.java |  48 +++--
 .../apache/beam/sdk/nexmark/model/AuctionBid.java  |   7 +-
 .../beam/sdk/nexmark/model/AuctionCount.java       |   9 +-
 .../beam/sdk/nexmark/model/AuctionPrice.java       |  10 +-
 .../org/apache/beam/sdk/nexmark/model/Bid.java     |  30 +--
 .../org/apache/beam/sdk/nexmark/model/Event.java   |  29 +--
 .../beam/sdk/nexmark/model/NameCityStateId.java    |  13 +-
 .../org/apache/beam/sdk/nexmark/model/Person.java  |  34 ++--
 .../beam/sdk/nexmark/model/sql/SelectEvent.java    |  68 +++++++
 .../apache/beam/sdk/nexmark/model/sql/ToRow.java   |  81 --------
 .../model/sql/adapter/ModelAdaptersMapping.java    | 218 ---------------------
 .../model/sql/adapter/ModelFieldsAdapter.java      |  54 -----
 .../beam/sdk/nexmark/queries/Query6Model.java      |   3 +-
 .../beam/sdk/nexmark/queries/WinningBids.java      |   2 +-
 .../sdk/nexmark/queries/WinningBidsSimulator.java  |  21 +-
 .../beam/sdk/nexmark/queries/sql/SqlQuery0.java    |  39 ++--
 .../beam/sdk/nexmark/queries/sql/SqlQuery1.java    |  31 +--
 .../beam/sdk/nexmark/queries/sql/SqlQuery2.java    |  35 +---
 .../beam/sdk/nexmark/queries/sql/SqlQuery3.java    |  48 ++---
 .../beam/sdk/nexmark/queries/sql/SqlQuery5.java    |  28 +--
 .../beam/sdk/nexmark/queries/sql/SqlQuery7.java    |  27 +--
 .../sdk/nexmark/sources/generator/Generator.java   |   4 +-
 .../sources/generator/model/AuctionGenerator.java  |  12 +-
 .../sources/generator/model/BidGenerator.java      |   3 +-
 .../sources/generator/model/PersonGenerator.java   |   5 +-
 .../beam/sdk/nexmark/model/sql/RowSizeTest.java    |   8 +-
 .../beam/sdk/nexmark/model/sql/ToRowTest.java      |  99 ----------
 .../sql/adapter/ModelAdaptersMappingTest.java      | 157 ---------------
 .../sdk/nexmark/queries/sql/SqlQuery0Test.java     |  18 +-
 .../sdk/nexmark/queries/sql/SqlQuery1Test.java     |  20 +-
 .../sdk/nexmark/queries/sql/SqlQuery2Test.java     |  15 +-
 .../sdk/nexmark/queries/sql/SqlQuery3Test.java     |  11 +-
 .../sdk/nexmark/queries/sql/SqlQuery5Test.java     |  22 +--
 .../sdk/nexmark/queries/sql/SqlQuery7Test.java     |  16 +-
 121 files changed, 978 insertions(+), 3047 deletions(-)