libcouchbase 1.3.0 → 1.3.2

data/ext/libcouchbase/src/wait.cc

@@ -22,7 +22,7 @@ static bool
 has_pending(lcb_t instance)
 {
 
-    if (!instance->retryq->empty()) {
+    if (!instance->retryq->empty(!LCBT_SETTING(instance, wait_for_config))) {
         return true;
     }
 

data/ext/libcouchbase/tests/CMakeLists.txt

@@ -66,10 +66,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
         COMPILE_FLAGS "-Wno-sign-compare -Wno-missing-field-initializers")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar AND NOT LCB_NO_MOCK)
-    DOWNLOAD_LCB_DEP("${COUCHBASE_MOCK_DLSERVER}/${COUCHBASE_MOCK_VERSION}"
-        "${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar")
-ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar AND NOT LCB_NO_MOCK)
+IF(NOT LCB_NO_MOCK)
+    IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar)
+        DOWNLOAD_LCB_DEP("${COUCHBASE_MOCK_URL}" "${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar")
+    ENDIF()
+    FIND_PROGRAM(JAVA java)
+    EXECUTE_PROCESS(COMMAND "${JAVA}" -jar "${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar" --version
+                    RESULT_VARIABLE RET OUTPUT_VARIABLE VER OUTPUT_STRIP_TRAILING_WHITESPACE)
+    IF(RET EQUAL 0)
+        MESSAGE(STATUS "Using ${VER}")
+    ELSE()
+        MESSAGE(FATAL_ERROR "Unable to use ${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar as CouchbaseMock")
+    ENDIF()
+ENDIF()
 
 # We're a library using the shared CRT. Don't use the static one
 INCLUDE_DIRECTORIES(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})

data/ext/libcouchbase/tests/iotests/mock-environment.cc

@@ -415,7 +415,7 @@ void MockEnvironment::bootstrapRealCluster()
 
 extern "C" {
 static void mock_flush_callback(lcb_t, int, const lcb_RESPBASE *resp) {
-    assert(resp->rc == LCB_SUCCESS);
+    ASSERT_EQ(LCB_SUCCESS, resp->rc);
 }
 }
 

data/ext/libcouchbase/tests/iotests/t_misc.cc

@@ -754,7 +754,7 @@ TEST_F(MockUnitTest, testAppendE2BIG)
     size_t nkey = strlen(key);
 
     size_t nvalue1 = 20 * 1024 * 1024;
-    void *value1 = malloc(nvalue1);
+    void *value1 = calloc(nvalue1, sizeof(char));
     lcb_CMDSTORE scmd = { 0 };
     scmd.operation = LCB_SET;
     LCB_CMD_SET_KEY(&scmd, key, nkey);
@@ -765,7 +765,7 @@ TEST_F(MockUnitTest, testAppendE2BIG)
     free(value1);
 
     size_t nvalue2 = 1 * 1024 * 1024;
-    void *value2 = malloc(nvalue2);
+    void *value2 = calloc(nvalue2, sizeof(char));
     lcb_CMDSTORE acmd = { 0 };
     acmd.operation = LCB_APPEND;
     LCB_CMD_SET_KEY(&acmd, key, nkey);

data/ext/libcouchbase/tests/iotests/t_views.cc

@@ -31,6 +31,7 @@ ViewsUnitTest::connectBeerSample(HandleWrap& hw, lcb_t& instance, bool first)
 {
     lcb_create_st crparams;
     lcb_create_st crparamsAdmin;
+    lcb_config_transport_t transports[] = {LCB_CONFIG_TRANSPORT_HTTP, LCB_CONFIG_TRANSPORT_LIST_END};
     MockEnvironment::getInstance()->makeConnectParams(crparams, NULL);
     crparamsAdmin = crparams;
 
@@ -40,7 +41,6 @@ ViewsUnitTest::connectBeerSample(HandleWrap& hw, lcb_t& instance, bool first)
         // the logs cleaner.
         crparams.v.v2.user = "beer-sample";
         crparams.v.v2.mchosts = NULL;
-        lcb_config_transport_t transports[] = {LCB_CONFIG_TRANSPORT_HTTP, LCB_CONFIG_TRANSPORT_LIST_END};
         crparams.v.v2.transports = transports;
     }
 

data/ext/libcouchbase/tests/iotests/testutil.cc

@@ -88,10 +88,11 @@ void KVOperation::assertOk(lcb_error_t err)
     }
 
     if (allowableErrors.empty()) {
-        ASSERT_EQ(LCB_SUCCESS, err);
+        ASSERT_EQ(LCB_SUCCESS, err) << "Unexpected error: " << lcb_strerror_short(err);
         return;
     }
