OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-matrix commits / ecdc090

Port unit test from PostgreSQL to RocksDB
ecdc090235b0fe9a1587394fb349b98f917471fa
by Linas Vepstas <linasvepstas@gmail.com> · 2025-10-10T14:40:01.000Z

Changed files (2) +33 -16

tests/matrix/CMakeLists.txt +14 -3
……@@ -11,13 +11,24 @@ LINK_DIRECTORIES(
1111)
1212
1313LINK_LIBRARIES(
14 # persist-sql
1514 ${ATOMSPACE_LIBRARIES}
1615 ${COGUTIL_LIBRARY}
1716)
1817
19IF (HAVE_ATOMSPACE_PGRES)
18# Check if RocksStorage is available by trying to load the Guile module
19EXECUTE_PROCESS(
20 COMMAND guile -c "(use-modules (opencog persist-rocks))"
21 RESULT_VARIABLE ROCKS_MODULE_RESULT
22 OUTPUT_QUIET ERROR_QUIET
23)
24
25IF (ROCKS_MODULE_RESULT EQUAL 0)
26 SET(HAVE_ROCKS_STORAGE 1)
27 ADD_DEFINITIONS(-DHAVE_ROCKS_STORAGE)
28 MESSAGE(STATUS "RocksStorage found - enabling storage tests")
2029 ADD_CXXTEST(VectorAPIUTest)
21ENDIF (HAVE_ATOMSPACE_PGRES)
30ELSE ()
31 MESSAGE(STATUS "RocksStorage not found - skipping storage tests")
32ENDIF ()
2233
2334ADD_GUILE_TEST(MarginalTest marginal-test.scm)
tests/matrix/VectorAPIUTest.cxxtest +19 -13
……@@ -64,7 +64,7 @@ class VectorAPIUTest : public CxxTest::TestSuite
6464 void test_marginals(void);
6565 void test_fast(void);
6666 void test_cosines(void);
67 void xtest_dynamic(void);
67 void test_dynamic(void);
6868 void test_fold(void);
6969 void test_transpose(void);
7070 void test_symmetric_mi(void);
……@@ -164,7 +164,7 @@ void VectorAPIUTest::test_basic(void)
164164
165165void VectorAPIUTest::test_marginals(void)
166166{
167#ifdef HAVE_SQL_STORAGE
167#ifdef HAVE_ROCKS_STORAGE
168168 logger().debug("BEGIN TEST: %s", __FUNCTION__);
169169
170170 std::string rc = eval->eval("(load-from-path \"tests/matrix/basic-data.scm\")");
……@@ -173,10 +173,13 @@ void VectorAPIUTest::test_marginals(void)
173173
174174 // -------------------------------------------------------------
175175 // Where the data will go
176 rc = eval->eval("(use-modules (opencog persist-sql))");
176 rc = eval->eval("(use-modules (opencog persist-rocks))");
177177 CHKERR;
178178
179 rc = eval->eval("(sql-open \"postgres:///opencog_test?user=opencog_tester&password=cheese\")");
179 rc = eval->eval("(define rsn (RocksStorageNode \"rocks:///tmp/vector-api-utest-marginals/\"))");
180 CHKERR;
181
182 rc = eval->eval("(cog-open rsn)");
180183 CHKERR;
181184
182185 // Compute and store all marginals
……@@ -184,7 +187,7 @@ void VectorAPIUTest::test_marginals(void)
184187 printf("Batch >>>%s", rc.c_str());
185188 CHKERR;
186189
187 rc = eval->eval("(sql-close)");
190 rc = eval->eval("(cog-close rsn)");
188191 CHKERR;
189192
190193 printf("---------------------------------------------------------\n");
……@@ -410,7 +413,7 @@ void VectorAPIUTest::test_marginals(void)
410413 CHKFLT("report total mi", num, chmi+domi+tami);
411414
412415 logger().debug("END TEST: %s", __FUNCTION__);
413#endif // HAVE_SQL_STORAGE
416#endif // HAVE_ROCKS_STORAGE
414417}
415418
416419// ====================================================================
……@@ -511,17 +514,20 @@ void VectorAPIUTest::test_cosines(void)
511514
512515// ====================================================================
513516
514// Make sure data can be fetched from SQL
515void VectorAPIUTest::xtest_dynamic(void)
517// Make sure data can be fetched from RocksStorage
518void VectorAPIUTest::test_dynamic(void)
516519{
517#ifdef HAVE_SQL_STORAGE
520#ifdef HAVE_ROCKS_STORAGE
518521 logger().debug("BEGIN TEST: %s", __FUNCTION__);
519522
520523 // Where the data comes from.
521 std::string rc = eval->eval("(use-modules (opencog persist-sql))");
524 std::string rc = eval->eval("(use-modules (opencog persist-rocks))");
525 CHKERR;
526
527 rc = eval->eval("(define rsn (RocksStorageNode \"rocks:///tmp/vector-api-utest-dynamic/\"))");
522528 CHKERR;
523529
524 rc = eval->eval("(sql-open \"postgres:///opencog_test?user=opencog_tester&password=cheese\")");
530 rc = eval->eval("(cog-open rsn)");
525531 CHKERR;
526532
527533 std::string num = eval->eval("(dosi 'right-product (Word \"table\") (Word \"dog\"))");
……@@ -536,11 +542,11 @@ void VectorAPIUTest::xtest_dynamic(void)
536542 double pchdo = 3.0*4.0 + 2.0*2.0;
537543 CHKFLT("dynamic product (chicken,dog)", num, pchdo);
538544
539 rc = eval->eval("(sql-close)");
545 rc = eval->eval("(cog-close rsn)");
540546 CHKERR;
541547
542548 logger().debug("END TEST: %s", __FUNCTION__);
543#endif // HAVE_SQL_STORAGE
549#endif // HAVE_ROCKS_STORAGE
544550}
545551
546552// ====================================================================