[BEAM-2166] Cherry-pick #2930 and #2933 onto release-2.0.0 This closes #2960
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/acb3f6a9 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/acb3f6a9 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/acb3f6a9 Branch: refs/heads/release-2.0.0 Commit: acb3f6a9cd2894d66df3e80065f2bf50b0a33c5f Parents: 5763c38 09d1aff Author: Luke Cwik <[email protected]> Authored: Tue May 9 10:46:54 2017 -0700 Committer: Luke Cwik <[email protected]> Committed: Tue May 9 10:46:54 2017 -0700 ---------------------------------------------------------------------- .../apex/translation/utils/ApexStreamTuple.java | 11 +++ .../UnboundedReadFromBoundedSource.java | 12 +-- .../runners/core/construction/CodersTest.java | 4 +- .../core/construction/PCollectionsTest.java | 12 +-- .../core/ElementAndRestrictionCoder.java | 12 +-- .../beam/runners/core/KeyedWorkItemCoder.java | 18 ++-- .../beam/runners/core/TimerInternals.java | 22 +++-- .../direct/CloningBundleFactoryTest.java | 20 ++--- .../beam/runners/direct/DirectRunnerTest.java | 4 +- .../UnboundedReadEvaluatorFactoryTest.java | 5 +- .../translation/types/CoderTypeSerializer.java | 4 +- .../streaming/SingletonKeyedWorkItemCoder.java | 16 +++- .../state/FlinkKeyGroupStateInternals.java | 9 +- .../runners/dataflow/BatchViewOverrides.java | 16 ++-- .../runners/dataflow/internal/IsmFormat.java | 59 +++++++------ .../runners/dataflow/util/RandomAccessData.java | 22 +++-- .../runners/dataflow/util/CloudObjectsTest.java | 8 +- .../dataflow/util/RandomAccessDataTest.java | 6 +- .../spark/aggregators/NamedAggregators.java | 4 +- .../beam/sdk/annotations/Experimental.java | 3 + .../org/apache/beam/sdk/coders/AvroCoder.java | 4 +- .../apache/beam/sdk/coders/BigDecimalCoder.java | 23 +++-- .../beam/sdk/coders/BigEndianIntegerCoder.java | 8 +- .../beam/sdk/coders/BigEndianLongCoder.java | 8 +- .../apache/beam/sdk/coders/BigIntegerCoder.java | 17 +++- .../org/apache/beam/sdk/coders/BitSetCoder.java | 11 +++ .../apache/beam/sdk/coders/ByteArrayCoder.java | 21 +++-- .../org/apache/beam/sdk/coders/ByteCoder.java | 8 +- .../java/org/apache/beam/sdk/coders/Coder.java | 90 +++++--------------- .../org/apache/beam/sdk/coders/CustomCoder.java | 47 ---------- .../apache/beam/sdk/coders/DelegateCoder.java | 11 +++ .../org/apache/beam/sdk/coders/DoubleCoder.java | 8 +- .../apache/beam/sdk/coders/DurationCoder.java | 16 ++-- .../apache/beam/sdk/coders/InstantCoder.java | 16 ++-- .../beam/sdk/coders/IterableLikeCoder.java | 23 +++-- .../org/apache/beam/sdk/coders/KvCoder.java | 27 ++++-- .../beam/sdk/coders/LengthPrefixCoder.java | 15 ++-- .../org/apache/beam/sdk/coders/MapCoder.java | 33 ++++--- .../apache/beam/sdk/coders/NullableCoder.java | 25 ++++-- .../beam/sdk/coders/SerializableCoder.java | 4 +- .../beam/sdk/coders/StringDelegateCoder.java | 12 ++- .../apache/beam/sdk/coders/StringUtf8Coder.java | 27 +++--- .../apache/beam/sdk/coders/StructuredCoder.java | 47 ---------- .../beam/sdk/coders/TextualIntegerCoder.java | 15 +++- .../org/apache/beam/sdk/coders/VarIntCoder.java | 8 +- .../apache/beam/sdk/coders/VarLongCoder.java | 8 +- .../org/apache/beam/sdk/coders/VoidCoder.java | 8 +- .../org/apache/beam/sdk/io/FileBasedSink.java | 15 ++-- .../beam/sdk/testing/CoderProperties.java | 6 +- .../sdk/transforms/ApproximateQuantiles.java | 66 ++++++-------- .../org/apache/beam/sdk/transforms/Combine.java | 23 +++++ .../apache/beam/sdk/transforms/CombineFns.java | 17 +++- .../org/apache/beam/sdk/transforms/Count.java | 8 +- .../org/apache/beam/sdk/transforms/Mean.java | 12 +-- .../org/apache/beam/sdk/transforms/Top.java | 17 ++-- .../beam/sdk/transforms/join/CoGbkResult.java | 18 ++-- .../beam/sdk/transforms/join/UnionCoder.java | 19 ++++- .../sdk/transforms/windowing/GlobalWindow.java | 4 +- .../transforms/windowing/IntervalWindow.java | 12 +-- .../beam/sdk/transforms/windowing/PaneInfo.java | 5 +- .../org/apache/beam/sdk/util/BitSetCoder.java | 12 ++- .../org/apache/beam/sdk/util/WindowedValue.java | 52 +++++++---- .../beam/sdk/values/TimestampedValue.java | 13 ++- .../beam/sdk/values/ValueInSingleWindow.java | 25 ++++-- .../beam/sdk/values/ValueWithRecordId.java | 15 +++- .../beam/sdk/coders/BigDecimalCoderTest.java | 5 +- .../beam/sdk/coders/BigIntegerCoderTest.java | 5 +- .../beam/sdk/coders/CoderRegistryTest.java | 20 +++-- .../apache/beam/sdk/coders/CustomCoderTest.java | 4 +- .../beam/sdk/coders/LengthPrefixCoderTest.java | 24 +++--- .../beam/sdk/coders/NullableCoderTest.java | 29 ++++--- .../beam/sdk/coders/SerializableCoderTest.java | 28 +++--- .../beam/sdk/coders/StructuredCoderTest.java | 12 +-- .../beam/sdk/testing/CoderPropertiesTest.java | 36 ++++---- .../apache/beam/sdk/testing/PAssertTest.java | 8 +- .../sdk/testing/SerializableMatchersTest.java | 5 +- .../beam/sdk/testing/WindowSupplierTest.java | 4 +- .../beam/sdk/transforms/CombineFnsTest.java | 11 +++ .../apache/beam/sdk/transforms/CombineTest.java | 33 ++++--- .../apache/beam/sdk/transforms/CreateTest.java | 13 ++- .../beam/sdk/transforms/GroupByKeyTest.java | 4 +- .../apache/beam/sdk/transforms/ParDoTest.java | 16 ++-- .../apache/beam/sdk/transforms/ViewTest.java | 11 +++ .../transforms/reflect/DoFnInvokersTest.java | 8 +- .../transforms/windowing/GlobalWindowTest.java | 2 +- ...BufferedElementCountingOutputStreamTest.java | 5 +- .../apache/beam/sdk/util/CoderUtilsTest.java | 4 +- .../beam/sdk/util/SerializableUtilsTest.java | 4 +- .../extensions/protobuf/ByteStringCoder.java | 19 +++-- .../sdk/extensions/protobuf/ProtoCoder.java | 11 +++ .../protobuf/ByteStringCoderTest.java | 10 +-- .../BeamFnDataBufferingOutboundObserver.java | 3 +- .../harness/data/BeamFnDataInboundObserver.java | 3 +- ...BeamFnDataBufferingOutboundObserverTest.java | 3 +- .../data/BeamFnDataInboundObserverTest.java | 3 +- .../sdk/io/gcp/bigquery/ShardedKeyCoder.java | 11 +-- .../io/gcp/bigquery/TableDestinationCoder.java | 12 +-- .../sdk/io/gcp/bigquery/TableRowInfoCoder.java | 15 +++- .../sdk/io/gcp/bigquery/TableRowJsonCoder.java | 15 +++- .../io/gcp/bigquery/WriteBundlesToFiles.java | 16 ++-- .../pubsub/PubsubMessagePayloadOnlyCoder.java | 11 +++ .../PubsubMessageWithAttributesCoder.java | 15 +++- .../sdk/io/gcp/pubsub/PubsubUnboundedSink.java | 20 ++--- .../io/gcp/pubsub/PubsubUnboundedSource.java | 13 ++- .../sdk/io/gcp/bigquery/BigQueryIOTest.java | 11 +++ .../beam/sdk/io/hadoop/WritableCoder.java | 4 +- .../beam/sdk/io/hbase/HBaseMutationCoder.java | 6 +- .../beam/sdk/io/hbase/HBaseResultCoder.java | 4 +- .../org/apache/beam/sdk/io/kafka/KafkaIO.java | 4 +- .../beam/sdk/io/kafka/KafkaRecordCoder.java | 15 +++- .../beam/sdk/io/kinesis/KinesisRecordCoder.java | 38 ++++----- .../org/apache/beam/sdk/io/xml/JAXBCoder.java | 45 ++++++---- .../apache/beam/sdk/io/xml/JAXBCoderTest.java | 21 +++-- 113 files changed, 976 insertions(+), 789 deletions(-) ----------------------------------------------------------------------