-    ASSERT_TRUE(allowableErrors.find(err) != allowableErrors.end());
+    ASSERT_TRUE(allowableErrors.find(err) != allowableErrors.end())
+        << "Unable to find " << lcb_strerror_short(err) << " in allowable errors";
 }
 
 void KVOperation::store(lcb_t instance)

data/ext/libcouchbase/tests/vbucket/confdata/map_node_present_nodesext_missing_nodes.json

@@ -0,0 +1,94 @@
+{
+    "rev":32470,
+    "name":"cache",
+    "uri":"/pools/default/buckets/cache?bucket_uuid=c82bb209e1afd5d938d7adcb6ea10de2",
+    "streamingUri":"/pools/default/bucketsStreaming/cache?bucket_uuid=c82bb209e1afd5d938d7adcb6ea10de2",
+    "nodes":[
+      {
+        "couchApiBase":"http://10.0.0.1:8092/cache%2Bc82bb209e1afd5d938d7adcb6ea10de2",
+        "hostname":"10.0.0.1:8091",
+        "ports":{
+          "proxy":11211,
+          "direct":11210
+        }
+      },
+      {
+        "couchApiBase":"http://10.0.0.2:8092/cache%2Bc82bb209e1afd5d938d7adcb6ea10de2",
+        "hostname":"10.0.0.2:8091",
+        "ports":{
+          "proxy":11211,
+          "direct":11210
+        }
+      },
+      {
+        "couchApiBase":"http://10.0.0.3:8092/cache%2Bc82bb209e1afd5d938d7adcb6ea10de2",
+        "hostname":"10.0.0.3:8091",
+        "ports":{
+          "proxy":11211,
+          "direct":11210
+        }
+      }
+    ],
+    "nodesExt":[
+      {
+        "services":{
+          "mgmt":8091,
+          "mgmtSSL":18091,
+          "capiSSL":18092,
+          "capi":8092,
+          "kvSSL":11207,
+          "projector":9999,
+          "kv":11210,
+          "moxi":11211
+        },
+        "thisNode":true,
+        "hostname":"10.0.0.1"
+      },
+      {
+        "services":{
+          "mgmt":8091,
+          "mgmtSSL":18091,
+          "capiSSL":18092,
+          "capi":8092,
+          "kvSSL":11207,
+          "projector":9999,
+          "kv":11210,
+          "moxi":11211
+        },
+        "hostname":"10.0.0.2"
+      },
+      {
+        "services":{
+          "mgmt":8091,
+          "mgmtSSL":18091,
+          "capiSSL":18092,
+          "capi":8092,
+          "kvSSL":11207,
+          "projector":9999,
+          "kv":11210,
+          "moxi":11211
+        },
+        "hostname":"10.0.0.3"
+      },
+      {
+        "services":{
+          "mgmt":8091,
+          "mgmtSSL":18091,
+          "capiSSL":18092,
+          "capi":8092,
+          "kvSSL":11207,
+          "projector":9999,
+          "kv":11210,
+          "moxi":11211
+        },
+        "hostname":"10.0.0.4"
+      }
+    ],
+    "nodeLocator":"ketama",
+    "uuid":"c82bb209e1afd5d938d7adcb6ea10de2",
+    "bucketCapabilitiesVer":"",
+    "bucketCapabilities":[
+      "cbhello",
+      "nodesExt"
+    ]
+  }

data/ext/libcouchbase/tests/vbucket/t_config.cc

@@ -369,3 +369,18 @@ TEST_F(ConfigTest, testKetamaCompliance) {
 
     lcbvb_destroy(vbc);
 }
+
+TEST_F(ConfigTest, testPresentNodesextMissingNodesKetama)
+{
+    // Scenario when a node is in nodesext but not nodes
+    string txt = getConfigFile("map_node_present_nodesext_missing_nodes.json");
+    lcbvb_CONFIG *vbc = lcbvb_parse_json(txt.c_str());
+    ASSERT_TRUE(vbc != NULL);
+    ASSERT_EQ(4, vbc->nsrv);
+    ASSERT_EQ(LCBVB_DIST_KETAMA, vbc->dtype);
+
+    ASSERT_NE((const char *)NULL, lcbvb_get_hostport(vbc, 0, LCBVB_SVCTYPE_DATA, LCBVB_SVCMODE_PLAIN));
+    ASSERT_NE((const char *)NULL, lcbvb_get_hostport(vbc, 1, LCBVB_SVCTYPE_DATA, LCBVB_SVCMODE_PLAIN));
+    ASSERT_NE((const char *)NULL, lcbvb_get_hostport(vbc, 2, LCBVB_SVCTYPE_DATA, LCBVB_SVCMODE_PLAIN));
+    ASSERT_EQ((const char *)NULL, lcbvb_get_hostport(vbc, 3, LCBVB_SVCTYPE_DATA, LCBVB_SVCMODE_PLAIN));
+}

