You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2018/12/27 12:51:02 UTC
[beam] branch master updated: Treat VarInt encoding as a Beam
primitive encoding in Dataflow runner (#7351)
This is an automated email from the ASF dual-hosted git repository.
robertwb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new bac909b Treat VarInt encoding as a Beam primitive encoding in Dataflow runner (#7351)
bac909b is described below
commit bac909b8e237ef8a2ab7e17ac986e5cc90143e5b
Author: CraigChambersG <45...@users.noreply.github.com>
AuthorDate: Thu Dec 27 04:50:51 2018 -0800
Treat VarInt encoding as a Beam primitive encoding in Dataflow runner (#7351)
---
.../org/apache/beam/runners/dataflow/util/CloudObjectKinds.java | 1 +
.../apache/beam/runners/dataflow/util/CloudObjectTranslators.java | 6 ++++--
.../worker/RunnerHarnessCoderCloudObjectTranslatorRegistrar.java | 2 --
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectKinds.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectKinds.java
index c6264f3..f1f3f69 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectKinds.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectKinds.java
@@ -26,4 +26,5 @@ class CloudObjectKinds {
static final String KIND_STREAM = "kind:stream";
static final String KIND_WINDOWED_VALUE = "kind:windowed_value";
static final String KIND_BYTES = "kind:bytes";
+ static final String KIND_VARINT = "kind:varint";
}
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectTranslators.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectTranslators.java
index b6f7388..2d74fca 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectTranslators.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/CloudObjectTranslators.java
@@ -314,7 +314,9 @@ class CloudObjectTranslators {
@Override
public CloudObject toCloudObject(VarLongCoder target, SdkComponents sdkComponents) {
return addComponents(
- CloudObject.forClass(target.getClass()), Collections.emptyList(), sdkComponents);
+ CloudObject.forClassName(CloudObjectKinds.KIND_VARINT),
+ Collections.emptyList(),
+ sdkComponents);
}
@Override
@@ -329,7 +331,7 @@ class CloudObjectTranslators {
@Override
public String cloudObjectClassName() {
- return CloudObject.forClass(VarLongCoder.class).getClassName();
+ return CloudObjectKinds.KIND_VARINT;
}
};
}
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/RunnerHarnessCoderCloudObjectTranslatorRegistrar.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/RunnerHarnessCoderCloudObjectTranslatorRegistrar.java
index de242d1..a48497e 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/RunnerHarnessCoderCloudObjectTranslatorRegistrar.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/RunnerHarnessCoderCloudObjectTranslatorRegistrar.java
@@ -35,7 +35,6 @@ import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.BigEndianLongCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.VarIntCoder;
-import org.apache.beam.sdk.coders.VarLongCoder;
import org.apache.beam.sdk.coders.VoidCoder;
import org.apache.beam.sdk.util.InstanceBuilder;
@@ -61,7 +60,6 @@ public class RunnerHarnessCoderCloudObjectTranslatorRegistrar
.put("kind:fixed_big_endian_int32", atomic(BigEndianIntegerCoder.class))
.put("kind:fixed_big_endian_int64", atomic(BigEndianLongCoder.class))
.put("kind:var_int32", atomic(VarIntCoder.class))
- .put("kind:varint", atomic(VarLongCoder.class))
.put("kind:void", atomic(VoidCoder.class))
.build();
}