You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/04/22 02:33:39 UTC
[1/3] incubator-beam git commit: Convert
BaseExecutionContext.getOrCreateStepContext to use specific interface instead
of com.google.base.Supplier
Repository: incubator-beam
Updated Branches:
refs/heads/master 6dd5d7041 -> 4c01c7d30
Convert BaseExecutionContext.getOrCreateStepContext to use specific interface instead of com.google.base.Supplier
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/53b76520
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/53b76520
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/53b76520
Branch: refs/heads/master
Commit: 53b765209c50053761d5fcea8750db2bc562706d
Parents: 6dd5d70
Author: Scott Wegner <sw...@google.com>
Authored: Thu Apr 21 16:47:15 2016 -0700
Committer: Scott Wegner <sw...@google.com>
Committed: Thu Apr 21 16:47:15 2016 -0700
----------------------------------------------------------------------
.../beam/sdk/util/BaseExecutionContext.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/53b76520/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BaseExecutionContext.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BaseExecutionContext.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BaseExecutionContext.java
index 630417b..a62444f 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BaseExecutionContext.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BaseExecutionContext.java
@@ -21,7 +21,6 @@ import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.util.state.StateInternals;
import org.apache.beam.sdk.values.TupleTag;
-import com.google.common.base.Supplier;
import java.io.IOException;
import java.util.Collection;
@@ -71,18 +70,27 @@ public abstract class BaseExecutionContext<T extends ExecutionContext.StepContex
final String finalTransformName = transformName;
return getOrCreateStepContext(
stepName,
- new Supplier<T>() {
+ new CreateStepContextFunction<T>() {
@Override
- public T get() {
+ public T create() {
return createStepContext(finalStepName, finalTransformName);
}
});
}
- protected final T getOrCreateStepContext(String stepName, Supplier<T> createContextFunc) {
+ /**
+ * Factory method interface to create an execution context if none exists during
+ * {@link #getOrCreateStepContext(String, CreateStepContextFunction)}.
+ */
+ protected interface CreateStepContextFunction<T extends ExecutionContext.StepContext> {
+ T create();
+ }
+
+ protected final T getOrCreateStepContext(String stepName,
+ CreateStepContextFunction<T> createContextFunc) {
T context = cachedStepContexts.get(stepName);
if (context == null) {
- context = createContextFunc.get();
+ context = createContextFunc.create();
cachedStepContexts.put(stepName, context);
}
[2/3] incubator-beam git commit: Expose IsmFormat.Footer constants as
public
Posted by lc...@apache.org.
Expose IsmFormat.Footer constants as public
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0a15bf5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0a15bf5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0a15bf5e
Branch: refs/heads/master
Commit: 0a15bf5e758a28316704230385c5fd503fd24b9b
Parents: 53b7652
Author: Scott Wegner <sw...@google.com>
Authored: Thu Apr 21 16:49:19 2016 -0700
Committer: Scott Wegner <sw...@google.com>
Committed: Thu Apr 21 16:49:57 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/runners/worker/IsmFormat.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0a15bf5e/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/IsmFormat.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/IsmFormat.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/IsmFormat.java
index 8b23e0a..8df46dd 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/IsmFormat.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/IsmFormat.java
@@ -54,7 +54,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-
import javax.annotation.Nullable;
/**
@@ -746,9 +745,9 @@ public class IsmFormat {
*/
@AutoValue
public abstract static class Footer {
- static final int LONG_BYTES = 8;
- static final int FIXED_LENGTH = 3 * LONG_BYTES + 1;
- static final byte VERSION = 2;
+ public static final int LONG_BYTES = 8;
+ public static final int FIXED_LENGTH = 3 * LONG_BYTES + 1;
+ public static final byte VERSION = 2;
public abstract byte getVersion();
public abstract long getIndexPosition();
[3/3] incubator-beam git commit: This closes #228
Posted by lc...@apache.org.
This closes #228
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4c01c7d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4c01c7d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4c01c7d3
Branch: refs/heads/master
Commit: 4c01c7d303ae2e50b4ec9026413dfcdc6b56a226
Parents: 6dd5d70 0a15bf5
Author: Luke Cwik <lc...@google.com>
Authored: Thu Apr 21 17:33:24 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Thu Apr 21 17:33:24 2016 -0700
----------------------------------------------------------------------
.../apache/beam/sdk/runners/worker/IsmFormat.java | 7 +++----
.../beam/sdk/util/BaseExecutionContext.java | 18 +++++++++++++-----
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------