lbug 0.12.3-dev.12 → 0.12.3-dev.14

package/lbug-source/.github/workflows/ci-workflow.yml

@@ -1152,6 +1152,9 @@ jobs:
     name: minimal test
     runs-on: ubuntu-latest
     needs: [ sanity-checks ]
+    env:
+      GEN: Ninja
+      USE_STD_FORMAT: 1
     steps:
       - uses: actions/checkout@v4
 
@@ -1159,12 +1162,14 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: minimal-test-${{ runner.os }}
+          max-size: 2G
+          restore-keys: minimal-test-
 
       - name: Build
-        run: make GEN=Ninja release USE_STD_FORMAT=1
+        run: make relwithdebinfo
 
       - name: Generate datasets
-        run: bash scripts/generate_binary_demo.sh
+        run: bash scripts/generate_binary_demo.sh --lbug-shell-mode relwithdebinfo
 
       - name: Install uv
         run: pip3 install uv
@@ -1210,6 +1215,8 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: minimal-extension-test-${{ runner.os }}
+          max-size: 2G
+          restore-keys: minimal-extension-test-
 
       - name: Update PostgreSQL host
         working-directory: extension/postgres/test/test_files

package/lbug-source/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(Lbug VERSION 0.12.3.12 LANGUAGES CXX C)
+project(Lbug VERSION 0.12.3.14 LANGUAGES CXX C)
 
 option(SINGLE_THREADED "Single-threaded mode" FALSE)
 if(SINGLE_THREADED)
@@ -14,15 +14,26 @@ endif()
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS TRUE)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 # On Linux, symbols in executables are not accessible by loaded shared libraries (e.g. via dlopen(3)). However, we need to export public symbols in executables so that extensions can access public symbols. This enables that behaviour.
 set(CMAKE_ENABLE_EXPORTS TRUE)
 
+# When building tests, we need all symbols visible so tests can link to the shared library
+# instead of static linking (which bloats binary sizes significantly)
+option(BUILD_TESTS "Build C++ tests." FALSE)
+option(BUILD_EXTENSION_TESTS "Build C++ extension tests." FALSE)
+if(BUILD_TESTS OR BUILD_EXTENSION_TESTS)
+    set(CMAKE_CXX_VISIBILITY_PRESET default)
+    set(CMAKE_C_VISIBILITY_PRESET default)
+    set(CMAKE_VISIBILITY_INLINES_HIDDEN OFF)
+else()
+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+    set(CMAKE_C_VISIBILITY_PRESET hidden)
+    set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+endif()
+
 option(ENABLE_WERROR "Treat all warnings as errors" FALSE)
 if(ENABLE_WERROR)
     if (CMAKE_VERSION VERSION_GREATER "3.24.0" OR CMAKE_VERSION VERSION_EQUAL "3.24.0")
@@ -302,8 +313,6 @@ option(BUILD_NODEJS "Build NodeJS API." FALSE)
 option(BUILD_PYTHON "Build Python API." FALSE)
 option(BUILD_SHELL "Build Interactive Shell" TRUE)
 option(BUILD_SINGLE_FILE_HEADER "Build single file header. Requires Python >= 3.9." TRUE)
-option(BUILD_TESTS "Build C++ tests." FALSE)
-option(BUILD_EXTENSION_TESTS "Build C++ extension tests." FALSE)
 option(BUILD_LBUG "Build Lbug." TRUE)
 option(ENABLE_BACKTRACES "Enable backtrace printing for exceptions and segfaults" FALSE)
 option(USE_STD_FORMAT "Use std::format instead of a custom formatter." FALSE)

package/lbug-source/Makefile

@@ -294,9 +294,8 @@ extension-release:
 		-DBUILD_LBUG=FALSE \
 	)
 
-# pytest expects a `Release` build path.
 shell-test:
-	$(call run-cmake-release, \
+	$(call run-cmake-relwithdebinfo, \
 		-DBUILD_SHELL=TRUE \
 	)
 	$(MAKE) -C tools/shell/test test

package/lbug-source/benchmark/serializer.py

@@ -95,17 +95,28 @@ if __name__ == '__main__':
     parser.add_argument("--single-thread",
                         help="If true, copy single threaded, which makes the results more reproducible",
                         action="store_true")
+    parser.add_argument("--lbug-shell-mode",
+                        help="debug, release or relwithdebinfo",
+                        default="release")
+    default_mode = "release"
     if sys.platform == "win32":
         default_lbug_exec_path = os.path.join(
-            base_dir, '..', 'build', 'release', 'tools', 'shell', 'lbug_shell')
+            base_dir, '..', 'build', default_mode, 'tools', 'shell', 'lbug_shell')
     else:
         default_lbug_exec_path = os.path.join(
-            base_dir, '..', 'build', 'release', 'tools', 'shell', 'lbug')
+            base_dir, '..', 'build', default_mode, 'tools', 'shell', 'lbug')
     parser.add_argument("--lbug-shell",
                         help="Path of the lbug shell executable. Defaults to the path as built in the default release build directory",
                         default=default_lbug_exec_path)
     args = parser.parse_args()
 
