test: align expected nodeKey + counts with sirix iter#32 fused OBJECT_NAMED_* (#28)

Sirix sirixdb/sirix#956 introduces fused OBJECT_NAMED_* records (kinds 48-53):
each "field-name + primitive value" pair, formerly two records, becomes one.
This shifts node keys downward and reduces total node counts on documents that
contain primitive-valued object fields.

Updated assertions:
  * test_find_all_projection: 2nd document of {key,location} pair → nodeKey 11 → 7
  * test_history (json_store): same shift, 11 → 7
  * test_read_metadata_key_only: nested {metadata, value} wrapper around the
    string value collapses (the value is no longer a separate node)
  * test_sirix_query / test_resource_query (async + sync): foo[2] over
    {foo:["bar",null,2.33]} resolves to nodeKey 5 instead of 6 (one fewer
    node since "foo" array is a single fused OBJECT_NAMED_ARRAY record)

Co-authored-by: Johannes Lichtenberger <johannes.lichtenberger@sirix.io>

Author: JohannesLichtenberger

tests/test_json_store.py

@@ -73,7 +73,7 @@ def test_find_all_projection():
     response = store.find_all({"key": 2}, ["location"])
     assert response[0] == {
         "location": {"state": "CA", "city": "Los Angeles"},
-        "nodeKey": 11,
+        "nodeKey": 7,
     }
     response = store.find_all({"key": 2}, ["location"], hash=True)
     assert "hash" in response[0]
@@ -119,14 +119,14 @@ def test_history():
     store.insert_one({"generic": 1, "location": {"state": "NY", "city": "New York"}})
     store.insert_one({"generic": 1, "location": {"state": "CA", "city": "Los Angeles"}})
     assert len(store.resource_history()) == 3
-    history = store.history(11)
+    history = store.history(7)
     assert len(history) == 1
     history = history[0]
     assert type(history["revisionTimestamp"]) == str
     assert type(history["revisionNumber"]) == int
     assert len(history) == 2
-    assert len(store.history(11, subtree=False)[0]) == 3
-    embedded = store.history_embed(11)
+    assert len(store.history(7, subtree=False)[0]) == 3
+    embedded = store.history_embed(7)
     assert len(embedded[0]) == 3
 
 

tests/test_resource_sync.py

@@ -119,7 +119,7 @@ def test_read_metadata_key_only():
                     {
                         "key": "test",
                         "metadata": {"nodeKey": 3},
-                        "value": {"metadata": {"nodeKey": 4}, "value": "dict"},
+                        "value": "dict",
                     }
                 ],
             }

tests/test_sirix_async.py

@@ -277,7 +277,7 @@ async def test_sirix_query():
     db = sirix.database("Query", DBType.JSON)
     resource = db.resource("query_resource1")
     await resource.create(data_for_query)
-    assert await sirix.query(post_query) == '{"rest":[6]}'
+    assert await sirix.query(post_query) == '{"rest":[5]}'
     await sirix.delete_all()
     await client.aclose()
 
@@ -289,6 +289,6 @@ async def test_resource_query():
     db = sirix.database("Query", DBType.JSON)
     resource = db.resource("query_resource2")
     await resource.create(data_for_query)
-    assert await resource.query(resource_query) == {"rest": [6]}
+    assert await resource.query(resource_query) == {"rest": [5]}
     await sirix.delete_all()
     await client.aclose()

tests/test_sirix_sync.py

@@ -90,7 +90,7 @@ def test_sirix_query():
     db = sirix.database("Query", DBType.JSON)
     resource = db.resource("query_resource1")
     resource.create(data_for_query)
-    assert sirix.query(post_query) == '{"rest":[6]}'
+    assert sirix.query(post_query) == '{"rest":[5]}'
     sirix.delete_all()
     client.close()
 
@@ -102,6 +102,6 @@ def test_resource_query():
     db = sirix.database("Query", DBType.JSON)
     resource = db.resource("query_resource")
     resource.create(data_for_query)
-    assert resource.query(resource_query) == {"rest": [6]}
+    assert resource.query(resource_query) == {"rest": [5]}
     sirix.delete_all()
     client.close()