Merge remote-tracking branch 'dse/unified_driver'

Author: Michael Fero

.build.sh

@@ -27,9 +27,11 @@ SHA=$(echo ${GIT_COMMIT} | cut -c1-7)
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 if [ "${OS_NAME}" = "osx" ]; then
+  LIB_SUFFIX="dylib"
   PROCS=$(sysctl -n hw.logicalcpu)
   . ${SCRIPT_DIR}/.build.osx.sh
 else
+  LIB_SUFFIX="so"
   PROCS=$(grep -e '^processor' -c /proc/cpuinfo)
   . ${SCRIPT_DIR}/.build.linux.sh
 fi
@@ -79,7 +81,6 @@ build_driver() {
     fi
     cmake -DCMAKE_BUILD_TYPE=Release \
           -D${driver_prefix}_BUILD_SHARED=On \
-          -D${driver_prefix}_BUILD_STATIC=On \
           -D${driver_prefix}_BUILD_EXAMPLES=On \
           -D${driver_prefix}_BUILD_UNIT_TESTS=On \
           -D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
@@ -91,11 +92,13 @@ build_driver() {
 
 check_driver_exports() {(
   set +e  #Disable fail fast for this subshell
-  local driver_library=${1}
+  local driver_library="${1}.${LIB_SUFFIX}"
   if [ -f ${driver_library} ]; then
     declare -a MISSING_FUNCTIONS
+    local symbols_file=$(mktemp /tmp/driver_exports.XXXXXX)
+    nm ${driver_library} > $symbols_file
     for function in "${@:2}"; do
-      nm ${driver_library} | grep ${function} > /dev/null
+      grep ${function} $symbols_file > /dev/null
       if [ $? -ne 0 ]
       then
         MISSING_DEFINITION+=("${function}")

CMakeLists.txt

@@ -55,7 +55,6 @@ if(CASS_BUILD_TESTS)
 endif()
 
 if(CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
-  set(CASS_BUILD_STATIC ON) # Required for tests
   set(CASS_USE_OPENSSL ON) # Required for tests
   set(CASS_USE_KERBEROS ON) # Required for tests
 endif()

build.yaml

@@ -46,7 +46,7 @@ build:
 
       FUNCTIONS+=($(grep -Eoh '(^cass_\s*(\w+)\s*\()|(^dse_\s*(\w+)\s*\()' include/dse.h | awk -F '(' '{print $1}'));
       FUNCTIONS+=($(grep -Eoh '^cass_\s*(\w+)\s*\(' include/cassandra.h | awk -F '(' '{print $1}'))
-      check_driver_exports 'build/libcassandra_static.a' "${FUNCTIONS[@]}"
+      check_driver_exports 'build/libcassandra' "${FUNCTIONS[@]}"
 
       build/cassandra-unit-tests --gtest_output=xml:unit-test-results.xml
 

examples/dse/date_range/date_range.c

@@ -228,11 +228,8 @@ CassError insert_into_collections(CassSession* session, const char* key, const D
   const CassDataType* udt_type = NULL;
   CassUserType* udt = NULL;
 
-  const char** item = NULL;
   const char* query =
       "INSERT INTO examples.drcoll (key, coll_value, tuple_value, udt_value) VALUES (?, ?, ?, ?);";
-  int ind = 0;
-
   statement = cass_statement_new(query, 4);
 
   cass_statement_bind_string(statement, 0, key);

examples/dse/geotypes/geotypes.c

@@ -316,16 +316,13 @@ void select_line_string(CassSession* session, const char* key) {
   if (cass_future_error_code(future) == CASS_OK) {
     const CassResult* result = cass_future_get_result(future);
     if (result && cass_result_row_count(result) > 0) {
-      cass_uint32_t i, num_points;
       const CassRow* row = cass_result_first_row(result);
       const CassValue* value = cass_row_get_column_by_name(row, "linestring");
 
       DseLineStringIterator* iterator = dse_line_string_iterator_new();
 
       dse_line_string_iterator_reset(iterator, value);
 
-      num_points = dse_line_string_iterator_num_points(iterator);
-
       printf("%s: ", key);
       print_line_string(iterator);
       printf(")\n");

examples/dse/gssapi/gssapi_proxy.c

@@ -141,7 +141,6 @@ void connect_and_run(const char* hosts, const char* proxy_user) {
 
 int main(int argc, char* argv[]) {
   /* Setup and connect to cluster */
-  CassFuture* connect_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];

examples/dse/proxy_execution/proxy_execution.c

@@ -108,7 +108,6 @@ CassError connect_session(CassSession* session, const CassCluster* cluster) {
 
 int main(int argc, char* argv[]) {
   /* Setup and connect to cluster */
-  CassFuture* connect_future = NULL;
   CassCluster* cluster = cass_cluster_new();
   CassSession* session = cass_session_new();
   char* hosts = "127.0.0.1";

examples/perf/perf.c

@@ -138,8 +138,6 @@ CassCluster* create_cluster(const char* hosts) {
   cass_cluster_set_num_threads_io(cluster, NUM_IO_WORKER_THREADS);
   cass_cluster_set_queue_size_io(cluster, 10000);
   cass_cluster_set_core_connections_per_host(cluster, 1);
-  cass_cluster_set_max_connections_per_host(cluster, 2);
-  cass_cluster_set_max_requests_per_flush(cluster, 10000);
   return cluster;
 }
 

src/dse_auth.cpp

@@ -14,6 +14,8 @@
   limitations under the License.
 */
 
+#include "dse.h"
+
 #include "dse_auth.hpp"
 #include "logger.hpp"
 
@@ -26,6 +28,21 @@ using namespace datastax;
 using namespace datastax::internal;
 using namespace datastax::internal::enterprise;
 
+extern "C" {
+
+CassError
+dse_gssapi_authenticator_set_lock_callbacks(DseGssapiAuthenticatorLockCallback lock_callback,
+                                            DseGssapiAuthenticatorUnlockCallback unlock_callback,
+                                            void* data) {
+#ifdef HAVE_KERBEROS
+  return DseGssapiAuthenticator::set_lock_callbacks(lock_callback, unlock_callback, data);
+#else
+  return CASS_ERROR_LIB_NOT_IMPLEMENTED;
+#endif
+}
+
+} // extern "C"
+
 bool DsePlainTextAuthenticator::initial_response(String* response) {
   if (class_name_ == DSE_AUTHENTICATOR) {
     response->assign(PLAINTEXT_AUTH_MECHANISM);

src/gssapi/dse_auth_gssapi.cpp

@@ -40,17 +40,6 @@ using namespace datastax::internal::enterprise;
 static void dse_gssapi_authenticator_nop_lock(void* data) {}
 static void dse_gssapi_authenticator_nop_unlock(void* data) {}
 
-extern "C" {
-
-CassError
-dse_gssapi_authenticator_set_lock_callbacks(DseGssapiAuthenticatorLockCallback lock_callback,
-                                            DseGssapiAuthenticatorUnlockCallback unlock_callback,
-                                            void* data) {
-  return DseGssapiAuthenticator::set_lock_callbacks(lock_callback, unlock_callback, data);
-}
-
-} // extern "C"
-
 struct GssapiBuffer {
 public:
   gss_buffer_desc buffer;