#901

babyfish-ct · Nov 26, 2024 · ceb72f0 · ceb72f0
1 parent 0cc2756
commit ceb72f0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntitySet.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntitySet.java
@@ -339,8 +339,7 @@ void merge(E data) {
             return;
         }
         int arrLen = originalArr == null ? 1 : originalArr.length;
-        this.originalCount++;
-        if (originalCount > arrLen) {
+        if (originalCount >= arrLen) {
             E[] arr = (E[])new Object[arrLen * 2];
             if (arrLen == 1) {
                 arr[0] = this.data;
@@ -350,7 +349,7 @@ void merge(E data) {
             this.originalArr = arr;
         }
         assert originalArr != null;
-        originalArr[arrLen] = data;
+        originalArr[originalCount++] = data;
         this.data = data;
     }
 

diff --git a/...ect/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntitySetTest.java b/...ect/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntitySetTest.java
@@ -232,4 +232,32 @@ public void testDuplicateKey() {
                 books.items().toString()
         );
     }
+
+    @Test
+    public void testEsNode() {
+        EsNode<Book> books = new EsNode<>(
+                0,
+                Immutables.createBook(draft -> {}),
+                null,
+                null,
+                null
+        );
+        assertContentEquals("[{}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}, {}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}, {}, {}, {}, {}]", books.getOriginalEntities());
+        books.merge(Immutables.createBook(draft -> {}));
+        assertContentEquals("[{}, {}, {}, {}, {}, {}, {}, {}, {}]", books.getOriginalEntities());
+    }
 }