data/ext/libcouchbase/tools/CMakeLists.txt

@@ -19,7 +19,10 @@ TARGET_LINK_LIBRARIES(cbc-n1qlback couchbase)
 INSTALL(TARGETS cbc cbc-pillowfight cbc-n1qlback
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-FIND_PACKAGE(OpenSSL)
+IF (NOT OPENSSL_FOUND AND (NOT LCB_NO_SSL))
+    FIND_PACKAGE(OpenSSL)
+ENDIF()
+
 IF(OPENSSL_FOUND AND (NOT LCB_NO_SSL))
     INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
     ADD_DEFINITIONS(${OPENSSL_DEFINITIONS})
@@ -31,11 +34,11 @@ IF(MSVC)
     SET_TARGET_PROPERTIES(cbc PROPERTIES DEBUG_OUTPUT_NAME cbc_d)
     SET_TARGET_PROPERTIES(cbc-pillowfight PROPERTIES DEBUG_OUTPUT_NAME cbc-pillowfight_d)
     SET_TARGET_PROPERTIES(cbc-n1qlback PROPERTIES DEBUG_OUTPUT_NAME cbc-n1qlback_d)
-ENDIF()
 
-INSTALL_PDBS(cbc)
-INSTALL_PDBS(cbc-pillowfight)
-INSTALL_PDBS(cbc-n1qlback)
+    INSTALL_PDBS(cbc)
+    INSTALL_PDBS(cbc-pillowfight)
+    INSTALL_PDBS(cbc-n1qlback)
+ENDIF()
 
 SET_TARGET_PROPERTIES(lcbtools PROPERTIES COMPILE_FLAGS "${LCB_CORE_CXXFLAGS}")
 SET_SOURCE_FILES_PROPERTIES(cbc.cc cbc-pillowfight.cc cbc-n1qlback.cc PROPERTIES COMPILE_FLAGS "${LCB_CORE_CXXFLAGS}")
@@ -62,7 +65,9 @@ IF(NOT WIN32)
         cat create observe observe-seqno incr decr mcflush hash lock
         unlock rm stats version verbosity view n1ql admin ping
         bucket-create bucket-delete bucket-flush connstr write-config strerror
-        touch role-list user-list user-upsert user-delete watch)
+        touch role-list user-list user-upsert user-delete watch
+        mcversion
+        )
 
     FOREACH(subcmd IN ITEMS ${CBC_SUBCOMMANDS})
         ADD_CUSTOM_COMMAND(TARGET cbc POST_BUILD

data/ext/libcouchbase/tools/cbc-handlers.h

@@ -220,6 +220,15 @@ protected:
     void run();
 };
 
