lbug 0.12.3-dev.25 → 0.12.3-dev.27

package/lbug-source/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(Lbug VERSION 0.12.3.25 LANGUAGES CXX C)
+project(Lbug VERSION 0.12.3.27 LANGUAGES CXX C)
 
 option(SINGLE_THREADED "Single-threaded mode" FALSE)
 if(SINGLE_THREADED)

package/lbug-source/src/processor/operator/index_lookup.cpp

@@ -28,7 +28,6 @@ std::optional<WarningSourceData> getWarningSourceData(
     return ret;
 }
 
-// TODO(Guodong): Add short path for unfiltered case.
 bool checkNullKey(ValueVector* keyVector, offset_t vectorOffset,
     BatchInsertErrorHandler* errorHandler, const std::vector<ValueVector*>& warningDataVectors) {
     bool isNull = keyVector->isNull(vectorOffset);
@@ -71,27 +70,17 @@ struct OffsetVectorManager {
     offset_t insertOffset;
 };
 
-// TODO(Guodong): Add short path for unfiltered case.
 template<bool hasNoNullsGuarantee>
-void fillOffsetArraysFromVector(transaction::Transaction* transaction, const IndexLookupInfo& info,
-    ValueVector* keyVector, ValueVector* resultVector,
-    const std::vector<ValueVector*>& warningDataVectors, BatchInsertErrorHandler* errorHandler) {
-    KU_ASSERT(resultVector->dataType.getPhysicalType() == PhysicalTypeID::INT64);
+void fillOffsetArraysFromVectorInternal(transaction::Transaction* transaction,
+    const IndexLookupInfo& info, ValueVector* keyVector, ValueVector* resultVector,
+    const std::vector<ValueVector*>& warningDataVectors, BatchInsertErrorHandler* errorHandler,
+    const sel_t* selVector, sel_t numKeys) {
     TypeUtils::visit(
         keyVector->dataType.getPhysicalType(),
         [&]<IndexHashable T>(T) {
-            auto numKeys = keyVector->state->getSelVector().getSelSize();
-
-            // fetch all the selection pos at the start
-            // since we may modify the selection vector in the middle of the lookup
-            std::vector<sel_t> lookupPos(numKeys);
-            for (idx_t i = 0; i < numKeys; ++i) {
-                lookupPos[i] = (keyVector->state->getSelVector()[i]);
-            }
-
             OffsetVectorManager resultManager{resultVector, errorHandler};
-            for (auto i = 0u; i < numKeys; i++) {
-                auto pos = lookupPos[i];
+            for (sel_t i = 0u; i < numKeys; i++) {
+                auto pos = selVector ? selVector[i] : i;
                 if constexpr (!hasNoNullsGuarantee) {
                     if (!checkNullKey(keyVector, pos, errorHandler, warningDataVectors)) {
                         continue;
@@ -99,12 +88,9 @@ void fillOffsetArraysFromVector(transaction::Transaction* transaction, const Ind
                 }
                 offset_t lookupOffset = 0;
                 if (!info.nodeTable->lookupPK(transaction, keyVector, pos, lookupOffset)) {
-                    TypeUtils::visit(keyVector->dataType, [&]<typename type>(type) {
-                        errorHandler->handleError(
-                            ExceptionMessage::nonExistentPKException(
-                                TypeUtils::toString(keyVector->getValue<type>(pos), keyVector)),
-                            getWarningSourceData(warningDataVectors, pos));
-                    });
+                    errorHandler->handleError(ExceptionMessage::nonExistentPKException(
+                                                  keyVector->getAsValue(pos)->toString()),
+                        getWarningSourceData(warningDataVectors, pos));
                 } else {
                     resultManager.insertEntry(lookupOffset, pos);
                 }
@@ -112,6 +98,28 @@ void fillOffsetArraysFromVector(transaction::Transaction* transaction, const Ind
         },
         [&](auto) { KU_UNREACHABLE; });
 }
+
+template<bool hasNoNullsGuarantee>
+void fillOffsetArraysFromVector(transaction::Transaction* transaction, const IndexLookupInfo& info,
+    ValueVector* keyVector, ValueVector* resultVector,
+    const std::vector<ValueVector*>& warningDataVectors, BatchInsertErrorHandler* errorHandler) {
+    KU_ASSERT(resultVector->dataType.getPhysicalType() == PhysicalTypeID::INT64);
+    auto& selVector = keyVector->state->getSelVector();
+    auto numKeys = selVector.getSelSize();
+    if (selVector.isUnfiltered()) {
+        // Fast path: selection vector is unfiltered - pass a null selection vector
+        fillOffsetArraysFromVectorInternal<hasNoNullsGuarantee>(transaction, info, keyVector,
+            resultVector, warningDataVectors, errorHandler, nullptr /* selVector */, numKeys);
+    } else {
+        // Filtered case: copy selection positions since we may modify the selection vector
+        std::vector<sel_t> lookupPos(numKeys);
+        for (idx_t i = 0; i < numKeys; ++i) {
+            lookupPos[i] = selVector[i];
+        }
+        fillOffsetArraysFromVectorInternal<hasNoNullsGuarantee>(transaction, info, keyVector,
+            resultVector, warningDataVectors, errorHandler, lookupPos.data(), numKeys);
+    }
+}
 } // namespace
 
 std::string IndexLookupPrintInfo::toString() const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lbug",
-  "version": "0.12.3-dev.25",
+  "version": "0.12.3-dev.27",
   "description": "An in-process property graph database management system built for query speed and scalability.",
   "main": "index.js",
   "module": "./index.mjs",