+    if args.lbug_shell == default_lbug_exec_path:
+        mode = args.lbug_shell_mode
+        if sys.platform == "win32":
+            args.lbug_shell = os.path.join(base_dir, '..', 'build', mode, 'tools', 'shell', 'lbug_shell')
+        else:
+            args.lbug_shell = os.path.join(base_dir, '..', 'build', mode, 'tools', 'shell', 'lbug')
+
     try:
         serialize(args.lbug_shell, args.dataset_name, args.dataset_path, args.serialized_graph_path,
                   args.benchmark_copy_log_dir, args.single_thread)

package/lbug-source/extension/httpfs/test/test_files/http.test

@@ -148,6 +148,7 @@ tinysnb1|LBUG
 ---- ok
 
 -CASE AttachNotExistPath
+-SKIP
 -LOAD_DYNAMIC_EXTENSION httpfs
 -STATEMENT attach 'http://localhost/dataset/databases/tinysnb1' as test (dbtype lbug)
 ---- error

package/lbug-source/scripts/generate_binary_demo.sh

@@ -2,4 +2,4 @@
 
 CD=`dirname "$0"`
 DATASET_DIR=$CD/../dataset
-python3 $CD/../benchmark/serializer.py DemoDB $DATASET_DIR/demo-db/parquet $DATASET_DIR/binary-demo --single-thread
+python3 $CD/../benchmark/serializer.py DemoDB $DATASET_DIR/demo-db/parquet $DATASET_DIR/binary-demo --single-thread $*

package/lbug-source/test/common/string_format.cpp

@@ -10,6 +10,7 @@ TEST(StringFormat, Basic) {
         "Some formatted data: a and 423");
 }
 
