bind functionality to specific protocol version

orientechnologies · Oct 16, 2018 · 4f8d618 · 4f8d618
1 parent 4da9e84
commit 4f8d618
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/sequence/OSequence.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/sequence/OSequence.java
@@ -477,8 +477,7 @@ public long next() throws OSequenceLimitReachedException, ExecutionException, In
     boolean shouldGoOverDistributted = shouldGoOverDistrtibute();
     return next(shouldGoOverDistributted);
   }
-
-  //TODO hide this for regular user
+
   long next(boolean executeViaDistributed) throws OSequenceLimitReachedException, ODatabaseException {
     long retVal;
     if (executeViaDistributed) {

diff --git a/.../main/java/com/orientechnologies/orient/core/metadata/sequence/OSequenceLibraryProxy.java b/.../main/java/com/orientechnologies/orient/core/metadata/sequence/OSequenceLibraryProxy.java
@@ -57,7 +57,7 @@ public OSequence getSequence(String iName) {
   @Override
   public OSequence createSequence(String iName, SEQUENCE_TYPE sequenceType, OSequence.CreateParams params)
       throws ExecutionException, InterruptedException {
-    boolean shouldGoOverDistributted = database.isDistributed() && (replicationProtocolVersion > 1);
+    boolean shouldGoOverDistributted = database.isDistributed() && (replicationProtocolVersion == 2);
     return createSequence(iName, sequenceType, params, shouldGoOverDistributted);
   }
 
@@ -82,7 +82,7 @@ OSequence createSequence(String iName, SEQUENCE_TYPE sequenceType, OSequence.Cre
   @Override
   @Deprecated
   public void dropSequence(String iName) throws ODatabaseException {
-    boolean shouldGoOverDistributted = database.isDistributed() && (replicationProtocolVersion > 1);
+    boolean shouldGoOverDistributted = database.isDistributed() && (replicationProtocolVersion == 2);
     dropSequence(iName, shouldGoOverDistributted);
   }
 

diff --git a/...om/orientechnologies/orient/server/distributed/sequence/ServerClusterLocalSequenceIT.java b/...om/orientechnologies/orient/server/distributed/sequence/ServerClusterLocalSequenceIT.java
@@ -16,7 +16,7 @@ public void test() throws Exception {
     final long previous = OGlobalConfiguration.DISTRIBUTED_ATOMIC_LOCK_TIMEOUT.getValueAsLong();
     try {
       OGlobalConfiguration.DISTRIBUTED_ATOMIC_LOCK_TIMEOUT.setValue(0);
-      OGlobalConfiguration.DISTRIBUTED_REPLICATION_PROTOCOL_VERSION.setValue(2);
+//      OGlobalConfiguration.DISTRIBUTED_REPLICATION_PROTOCOL_VERSION.setValue(2);
 
       init(2);
       prepare(false);