+class McVersionHandler : public Handler {
+public:
+    HANDLER_DESCRIPTION("Query server versions using the memcached command")
+    HANDLER_USAGE("[OPTIONS ...]")
+    McVersionHandler() : Handler("mcversion") {}
+protected:
+    void run();
+};
+
 class PingHandler : public Handler {
 public:
     HANDLER_DESCRIPTION("Reach all services on every node and measure response time")

data/ext/libcouchbase/tools/cbc-proxy.cc

@@ -350,7 +350,7 @@ static void conn_readcb(struct bufferevent *bev, void *cookie)
             cmd.callback = n1ql_callback;
             cl->cnt = 0;
             if (cbas) {
-                cmd.cmdflags |= LCB_CMDN1QL_F_CBASQUERY;
+                cmd.cmdflags |= LCB_CMDN1QL_F_ANALYTICSQUERY;
             }
             rc = lcb_n1ql_query(instance, cl, &cmd);
             if (rc != LCB_SUCCESS) {

data/ext/libcouchbase/tools/cbc.cc

@@ -81,9 +81,15 @@ get_callback(lcb_t, lcb_CALLBACKTYPE cbtype, const lcb_RESPGET *resp)
                 key.c_str(), resp->cas, resp->itmflags, (unsigned long)resp->nvalue,
                 (int)resp->datatype);
         if (resp->datatype) {
+            int nflags = 0;
             fprintf(stderr, "(");
             if (resp->datatype & LCB_VALUE_F_JSON) {
                 fprintf(stderr, "JSON");
+                nflags++;
+            }
+            if (resp->datatype & LCB_VALUE_F_SNAPPYCOMP) {
+                fprintf(stderr, "%sSNAPPY", nflags > 0 ? "," : "");
+                nflags++;
             }
             fprintf(stderr, ")");
         }
@@ -262,11 +268,14 @@ watch_callback(lcb_t, lcb_CALLBACKTYPE, const lcb_RESPSTATS *resp)
 static void
 common_server_callback(lcb_t, int cbtype, const lcb_RESPSERVERBASE *sbase)
 {
-    const char *msg;
+    string msg;
     if (cbtype == LCB_CALLBACK_VERBOSITY) {
         msg = "Set verbosity";
     } else if (cbtype == LCB_CALLBACK_FLUSH) {
         msg = "Flush";
+    } else if (cbtype == LCB_CALLBACK_VERSIONS) {
+        const lcb_RESPMCVERSION *resp = (const lcb_RESPMCVERSION *)sbase;
+        msg = string(resp->mcversion, resp->nversion);
     } else {
         msg = "";
     }
@@ -274,10 +283,10 @@ common_server_callback(lcb_t, int cbtype, const lcb_RESPSERVERBASE *sbase)
         return;
     }
     if (sbase->rc != LCB_SUCCESS) {
-        fprintf(stderr, "%s failed for server %s: %s\n", msg, sbase->server,
+        fprintf(stderr, "%s failed for server %s: %s\n", msg.c_str(), sbase->server,
             lcb_strerror(NULL, sbase->rc));
     } else {
-        fprintf(stderr, "%s: %s\n", msg, sbase->server);
+        fprintf(stderr, "%s: %s\n", msg.c_str(), sbase->server);
     }
 }
 
@@ -834,6 +843,7 @@ VersionHandler::run()
         lcb_get_version(NULL), changeset);
     fprintf(stderr, "  Headers: Version=%s, Changeset=%s\n",
         LCB_VERSION_STRING, LCB_VERSION_CHANGESET);
+    fprintf(stderr, "  Build Timestamp: %s\n", LCB_BUILD_TIMESTAMP);
 
     struct lcb_cntl_iops_info_st info;
     memset(&info, 0, sizeof info);
@@ -1033,6 +1043,23 @@ VerbosityHandler::run()
     lcb_wait(instance);
 }
 
