lbug 0.12.3-dev.18 → 0.12.3-dev.19

package/lbug-source/CMakeLists.txt

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

package/lbug-source/benchmark/serializer.py

@@ -39,7 +39,17 @@ def serialize(lbug_exec_path, dataset_name, dataset_path, serialized_graph_path,
         with open(os.path.join(dataset_path, 'schema.cypher'), 'r') as f:
             serialize_queries += f.readlines()
         with open(os.path.join(dataset_path, 'copy.cypher'), 'r') as f:
-            serialize_queries += f.readlines()
+            copy_lines = f.readlines()
+        # Fix relative paths in copy.cypher
+        for line in copy_lines:
+            # Replace quoted paths with absolute paths
+            def replace_path(match):
+                path = match.group(1)
+                if not os.path.isabs(path):
+                    return '"' + os.path.join(dataset_path, path) + '"'
+                return match.group(0)
+            fixed_line = re.sub(r'"([^"]*)"', replace_path, line)
+            serialize_queries.append(fixed_line.strip())
     else:
         with open(os.path.join(base_dir, 'serialize.cypher'), 'r') as f:
             serialize_queries += f.readlines()

package/lbug-source/dataset/demo-db/csv/copy.cypher

@@ -1,4 +1,4 @@
-COPY User From "dataset/demo-db/csv/user.csv"
-COPY City FROM "dataset/demo-db/csv/city.csv"
-COPY Follows FROM "dataset/demo-db/csv/follows.csv"
-COPY LivesIn FROM "dataset/demo-db/csv/lives-in.csv"
+COPY User From "user.csv"
+COPY City FROM "city.csv"
+COPY Follows FROM "follows.csv"
+COPY LivesIn FROM "lives-in.csv"

package/lbug-source/dataset/demo-db/parquet/copy.cypher

@@ -1,4 +1,4 @@
-COPY User From "dataset/demo-db/parquet/user.parquet";
-COPY City FROM "dataset/demo-db/parquet/city.parquet";
-COPY Follows FROM "dataset/demo-db/parquet/follows.parquet";
-COPY LivesIn FROM "dataset/demo-db/parquet/lives-in.parquet";
+COPY User From "user.parquet";
+COPY City FROM "city.parquet";
+COPY Follows FROM "follows.parquet";
+COPY LivesIn FROM "lives-in.parquet";

package/lbug-source/test/test_helper/test_helper.cpp

@@ -32,6 +32,7 @@ void TestHelper::executeScript(const std::string& cypherScript, Connection& conn
         std::cout << "cypherScript: " << cypherScript << " doesn't exist. Skipping..." << std::endl;
         return;
     }
+    auto cypherDir = std::filesystem::path(cypherScript).parent_path();
     std::ifstream file(cypherScript);
     if (!file.is_open()) {
         throw Exception(stringFormat("Error opening file: {}, errno: {}.", cypherScript, errno));
@@ -68,7 +69,14 @@ void TestHelper::executeScript(const std::string& cypherScript, Connection& conn
             index = end + 1;
         }
         for (auto& csvFilePath : csvFilePaths) {
-            auto fullPath = appendLbugRootPath(csvFilePath);
+            std::string fullPath = csvFilePath;
+            if (std::filesystem::path(csvFilePath).is_relative()) {
+                if (std::filesystem::path(csvFilePath).parent_path().empty()) {
+                    fullPath = (cypherDir / csvFilePath).string();
+                } else {
+                    fullPath = appendLbugRootPath(csvFilePath);
+                }
+            }
             line.replace(line.find(csvFilePath), csvFilePath.length(), fullPath);
         }
         // Also handle storage = 'path' for parquet tables

package/lbug-source/tools/shell/embedded_shell.cpp

@@ -271,6 +271,22 @@ void completion(const char* buffer, linenoiseCompletions* lc) {
         return;
     }
 
+    // RETURN *; completion for MATCH and CALL queries.
+    // Trigger when buffer ends with ')' or ') ' after a MATCH pattern or CALL function.
+    if (regex_search(buf, std::regex(R"(\)\s*$)"))) {
+        // Check for MATCH pattern: MATCH(var:Table) or MATCH (var:Table)
+        bool isMatchQuery =
+            regex_search(buf, std::regex(R"(^\s*MATCH\s*\()", std::regex_constants::icase));
+        // Check for CALL function: CALL func_name(...) or CALL func_name (...)
+        bool isCallFunction =
+            regex_search(buf, std::regex(R"(^\s*CALL\s+\w+\s*\()", std::regex_constants::icase));
+        if (isMatchQuery || isCallFunction) {
+            std::string suffix = buf.back() == ')' ? " RETURN *;" : "RETURN *;";
+            linenoiseAddCompletion(lc, (buf + suffix).c_str());
+            return;
+        }
+    }
+
     // Node table name completion. Match patterns that include an open bracket `(` with no closing
     // bracket `)`, and a colon `:` sometime after the open bracket.
     if (regex_search(buf, std::regex("^[^]*\\([^\\)]*:[^\\)]*$"))) {

package/package.json

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