Added SELECTNS admin command to switch to databases in other namespaces

Snapchat · Nov 6, 2021 · d0e5165 · d0e5165
1 parent ace526f
commit d0e5165
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/db.cpp b/src/db.cpp
@@ -930,6 +930,12 @@ void selectCommand(client *c) {
     }
 }
 
+void selectNsCommand(client *c) {
+    //TODO: validate namespace name
+    c->ns = getNamespace(szFromObj(c->argv[2]));
+    selectCommand(c);
+}
+
 void allocateCommand(client *c) {
     int global_db, ns_db;
 

diff --git a/src/server.cpp b/src/server.cpp
@@ -1174,6 +1174,10 @@ struct redisCommand redisCommandTable[] = {
      {"allocate",allocateCommand,4,
       "ok-loading fast ok-stale @keyspace",
       0,NULL,0,0,0,0,0,0},
+
+    {"selectns",selectNsCommand,3,
+     "admin ok-loading fast ok-stale @keyspace",
+     0,NULL,0,0,0,0,0,0},
 };
 
 /*============================ Utility functions ============================ */

diff --git a/src/server.h b/src/server.h
@@ -2949,6 +2949,7 @@ void incrbyCommand(client *c);
 void decrbyCommand(client *c);
 void incrbyfloatCommand(client *c);
 void selectCommand(client *c);
+void selectNsCommand(client *c);
 void allocateCommand(client *c);
 void swapdbCommand(client *c);
 void randomkeyCommand(client *c);

diff --git a/tests/unit/namespace.tcl b/tests/unit/namespace.tcl
@@ -71,6 +71,16 @@ start_server [list overrides [list "dir" $server_path "aclfile" "user-namespaces
         assert_equal "bob2" [r GET name]
     }
 
-
+    test {admin can select databases in different namespaces} {
+        r AUTH default ""
+        r SELECTNS 0 ::ns1
+        assert_equal "alice0" [r GET name]
+        r SELECTNS 1 ::ns1
+        assert_equal "alice1" [r GET name]
+        r SELECTNS 0 ::ns2
+        assert_equal "bob0" [r GET name]
+        r SELECTNS 1 ::ns2
+        assert_equal "bob1" [r GET name]
+    }
 }