refroot

Signed-off-by: Akshat Sikarwar <[email protected]>
bloomberg · Feb 24, 2025 · 5ae399f · 5ae399f
1 parent 80ba42e
commit 5ae399f
Show file tree

Hide file tree

Showing 89 changed files with 105 additions and 721 deletions.
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>

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
 

diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
@@ -224,24 +224,23 @@ add_definitions(
 add_executable(comdb2 ${src})
 add_dependencies(comdb2 mem proto sqlite db bdb)
 target_link_libraries(comdb2 PRIVATE
-  ${PLUGIN_LIBRARIES}
-  schemachange
   bdb
-  util
-  crc32c
   comdb2rle
+  crc32c
   csc2
   cson
   db
   dfpal
+  dlmalloc
   lua
   mem
-  dlmalloc
   net
+  schemachange
   sockpool
   sqlite
-  util
   tz
+  util
+  ${PLUGIN_LIBRARIES}
   ${LibArchive_LIBRARIES}
   ${LZ4_LIBRARY}
   ${RDKAFKA_LIBRARY}
@@ -254,8 +253,8 @@ target_link_libraries(comdb2 PRIVATE
 )
 
 if (COMDB2_BBCMAKE)
-  target_link_libraries(comdb2 PRIVATE opencdb2api uuid event_core_static event_pthreads_static)
-  comdb2_bb_target(comdb2)
+  target_link_libraries(comdb2 PRIVATE opencdb2api)
+  comdb2_bin_target(comdb2)
 else()
   target_link_libraries(comdb2 PRIVATE cdb2api m ${CMAKE_DL_LIBS})
 endif()

diff --git a/db/api_history.c b/db/api_history.c
@@ -17,7 +17,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <sys_wrap.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <pthread.h>
 #include <string.h>
 

diff --git a/db/appsock_handler.c b/db/appsock_handler.c
@@ -27,7 +27,7 @@
 #include "comdb2.h"
 #include "comdb2_plugin.h"
 #include "comdb2_appsock.h"
-#include "plhash.h"
+#include <plhash_glue.h>
 #include "comdb2_atomic.h"
 #include "perf.h"
 

diff --git a/db/comdb2.c b/db/comdb2.c
@@ -86,7 +86,7 @@ void berk_memp_sync_alarm_ms(int);
 #include "tag.h"
 #include "types.h"
 #include "timer.h"
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "verify.h"
 #include "ssl_bend.h"
 #include "switches.h"

diff --git a/db/disttxn.c b/db/disttxn.c
@@ -2,7 +2,7 @@
 #include <sqlquery.pb-c.h>
 #include <pthread.h>
 #include <epochlib.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locks.h>

diff --git a/db/eventlog.c b/db/eventlog.c
@@ -34,7 +34,7 @@
 #include "eventlog.h"
 #include "util.h"
 #include "tohex.h"
-#include "plhash.h"
+#include <plhash_glue.h>
 #include "logmsg.h"
 #include "thread_stats.h"
 #include "dbinc/locker_info.h"

diff --git a/db/fdb_access.c b/db/fdb_access.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include "plhash.h"
+#include <plhash_glue.h>
 #include "list.h"
 
 #include "comdb2.h"

diff --git a/db/fdb_bend.c b/db/fdb_bend.c
@@ -50,7 +50,7 @@
 #include <alloca.h>
 #include <poll.h>
 
-#include <plhash.h>
+#include <plhash_glue.h>
 #include "debug_switches.h"
 
 #include "util.h"

diff --git a/db/lrucache.c b/db/lrucache.c
@@ -23,7 +23,7 @@
 #include <stdint.h>
 
 #include "list.h"
-#include "plhash.h"
+#include <plhash_glue.h>
 
 #include "lrucache.h"
 #include <mem_uncategorized.h>

diff --git a/db/lrucache.h b/db/lrucache.h
@@ -17,7 +17,7 @@
 #ifndef INCLUDED_LRUCACHE_H
 #define INCLUDED_LRUCACHE_H
 
-#include "plhash.h"
+#include <plhash_glue.h>
 #include "list.h"
 
 struct lrucache {

diff --git a/db/machcache.c b/db/machcache.c
@@ -15,7 +15,7 @@
  */
 
 #include <pthread.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <string.h>
 #include <sys_wrap.h>
 #include <cdb2api.h>

diff --git a/db/memdebug.c b/db/memdebug.c
@@ -27,7 +27,7 @@
 #include <alloca.h>
 #include <strings.h>
 
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <list.h>
 #include <walkback.h>
 #include <lockmacros.h>

diff --git a/db/osqlblkseq.c b/db/osqlblkseq.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <poll.h>
 #include "comdb2.h"
 #include "osqlblkseq.h"

diff --git a/db/osqlblockproc.c b/db/osqlblockproc.c
@@ -34,7 +34,7 @@
 #include <poll.h>
 #include <str0.h>
 #include <epochlib.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <assert.h>
 #include <unistd.h>
 #include <uuid/uuid.h>

diff --git a/db/osqlcheckboard.c b/db/osqlcheckboard.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <poll.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <ctrace.h>
 #include "comdb2.h"
 #include "osqlcheckboard.h"

diff --git a/db/osqlshadtbl.c b/db/osqlshadtbl.c
@@ -23,7 +23,7 @@
 #include "bdb_osqlcur.h"
 #include <assert.h>
 #include <list.h>
-#include <plhash.h>
+#include <plhash_glue.h>
 #include <bpfunc.h>
 #include <compile_time_assert.h>
-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 @@