Merge pull request #243 from appy-one:appy-one/issue242

Fix issue #242
appy-one · Aug 19, 2023 · 9d6c654 · 9d6c654
2 parents aa4e9e9 + 444c1ff
commit 9d6c654
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/btree/binary-tree.ts b/src/btree/binary-tree.ts
@@ -2359,6 +2359,11 @@ export class BinaryBPlusTree {
             throw new Error('specify options.cancelCallback to undo any changes when a rollback needs to be performed');
         }
 
+        if (!leaf.parentNode) {
+            // This is a single-leaf tree, cannot split without rebuilding
+            throw new DetailedError('single-leaf-tree-split', 'Cannot split leaf because it is a single-leaf tree. Tree needs to be rebuilt');
+        }
+
         if (leaf.parentNode.entries.length >= this.info.entriesPerNode) {
             // TODO: TEST splitting node
             // throw new DetailedError('parent-node-full', `Cannot split leaf because parent node is full`);
@@ -2883,10 +2888,10 @@ export class BinaryBPlusTree {
 
                 // Should this entry be added to this leaf?
                 const applyToThisLeaf = (() => {
-                    if (leaf.entries.length > this.info.entriesPerNode) {
+                    if (type === 'add' && leaf.entries.length >= this.info.entriesPerNode) {
                         return false;
                     }
-                    // Check if the "roadsigns" in parent nodes will point to this leaf for the new key
+                    // Check if the "roadsigns" in parent nodes point to this leaf for current key
                     const pointsThisDirection = (node: BinaryBPlusTreeLeaf | BinaryBPlusTreeNode): boolean => {
                         if (node.parentEntry) {
                             // Parent node's entry has a less than connection to this node/leaf

diff --git a/src/storage/binary/test.spec.ts b/src/storage/binary/test.spec.ts
@@ -13,7 +13,7 @@ describe('issue', () => {
         await removeDB();
     });
 
-    it('#239', async () => {
+    it('#239 and #242', async () => {
         // Created for issue #239 ("TypeError when trying to add new records after removing old ones")
         const ref = db.ref('table');
 
@@ -27,12 +27,22 @@ describe('issue', () => {
         // remove all the added records with the query
         await ref.query().filter('playlistId', '==', 'playlist1').remove();
 
-        // add new "small" dataset to the database -> error
-        const songIds2 = Array(10).fill(0).map((_value, index) => `id-${index}`);
+        // add new "large" dataset to the database -> error
+        const songIds2 = Array(110).fill(0).map((_value, index) => `id-${index}`);
         await ref.update(songIds2.reduce((obj, songId) => {
             obj[songId] = { playlistId: 'playlist1' };
             return obj;
         }, {} as any));
 
-    });
+        // remove all the added records with the query
+        await ref.query().filter('playlistId', '==', 'playlist1').remove();
+
+        // add new "large" dataset to the database -> error
+        const songIds3 = Array(500).fill(0).map((_value, index) => `id-${index}`);
+        await ref.update(songIds3.reduce((obj, songId) => {
+            obj[songId] = { playlistId: 'playlist1' };
+            return obj;
+        }, {} as any));
+
+    }, 30e6);
 });