Only allow retry functions internally/for testing

Signed-off-by: Salil Chandra <schandra107@bloomberg.net>

Author: chands10

CMakeLists.txt

@@ -17,7 +17,8 @@ endif()
 
 option(COMDB2_TEST "Turn ON to compile with testing features" OFF)
 if(COMDB2_TEST)
-	add_definitions(-DCOMDB2_TEST)
+  add_definitions(-DCOMDB2_TEST)
+  add_definitions(-DCDB2API_TEST)
 endif()
 
 option(WITH_TINFO "Turn ON on platforms where tinfo library is required for cdb2sql" OFF)

cdb2api/CMakeLists.txt

@@ -28,10 +28,6 @@ include_directories(
 add_definitions(-DDISABLE_HOSTADDR_CACHE)
 add_definitions(-DSBUF2_SERVER=0)
 
-if (COMDB2_TEST)
-  add_definitions(-DCDB2API_TEST)
-endif()
-
 if (COMDB2_BBCMAKE)
   include(${EXTRA_PLUGINS}/cdb2api/cdb2api.cmake)
   add_library(opencdb2api STATIC ${src})

cdb2api/cdb2api.c

@@ -1425,6 +1425,7 @@ struct newsqlheader {
     int length;
 };
 
+#ifdef CDB2API_TEST
 void cdb2_set_min_retries(int min_retries)
 {
     if (min_retries > 0) {
@@ -1438,6 +1439,7 @@ void cdb2_set_max_retries(int max_retries)
         MAX_RETRIES = max_retries;
     }
 }
+#endif
 
 void cdb2_hndl_set_min_retries(cdb2_hndl_tp *hndl, int min_retries)
 {

cdb2api/cdb2api.h

@@ -238,10 +238,6 @@ void cdb2_dump_ports(cdb2_hndl_tp *hndl, FILE *out);
 void cdb2_cluster_info(cdb2_hndl_tp *hndl, char **cluster, int *ports, int max, int *count);
 int cdb2_snapshot_file(cdb2_hndl_tp *hndl, int *file, int *offset);
 void cdb2_getinfo(cdb2_hndl_tp *hndl, int *intrans, int *hasql);
-void cdb2_set_max_retries(int max_retries);
-void cdb2_set_min_retries(int min_retries);
-void cdb2_hndl_set_max_retries(cdb2_hndl_tp *hndl, int max_retries);
-void cdb2_hndl_set_min_retries(cdb2_hndl_tp *hndl, int min_retries);
 
 int cdb2_bind_param(cdb2_hndl_tp *hndl, const char *name, int type,
                     const void *varaddr, int length);

cdb2api/cdb2api_int.h

@@ -38,6 +38,9 @@ int cdb2_read_line(char *line, int maxlen, SBUF2 *s, const char *buf, int *chrno
 
 void cdb2_setIdentityBlob(cdb2_hndl_tp *hndl, void *id);
 
+void cdb2_hndl_set_max_retries(cdb2_hndl_tp *hndl, int max_retries);
+void cdb2_hndl_set_min_retries(cdb2_hndl_tp *hndl, int min_retries);
+
 #ifndef WITH_DL_LIBS
 #define WITH_DL_LIBS 0
 #endif

cdb2api/cdb2api_test.h

@@ -82,6 +82,9 @@ struct cdb2_hndl;
 const char *get_default_cluster(void);
 const char *get_default_cluster_hndl(struct cdb2_hndl *);
 
+void cdb2_set_max_retries(int max_retries);
+void cdb2_set_min_retries(int min_retries);
+
 #if defined __cplusplus
 }
 #endif /* __cplusplus */

db/sqllogfill.c

@@ -15,6 +15,7 @@
  */
 #include <sqllogfill.h>
 #include <cdb2api.h>
+#include <cdb2api_int.h>
 #include <sys_wrap.h>
 #include <parse_lsn.h>
 #include <unistd.h>

tests/tools/cdb2api_unit.c

@@ -23,6 +23,8 @@
 #include <assert.h>
 #include <bb_oscompat.h>
 #include <cdb2api.c>
+#include <cdb2api_test.h>
+#include <cdb2api_int.h>
 
 void test_is_sql_read()
 {

tests/tools/ins_upd_del.cpp

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <cdb2api.h>
+#include <cdb2api_test.h>
 #include <unistd.h>
 #include <time.h>
 #include <sstream>

tests/tools/inscntdel.cpp

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <cdb2api.h>
+#include <cdb2api_test.h>
 #include <unistd.h>
 #include <time.h>
 #include <sstream>