[fix] stream cases

src/commands_swap/xackdel.json.merge

@@ -1,6 +1,6 @@
 {
     "XACKDEL": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xadd.json.merge

@@ -1,6 +1,6 @@
 {
     "XADD": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xautoclaim.json.merge

@@ -1,6 +1,6 @@
 {
     "XAUTOCLAIM": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xclaim.json.merge

@@ -1,6 +1,6 @@
 {
     "XCLAIM": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xdel.json.merge

@@ -1,6 +1,6 @@
 {
     "XDEL": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xdelex.json.merge

@@ -1,6 +1,6 @@
 {
     "XDELEX": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xgroup-create.json.merge

@@ -0,0 +1,6 @@
+{
+    "CREATE": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xgroup-createconsumer.json.merge

@@ -0,0 +1,6 @@
+{
+    "CREATECONSUMER": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xgroup-delconsumer.json.merge

@@ -0,0 +1,6 @@
+{
+    "DELCONSUMER": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xgroup-destroy.json.merge

@@ -0,0 +1,6 @@
+{
+    "DESTROY": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xgroup-help.json.merge

@@ -0,0 +1,6 @@
+{
+    "HELP": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xgroup-setid.json.merge

@@ -0,0 +1,6 @@
+{
+    "SETID": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xinfo-consumers.json.merge

@@ -0,0 +1,6 @@
+{
+    "CONSUMERS": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xinfo-groups.json.merge

@@ -0,0 +1,6 @@
+{
+    "GROUPS": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xinfo-help.json.merge

@@ -0,0 +1,6 @@
+{
+    "HELP": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xinfo-stream.json.merge

@@ -0,0 +1,6 @@
+{
+    "STREAM": {
+        "swap_command_flags": [],
+        "intention": "SWAP_NOP"
+    }
+}

src/commands_swap/xinfo.json.merge

@@ -1,6 +1,6 @@
 {
     "XINFO": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xlen.json.merge

@@ -1,6 +1,6 @@
 {
     "XLEN": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xpending.json.merge

@@ -1,6 +1,6 @@
 {
     "XPENDING": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xrange.json.merge

@@ -1,6 +1,6 @@
 {
     "XRANGE": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xread.json.merge

@@ -1,6 +1,6 @@
 {
     "XREAD": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xreadgroup.json.merge

@@ -1,6 +1,6 @@
 {
     "XREADGROUP": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xrevrange.json.merge

@@ -1,6 +1,6 @@
 {
     "XREVRANGE": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

src/commands_swap/xtrim.json.merge

@@ -1,6 +1,6 @@
 {
     "XTRIM": {
         "swap_command_flags": [],
-        "intention": "SWAP_IN"
+        "intention": "SWAP_NOP"
     }
 }

tests/unit/type/stream-cgroups.tcl

@@ -315,7 +315,13 @@ start_server {
         $rd XREADGROUP GROUP mygroup Alice BLOCK 0 STREAMS mystream ">"
         wait_for_blocked_clients_count 1
         r SWAPDB 4 9
-        assert_error "*WRONGTYPE*" {$rd read}
+        # In SWAP mode, after SWAPDB the consumer group is moved to another DB,
+        # so we get NOGROUP error instead of WRONGTYPE
+        if {$::swap} {
+            assert_error "*NOGROUP*" {$rd read}
+        } else {
+            assert_error "*WRONGTYPE*" {$rd read}
+        }
         $rd close
     } {0} {external:skip}
 

tests/unit/type/stream.tcl

@@ -859,7 +859,7 @@ start_server {
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes}} {
     test {XADD with MAXLEN > xlen can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             r XADD mystream * xitem v
@@ -874,7 +874,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes}} {
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes}} {
     test {XADD with MINID > lastid can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             set id [expr {$j+1}]
@@ -890,7 +890,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes}} {
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-max-entries 100}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes stream-node-max-entries 100}} {
     test {XADD with ~ MAXLEN can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             r XADD mystream * xitem v
@@ -906,7 +906,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-max-entries 10}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes stream-node-max-entries 10}} {
     test {XADD with ~ MAXLEN and LIMIT can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             r XADD mystream * xitem v
@@ -920,7 +920,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-max-entries 100}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes stream-node-max-entries 100}} {
     test {XADD with ~ MINID can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             set id [expr {$j+1}]
@@ -937,7 +937,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-max-entries 10}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes stream-node-max-entries 10}} {
     test {XADD with ~ MINID and LIMIT can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             set id [expr {$j+1}]
@@ -952,7 +952,7 @@ start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes stream-node-max-entries 10}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes stream-node-max-entries 10}} {
     test {XTRIM with ~ MAXLEN can propagate correctly} {
         for {set j 0} {$j < 100} {incr j} {
             r XADD mystream * xitem v
@@ -1104,7 +1104,7 @@ start_server {tags {"stream"}} {
     }
 }
 
-start_server {tags {"stream needs:debug"} overrides {appendonly yes aof-use-rdb-preamble no}} {
+start_server {tags {"stream needs:debug memonly"} overrides {appendonly yes aof-use-rdb-preamble no}} {
     test {Empty stream can be rewrite into AOF correctly} {
         r XADD mystream MAXLEN 0 * a b
         assert {[dict get [r xinfo stream mystream] length] == 0}