+void
+McVersionHandler::run()
+{
+    Handler::run();
+
+    lcb_install_callback3(instance, LCB_CALLBACK_VERSIONS, (lcb_RESPCALLBACK)common_server_callback);
+    lcb_CMDBASE cmd = { 0 };
+    lcb_error_t err;
+    lcb_sched_enter(instance);
+    err = lcb_server_versions3(instance, NULL, &cmd);
+    if (err != LCB_SUCCESS) {
+        throw LcbError(err);
+    }
+    lcb_sched_leave(instance);
+    lcb_wait(instance);
+}
+
 void
 PingHandler::run()
 {
@@ -1041,7 +1068,7 @@ PingHandler::run()
     lcb_install_callback3(instance, LCB_CALLBACK_PING, (lcb_RESPCALLBACK)ping_callback);
     lcb_CMDPING cmd = { 0 };
     lcb_error_t err;
-    cmd.services = LCB_PINGSVC_F_KV | LCB_PINGSVC_F_N1QL | LCB_PINGSVC_F_VIEWS | LCB_PINGSVC_F_FTS;
+    cmd.services = LCB_PINGSVC_F_KV | LCB_PINGSVC_F_N1QL | LCB_PINGSVC_F_VIEWS | LCB_PINGSVC_F_FTS | LCB_PINGSVC_F_ANALYTICS;
     cmd.options = LCB_PINGOPT_F_JSON | LCB_PINGOPT_F_JSONPRETTY;
     if (o_details.passed()) {
         cmd.options |= LCB_PINGOPT_F_JSONDETAILS;
@@ -1243,7 +1270,7 @@ N1qlHandler::run()
         cmd.cmdflags |= LCB_CMDN1QL_F_PREPCACHE;
     }
     if (o_analytics.passed()) {
-        cmd.cmdflags |= LCB_CMDN1QL_F_CBASQUERY;
+        cmd.cmdflags |= LCB_CMDN1QL_F_ANALYTICSQUERY;
     }
     fprintf(stderr, "---> Encoded query: %.*s\n", (int)cmd.nquery, cmd.query);
     cmd.callback = n1qlCallback;
@@ -1765,6 +1792,7 @@ setupHandlers()
     handlers_s["user-list"] = new UserListHandler();
     handlers_s["user-upsert"] = new UserUpsertHandler();
     handlers_s["user-delete"] = new UserDeleteHandler();
+    handlers_s["mcversion"] = new McVersionHandler();
 
     map<string,Handler*>::iterator ii;
     for (ii = handlers_s.begin(); ii != handlers_s.end(); ++ii) {

data/ext/libcouchbase/tools/common/options.cc

@@ -434,7 +434,7 @@ ConnParams::doCtls(lcb_t instance)
         // Set the detailed error codes option
         doSctl<int>(instance, LCB_CNTL_DETAILED_ERRCODES, 1);
 
-        {
+        if (!o_connstr.passed() || o_connstr.result().find("compression=") == std::string::npos) {
             int opts = LCB_COMPRESS_IN;
             if (o_compress.passed()) {
                 opts |= LCB_COMPRESS_OUT;

data/ext/libcouchbase/tools/extract-packets.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/ruby
+
+# This tool extracts packet dumps from the TRACE log statements
+# when the library compiled with -DLCB_DUMP_PACKETS=ON
+
+require 'stringio'
+require 'base64'
+
+def pad(dir, *lines)
+  lines.flatten.join("\n").gsub(/^/, dir == 'snd' ? '> ' : '< ')
+end
+
+def format_bytes(buf, style = :wide)
+  out = StringIO.new
+  width = style == :wide ? 32 : 16
+  full_rows = buf.size / width
+  remainder = buf.size % width
+
+  if style == :wide
+    out.print("         +-------------------------------------------------------------------------------------------------+\n" \
+              "         |  0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f  0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f |\n" \
+              "+--------+-------------------------------------------------------------------------------------------------+--------------------------------+")
+  else
+    out.print("         +-------------------------------------------------+\n" \
+              "         |  0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f |\n" \
+              "+--------+-------------------------------------------------+----------------+")
+  end
+
+  row = 0
+  while row < full_rows
+    row_start_index = row * width
+    # prefix
+    out.printf("\n|%08x|", row_start_index)
+    row_end_index = row_start_index + width
+    # hex
+    i = row_start_index
+    while i < row_end_index
+      out.printf(" %02x", buf[i].ord)
+      i += 1
+    end
+    out.printf(" |")
+    # ascii
+    i = row_start_index
+    while i < row_end_index
+      b = buf[i].ord
+      i += 1
+      if (b <= 0x1f) || (b >= 0x7f)
+        out.printf(".")
+      else
+        out.printf("%c", b)
+      end
+    end
+    out.printf("|")
+    row += 1
+  end
+  if remainder != 0
+    row_start_index = full_rows * width
+    # prefix
+    out.printf("\n|%08x|", row_start_index)
+    row_end_index = row_start_index + remainder
+    # hex
+    i = row_start_index
+    while i < row_end_index
+      out.printf(" %02x", buf[i].ord)
+      i += 1
+    end
+    i = width - remainder
+    while i > 0
+      out.printf("   ")
+      i -= 1
+    end
+    out.printf(" |")
+    # ascii
+    i = row_start_index
+    while i < row_end_index
+      b = buf[i].ord
+      i += 1
+      if (b <= 0x1f) || (b >= 0x7f)
+        out.printf(".")
+      else
+        out.printf("%c", b)
+      end
+    end
+    i = width - remainder
+    while i > 0
+      out.printf(" ")
+      i -= 1
+    end
+    out.printf("|")
+  end
+  if style == :wide
+    out.print("\n+--------+-------------------------------------------------------------------------------------------------+--------------------------------+\n")
+  else
+    out.print("\n+--------+-------------------------------------------------+----------------+\n")
+  end
+  out.string
+end
+
+ARGF.each_line do |line|
+  line.force_encoding(Encoding::BINARY)
+  md = line.match(/TRACE.*<([^>]+)>.*\(CTX=(0x[0-9a-z]+),([^,)]+).*pkt,(snd|rcv).*: size=(\d+), (.+)/)
+  next unless md
+  address = md[1]
+  ctx_id = md[2]
+  subsys = md[3]
+  dir = md[4]
+  data = Base64.decode64(md[6])
+  puts pad(dir, "#{address} CTX=#{ctx_id},#{subsys} #{dir == 'snd' ? 'sent' : 'received'} #{data.size} bytes")
+  puts pad(dir, format_bytes(data))
+end