Make new arrays mutable.

RumbleDB · Jul 31, 2024 · 57c0e2f · 57c0e2f
1 parent f225718
commit 57c0e2f
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/src/main/java/org/rumbledb/items/ItemFactory.java b/src/main/java/org/rumbledb/items/ItemFactory.java
@@ -209,8 +209,14 @@ public Item createArrayItem() {
         return new ArrayItem();
     }
 
-    public Item createArrayItem(List<Item> items) {
-        return new ArrayItem(items);
+    public Item createArrayItem(List<Item> items, boolean mutable) {
+        Item result = new ArrayItem(items);
+        if (mutable) {
+            result.setMutabilityLevel(0);
+        } else {
+            result.setMutabilityLevel(-1);
+        }
+        return result;
     }
 
     public Item createObjectItem(

diff --git a/src/main/java/org/rumbledb/items/LazyObjectItem.java b/src/main/java/org/rumbledb/items/LazyObjectItem.java
@@ -77,7 +77,7 @@ public Item getItem() {
                     return ItemFactory.getInstance().createNullItem();
                 }
             }
-            return ItemFactory.getInstance().createArrayItem(items);
+            return ItemFactory.getInstance().createArrayItem(items, true);
         }
     }
 

diff --git a/src/main/java/org/rumbledb/items/ObjectItem.java b/src/main/java/org/rumbledb/items/ObjectItem.java
@@ -112,7 +112,7 @@ public ObjectItem(Map<String, List<Item>> keyValuePairs) {
             List<Item> values = keyValuePairs.get(key);
             // for each key, convert the lists of values into arrayItems
             if (values.size() > 1) {
-                Item valuesArray = ItemFactory.getInstance().createArrayItem(values);
+                Item valuesArray = ItemFactory.getInstance().createArrayItem(values, false);
                 valueList.add(valuesArray);
             } else if (values.size() == 1) {
                 Item value = values.get(0);

diff --git a/src/main/java/org/rumbledb/items/parsing/ItemParser.java b/src/main/java/org/rumbledb/items/parsing/ItemParser.java
@@ -116,7 +116,7 @@ public static Item getItemFromObject(JsonReader object, ExceptionMetadata metada
                     values.add(getItemFromObject(object, metadata));
                 }
                 object.endArray();
-                return ItemFactory.getInstance().createArrayItem(values);
+                return ItemFactory.getInstance().createArrayItem(values, false);
             }
             if (object.peek() == JsonToken.BEGIN_OBJECT) {
                 List<String> keys = new ArrayList<>();
@@ -203,7 +203,7 @@ public static Item getItemFromYAML(
                     // System.err.println("Next token (reading array): " + nt.toString());
                 }
                 // System.err.println("Finished reading array.");
-                return ItemFactory.getInstance().createArrayItem(values);
+                return ItemFactory.getInstance().createArrayItem(values, false);
             }
             if (lookahead.equals(com.fasterxml.jackson.core.JsonToken.START_OBJECT)) {
                 List<String> keys = new ArrayList<>();
@@ -595,7 +595,7 @@ private static Item convertValueToItem(
                     members.add(convertValueToItem(value, dataType, metadata, memberType));
                 }
             }
-            Item item = ItemFactory.getInstance().createArrayItem(members);
+            Item item = ItemFactory.getInstance().createArrayItem(members, false);
             if (itemType == null || itemType.equals(BuiltinTypesCatalogue.arrayItem)) {
                 return item;
             } else {
@@ -615,7 +615,7 @@ private static Item convertValueToItem(
                 for (double value : denseVector.values()) {
                     members.add(ItemFactory.getInstance().createDoubleItem(value));
                 }
-                Item item = ItemFactory.getInstance().createArrayItem(members);
+                Item item = ItemFactory.getInstance().createArrayItem(members, false);
                 if (itemType == null || itemType.equals(BuiltinTypesCatalogue.arrayItem)) {
                     return item;
                 } else {

diff --git a/src/main/java/org/rumbledb/runtime/functions/object/ObjectIntersectMapClosure.java b/src/main/java/org/rumbledb/runtime/functions/object/ObjectIntersectMapClosure.java
@@ -45,7 +45,7 @@ public Item call(Item arg0) throws Exception {
         for (String key : arg0.getKeys()) {
             Item value = arg0.getItemByKey(key);
             Item arrayValue = ItemFactory.getInstance()
-                .createArrayItem(new ArrayList<Item>(Collections.singletonList(value)));
+                .createArrayItem(new ArrayList<Item>(Collections.singletonList(value)), false);
             keyValuePairs.put(key, new ArrayList<Item>(Collections.singletonList(arrayValue)));
         }
 

diff --git a/src/main/java/org/rumbledb/runtime/primary/ArrayRuntimeIterator.java b/src/main/java/org/rumbledb/runtime/primary/ArrayRuntimeIterator.java
@@ -51,7 +51,7 @@ public Item materializeFirstItemOrNull(
         if (!this.children.isEmpty()) {
             result.addAll(this.children.get(0).materialize(dynamicContext));
         }
-        Item item = ItemFactory.getInstance().createArrayItem(result);
+        Item item = ItemFactory.getInstance().createArrayItem(result, true);
         return item;
     }
 }
diff --git a/src/main/java/org/rumbledb/runtime/primary/ObjectConstructorRuntimeIterator.java b/src/main/java/org/rumbledb/runtime/primary/ObjectConstructorRuntimeIterator.java
@@ -90,7 +90,7 @@ public Item materializeFirstItemOrNull(DynamicContext dynamicContext) {
                 valueIterator.close();
                 // SIMILAR TO ZORBA, if value is more than one item, wrap it in an array
                 if (currentResults.size() > 1) {
-                    values.add(ItemFactory.getInstance().createArrayItem(currentResults));
+                    values.add(ItemFactory.getInstance().createArrayItem(currentResults, true));
                 } else if (currentResults.size() == 1) {
                     values.add(currentResults.get(0));
                 } else {

diff --git a/src/main/java/org/rumbledb/runtime/typing/ValidateTypeIterator.java b/src/main/java/org/rumbledb/runtime/typing/ValidateTypeIterator.java
@@ -389,7 +389,7 @@ private static Item validate(Item item, ItemType itemType, ExceptionMetadata met
             }
             Integer minLength = itemType.getMinLengthFacet();
             Integer maxLength = itemType.getMaxLengthFacet();
-            Item arrayItem = ItemFactory.getInstance().createArrayItem(members);
+            Item arrayItem = ItemFactory.getInstance().createArrayItem(members, true);
             if (itemType.getName() == null) {
                 itemType = itemType.getBaseType();
             }

diff --git a/src/main/java/org/rumbledb/runtime/update/expression/ReplaceExpressionIterator.java b/src/main/java/org/rumbledb/runtime/update/expression/ReplaceExpressionIterator.java
@@ -93,7 +93,7 @@ public PendingUpdateList getPendingUpdateList(DynamicContext context) {
             for (Item item : tempContent) {
                 copyContent.add((Item) SerializationUtils.clone(item));
             }
-            content = ItemFactory.getInstance().createArrayItem(copyContent);
+            content = ItemFactory.getInstance().createArrayItem(copyContent, true);
         }
 
         UpdatePrimitiveFactory factory = UpdatePrimitiveFactory.getInstance();

diff --git a/src/main/java/org/rumbledb/server/RumbleHttpHandler.java b/src/main/java/org/rumbledb/server/RumbleHttpHandler.java
@@ -155,7 +155,7 @@ private static Item assembleResponse(RumbleRuntimeConfiguration configuration, L
             );
         } else {
             if (results != null) {
-                Item values = ItemFactory.getInstance().createArrayItem(results);
+                Item values = ItemFactory.getInstance().createArrayItem(results, false);
                 output.putItemByKey("values", values);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ public Item getItem() { @@
                         return ItemFactory.getInstance().createNullItem();
                     }
                 }
-                return ItemFactory.getInstance().createArrayItem(items);
+                return ItemFactory.getInstance().createArrayItem(items, true);
             }
         }
@@ Expand Down @@