bloomberg · akshatsikarwar · Feb 21, 2025 · Feb 20, 2025 · Feb 21, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,12 +52,14 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
   endif()
 endif()
 
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
 if(COMDB2_BBCMAKE)
   include(${COMDB2_BBCMAKE})
-  add_definitions(-DCOMDB2_BBCMAKE)
 else()
-configure_file(bbinc/plhash.in bbinc/plhash.h COPYONLY)
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${PROJECT_SOURCE_DIR}/cmake)
+  configure_file(bbinc/plhash.in bbinc/plhash.h COPYONLY)
+endif()
+
 find_package(LZ4 REQUIRED)
 find_package(OpenSSL REQUIRED)
 set(PROTOBUF_C_MIN_VERSION 1.1.0)
@@ -83,8 +85,6 @@ if(WITH_QKAFKA)
   add_definitions(-DWITH_QKAFKA)
 endif()
 
-endif(COMDB2_BBCMAKE)
-
 option(COMDB2_LEGACY_DEFAULTS "Legacy defaults without lrl override" OFF)
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

diff --git a/bbinc/plhash_glue.h b/bbinc/plhash_glue.h
@@ -1,6 +1,7 @@
 #ifndef INCLUDED_PLHASH_GLUE_H
 #define INCLUDED_PLHASH_GLUE_H
 #include <plhash.h>
+
 /* Following are not available in sysutil */
 hash_t *hash_init_ptr(void); /* hash of pointers (addresses) */
 hash_t *hash_init_strcase(int keyoff); /* string starts at keyoff (case-insensitive) */

diff --git a/bbinc/tunables.h b/bbinc/tunables.h
@@ -17,7 +17,7 @@
 #ifndef _TUNABLES_H
 #define _TUNABLES_H
 
