Add deactive namespace support (#521)

* fix * fix
distkv-project · Feb 18, 2020 · df66c5b · df66c5b
1 parent 7ae7e46
commit df66c5b
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 1 deletion.
diff --git a/client/src/main/java/com/distkv/asyncclient/DefaultAsyncClient.java b/client/src/main/java/com/distkv/asyncclient/DefaultAsyncClient.java
@@ -64,6 +64,11 @@ public void activeNamespace(String namespace) {
     namespaceInterceptor.active(namespace);
   }
 
+  @Override
+  public void deactiveNamespace() {
+    namespaceInterceptor.deactive();
+  }
+
   @Override
   public String getActivedNamespace() {
     return namespaceInterceptor.getNamespace();

diff --git a/client/src/main/java/com/distkv/asyncclient/DistkvAsyncClient.java b/client/src/main/java/com/distkv/asyncclient/DistkvAsyncClient.java
@@ -29,6 +29,11 @@ public interface DistkvAsyncClient {
    */
   void activeNamespace(String namespace);
 
+  /**
+   * Deactivate the already achieved Namespace
+   */
+  void deactiveNamespace();
+
   String getActivedNamespace();
 
   /**

diff --git a/client/src/main/java/com/distkv/client/DefaultDistkvClient.java b/client/src/main/java/com/distkv/client/DefaultDistkvClient.java
@@ -74,6 +74,11 @@ public void activeNamespace(String namespace) {
     asyncClient.activeNamespace(namespace);
   }
 
+  @Override
+  public void deactiveNamespace() {
+    asyncClient.deactiveNamespace();
+  }
+
   @Override
   public String getActivedNamespace() {
     return asyncClient.getActivedNamespace();

diff --git a/client/src/main/java/com/distkv/client/DistkvClient.java b/client/src/main/java/com/distkv/client/DistkvClient.java
@@ -29,6 +29,11 @@ public interface DistkvClient {
    */
   void activeNamespace(String namespace);
 
+  /**
+   * Deactivate the already achieved Namespace
+   */
+  void deactiveNamespace();
+
   /**
    * Get actived namespace
    * @return the actived namespace's name

diff --git a/client/src/main/java/com/distkv/client/commandlinetool/CommandExecutorHandler.java b/client/src/main/java/com/distkv/client/commandlinetool/CommandExecutorHandler.java
@@ -452,4 +452,13 @@ public static String activeNamespace(
     return STATUS_OK;
   }
 
+  public static String deactiveNamespace(
+      DistkvClient distkvClient, DistkvParsedResult parsedResult) {
+    if (distkvClient.getActivedNamespace() == null) {
+      return "Namespace has not been activated";
+    }
+    distkvClient.deactiveNamespace();
+    return STATUS_OK;
+  }
+
 }
diff --git a/client/src/main/java/com/distkv/client/commandlinetool/DistkvCommandExecutor.java b/client/src/main/java/com/distkv/client/commandlinetool/DistkvCommandExecutor.java
@@ -80,6 +80,8 @@ public String execute(DistkvParsedResult parsedResult) {
         return null;
       case ACTIVE_NAMESPACE:
         return CommandExecutorHandler.activeNamespace(distkvClient, parsedResult);
+      case DEACTIVE_NAMESPACE:
+        return CommandExecutorHandler.deactiveNamespace(distkvClient, parsedResult);
       default:
         return null;
     }

diff --git a/client/src/main/java/com/distkv/namespace/NamespaceInterceptor.java b/client/src/main/java/com/distkv/namespace/NamespaceInterceptor.java
@@ -16,4 +16,8 @@ public  void active(String namespace) {
     this.namespace = namespace;
   }
 
+  public  void deactive() {
+    this.namespace = null;
+  }
+
 }
diff --git a/parser/src/main/java/com/distkv/parser/DistkvNewSQL.g4 b/parser/src/main/java/com/distkv/parser/DistkvNewSQL.g4
@@ -12,9 +12,10 @@ statement: (conceptStatement) EOF;
 conceptStatement: basicOperationsStatement | strStatement | listStatement | setStatement | dictStatement | slistStatement;
 
 // basic operations
-basicOperationsStatement: exit | activeNamespace;
+basicOperationsStatement: exit | activeNamespace | deactiveNamespace;
 exit: 'exit';
 activeNamespace: 'active namespace' namespace;
+deactiveNamespace: 'deactive namespace';
 
 // str concept
 strStatement: strPut | strGet | strDrop;

diff --git a/parser/src/main/java/com/distkv/parser/DistkvNewSqlListener.java b/parser/src/main/java/com/distkv/parser/DistkvNewSqlListener.java
@@ -44,6 +44,13 @@ public void enterActiveNamespace(DistkvNewSQLParser.ActiveNamespaceContext ctx)
     parsedResult = new DistkvParsedResult(RequestType.ACTIVE_NAMESPACE, request);
   }
 
+  @Override
+  public void enterDeactiveNamespace(DistkvNewSQLParser.DeactiveNamespaceContext ctx) {
+    Preconditions.checkState(parsedResult == null);
+    Preconditions.checkState(ctx.children.size() == 1);
+    parsedResult = new DistkvParsedResult(RequestType.DEACTIVE_NAMESPACE, null);
+  }
+
   @Override
   public void enterStrPut(DistkvNewSQLParser.StrPutContext ctx) {
     Preconditions.checkState(parsedResult == null);

diff --git a/rpc/src/main/java/com/distkv/rpc/protobuf/distkv_pb.proto b/rpc/src/main/java/com/distkv/rpc/protobuf/distkv_pb.proto
@@ -24,6 +24,8 @@ enum RequestType {
 
     ACTIVE_NAMESPACE = 2;
 
+    DEACTIVE_NAMESPACE = 3;
+
     // string concept
     STR_PUT = 101;
     STR_GET = 102;

diff --git a/test/src/test/java/com/distkv/client/NamespaceTest.java b/test/src/test/java/com/distkv/client/NamespaceTest.java
@@ -61,4 +61,36 @@ public void testNamespaceDisabled()
     Assert.assertEquals(value, "v2");
   }
 
+
+  @Test
+  public void testNamespaceDeactive()
+      throws ExecutionException, InterruptedException, InvalidProtocolBufferException {
+    DistkvAsyncClient client1 = newAsyncDistkvClient();
+    DistkvAsyncClient client2 = newAsyncDistkvClient();
+
+    client1.activeNamespace("a");
+
+    CompletableFuture<DistkvProtocol.DistkvResponse> putFuture =
+        client1.strs().put("k1", "v1");
+    Assert.assertEquals(CommonProtocol.Status.OK, putFuture.get().getStatus());
+    putFuture = client2.strs().put("k1", "v2");
+    Assert.assertEquals(CommonProtocol.Status.OK, putFuture.get().getStatus());
+
+    CompletableFuture<DistkvProtocol.DistkvResponse> getFuture = client1.strs().get("k1");
+    String value = getFuture.get()
+        .getResponse().unpack(StringProtocol.StrGetResponse.class).getValue();
+    Assert.assertEquals(value, "v1");
+
+    getFuture = client2.strs().get("k1");
+    value = getFuture.get()
+        .getResponse().unpack(StringProtocol.StrGetResponse.class).getValue();
+    Assert.assertEquals(value, "v2");
+
+    client1.deactiveNamespace();
+    CompletableFuture<DistkvProtocol.DistkvResponse> getFuture1 = client1.strs().get("k1");
+    String value1 = getFuture.get()
+        .getResponse().unpack(StringProtocol.StrGetResponse.class).getValue();
+    Assert.assertEquals(value, "v2");
+  }
+
 }
diff --git a/test/src/test/java/com/distkv/client/commandlinetool/DistkvCommandExecutorHandlerTest.java b/test/src/test/java/com/distkv/client/commandlinetool/DistkvCommandExecutorHandlerTest.java
@@ -224,6 +224,12 @@ public void testMain() {
     Assert.assertEquals(
         CommandExecutorHandler.activeNamespace(distkvClient, distKVParsedResult), STATUS_OK);
 
+    // Test Deactive namespace
+    command = "deactive namespace";
+    distKVParsedResult = distkvParser.parse(command);
+    Assert.assertEquals(
+        CommandExecutorHandler.deactiveNamespace(distkvClient, distKVParsedResult), STATUS_OK);
+
     distkvClient.disconnect();
   }