+#if !USE_STD_FORMAT
 TEST(StringFormat, Escape) {
     ASSERT_EQ(stringFormat("Escape this {{}} but not this {{ }}"),
         "Escape this {} but not this {{ }}");
@@ -29,6 +30,7 @@ TEST(StringFormat, TooManyArguments) {
 TEST(StringFormat, TooFewArguments) {
     ASSERT_THROW(stringFormat("Format with arguments {}"), InternalException);
 }
+#endif
 
 TEST(StringFormat, Format8BitTypes) {
     enum TestEnum : uint8_t {
@@ -38,7 +40,9 @@ TEST(StringFormat, Format8BitTypes) {
     char literal_character = 'a';
     TestEnum enum_val = TestEnum::NO;
     int8_t signed_int8 = 4;
-    ASSERT_EQ(stringFormat("{} {} {}", literal_character, enum_val, signed_int8), "a 1 4");
+    ASSERT_EQ(
+        stringFormat("{} {} {}", literal_character, static_cast<uint8_t>(enum_val), signed_int8),
+        "a 1 4");
 }
 
 TEST(StringFormat, FormatString) {
@@ -64,5 +68,9 @@ TEST(StringFormat, FormatIntegers) {
 TEST(StringFormat, FormatFloats) {
     float a = 2.3;
     double b = 5.4;
+#if USE_STD_FORMAT
+    ASSERT_EQ(stringFormat("{} {}", a, b), "2.3 5.4");
+#else
     ASSERT_EQ(stringFormat("{} {}", a, b), "2.300000 5.400000");
+#endif
 }

package/lbug-source/test/copy/copy_test.cpp

@@ -280,7 +280,7 @@ TEST_F(CopyTest, NodeInsertBMExceptionDuringCommitRecovery) {
         .executeFunc =
             [](main::Connection* conn, int) {
                 const auto queryString = common::stringFormat(
-                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {ID:i})", numValues);
+                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {{ID:i}})", numValues);
                 return conn->query(queryString);
             },
         .earlyExitOnFailureFunc = [](main::QueryResult*) { return false; },
@@ -300,7 +300,7 @@ TEST_F(CopyTest, RelInsertBMExceptionDuringCommitRecovery) {
                 conn->query("CREATE NODE TABLE account(ID INT64, PRIMARY KEY(ID))");
                 conn->query("CREATE REL TABLE follows(FROM account TO account);");
                 const auto queryString = common::stringFormat(
-                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {ID:i})", numNodes);
+                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {{ID:i}})", numNodes);
                 ASSERT_TRUE(conn->query(queryString)->isSuccess());
                 failureFrequency = 32;
             },
@@ -309,7 +309,7 @@ TEST_F(CopyTest, RelInsertBMExceptionDuringCommitRecovery) {
                 return conn->query(common::stringFormat(
                     "UNWIND RANGE(1,{}) AS i MATCH (a:account), (b:account) WHERE a.ID = i AND "
                     "b.ID = i + 1 CREATE (a)-[f:follows]->(b)",
-                    numNodes));
+                    numNodes - 1));
             },
         .earlyExitOnFailureFunc = [](main::QueryResult*) { return false; },
         .checkFunc =
@@ -407,7 +407,7 @@ TEST_F(CopyTest, NodeInsertBMExceptionDuringCheckpointRecovery) {
         .executeFunc =
             [](main::Connection* conn, int) {
                 return conn->query(common::stringFormat(
-                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {ID:i})", numValues));
+                    "UNWIND RANGE(1,{}) AS i CREATE (a:account {{ID:i}})", numValues));
             },
         .earlyExitOnFailureFunc = [](main::QueryResult*) { return true; },
         .checkFunc =

package/lbug-source/test/graph_test/CMakeLists.txt

@@ -8,7 +8,7 @@ target_include_directories(
         PUBLIC
         ../include/
 )
-target_link_libraries(graph_test PUBLIC GTEST_LIB lbug)
+target_link_libraries(graph_test PUBLIC GTEST_LIB lbug_shared)
 
 add_library(
         api_graph_test

package/lbug-source/test/test_helper/CMakeLists.txt

@@ -8,7 +8,7 @@ target_include_directories(
         PUBLIC
         ../include/
 )
-target_link_libraries(test_helper PUBLIC lbug)
+target_link_libraries(test_helper PUBLIC lbug_shared)
 
 add_library(
         api_test_helper

package/lbug-source/test/test_runner/CMakeLists.txt

@@ -15,4 +15,4 @@ target_include_directories(
         ../include/
 )
 
-target_link_libraries(test_runner PUBLIC GTEST_LIB lbug)
+target_link_libraries(test_runner PUBLIC GTEST_LIB lbug_shared)

package/lbug-source/test/test_runner/insert_by_row.cpp

@@ -111,23 +111,21 @@ std::string InsertDatasetByRow::TableInfo::getBodyForLoad() const {
 }
 
 std::string InsertDatasetByRow::NodeTableInfo::getLoadFromQuery() const {
-    const std::string query = "LOAD WITH HEADERS ({}) FROM {} "
-                              "CREATE (:{} {});";
     const auto header = getHeaderForLoad();
     const auto body = getBodyForLoad();
-    return stringFormat(query, header, filePath, name, "{" + body + "}");
+    return stringFormat("LOAD WITH HEADERS ({}) FROM {} CREATE (:{} {{{}}});", header, filePath,
+        name, body);
 }
 
 std::string InsertDatasetByRow::RelTableInfo::getLoadFromQuery() const {
-    const std::string query = "LOAD WITH HEADERS ({}) FROM {} "
-                              "MATCH (a:{}), (b:{}) WHERE a.{} = aid_ AND b.{} = bid_ "
-                              "CREATE (a)-[:{} {}]->(b);";
     auto header = stringFormat("aid_ {},bid_ {}", from.type, to.type);
     auto headerRest = getHeaderForLoad();
     header += headerRest.length() == 0 ? "" : "," + getHeaderForLoad();
     const auto body = getBodyForLoad();
-    return stringFormat(query, header, filePath, from.name, to.name, from.property, to.property,
-        name, "{" + body + "}");
+    return stringFormat("LOAD WITH HEADERS ({}) FROM {} "
+                        "MATCH (a:{}), (b:{}) WHERE a.{} = aid_ AND b.{} = bid_ "
+                        "CREATE (a)-[:{} {{{}}}]->(b);",
+        header, filePath, from.name, to.name, from.property, to.property, name, body);
 }
 
 } // namespace testing

package/lbug-source/test/test_runner/multi_copy_split.cpp

@@ -62,8 +62,7 @@ void SplitMultiCopyRandom::init() {
 
     const std::string tmpDir = TestHelper::getTempDir("multi_copy");
     auto totalFilePath = TestHelper::joinPath(tmpDir, tableName + ".csv");
-    std::string loadQuery = "COPY (LOAD FROM {} RETURN *) TO '{}';";
-    loadQuery = stringFormat(loadQuery, source, totalFilePath);
+    auto loadQuery = stringFormat("COPY (LOAD FROM {} RETURN *) TO '{}';", source, totalFilePath);
     spdlog::info("QUERY: {}", loadQuery);
     validateQuery(connection, loadQuery);
 
@@ -96,9 +95,8 @@ void SplitMultiCopyRandom::init() {
 }
 
 void SplitMultiCopyRandom::run() {
-    const std::string query = "COPY {} FROM \"{}\";";
     for (auto file : splitFilePaths) {
-        auto currQuery = stringFormat(query, tableName, file);
+        auto currQuery = stringFormat("COPY {} FROM \"{}\";", tableName, file);
         spdlog::info("QUERY: {}", currQuery);
         validateQuery(connection, currQuery);
     }

package/lbug-source/test/transaction/checkpoint_test.cpp

@@ -37,7 +37,7 @@ public:
         conn->query("CALL auto_checkpoint=false");
         conn->query("CREATE NODE TABLE test(id INT64 PRIMARY KEY, name STRING);");
         for (auto i = 0; i < 5000; i++) {
-            conn->query(stringFormat("CREATE (a:test {id: {}, name: 'name_{}'});", i, i));
+            conn->query(stringFormat("CREATE (a:test {{id: {}, name: 'name_{}'}});", i, i));
         }
         auto context = getClientContext(*conn);
         flakyCheckpointer.setCheckpointer(*context);

package/lbug-source/test/transaction/transaction_test.cpp

@@ -138,7 +138,8 @@ static void insertNodes(uint64_t startID, uint64_t num, lbug::main::Database& da
     auto conn = std::make_unique<lbug::main::Connection>(&database);
     for (uint64_t i = 0; i < num; ++i) {
         auto id = startID + i;
-        auto res = conn->query(stringFormat("CREATE (:test {id: {}, name: 'Person{}'});", id, id));
+        auto res =
+            conn->query(stringFormat("CREATE (:test {{id: {}, name: 'Person{}'}});", id, id));
         ASSERT_TRUE(res->isSuccess())
             << "Failed to insert test" << id << ": " << res->getErrorMessage();
     }
@@ -181,7 +182,7 @@ static void insertNodesWithMixedTypes(uint64_t startID, uint64_t num,
         auto score = 95.5 + (id % 10);
         auto isActive = (id % 2 == 0) ? "true" : "false";
         auto res = conn->query(
-            stringFormat("CREATE (:mixed_test {id: {}, score: {}, active: {}, name: 'User{}'});",
+            stringFormat("CREATE (:mixed_test {{id: {}, score: {}, active: {}, name: 'User{}'}});",
                 id, score, isActive, id));
         ASSERT_TRUE(res->isSuccess())
             << "Failed to insert mixed_test" << id << ": " << res->getErrorMessage();
@@ -227,7 +228,7 @@ static void insertRelationships(uint64_t startID, uint64_t num, lbug::main::Data
         auto toID = (startID + i + 1) % (num * 4);
         auto weight = 1.0 + (i % 10) * 0.1;
         auto res = conn->query(stringFormat("MATCH (a:person), (b:person) WHERE a.id = {} AND b.id "
-                                            "= {} CREATE (a)-[:knows {weight: {}}]->(b);",
+                                            "= {} CREATE (a)-[:knows {{weight: {}}}]->(b);",
             fromID, toID, weight));
         ASSERT_TRUE(res->isSuccess()) << "Failed to insert relationship from " << fromID << " to "
                                       << toID << ": " << res->getErrorMessage();
@@ -248,7 +249,8 @@ TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipInsertions) {
 
     conn->query("BEGIN TRANSACTION;");
     for (auto i = 0; i < numTotalInsertions; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:person {id: {}, name: 'Person{}'});", i, i));
+        auto res =
+            conn->query(stringFormat("CREATE (:person {{id: {}, name: 'Person{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
     conn->query("COMMIT;");
@@ -286,7 +288,7 @@ static void insertComplexRelationships(uint64_t startID, uint64_t num,
         auto isVerified = (i % 3 == 0) ? "true" : "false";
         auto res =
             conn->query(stringFormat("MATCH (u:user), (p:product) WHERE u.id = {} AND p.id = {} "
-                                     "CREATE (u)-[:rates {rating: {}, verified: {}}]->(p);",
+                                     "CREATE (u)-[:rates {{rating: {}, verified: {}}}]->(p);",
                 userID, productID, rating, isVerified));
         ASSERT_TRUE(res->isSuccess())
             << "Failed to insert rating from user " << userID << " to product " << productID << ": "
@@ -309,12 +311,12 @@ TEST_F(EmptyDBTransactionTest, ConcurrentComplexRelationshipInsertions) {
 
     conn->query("BEGIN TRANSACTION;");
     for (auto i = 0; i < numTotalInsertions; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:user {id: {}, name: 'User{}'});", i, i));
+        auto res = conn->query(stringFormat("CREATE (:user {{id: {}, name: 'User{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
     for (auto i = 0; i < numTotalInsertions * 2; ++i) {
         auto res =
-            conn->query(stringFormat("CREATE (:product {id: {}, title: 'Product{}'});", i, i));
+            conn->query(stringFormat("CREATE (:product {{id: {}, title: 'Product{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
     conn->query("COMMIT;");
@@ -367,7 +369,7 @@ TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdates) {
 
     // First insert all nodes
     for (auto i = 0; i < numTotalNodes; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:test {id: {}, name: 'Person{}'});", i, i));
+        auto res = conn->query(stringFormat("CREATE (:test {{id: {}, name: 'Person{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
 
@@ -429,8 +431,8 @@ TEST_F(EmptyDBTransactionTest, ConcurrentMixedTypeUpdates) {
         auto score = 95.5 + (i % 10);
         auto isActive = (i % 2 == 0) ? "true" : "false";
         auto res = conn->query(
-            stringFormat("CREATE (:mixed_test {id: {}, score: {}, active: {}, name: 'User{}'});", i,
-                score, isActive, i));
+            stringFormat("CREATE (:mixed_test {{id: {}, score: {}, active: {}, name: 'User{}'}});",
+                i, score, isActive, i));
         ASSERT_TRUE(res->isSuccess());
     }
 
@@ -503,7 +505,8 @@ TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdates) {
 
     // Create nodes
     for (auto i = 0; i < numTotalUpdates; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:person {id: {}, name: 'Person{}'});", i, i));
+        auto res =
+            conn->query(stringFormat("CREATE (:person {{id: {}, name: 'Person{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
 
@@ -513,7 +516,7 @@ TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdates) {
         auto toID = (i + 1) % numTotalUpdates;
         auto weight = 1.0 + (i % 10) * 0.1;
         auto res = conn->query(stringFormat("MATCH (a:person), (b:person) WHERE a.id = {} AND b.id "
-                                            "= {} CREATE (a)-[:knows {weight: {}}]->(b);",
+                                            "= {} CREATE (a)-[:knows {{weight: {}}}]->(b);",
             fromID, toID, weight));
         ASSERT_TRUE(res->isSuccess());
     }
@@ -577,7 +580,7 @@ TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdatesWithMixedTransactions) {
 
     // Insert initial nodes
     for (auto i = 0; i < numTotalNodes; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:test {id: {}, name: 'Person{}'});", i, i));
+        auto res = conn->query(stringFormat("CREATE (:test {{id: {}, name: 'Person{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
 
@@ -650,7 +653,8 @@ TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdatesWithMixedTransaction
 
     // Create nodes
     for (auto i = 0; i < numTotalUpdates; ++i) {
-        auto res = conn->query(stringFormat("CREATE (:person {id: {}, name: 'Person{}'});", i, i));
+        auto res =
+            conn->query(stringFormat("CREATE (:person {{id: {}, name: 'Person{}'}});", i, i));
         ASSERT_TRUE(res->isSuccess());
     }
 
@@ -660,7 +664,7 @@ TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdatesWithMixedTransaction
         auto toID = i;
         auto weight = 20.0;
         auto res = conn->query(stringFormat("MATCH (a:person), (b:person) WHERE a.id = {} AND b.id "
-                                            "= {} CREATE (a)-[:knows {weight: {}}]->(b);",
+                                            "= {} CREATE (a)-[:knows {{weight: {}}}]->(b);",
             fromID, toID, weight));
         ASSERT_TRUE(res->isSuccess());
     }

package/lbug-source/tools/shell/test/test_helper.py

@@ -11,7 +11,7 @@ if sys.platform == "win32":
 LBUG_EXEC_PATH = os.path.join(
     LBUG_ROOT,
     "build",
-    "release",
+    "relwithdebinfo",
     "tools",
     "shell",
     "lbug",

package/package.json

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