Fix a bug when intersecting an empty build side table (#4089)

kuzudb · Aug 15, 2024 · 5590bca · 5590bca
1 parent 2067ffa
commit 5590bca
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/extension/httpfs/test/test_files/http.test b/extension/httpfs/test/test_files/http.test
@@ -146,7 +146,9 @@ tinysnb1|KUZU
 ---- error
 Runtime exception: Cannot attach a remote kuzu database due to invalid path: http://localhost/databases/tinysnb1.
 
+#TODO(Ziyi): figure out a way to automate upload if storage has changed.
 -CASE AttachDBWithNonEmptyWAL
+-SKIP
 -STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/httpfs/build/libhttpfs.kuzu_extension"
 ---- ok
 -STATEMENT attach 'http://localhost/databases/non-empty-wal' as test (dbtype kuzu)

diff --git a/extension/httpfs/test/test_files/s3_remote_database.test b/extension/httpfs/test/test_files/s3_remote_database.test
@@ -2,7 +2,9 @@
 
 --
 
+#TODO(Ziyi): figure out a way to automate upload if storage has changed.
 -CASE UWS3RemoteDB
+-SKIP
 -STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/httpfs/build/libhttpfs.kuzu_extension"
 ---- ok
 -STATEMENT CALL s3_access_key_id='${UW_S3_ACCESS_KEY_ID}'

diff --git a/src/include/processor/operator/hash_join/join_hash_table.h b/src/include/processor/operator/hash_join/join_hash_table.h
@@ -45,6 +45,7 @@ class JoinHashTable : public BaseHashTable {
     }
     uint8_t* getTupleForHash(common::hash_t hash) {
         auto slotIdx = getSlotIdxForHash(hash);
+        KU_ASSERT(slotIdx < maxNumHashSlots);
         return ((uint8_t**)(hashSlotsBlocks[slotIdx >> numSlotsPerBlockLog2]
                                 ->getData()))[slotIdx & slotIdxInBlockMask];
     }

diff --git a/src/processor/operator/intersect/intersect.cpp b/src/processor/operator/intersect/intersect.cpp
@@ -45,6 +45,9 @@ void Intersect::probeHTs() {
     for (auto i = 0u; i < probeKeyVectors.size(); i++) {
         KU_ASSERT(probeKeyVectors[i]->state->isFlat());
         probedFlatTuples[i].clear();
+        if (sharedHTs[i]->getHashTable()->getNumTuples() == 0) {
+            continue;
+        }
         auto key =
             probeKeyVectors[i]->getValue<nodeID_t>(probeKeyVectors[i]->state->getSelVector()[0]);
         function::Hash::operation<nodeID_t>(key, false, hashVal);

diff --git a/test/test_files/hint/hint.test b/test/test_files/hint/hint.test
@@ -60,4 +60,10 @@ Binder exception: Cannot bind x to a node or relationship pattern
 5|0|2
 5|0|3
 5|2|0
-5|3|0
+5|3|0
+-LOG EmptyWCOJBuild
+-STATEMENT MATCH (a:person)-[e:knows]->(b:person)-[e2:knows]->(c:person), (a)-[e3:knows]->(c)
+            WHERE e2.date > date("2024-10-10")
+            HINT (((a JOIN e) JOIN b) MULTI_JOIN e2 MULTI_JOIN e3) JOIN c
+            RETURN a.ID, b.ID, c.ID
+---- 0