You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2017/05/12 21:20:22 UTC
samza git commit: SAMZA-1289: Default id generator if not configured
Repository: samza
Updated Branches:
refs/heads/master b31c0dc6e -> e3e553673
SAMZA-1289: Default id generator if not configured
Right now in standalone deployment we require the user to provide an id generator. Since most of the time the users can simply use the UUID generator for id generation, we should default it using that.
Author: Xinyu Liu <xi...@xiliu-ld.linkedin.biz>
Reviewers: Jagadish V <vj...@apache.org>
Closes #189 from xinyuiscool/SAMZA-1289
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/e3e55367
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/e3e55367
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/e3e55367
Branch: refs/heads/master
Commit: e3e553673c73eeae4540d64b875effeae7a14bf3
Parents: b31c0dc
Author: Xinyu Liu <xi...@xiliu-ld.linkedin.biz>
Authored: Fri May 12 14:20:15 2017 -0700
Committer: Xinyu Liu <xi...@xiliu-ld.linkedin.biz>
Committed: Fri May 12 14:20:15 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/samza/operators/MessageStream.java | 1 +
.../main/java/org/apache/samza/config/ApplicationConfig.java | 5 ++++-
.../org/apache/samza/container/ContainerHeartbeatClient.java | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/e3e55367/samza-api/src/main/java/org/apache/samza/operators/MessageStream.java
----------------------------------------------------------------------
diff --git a/samza-api/src/main/java/org/apache/samza/operators/MessageStream.java b/samza-api/src/main/java/org/apache/samza/operators/MessageStream.java
index b081869..bef1d3f 100644
--- a/samza-api/src/main/java/org/apache/samza/operators/MessageStream.java
+++ b/samza-api/src/main/java/org/apache/samza/operators/MessageStream.java
@@ -153,6 +153,7 @@ public interface MessageStream<M> {
* The merged {@link MessageStream} contains messages from all {@code streams} in the order they arrive.
*
* @param streams {@link MessageStream}s to be merged
+ * @param <T> the type of messages in each of the streams
* @return the merged {@link MessageStream}
* @throws IllegalArgumentException if {@code streams} is empty
*/
http://git-wip-us.apache.org/repos/asf/samza/blob/e3e55367/samza-core/src/main/java/org/apache/samza/config/ApplicationConfig.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/config/ApplicationConfig.java b/samza-core/src/main/java/org/apache/samza/config/ApplicationConfig.java
index 1434231..1b53321 100644
--- a/samza-core/src/main/java/org/apache/samza/config/ApplicationConfig.java
+++ b/samza-core/src/main/java/org/apache/samza/config/ApplicationConfig.java
@@ -18,6 +18,9 @@
*/
package org.apache.samza.config;
+import org.apache.samza.runtime.UUIDGenerator;
+
+
/**
* Accessors for configs associated with Application scope
*/
@@ -52,7 +55,7 @@ public class ApplicationConfig extends MapConfig {
}
public String getAppProcessorIdGeneratorClass() {
- return get(APP_PROCESSOR_ID_GENERATOR_CLASS, null);
+ return get(APP_PROCESSOR_ID_GENERATOR_CLASS, UUIDGenerator.class.getName());
}
public String getAppName() {
http://git-wip-us.apache.org/repos/asf/samza/blob/e3e55367/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java
index cc14948..f2c2651 100644
--- a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java
+++ b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java
@@ -60,8 +60,8 @@ public class ContainerHeartbeatClient {
}
/**
- * Issues a heartbeat request to the coordinator and
- * returns the corresponding {@link ContainerHeartbeatResponse}.
+ * Issues a heartbeat request to the coordinator
+ * @return the corresponding {@link ContainerHeartbeatResponse}.
*/
public ContainerHeartbeatResponse requestHeartbeat() {
ObjectMapper mapper = new ObjectMapper();