[issue-120] updated pravega submodule version (#121)

* fixed segment getScope API changes * removed authplugin dependency Signed-off-by: Vijay Srinivasaraghavan <[email protected]>
pravega · Apr 16, 2018 · fb1b5ca · fb1b5ca
1 parent 965e7e0
commit fb1b5ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -95,9 +95,6 @@ dependencies {
         // pravega-shared pulls in curator which isn't needed on the client
         exclude group: 'org.apache.curator', module: 'curator-recipes'
     }
-    compile(group: 'io.pravega', name: 'pravega-authplugin', version: pravegaVersion) {
-        exclude group:  'org.slf4j', module: 'slf4j-api'
-    }
     compileOnly group: 'org.slf4j', name: 'slf4j-api', version: slf4jApiVersion // provided by flink-runtime
     compile group: 'org.apache.commons', name: 'commons-lang3', version: apacheCommonsVersion
     compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion // not needed at runtime

diff --git a/pravega b/pravega
diff --git a/src/main/java/io/pravega/connectors/flink/PravegaInputSplit.java b/src/main/java/io/pravega/connectors/flink/PravegaInputSplit.java
@@ -64,8 +64,8 @@ public boolean equals(Object o) {
             return false;
         }
 
-        String thisScope = segmentRange.getScopeName();
-        String thatScope = that.getSegmentRange().getScopeName();
+        String thisScope = segmentRange.getScope();
+        String thatScope = that.getSegmentRange().getScope();
         if (thisScope == null ? thatScope != null : !thisScope.equals(thatScope)) {
             return false;
         }
@@ -93,7 +93,7 @@ public int hashCode() {
         result = result * prime + Long.hashCode(getSegmentRange().getStartOffset());
         result = result * prime + Long.hashCode(getSegmentRange().getEndOffset());
 
-        String scope = getSegmentRange().getScopeName();
+        String scope = getSegmentRange().getScope();
         String stream = getSegmentRange().getStreamName();
 
         result = result * prime + (scope == null ? 43 : scope.hashCode());
+2 −2		client/src/main/java/io/pravega/client/batch/SegmentRange.java
+4 −2		client/src/main/java/io/pravega/client/batch/impl/SegmentRangeImpl.java
+4 −4		client/src/main/java/io/pravega/client/stream/impl/CheckpointState.java
+2 −2		client/src/main/java/io/pravega/client/stream/impl/ReaderGroupImpl.java
+4 −3		client/src/main/java/io/pravega/client/stream/impl/ReaderGroupState.java
+2 −0		client/src/main/java/io/pravega/client/stream/impl/ReaderGroupStateManager.java
+5 −2		client/src/test/java/io/pravega/client/batch/impl/SegmentRangeImplTest.java
+24 −3		client/src/test/java/io/pravega/client/stream/impl/CheckpointStateTest.java
+2 −1		controller/src/main/java/io/pravega/controller/server/ControllerServiceStarter.java
+4 −2		controller/src/main/java/io/pravega/controller/server/eventProcessor/ControllerEventProcessors.java
+66 −0		controller/src/main/java/io/pravega/controller/server/eventProcessor/requesthandlers/SealStreamTask.java
+12 −2		controller/src/main/java/io/pravega/controller/store/stream/PersistentStreamBase.java
+3 −3		controller/src/test/java/io/pravega/controller/server/ControllerServiceWithZKStreamTest.java
+2 −1		controller/src/test/java/io/pravega/controller/server/eventProcessor/ControllerEventProcessorsTest.java
+3 −3		controller/src/test/java/io/pravega/controller/server/v1/InMemoryControllerServiceImplTest.java
+3 −3		controller/src/test/java/io/pravega/controller/server/v1/ZKControllerServiceImplTest.java
+82 −2		controller/src/test/java/io/pravega/controller/task/Stream/StreamMetadataTasksTest.java
+13 −11		documentation/src/docs/basic-reader-and-writer.md
+8 −6		documentation/src/docs/reader-group-notifications.md
+3 −3		documentation/src/docs/state-synchronizer-design.md
+13 −13		documentation/src/docs/state-synchronizer.md
+4 −4		documentation/src/docs/transactions.md