@powersync/service-module-mongodb-storage 0.0.0-dev-20260602073133 → 0.0.0-dev-20260909133214

package/test/src/__snapshots__/storage_sync.test.ts.snap

@@ -589,200 +589,6 @@ exports[`sync - mongodb > storage v1 > sync global data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v1 > sync interrupts low-priority buckets on new checkpoints (2) 1`] = `
-[
-  {
-    "checkpoint": {
-      "buckets": [
-        {
-          "bucket": "b0a[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 0,
-            },
-          ],
-        },
-        {
-          "bucket": "b0b[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "b1[]",
-          "checksum": -1096116670,
-          "count": 1,
-          "priority": 1,
-          "subscriptions": [
-            {
-              "default": 2,
-            },
-          ],
-        },
-      ],
-      "last_op_id": "4001",
-      "streams": [
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b0a",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b0b",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b1",
-        },
-      ],
-      "write_checkpoint": undefined,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "b1[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "1",
-    },
-  },
-  {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4001",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "2000",
-    },
-  },
-  {
-    "data": {
-      "after": "2000",
-      "bucket": "b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "4000",
-    },
-  },
-  {
-    "checkpoint_diff": {
-      "last_op_id": "4004",
-      "removed_buckets": [],
-      "updated_buckets": [
-        {
-          "bucket": "b0a[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 0,
-            },
-          ],
-        },
-        {
-          "bucket": "b0b[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "b1[]",
-          "checksum": 1841937527,
-          "count": 2,
-          "priority": 1,
-          "subscriptions": [
-            {
-              "default": 2,
-            },
-          ],
-        },
-      ],
-      "write_checkpoint": undefined,
-    },
-  },
-  {
-    "data": {
-      "after": "1",
-      "bucket": "b1[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4002",
-    },
-  },
-  {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4004",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "4000",
-      "bucket": "b0a[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4003",
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "1999",
-    },
-  },
-  {
-    "data": {
-      "after": "1999",
-      "bucket": "b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "3999",
-    },
-  },
-  {
-    "data": {
-      "after": "3999",
-      "bucket": "b0b[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4004",
-    },
-  },
-  {
-    "checkpoint_complete": {
-      "last_op_id": "4004",
-    },
-  },
-]
-`;
-
 exports[`sync - mongodb > storage v1 > sync legacy non-raw data 1`] = `
 [
   {
@@ -1778,61 +1584,29 @@ exports[`sync - mongodb > storage v2 > sync global data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync interrupts low-priority buckets on new checkpoints (2) 1`] = `
+exports[`sync - mongodb > storage v2 > sync legacy non-raw data 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#b0a[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 0,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b0b[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b1[]",
-          "checksum": -1096116670,
+          "bucket": "1#mybucket[]",
+          "checksum": -852817836,
           "count": 1,
-          "priority": 1,
+          "priority": 3,
           "subscriptions": [
             {
-              "default": 2,
+              "default": 0,
             },
           ],
         },
       ],
-      "last_op_id": "4001",
+      "last_op_id": "1",
       "streams": [
         {
           "errors": [],
           "is_default": true,
-          "name": "b0a",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b0b",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b1",
+          "name": "mybucket",
         },
       ],
       "write_checkpoint": undefined,
@@ -1841,146 +1615,129 @@ exports[`sync - mongodb > storage v2 > sync interrupts low-priority buckets on n
   {
     "data": {
       "after": "0",
-      "bucket": "1#b1[]",
-      "data": undefined,
+      "bucket": "1#mybucket[]",
+      "data": [
+        {
+          "checksum": 3442149460n,
+          "data": {
+            "description": "Test
+"string"",
+            "id": "t1",
+            "large_num": 12345678901234567890n,
+          },
+          "object_id": "t1",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "1",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+        },
+      ],
       "has_more": false,
       "next_after": "1",
     },
   },
   {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4001",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "2000",
-    },
-  },
-  {
-    "data": {
-      "after": "2000",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "4000",
+    "checkpoint_complete": {
+      "last_op_id": "1",
     },
   },
+]
+`;
+
+exports[`sync - mongodb > storage v2 > sync updates to data query only 1`] = `
+[
   {
-    "checkpoint_diff": {
-      "last_op_id": "4004",
-      "removed_buckets": [],
-      "updated_buckets": [
+    "checkpoint": {
+      "buckets": [
         {
-          "bucket": "1#b0a[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
+          "bucket": "1#by_user["user1"]",
+          "checksum": 0,
+          "count": 0,
+          "priority": 3,
           "subscriptions": [
             {
               "default": 0,
             },
           ],
         },
+      ],
+      "last_op_id": "1",
+      "streams": [
         {
-          "bucket": "1#b0b[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b1[]",
-          "checksum": 1841937527,
-          "count": 2,
-          "priority": 1,
-          "subscriptions": [
-            {
-              "default": 2,
-            },
-          ],
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
         },
       ],
       "write_checkpoint": undefined,
     },
   },
   {
-    "data": {
-      "after": "1",
-      "bucket": "1#b1[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4002",
+    "checkpoint_complete": {
+      "last_op_id": "1",
     },
   },
+]
+`;
+
+exports[`sync - mongodb > storage v2 > sync updates to data query only 2`] = `
+[
   {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4004",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "4000",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4003",
+    "checkpoint_diff": {
+      "last_op_id": "2",
+      "removed_buckets": [],
+      "updated_buckets": [
+        {
+          "bucket": "1#by_user["user1"]",
+          "checksum": 1418351250,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "write_checkpoint": undefined,
     },
   },
   {
     "data": {
       "after": "0",
-      "bucket": "1#b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "1999",
-    },
-  },
-  {
-    "data": {
-      "after": "1999",
-      "bucket": "1#b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "3999",
-    },
-  },
-  {
-    "data": {
-      "after": "3999",
-      "bucket": "1#b0b[]",
-      "data": undefined,
+      "bucket": "1#by_user["user1"]",
+      "data": [
+        {
+          "checksum": 1418351250,
+          "data": "{"id":"list1","user_id":"user1","name":"User 1"}",
+          "object_id": "list1",
+          "object_type": "lists",
+          "op": "PUT",
+          "op_id": "2",
+          "subkey": "ae9cbda1-5d8a-5a61-aaa4-366940758339",
+        },
+      ],
       "has_more": false,
-      "next_after": "4004",
+      "next_after": "2",
     },
   },
   {
     "checkpoint_complete": {
-      "last_op_id": "4004",
+      "last_op_id": "2",
     },
   },
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync legacy non-raw data 1`] = `
+exports[`sync - mongodb > storage v2 > sync updates to global data 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
           "bucket": "1#mybucket[]",
-          "checksum": -852817836,
-          "count": 1,
+          "checksum": 0,
+          "count": 0,
           "priority": 3,
           "subscriptions": [
             {
@@ -1989,7 +1746,7 @@ exports[`sync - mongodb > storage v2 > sync legacy non-raw data 1`] = `
           ],
         },
       ],
-      "last_op_id": "1",
+      "last_op_id": "0",
       "streams": [
         {
           "errors": [],
@@ -2000,19 +1757,44 @@ exports[`sync - mongodb > storage v2 > sync legacy non-raw data 1`] = `
       "write_checkpoint": undefined,
     },
   },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "0",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v2 > sync updates to global data 2`] = `
+[
+  {
+    "checkpoint_diff": {
+      "last_op_id": "1",
+      "removed_buckets": [],
+      "updated_buckets": [
+        {
+          "bucket": "1#mybucket[]",
+          "checksum": 920318466,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
   {
     "data": {
       "after": "0",
       "bucket": "1#mybucket[]",
       "data": [
         {
-          "checksum": 3442149460n,
-          "data": {
-            "description": "Test
-"string"",
-            "id": "t1",
-            "large_num": 12345678901234567890n,
-          },
+          "checksum": 920318466,
+          "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
           "op": "PUT",
@@ -2032,15 +1814,17 @@ exports[`sync - mongodb > storage v2 > sync legacy non-raw data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to data query only 1`] = `
+exports[`sync - mongodb > storage v2 > sync updates to global data 3`] = `
 [
   {
-    "checkpoint": {
-      "buckets": [
+    "checkpoint_diff": {
+      "last_op_id": "2",
+      "removed_buckets": [],
+      "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
-          "checksum": 0,
-          "count": 0,
+          "bucket": "1#mybucket[]",
+          "checksum": -93886621,
+          "count": 2,
           "priority": 3,
           "subscriptions": [
             {
@@ -2049,7 +1833,42 @@ exports[`sync - mongodb > storage v2 > sync updates to data query only 1`] = `
           ],
         },
       ],
-      "last_op_id": "1",
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "data": {
+      "after": "1",
+      "bucket": "1#mybucket[]",
+      "data": [
+        {
+          "checksum": 3280762209,
+          "data": "{"id":"t2","description":"Test 2"}",
+          "object_id": "t2",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "2",
+          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
+        },
+      ],
+      "has_more": false,
+      "next_after": "2",
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "2",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 1`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [],
+      "last_op_id": "0",
       "streams": [
         {
           "errors": [],
@@ -2062,13 +1881,13 @@ exports[`sync - mongodb > storage v2 > sync updates to data query only 1`] = `
   },
   {
     "checkpoint_complete": {
-      "last_op_id": "1",
+      "last_op_id": "0",
     },
   },
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to data query only 2`] = `
+exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -2101,12 +1920,12 @@ exports[`sync - mongodb > storage v2 > sync updates to data query only 2`] = `
           "object_id": "list1",
           "object_type": "lists",
           "op": "PUT",
-          "op_id": "2",
+          "op_id": "1",
           "subkey": "ae9cbda1-5d8a-5a61-aaa4-366940758339",
         },
       ],
       "has_more": false,
-      "next_after": "2",
+      "next_after": "1",
     },
   },
   {
@@ -2117,13 +1936,39 @@ exports[`sync - mongodb > storage v2 > sync updates to data query only 2`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to global data 1`] = `
+exports[`sync - mongodb > storage v2 > sync updates to parameter query only 1`] = `
 [
   {
     "checkpoint": {
-      "buckets": [
+      "buckets": [],
+      "last_op_id": "0",
+      "streams": [
         {
-          "bucket": "1#mybucket[]",
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "0",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v2 > sync updates to parameter query only 2`] = `
+[
+  {
+    "checkpoint_diff": {
+      "last_op_id": "1",
+      "removed_buckets": [],
+      "updated_buckets": [
+        {
+          "bucket": "1#by_user["user1"]",
           "checksum": 0,
           "count": 0,
           "priority": 3,
@@ -2134,36 +1979,403 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 1`] = `
           ],
         },
       ],
-      "last_op_id": "0",
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "1",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > can override priority when subscribing to stream 1`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [
+        {
+          "bucket": "todos|0.1.1["a"]",
+          "checksum": -1712802421,
+          "count": 1,
+          "priority": 0,
+          "subscriptions": [
+            {
+              "sub": 0,
+            },
+            {
+              "sub": 1,
+            },
+          ],
+        },
+        {
+          "bucket": "todos|0.1.1["b"]",
+          "checksum": -1291414318,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "sub": 1,
+            },
+          ],
+        },
+      ],
+      "last_op_id": "2",
       "streams": [
         {
           "errors": [],
-          "is_default": true,
-          "name": "mybucket",
+          "is_default": false,
+          "name": "todos",
         },
       ],
       "write_checkpoint": undefined,
     },
   },
+  {
+    "data": {
+      "after": "0",
+      "bucket": "todos|0.1.1["a"]",
+      "data": [
+        {
+          "checksum": 2582164875,
+          "data": "{"id":"a","description":"Test 1"}",
+          "object_id": "a",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "1",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+        },
+      ],
+      "has_more": false,
+      "next_after": "1",
+    },
+  },
+  {
+    "partial_checkpoint_complete": {
+      "last_op_id": "2",
+      "priority": 0,
+    },
+  },
+  {
+    "data": {
+      "after": "0",
+      "bucket": "todos|0.1.1["b"]",
+      "data": [
+        {
+          "checksum": 3003552978,
+          "data": "{"id":"b","description":"Test 2"}",
+          "object_id": "b",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "2",
+          "subkey": "0dfe86bd-d15b-5fd0-9c7b-a31693030ee0",
+        },
+      ],
+      "has_more": false,
+      "next_after": "2",
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "2",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 1`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [
+        {
+          "bucket": "mybucket.1.1[]",
+          "checksum": -93886621,
+          "count": 2,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "last_op_id": "2",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 2`] = `
+[
+  {
+    "data": {
+      "after": "0",
+      "bucket": "mybucket.1.1[]",
+      "data": [
+        {
+          "checksum": -93886621,
+          "op": "CLEAR",
+          "op_id": "2",
+        },
+      ],
+      "has_more": false,
+      "next_after": "2",
+    },
+  },
+  {
+    "checkpoint_diff": {
+      "last_op_id": "4",
+      "removed_buckets": [],
+      "updated_buckets": [
+        {
+          "bucket": "mybucket.1.1[]",
+          "checksum": 499012468,
+          "count": 4,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "data": {
+      "after": "2",
+      "bucket": "mybucket.1.1[]",
+      "data": [
+        {
+          "checksum": 1859363232,
+          "data": "{"id":"t1","description":"Test 1b"}",
+          "object_id": "t1",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "3",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+        },
+        {
+          "checksum": 3028503153,
+          "data": "{"id":"t2","description":"Test 2b"}",
+          "object_id": "t2",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "4",
+          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
+        },
+      ],
+      "has_more": false,
+      "next_after": "4",
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "4",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for streams 1`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [
+        {
+          "bucket": "test|0.1.1[]",
+          "checksum": 920318466,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "last_op_id": "1",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "test",
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "data": {
+      "after": "0",
+      "bucket": "test|0.1.1[]",
+      "data": [
+        {
+          "checksum": 920318466,
+          "data": "{"id":"t1","description":"Test 1"}",
+          "object_id": "t1",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "1",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+        },
+      ],
+      "has_more": false,
+      "next_after": "1",
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "1",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for streams 2`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [
+        {
+          "bucket": "test2|0.2.1[]",
+          "checksum": 920318466,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "last_op_id": "2",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "test2",
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "data": {
+      "after": "0",
+      "bucket": "test2|0.2.1[]",
+      "data": [
+        {
+          "checksum": 920318466,
+          "data": "{"id":"t1","description":"Test 1"}",
+          "object_id": "t1",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "2",
+          "subkey": "bfe6a7fc-1a36-5a95-877f-518ff63ecb56",
+        },
+      ],
+      "has_more": false,
+      "next_after": "2",
+    },
+  },
+  {
+    "checkpoint_complete": {
+      "last_op_id": "2",
+    },
+  },
+]
+`;
+
+exports[`sync - mongodb > storage v3 > sends checkpoint complete line for empty checkpoint 1`] = `
+[
+  {
+    "checkpoint": {
+      "buckets": [
+        {
+          "bucket": "mybucket.1.1[]",
+          "checksum": -1221282404,
+          "count": 1,
+          "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
+        },
+      ],
+      "last_op_id": "1",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
+      "write_checkpoint": undefined,
+    },
+  },
+  {
+    "data": {
+      "after": "0",
+      "bucket": "mybucket.1.1[]",
+      "data": [
+        {
+          "checksum": 3073684892,
+          "data": "{"id":"t1","description":"sync"}",
+          "object_id": "t1",
+          "object_type": "test",
+          "op": "PUT",
+          "op_id": "1",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+        },
+      ],
+      "has_more": false,
+      "next_after": "1",
+    },
+  },
+  null,
+  {
+    "checkpoint_complete": {
+      "last_op_id": "1",
+    },
+  },
+  {
+    "checkpoint_diff": {
+      "last_op_id": "1",
+      "removed_buckets": [],
+      "updated_buckets": [],
+      "write_checkpoint": "1",
+    },
+  },
   {
     "checkpoint_complete": {
-      "last_op_id": "0",
+      "last_op_id": "1",
     },
   },
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to global data 2`] = `
+exports[`sync - mongodb > storage v3 > sync updates to data query only 1`] = `
 [
   {
-    "checkpoint_diff": {
-      "last_op_id": "1",
-      "removed_buckets": [],
-      "updated_buckets": [
+    "checkpoint": {
+      "buckets": [
         {
-          "bucket": "1#mybucket[]",
-          "checksum": 920318466,
-          "count": 1,
+          "bucket": "by_user.1.1["user1"]",
+          "checksum": 0,
+          "count": 0,
           "priority": 3,
           "subscriptions": [
             {
@@ -2172,26 +2384,15 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 2`] = `
           ],
         },
       ],
-      "write_checkpoint": undefined,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "1#mybucket[]",
-      "data": [
+      "last_op_id": "1",
+      "streams": [
         {
-          "checksum": 920318466,
-          "data": "{"id":"t1","description":"Test 1"}",
-          "object_id": "t1",
-          "object_type": "test",
-          "op": "PUT",
-          "op_id": "1",
-          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
         },
       ],
-      "has_more": false,
-      "next_after": "1",
+      "write_checkpoint": undefined,
     },
   },
   {
@@ -2202,7 +2403,7 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 2`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to global data 3`] = `
+exports[`sync - mongodb > storage v3 > sync updates to data query only 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -2210,9 +2411,9 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 3`] = `
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#mybucket[]",
-          "checksum": -93886621,
-          "count": 2,
+          "bucket": "by_user.1.1["user1"]",
+          "checksum": 1418351250,
+          "count": 1,
           "priority": 3,
           "subscriptions": [
             {
@@ -2227,16 +2428,16 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 3`] = `
   {
     "data": {
       "after": "1",
-      "bucket": "1#mybucket[]",
+      "bucket": "by_user.1.1["user1"]",
       "data": [
         {
-          "checksum": 3280762209,
-          "data": "{"id":"t2","description":"Test 2"}",
-          "object_id": "t2",
-          "object_type": "test",
+          "checksum": 1418351250,
+          "data": "{"id":"list1","user_id":"user1","name":"User 1"}",
+          "object_id": "list1",
+          "object_type": "lists",
           "op": "PUT",
           "op_id": "2",
-          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
+          "subkey": "ae9cbda1-5d8a-5a61-aaa4-366940758339",
         },
       ],
       "has_more": false,
@@ -2251,7 +2452,7 @@ exports[`sync - mongodb > storage v2 > sync updates to global data 3`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 1`] = `
+exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 1`] = `
 [
   {
     "checkpoint": {
@@ -2275,7 +2476,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 1`
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 2`] = `
+exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -2283,7 +2484,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 2`
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 1418351250,
           "count": 1,
           "priority": 3,
@@ -2300,7 +2501,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 2`
   {
     "data": {
       "after": "0",
-      "bucket": "1#by_user["user1"]",
+      "bucket": "by_user.1.1["user1"]",
       "data": [
         {
           "checksum": 1418351250,
@@ -2324,7 +2525,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query + data 2`
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to parameter query only 1`] = `
+exports[`sync - mongodb > storage v3 > sync updates to parameter query only 1`] = `
 [
   {
     "checkpoint": {
@@ -2348,7 +2549,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query only 1`]
 ]
 `;
 
-exports[`sync - mongodb > storage v2 > sync updates to parameter query only 2`] = `
+exports[`sync - mongodb > storage v3 > sync updates to parameter query only 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -2356,7 +2557,7 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query only 2`]
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 0,
           "count": 0,
           "priority": 3,
@@ -2378,13 +2579,13 @@ exports[`sync - mongodb > storage v2 > sync updates to parameter query only 2`]
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > can override priority when subscribing to stream 1`] = `
+exports[`sync - mongodb > storage v4 > can override priority when subscribing to stream 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#todos|0["a"]",
+          "bucket": "todos|0.1.1["a"]",
           "checksum": -1712802421,
           "count": 1,
           "priority": 0,
@@ -2398,7 +2599,7 @@ exports[`sync - mongodb > storage v3 > can override priority when subscribing to
           ],
         },
         {
-          "bucket": "1#todos|0["b"]",
+          "bucket": "todos|0.1.1["b"]",
           "checksum": -1291414318,
           "count": 1,
           "priority": 3,
@@ -2423,7 +2624,7 @@ exports[`sync - mongodb > storage v3 > can override priority when subscribing to
   {
     "data": {
       "after": "0",
-      "bucket": "1#todos|0["a"]",
+      "bucket": "todos|0.1.1["a"]",
       "data": [
         {
           "checksum": 2582164875,
@@ -2448,7 +2649,7 @@ exports[`sync - mongodb > storage v3 > can override priority when subscribing to
   {
     "data": {
       "after": "0",
-      "bucket": "1#todos|0["b"]",
+      "bucket": "todos|0.1.1["b"]",
       "data": [
         {
           "checksum": 3003552978,
@@ -2472,13 +2673,13 @@ exports[`sync - mongodb > storage v3 > can override priority when subscribing to
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 1`] = `
+exports[`sync - mongodb > storage v4 > compacting data - invalidate checkpoint 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
@@ -2503,12 +2704,12 @@ exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 1
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 2`] = `
+exports[`sync - mongodb > storage v4 > compacting data - invalidate checkpoint 2`] = `
 [
   {
     "data": {
       "after": "0",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": -93886621,
@@ -2526,7 +2727,7 @@ exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 2
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": 499012468,
           "count": 4,
           "priority": 3,
@@ -2543,7 +2744,7 @@ exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 2
   {
     "data": {
       "after": "2",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 1859363232,
@@ -2576,13 +2777,13 @@ exports[`sync - mongodb > storage v3 > compacting data - invalidate checkpoint 2
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for streams 1`] = `
+exports[`sync - mongodb > storage v4 > encodes sync rules id in buckets for streams 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#test|0[]",
+          "bucket": "test|0.1.1[]",
           "checksum": 920318466,
           "count": 1,
           "priority": 3,
@@ -2607,7 +2808,7 @@ exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for stre
   {
     "data": {
       "after": "0",
-      "bucket": "1#test|0[]",
+      "bucket": "test|0.1.1[]",
       "data": [
         {
           "checksum": 920318466,
@@ -2631,13 +2832,13 @@ exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for stre
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for streams 2`] = `
+exports[`sync - mongodb > storage v4 > encodes sync rules id in buckets for streams 2`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "2#test2|0[]",
+          "bucket": "test2|0.2.1[]",
           "checksum": 920318466,
           "count": 1,
           "priority": 3,
@@ -2662,7 +2863,7 @@ exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for stre
   {
     "data": {
       "after": "0",
-      "bucket": "2#test2|0[]",
+      "bucket": "test2|0.2.1[]",
       "data": [
         {
           "checksum": 920318466,
@@ -2686,7 +2887,7 @@ exports[`sync - mongodb > storage v3 > encodes sync rules id in buckets for stre
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > expired token 1`] = `
+exports[`sync - mongodb > storage v4 > expired token 1`] = `
 [
   {
     "token_expires_in": 0,
@@ -2694,13 +2895,13 @@ exports[`sync - mongodb > storage v3 > expired token 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > expiring token 1`] = `
+exports[`sync - mongodb > storage v4 > expiring token 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": 0,
           "count": 0,
           "priority": 3,
@@ -2730,7 +2931,7 @@ exports[`sync - mongodb > storage v3 > expiring token 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > expiring token 2`] = `
+exports[`sync - mongodb > storage v4 > expiring token 2`] = `
 [
   {
     "token_expires_in": 0,
@@ -2738,13 +2939,13 @@ exports[`sync - mongodb > storage v3 > expiring token 2`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sends checkpoint complete line for empty checkpoint 1`] = `
+exports[`sync - mongodb > storage v4 > sends checkpoint complete line for empty checkpoint 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": -1221282404,
           "count": 1,
           "priority": 3,
@@ -2769,7 +2970,7 @@ exports[`sync - mongodb > storage v3 > sends checkpoint complete line for empty
   {
     "data": {
       "after": "0",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 3073684892,
@@ -2807,13 +3008,13 @@ exports[`sync - mongodb > storage v3 > sends checkpoint complete line for empty
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync buckets in order 1`] = `
+exports[`sync - mongodb > storage v4 > sync buckets in order 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#b0[]",
+          "bucket": "b0.1.1[]",
           "checksum": 920318466,
           "count": 1,
           "priority": 2,
@@ -2824,7 +3025,7 @@ exports[`sync - mongodb > storage v3 > sync buckets in order 1`] = `
           ],
         },
         {
-          "bucket": "1#b1[]",
+          "bucket": "b1.1.2[]",
           "checksum": -1382098757,
           "count": 1,
           "priority": 1,
@@ -2854,7 +3055,7 @@ exports[`sync - mongodb > storage v3 > sync buckets in order 1`] = `
   {
     "data": {
       "after": "0",
-      "bucket": "1#b1[]",
+      "bucket": "b1.1.2[]",
       "data": [
         {
           "checksum": 2912868539,
@@ -2879,7 +3080,7 @@ exports[`sync - mongodb > storage v3 > sync buckets in order 1`] = `
   {
     "data": {
       "after": "0",
-      "bucket": "1#b0[]",
+      "bucket": "b0.1.1[]",
       "data": [
         {
           "checksum": 920318466,
@@ -2903,13 +3104,13 @@ exports[`sync - mongodb > storage v3 > sync buckets in order 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync global data 1`] = `
+exports[`sync - mongodb > storage v4 > sync global data 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
@@ -2934,7 +3135,7 @@ exports[`sync - mongodb > storage v3 > sync global data 1`] = `
   {
     "data": {
       "after": "0",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 920318466,
@@ -2967,207 +3168,13 @@ exports[`sync - mongodb > storage v3 > sync global data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync interrupts low-priority buckets on new checkpoints (2) 1`] = `
-[
-  {
-    "checkpoint": {
-      "buckets": [
-        {
-          "bucket": "1#b0a[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 0,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b0b[]",
-          "checksum": -659831575,
-          "count": 2000,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b1[]",
-          "checksum": -1096116670,
-          "count": 1,
-          "priority": 1,
-          "subscriptions": [
-            {
-              "default": 2,
-            },
-          ],
-        },
-      ],
-      "last_op_id": "4001",
-      "streams": [
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b0a",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b0b",
-        },
-        {
-          "errors": [],
-          "is_default": true,
-          "name": "b1",
-        },
-      ],
-      "write_checkpoint": undefined,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "1#b1[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "1",
-    },
-  },
-  {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4001",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "2000",
-    },
-  },
-  {
-    "data": {
-      "after": "2000",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "4000",
-    },
-  },
-  {
-    "checkpoint_diff": {
-      "last_op_id": "4004",
-      "removed_buckets": [],
-      "updated_buckets": [
-        {
-          "bucket": "1#b0a[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 0,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b0b[]",
-          "checksum": 883076828,
-          "count": 2001,
-          "priority": 2,
-          "subscriptions": [
-            {
-              "default": 1,
-            },
-          ],
-        },
-        {
-          "bucket": "1#b1[]",
-          "checksum": 1841937527,
-          "count": 2,
-          "priority": 1,
-          "subscriptions": [
-            {
-              "default": 2,
-            },
-          ],
-        },
-      ],
-      "write_checkpoint": undefined,
-    },
-  },
-  {
-    "data": {
-      "after": "1",
-      "bucket": "1#b1[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4002",
-    },
-  },
-  {
-    "partial_checkpoint_complete": {
-      "last_op_id": "4004",
-      "priority": 1,
-    },
-  },
-  {
-    "data": {
-      "after": "4000",
-      "bucket": "1#b0a[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4003",
-    },
-  },
-  {
-    "data": {
-      "after": "0",
-      "bucket": "1#b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "1999",
-    },
-  },
-  {
-    "data": {
-      "after": "1999",
-      "bucket": "1#b0b[]",
-      "data": undefined,
-      "has_more": true,
-      "next_after": "3999",
-    },
-  },
-  {
-    "data": {
-      "after": "3999",
-      "bucket": "1#b0b[]",
-      "data": undefined,
-      "has_more": false,
-      "next_after": "4004",
-    },
-  },
-  {
-    "checkpoint_complete": {
-      "last_op_id": "4004",
-    },
-  },
-]
-`;
-
-exports[`sync - mongodb > storage v3 > sync legacy non-raw data 1`] = `
+exports[`sync - mongodb > storage v4 > sync legacy non-raw data 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": -852817836,
           "count": 1,
           "priority": 3,
@@ -3192,7 +3199,7 @@ exports[`sync - mongodb > storage v3 > sync legacy non-raw data 1`] = `
   {
     "data": {
       "after": "0",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 3442149460n,
@@ -3221,13 +3228,13 @@ exports[`sync - mongodb > storage v3 > sync legacy non-raw data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to data query only 1`] = `
+exports[`sync - mongodb > storage v4 > sync updates to data query only 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 0,
           "count": 0,
           "priority": 3,
@@ -3257,7 +3264,7 @@ exports[`sync - mongodb > storage v3 > sync updates to data query only 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to data query only 2`] = `
+exports[`sync - mongodb > storage v4 > sync updates to data query only 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -3265,7 +3272,7 @@ exports[`sync - mongodb > storage v3 > sync updates to data query only 2`] = `
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 1418351250,
           "count": 1,
           "priority": 3,
@@ -3281,8 +3288,8 @@ exports[`sync - mongodb > storage v3 > sync updates to data query only 2`] = `
   },
   {
     "data": {
-      "after": "0",
-      "bucket": "1#by_user["user1"]",
+      "after": "1",
+      "bucket": "by_user.1.1["user1"]",
       "data": [
         {
           "checksum": 1418351250,
@@ -3306,13 +3313,13 @@ exports[`sync - mongodb > storage v3 > sync updates to data query only 2`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to global data 1`] = `
+exports[`sync - mongodb > storage v4 > sync updates to global data 1`] = `
 [
   {
     "checkpoint": {
       "buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": 0,
           "count": 0,
           "priority": 3,
@@ -3342,7 +3349,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 1`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to global data 2`] = `
+exports[`sync - mongodb > storage v4 > sync updates to global data 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -3350,7 +3357,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 2`] = `
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": 920318466,
           "count": 1,
           "priority": 3,
@@ -3367,7 +3374,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 2`] = `
   {
     "data": {
       "after": "0",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 920318466,
@@ -3391,7 +3398,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 2`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to global data 3`] = `
+exports[`sync - mongodb > storage v4 > sync updates to global data 3`] = `
 [
   {
     "checkpoint_diff": {
@@ -3399,7 +3406,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 3`] = `
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#mybucket[]",
+          "bucket": "mybucket.1.1[]",
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
@@ -3416,7 +3423,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 3`] = `
   {
     "data": {
       "after": "1",
-      "bucket": "1#mybucket[]",
+      "bucket": "mybucket.1.1[]",
       "data": [
         {
           "checksum": 3280762209,
@@ -3440,7 +3447,7 @@ exports[`sync - mongodb > storage v3 > sync updates to global data 3`] = `
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 1`] = `
+exports[`sync - mongodb > storage v4 > sync updates to parameter query + data 1`] = `
 [
   {
     "checkpoint": {
@@ -3464,7 +3471,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 1`
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 2`] = `
+exports[`sync - mongodb > storage v4 > sync updates to parameter query + data 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -3472,7 +3479,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 2`
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 1418351250,
           "count": 1,
           "priority": 3,
@@ -3489,7 +3496,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 2`
   {
     "data": {
       "after": "0",
-      "bucket": "1#by_user["user1"]",
+      "bucket": "by_user.1.1["user1"]",
       "data": [
         {
           "checksum": 1418351250,
@@ -3513,7 +3520,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query + data 2`
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to parameter query only 1`] = `
+exports[`sync - mongodb > storage v4 > sync updates to parameter query only 1`] = `
 [
   {
     "checkpoint": {
@@ -3537,7 +3544,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query only 1`]
 ]
 `;
 
-exports[`sync - mongodb > storage v3 > sync updates to parameter query only 2`] = `
+exports[`sync - mongodb > storage v4 > sync updates to parameter query only 2`] = `
 [
   {
     "checkpoint_diff": {
@@ -3545,7 +3552,7 @@ exports[`sync - mongodb > storage v3 > sync updates to parameter query only 2`]
       "removed_buckets": [],
       "updated_buckets": [
         {
-          "bucket": "1#by_user["user1"]",
+          "bucket": "by_user.1.1["user1"]",
           "checksum": 0,
           "count": 0,
           "priority": 3,