-#include "plhash.h"
+#include <plhash_glue.h>
 
 typedef enum {
     /*

diff --git a/bdb/CMakeLists.txt b/bdb/CMakeLists.txt
@@ -111,7 +111,6 @@ include_directories(
   ${PROTOBUF-C_INCLUDE_DIR}
 )
 if (COMDB2_BBCMAKE)
-  target_link_libraries(bdb PUBLIC db lz4)
-  configure_bb_target(bdb V2 NO_BUILDID NO_PLINKSTRINGS HEADER_DIRS)
+  comdb2_lib_target(bdb)
 endif()
 add_dependencies(bdb db mem proto)
diff --git a/bdb/bdb_int.h b/bdb/bdb_int.h
@@ -30,7 +30,7 @@
 
 #include <object_pool.h>
 #include <list.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <thread_util.h>
 
 #include "bdb_cursor.h"

diff --git a/bdb/cursor.c b/bdb/cursor.c
@@ -90,7 +90,7 @@ as long as there was a successful move in the past
 #include "bdb_osqltrn.h"
 #include <dlfcn.h>
 #include <list.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "logmsg.h"
 #include "util.h"
 #include "tohex.h"

diff --git a/bdb/genid.c b/bdb/genid.c
@@ -49,7 +49,7 @@
 #include <build/db.h>
 #include <epochlib.h>
 #include <ctrace.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <list.h>
 
 #include <net.h>

diff --git a/bdb/rowlocks.c b/bdb/rowlocks.c
@@ -16,7 +16,7 @@
 
 #include <segstr.h>
 #include <list.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <fsnapf.h>
 
 #include <net.h>
@@ -2308,7 +2308,7 @@ int handle_undo_add_dta(DB_ENV *dbenv, u_int32_t rectype,
         /* keep format similar to berkeley - except for the raw data -
            dump that in more readable format */
         printf("[%lu][%lu] CUSTOM: add_dta: rec: %lu txnid %lx"
-               " prevlsn[%lu][%lu] utxnid \%"PRIx64" prevllsn[%lu][%lu] tranid %016" PRIx64,
+               " prevlsn[%lu][%lu] utxnid %"PRIx64" prevllsn[%lu][%lu] tranid %016" PRIx64,
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)addop->txnid->txnid, (u_long)addop->prev_lsn.file,
                (u_long)addop->prev_lsn.offset, addop->txnid->utxnid, (u_long)lprev->file,
@@ -2403,7 +2403,7 @@ int handle_undo_add_dta_lk(DB_ENV *dbenv, u_int32_t rectype,
         /* keep format similar to berkeley - except for the raw data -
            dump that in more readable format */
         printf("[%lu][%lu] CUSTOM: add_dta_lk: rec: %lu txnid %lx"
-               " prevlsn[%lu][%lu] utxnid \%"PRIx64" prevllsn[%lu][%lu] tranid %016" PRIx64,
+               " prevlsn[%lu][%lu] utxnid %"PRIx64" prevllsn[%lu][%lu] tranid %016" PRIx64,
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)addop->txnid->txnid, (u_long)addop->prev_lsn.file,
                (u_long)addop->prev_lsn.offset, addop->txnid->utxnid, (u_long)lprev->file,
@@ -2504,7 +2504,7 @@ int handle_undo_add_ix(DB_ENV *dbenv, u_int32_t rectype,
         /* keep format similar to berkeley - except for the raw data -
            dump that in more readable format */
         printf("[%lu][%lu] CUSTOM: add_ix: %lu txnid %lx prevlsn[%lu][%lu]  "
-               "prevllsn[%lu][%lu] utxnid \%"PRIx64" tranid %016" PRIx64 "\n",
+               "prevllsn[%lu][%lu] utxnid %"PRIx64" tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)addop->txnid->txnid, (u_long)addop->prev_lsn.file,
                (u_long)addop->prev_lsn.offset, (u_long)lprev->file,
@@ -2593,7 +2593,7 @@ int handle_undo_add_ix_lk(DB_ENV *dbenv, u_int32_t rectype,
         /* keep format similar to berkeley - except for the raw data -
            dump that in more readable format */
         printf("[%lu][%lu] CUSTOM: add_ix_lk: %lu txnid %lx prevlsn[%lu][%lu]  "
-               "prevllsn[%lu][%lu] utxnid \%"PRIx64" tranid %016" PRIx64 "\n",
+               "prevllsn[%lu][%lu] utxnid %"PRIx64" tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)addop->txnid->txnid, (u_long)addop->prev_lsn.file,
                (u_long)addop->prev_lsn.offset, (u_long)lprev->file,
@@ -2716,7 +2716,7 @@ int handle_commit(DB_ENV *dbenv, u_int32_t rectype,
         lprev = &args->prevllsn;
         /* keep format similar to berkeley - except for the raw data -
            dump that in more readable format */
-        printf("[%lu][%lu] CUSTOM: %s: %lu txnid %lx prevlsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: %s: %lu txnid %lx prevlsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu] tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset,
                args->isabort ? "abort" : "commit", (u_long)rectype,
@@ -2775,7 +2775,7 @@ int handle_start(DB_ENV *dbenv, u_int32_t rectype, llog_ltran_start_args *args,
 
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
-        printf("[%lu][%lu] CUSTOM: start: %lu txnid %lx prevlsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: start: %lu txnid %lx prevlsn[%lu][%lu] utxnid %"PRIx64" "
                "tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)args->txnid->txnid, (u_long)args->prev_lsn.file,
@@ -2824,7 +2824,7 @@ int handle_comprec(DB_ENV *dbenv, u_int32_t rectype,
 
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
-        printf("[%lu][%lu] CUSTOM: comprec: %lu txnid %lx prevlsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: comprec: %lu txnid %lx prevlsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu] tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)args->txnid->txnid, (u_long)args->prev_lsn.file,
@@ -3091,7 +3091,7 @@ int handle_undo_del_dta(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &delop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: del_dta %lu txnid %lx prevlsn[%lu][%lu] utxnid \%"PRIx64" " 
+        printf("[%lu][%lu] CUSTOM: del_dta %lu txnid %lx prevlsn[%lu][%lu] utxnid %"PRIx64" " 
                "prevllsn[%lu][%lu]  tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)delop->txnid->txnid, (u_long)delop->prev_lsn.file,
@@ -3168,7 +3168,7 @@ int handle_undo_del_ix(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &delop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: del_ix %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: del_ix %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)delop->txnid->txnid, (u_long)delop->prev_lsn.file,
@@ -3247,7 +3247,7 @@ int handle_undo_upd_dta(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &updop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: upd_dta %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: upd_dta %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)updop->txnid->txnid, (u_long)updop->prev_lsn.file,
@@ -3347,7 +3347,7 @@ int handle_undo_upd_ix(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &updop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: upd_ix %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: upd_ix %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016llx\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)updop->txnid->txnid, (u_long)updop->prev_lsn.file,
@@ -3709,7 +3709,7 @@ int handle_repblob(DB_ENV *dbenv, u_int32_t rectype, llog_repblob_args *repblob,
 
     if (op == DB_TXN_PRINT || op == DB_TXN_SNAPISOL) {
         printf("[%u][%u] CUSTOM: repblob: rec: %u txnid %x"
-               " prevlsn[%u][%u] utxnid \%"PRIx64" sessionid %d seqno %d dtasz %d\n\n",
+               " prevlsn[%u][%u] utxnid %"PRIx64" sessionid %d seqno %d dtasz %d\n\n",
                lsn->file, lsn->offset, rectype, repblob->txnid->txnid,
                repblob->prev_lsn.file, repblob->prev_lsn.offset, repblob->txnid->utxnid,
                repblob->sessionid, repblob->seqno, repblob->data.size);
@@ -3762,7 +3762,7 @@ int handle_undo_del_dta_lk(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &delop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: del_dta_lk %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: del_dta_lk %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)delop->txnid->txnid, (u_long)delop->prev_lsn.file,
@@ -3846,7 +3846,7 @@ int handle_undo_del_ix_lk(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &delop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: del_ix_lk %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: del_ix_lk %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)delop->txnid->txnid, (u_long)delop->prev_lsn.file,
@@ -3930,7 +3930,7 @@ int handle_undo_upd_dta_lk(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &updop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: upd_dta_lk %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: upd_dta_lk %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)updop->txnid->txnid, (u_long)updop->prev_lsn.file,
@@ -4033,7 +4033,7 @@ int handle_undo_upd_ix_lk(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         lprev = &updop->prevllsn;
-        printf("[%lu][%lu] CUSTOM: upd_ix_lk %lu txnid %lx prelsn[%lu][%lu] utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: upd_ix_lk %lu txnid %lx prelsn[%lu][%lu] utxnid %"PRIx64" "
                "prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)updop->txnid->txnid, (u_long)updop->prev_lsn.file,
@@ -4103,7 +4103,7 @@ int handle_rowlocks_log_bench(DB_ENV *dbenv, u_int32_t rectype,
 
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
-        printf("[%lu][%lu] CUSTOM: rowlocks_log_bench %lu txnid %lx utxnid \%"PRIx64" "
+        printf("[%lu][%lu] CUSTOM: rowlocks_log_bench %lu txnid %lx utxnid %"PRIx64" "
                "prelsn[%lu][%lu]  prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)rl_log_bench->txnid->txnid,
@@ -4158,7 +4158,7 @@ int handle_commit_log_bench(DB_ENV *dbenv, u_int32_t rectype,
     case DB_TXN_SNAPISOL:
     case DB_TXN_PRINT:
         printf("[%lu][%lu] CUSTOM: commit_log_bench %lu txnid %lx "
-               "prelsn[%lu][%lu] utxnid \%"PRIx64" prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
+               "prelsn[%lu][%lu] utxnid %"PRIx64" prevllsn[%lu][%lu]  tranid %016" PRIx64 "\n",
                (u_long)lsn->file, (u_long)lsn->offset, (u_long)rectype,
                (u_long)c_log_bench->txnid->txnid,
                (u_long)c_log_bench->prev_lsn.file,

diff --git a/bdb/temptable.c b/bdb/temptable.c
@@ -31,7 +31,7 @@
 #include <sbuf2.h>
 #include "bdb_int.h"
 #include <list.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <sys/time.h>
 
 #ifdef _LINUX_SOURCE

diff --git a/berkdb/CMakeLists.txt b/berkdb/CMakeLists.txt
@@ -290,8 +290,7 @@ elseif(${CMAKE_C_COMPILER_ID} STREQUAL Clang OR ${CMAKE_C_COMPILER_ID} STREQUAL
 endif()
 
 if (COMDB2_BBCMAKE)
-  target_link_libraries(db PUBLIC lz4 openssl)
-  comdb2_bb_target(db)
+  comdb2_lib_target(db)
 endif()
 
 option(PAGELIST_DEBUG "Enable debug logic for pagelist dumping and loading" OFF)

diff --git a/berkdb/build/db.h b/berkdb/build/db.h
@@ -26,7 +26,7 @@
 
 #include <list.h>
 #include <pool.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <dlmalloc.h>
 #include <thdpool.h>
 #include <mem_berkdb.h>

diff --git a/berkdb/db/db_dispatch.c b/berkdb/db/db_dispatch.c
@@ -51,7 +51,7 @@ static const char revid[] = "$Id: db_dispatch.c,v 11.145 2003/09/10 20:31:18 ube
 #include <stdio.h>
 #endif
 
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "db_int.h"
 #include "dbinc/db_page.h"
 #include "dbinc/db_shash.h"

diff --git a/berkdb/db/trigger_subscription.c b/berkdb/db/trigger_subscription.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "dbinc/trigger_subscription.h"
 #include <sys_wrap.h>
 

diff --git a/berkdb/dbinc/db_dispatch.h b/berkdb/dbinc/db_dispatch.h
@@ -38,7 +38,7 @@
 #ifndef _DB_DISPATCH_H_
 #define	_DB_DISPATCH_H_
 
-#include <plhash.h>
+#include <plhash_glue.h>
 /*
  * Declarations and typedefs for the list of transaction IDs used during
  * recovery.  This is a generic list used to pass along whatever information

diff --git a/berkdb/env/env_open.c b/berkdb/env/env_open.c
@@ -24,7 +24,7 @@ static const char revid[] = "$Id: env_open.c,v 11.144 2003/09/13 18:39:34 bostic
 #include <unistd.h>
 #include <limits.h>
 
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "db_int.h"
 #include "dbinc/crypto.h"
 #include "dbinc/db_page.h"

diff --git a/berkdb/log/log.c b/berkdb/log/log.c
@@ -27,7 +27,7 @@ static const char revid[] = "$Id: log.c,v 11.133 2003/09/13 19:20:37 bostic Exp
 #include "dbinc/txn.h"
 #include <logmsg.h>
 
-#include <plhash.h>
+#include <plhash_glue.h>
 
 static int	__log_init __P((DB_ENV *, DB_LOG *));
 static int	__log_recover __P((DB_LOG *));

diff --git a/berkdb/rep/rep_record.c b/berkdb/rep/rep_record.c
@@ -4209,7 +4209,7 @@ logical_record_file_affinity(int rectype)
 
 int gbl_processor_thd_poll;
 
-#include <plhash.h>
+#include <plhash_glue.h>
 
 struct fuid_integer {
 	u_int8_t fuid[DB_FILE_ID_LEN];

diff --git a/cdb2api/CMakeLists.txt b/cdb2api/CMakeLists.txt
@@ -16,29 +16,24 @@ set_source_files_properties(
 )
 
 include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${PROJECT_SOURCE_DIR}/bbinc
   ${PROJECT_SOURCE_DIR}/util
   ${PROJECT_BINARY_DIR}/protobuf
   ${PROTOBUF-C_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
 )
 
-if (EXTRA_PLUGINS)
-  include(${EXTRA_PLUGINS}/cdb2api/CMakeLists.txt)
-endif()
-
 # common obj files for .so/.dylib and .a
 add_definitions(-DDISABLE_HOSTADDR_CACHE)
 add_definitions(-DSBUF2_SERVER=0)
 
 if (COMDB2_BBCMAKE)
+  include(${EXTRA_PLUGINS}/cdb2api/cdb2api.cmake)
   add_library(opencdb2api STATIC ${src})
-  add_dependencies(opencdb2api  proto)
-  target_link_libraries(opencdb2api PUBLIC protobuf-c)
-  if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-    target_link_libraries(opencdb2api PUBLIC libunwind)
-  endif()
-  comdb2_bb_target(opencdb2api)
+  add_dependencies(opencdb2api proto)
+  target_link_libraries(opencdb2api PUBLIC cdb2api)
+  comdb2_lib_target(opencdb2api)
 else()
 
 add_library(cdb2api STATIC ${src})

diff --git a/datetime/CMakeLists.txt b/datetime/CMakeLists.txt
@@ -16,5 +16,5 @@ include_directories(
 )
 add_dependencies(tz mem)
 if (COMDB2_BBCMAKE)
-  comdb2_bb_target(tz)
+  comdb2_lib_target(tz)
 endif()
diff --git a/datetime/localtimedb.c b/datetime/localtimedb.c
@@ -2172,7 +2172,7 @@ static void db_settzname(void)
     }
 }
 
-#include <plhash.h>
+#include <plhash_glue.h>
 
 #define NAME_KEY_MAX 40
-Original file line number
+Diff line change
@@ Expand Up / @@ -2172,7 +2172,7 @@ static void db_settzname(void) @@
         }
     }
-    #include <plhash.h>
+    #include <plhash_glue.h>
     #define NAME_KEY_MAX 40
@@ Expand Down @@