libcouchbase 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77f4344c80a4dcb25a8b4641eb1f451871999f3
-  data.tar.gz: ad1dfe2a7276dbe6eaf72466203fb44f9989461a
+  metadata.gz: 1663915161bb8f351a30c388c2faca80aae361b5
+  data.tar.gz: fb8ba6fda5a579c68758ea4310e36c3ca118d49d
 SHA512:
-  metadata.gz: 77c92e787e39f9704148c3fce013fe11c52c3a0a6329b22c00f76bfbb47425fb389e3ffbda01b8f2fe2709dfdaa2d064afe2adf56eed3421ad3b044fcff8058d
-  data.tar.gz: fb143e552a235d9aa96412636fe197644c10a81b39780ed9a52cad8729c6f400ce659050bbf41340cd0383e75f91e98d3ad3c91ee7c666afd3fe84f3dcd1685d
+  metadata.gz: 5ba0d969fff91188a9ac8fda5b7f40951746cb30749479a8732ab739fb14c088b057785ee6f93118a5fdab26bbb614bf66eabc0416d8768860a7ad5b81ada944
+  data.tar.gz: bc96762d3e047a3bf6becb91154bbe92866da46d4f22eb0f898984f364ec8e5b5930999893179f28d261aeae567549675d49da247134320a1446050e3cb1c9c7

data/ext/libcouchbase/.gitignore

@@ -128,3 +128,5 @@ packaging/distinfo/MANIFEST
 *.tlog
 *.nupkg
 *.suo
+tests/LOCAL
+inst

data/ext/libcouchbase/CMakeLists.txt

@@ -151,12 +151,12 @@ IF(WIN32)
     ADD_DEFINITIONS(-DWINVER=${NT_REQUIRED_VERSION})
     ADD_DEFINITIONS(-D_WIN32_WINNT=${NT_REQUIRED_VERSION})
     SET(lcb_plat_includes "${SOURCE_ROOT}/contrib/win32-defs")
-    SET(lcb_plat_libs ws2_32.lib)
+    SET(lcb_plat_libs ws2_32.lib dnsapi.lib)
     SET(lcb_plat_objs $<TARGET_OBJECTS:couchbase_iocp>)
 ELSE()
     SET(lcb_plat_libs m)
     IF(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-        SET(lcb_plat_libs ${lcb_plat_libs} dl)
+        SET(lcb_plat_libs ${lcb_plat_libs} dl resolv)
     ELSE()
         # BSD _and_ DTrace
         IF(LCB_BUILD_DTRACE)
@@ -205,6 +205,7 @@ ADD_LIBRARY(netbuf-malloc OBJECT ${LCB_NETBUF_SRC})
 ADD_LIBRARY(mcreq OBJECT ${LCB_MC_SRC})
 ADD_LIBRARY(rdb OBJECT ${LCB_RDB_SRC})
 ADD_LIBRARY(lcbio OBJECT ${LCB_IO_SRC})
+ADD_LIBRARY(lcbio-cxx OBJECT ${LCB_IO_CXXSRC})
 ADD_LIBRARY(lcbht OBJECT ${LCB_HT_SRC})
 ADD_LIBRARY(lcbcore OBJECT ${LCB_CORE_SRC})
 ADD_LIBRARY(lcbcore-cxx OBJECT ${LCB_CORE_CXXSRC})
@@ -214,6 +215,7 @@ LCB_UTIL(netbuf-malloc)
 LCB_UTIL(netbuf)
 LCB_UTIL(rdb)
 LCB_UTIL(lcbio)
+LCB_CXXUTIL(lcbio-cxx)
 LCB_UTIL(couchbase_utils)
 LCB_UTIL(mcreq)
 LCB_UTIL(lcbht)
@@ -245,10 +247,6 @@ IF(NOT WIN32 AND LCB_BUILD_DTRACE)
     INCLUDE(cmake/Modules/ConfigureDtrace.cmake)
 ENDIF()
 
-FILE(GLOB LCB_VIEWS_C_SRC src/views/*.c)
-ADD_LIBRARY(lcb_views_c OBJECT ${LCB_VIEWS_C_SRC})
-LCB_UTIL(lcb_views_c)
-
 FILE(GLOB LCB_JSPARSE_SRC src/jsparse/*.cc)
 ADD_LIBRARY(lcb_jsparse OBJECT ${LCB_JSPARSE_SRC})
 LCB_CXXUTIL(lcb_jsparse)
@@ -261,11 +259,11 @@ SET(LCB_CORE_OBJS
     $<TARGET_OBJECTS:netbuf>
     $<TARGET_OBJECTS:cbsasl>
     $<TARGET_OBJECTS:lcbio>
+    $<TARGET_OBJECTS:lcbio-cxx>
     $<TARGET_OBJECTS:rdb>
     $<TARGET_OBJECTS:lcbht>
     $<TARGET_OBJECTS:lcbcore>
     $<TARGET_OBJECTS:lcbcore-cxx>
-    $<TARGET_OBJECTS:lcb_views_c>
     $<TARGET_OBJECTS:lcb_jsparse>
     $<TARGET_OBJECTS:lcb_jsoncpp>
     ${LCB_DTRACE_OBJECT}

data/ext/libcouchbase/README.markdown

@@ -78,7 +78,7 @@ If you wish to link against OpenSSL, you should set the value of
 
 ## Bugs, Support, Issues
 You may report issues in the library in our issue tracked at
-<http://couchbase.com/issues>. Sign up for an account and file an issue
+<https://issues.couchbase.com>. Sign up for an account and file an issue
 against the _Couchbase C Client Library_ project.
 
 The developers of the library hang out in IRC on `#libcouchbase` on
@@ -95,7 +95,7 @@ irc.freenode.net.
     * [PHP](http://github.com/couchbase/php-couchbase) (uses the old < 2.6 API)
 * Community projects using libcouchbase
     * [C++11 wrapper](https://github.com/couchbaselabs/libcouchbase-cxx)
-    * [cberl - Couchbase NIF](https://github.com/chitika/cberl)
+    * [cberl - Couchbase NIF](https://github.com/wcummings/cberl)
     * [Perl client](https://github.com/mnunberg/perl-Couchbase-Client)
 
 ## Documentation

data/ext/libcouchbase/RELEASE_NOTES.markdown

@@ -1,5 +1,54 @@
 # Release Notes
 
+## 2.7.2 (February 21 2017)
+
+This release consists of additional internal refactoring and some improved
+logging messages. There is enhanced experimental XATTR support. This release
+also contains some bug fixes:
+
+* Fix build issues on FreeBSD. This allows normal BSD `make` to be used, rather
+  than forcing `gmake`
+
+* Fixed broken JIRA link in README
+
+* Fix hanging SSL connections in IOCP/Completion mode. This would sometimes
+  stall the connection by not requesting a write if a read was in progress.
+  This would result in the command not being sent and the client hanging.
+  Note that this only affects completion-style I/O plugins such as IOCP and
+  libuv.
+  * Issues: [CCBC-744](https://issues.couchbase.com/browse/CCBC-744)
+
+* Rename `LCB_SDSPEC_F_VIRTPATH` to `LCB_SDSPEC_F_MACROVALUES`. `VIRTPATH`
+  is intended for possible future materialized XATTRs.
+
+* Add `LCB_SDSPEC_F_XATTR_DELETED_OK`, which maps to the protocol flag of
+  roughly the same name.
+
+## 2.7.1 (January 19 2017)
+
+This release consists of additional internal refactoring. More internals have
+been converted to C++.
+
+* Provide XATTR (Extended Attribute) prototype support.
+  This provides a prototype implementation of xattrs, allowing the client to
+  access extended (hidden) attributes of a document. This feature can be used
+  on the client side by simply setting the `LCB_SDSPEC_F_XATTRPATH` bit in
+  the `lcb_SDSPEC::options` field.
+  * Issues: [CCBC-728](https://issues.couchbase.com/browse/CCBC-728)
+
+* Add automatic DNS SRV record lookup when simple hostname supplied.
+  The library will now automatically attempt to look up SRV records
+  for various couchbase services if only one host is present in the
+  connection string. Automatic lookup will not be performed if more
+  than a single host is provded. See the [Java Documentation](https://developer.couchbase.com/documentation/server/current/sdk/java/managing-connections.html)
+  on the matter (go to the bottom of the page).
+  * Issues: [CCBC-566](https://issues.couchbase.com/browse/CCBC-566)
+
+## 2.7.0 (December 21 2016)
+
+This release consists mainly of internal refactoring. Many of the internals
+have been 'upgraded' to C++
+
 ## 2.6.4 (November 28 2016)
 
 * Fix bug in pillowfight where large value sizes would cause a segfault.

data/ext/libcouchbase/cmake/Modules/ConfigureDtrace.cmake

@@ -11,6 +11,17 @@ IF(DTRACE)
         RETURN()
     ENDIF()
 
+    # Fix probes.h on FreeBSD
+    IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+        FIND_PROGRAM(SED sed)
+        EXECUTE_PROCESS(COMMAND ${SED} -i.tmp "s/, *char \\*/, const char \\*/g" ${LCB_DTRACE_HEADER}
+            RESULT_VARIABLE _rv)
+        IF(NOT ${_rv} EQUAL 0)
+            MESSAGE(WARNING "Could not execute sed to update dtrace-generated header. DTrace support will be disabled!")
+            RETURN()
+        ENDIF()
+    ENDIF()
+
     ADD_DEFINITIONS(-DHAVE_DTRACE)
     IF(NOT APPLE)
         SET(LCB_DTRACE_OBJECT "${LCB_GENSRCDIR}/probes.o")

data/ext/libcouchbase/cmake/Modules/GenerateConfigDotH.cmake

@@ -9,6 +9,7 @@ IF(UNIX)
     CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
     CHECK_FUNCTION_EXISTS(setitimer HAVE_SETITIMER)
     CHECK_SYMBOL_EXISTS(htonll arpa/inet.h HAVE_HTONLL)
+    CHECK_SYMBOL_EXISTS(res_search resolv.h HAVE_RES_SEARCH)
     CHECK_INCLUDE_FILES(dlfcn.h HAVE_DLFCN_H)
     CHECK_INCLUDE_FILES(netdb.h HAVE_NETDB_H)
     CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
@@ -22,6 +23,7 @@ IF(UNIX)
     CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
     CHECK_INCLUDE_FILES(arpa/inet.h HAVE_ARPA_INET_H)
     CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
+    CHECK_INCLUDE_FILES(arpa/nameser.h HAVE_ARPA_NAMESER_H)
 ENDIF()
 
 CONFIGURE_FILE(

data/ext/libcouchbase/cmake/Modules/GetLibcouchbaseFlags.cmake

@@ -22,7 +22,8 @@ ENDMACRO(list2args)
 
 LIST(APPEND LCB_GNUC_CPP_WARNINGS
     -Wall -pedantic -Wshadow -fdiagnostics-show-option -Wformat
-    -Wno-strict-aliasing -Wextra -Winit-self -Wno-missing-field-initializers)
+    -Wno-strict-aliasing -Wextra -Winit-self -Wno-missing-field-initializers
+    -Wno-variadic-macros)
 
 IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
     LIST(APPEND LCB_GNUC_CPP_WARNINGS -Wno-cast-align -Wno-dollar-in-identifier-extension)

data/ext/libcouchbase/cmake/Modules/GetVersionInfo.cmake

@@ -42,13 +42,13 @@ ENDIF()
 
 IF (NOT LCB_VERSION)
     SET(LCB_NOGITVERSION ON)
-    SET(LCB_VERSION "2.6.4")
+    SET(LCB_VERSION "2.7.2")
 ENDIF()
 IF (NOT LCB_VERSION_CHANGESET)
     SET(LCB_VERSION_CHANGESET "0xdeadbeef")
 ENDIF()
 IF (NOT LCB_VERSION_HEX)
-    SET(LCB_VERSION_HEX 0x020604)
+    SET(LCB_VERSION_HEX 0x020702)
 ENDIF()
 
 # Now parse the version string
@@ -63,7 +63,7 @@ IF(APPLE)
 ELSE()
     SET(LCB_SONAME_MAJOR "2")
 ENDIF()
-SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.39")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.42")
 
 MESSAGE(STATUS
     "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")

data/ext/libcouchbase/cmake/config-cmake.h.in

@@ -31,6 +31,8 @@
 #cmakedefine HAVE_SYS_UIO_H
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_ARPA_INET_H
+#cmakedefine HAVE_RES_SEARCH
+#cmakedefine HAVE_ARPA_NAMESER_H
 
 #ifndef HAVE_LIBEVENT
 #cmakedefine HAVE_LIBEVENT

data/ext/libcouchbase/cmake/defs.mk.in

@@ -4,5 +4,3 @@ SRCROOT=${CMAKE_SOURCE_DIR}
 REVDESCRIBE=${LCB_REVDESCRIBE}
 PACKAGE=libcouchbase
 VERSION=${LCB_VERSION}
-LCB_BUILDING_WITH_CMAKE=1
-export LCB_BUILDING_WITH_CMAKE

data/ext/libcouchbase/cmake/source_files.cmake

@@ -10,12 +10,11 @@ SET(LCB_UTILS_SRC
     src/hashtable.c
     src/list.c
     src/logging.c
-    src/packetutils.c
-    src/ringbuffer.c
-    src/simplestring.c)
+    src/ringbuffer.c)
 
 # lcbio
 FILE(GLOB LCB_IO_SRC src/lcbio/*.c)
+FILE(GLOB LCB_IO_CXXSRC src/lcbio/*.cc)
 
 # common memcached operations
 FILE(GLOB LCB_OP_SRC src/operations/*.c)
@@ -30,7 +29,6 @@ FILE(GLOB LCB_RDB_SRC src/rdb/*.c)
 FILE(GLOB LCB_NETBUF_SRC src/netbuf/*.c)
 
 # HTTP protocol management
-FILE(GLOB LCB_HT_SRC src/lcbht/*.c)
 LIST(APPEND LCB_HT_SRC "contrib/http_parser/http_parser.c")
 
 # bucket config ("confmon")
@@ -40,34 +38,56 @@ SET(LCB_CORE_SRC
     ${LCB_OP_SRC}
     ${LCB_BCONF_SRC}
     ${LCB_N1QL_SRC}
-    src/bootstrap.c
     src/callbacks.c
-    src/dump.c
-    src/getconfig.c
     src/legacy.c
     # src/mcserver/negotiate.c
-    src/mcserver/mcserver.c
-    src/newconfig.c
     src/iofactory.c
-    src/retryq.c
-    src/retrychk.c
     src/settings.c
-    src/utilities.c
-    src/wait.c)
+    src/utilities.c)
 
 SET(LCB_CORE_CXXSRC
     src/instance.cc
     src/auth.cc
+    src/bootstrap.cc
+    src/bucketconfig/bc_cccp.cc
+    src/bucketconfig/bc_http.cc
+    src/bucketconfig/bc_file.cc
+    src/bucketconfig/bc_mcraw.cc
+    src/bucketconfig/confmon.cc
     src/connspec.cc
+    src/dns-srv.cc
+    src/dump.cc
+    src/getconfig.cc
     src/nodeinfo.cc
     src/handler.cc
     src/hostlist.cc
     src/http/http.cc
     src/http/http_io.cc
+    src/lcbht/lcbht.cc
+    src/newconfig.cc
     src/n1ql/params.cc
     src/n1ql/n1ql.cc
     src/n1ql/ixmgmt.cc
     src/cbft.cc
+    src/operations/cbflush.cc
+    src/operations/counter.cc
+    src/operations/durability.cc
+    src/operations/durability-cas.cc
+    src/operations/durability-seqno.cc
+    src/operations/get.cc
+    src/operations/observe.cc
+    src/operations/observe-seqno.cc
+    src/operations/pktfwd.cc
+    src/operations/remove.cc
+    src/operations/stats.cc
+    src/operations/store.cc
     src/operations/subdoc.cc
+    src/operations/touch.cc
+    src/mcserver/mcserver.cc
     src/mcserver/negotiate.cc
-    src/cntl.cc)
+    src/retrychk.cc
+    src/retryq.cc
+    src/views/docreq.cc
+    src/views/viewreq.cc
+    src/cntl.cc
+    src/wait.cc)

data/ext/libcouchbase/configure.pl

@@ -1 +1 @@
-cmake/configure
+ext/libcouchbase/cmake/configure

data/ext/libcouchbase/contrib/genhash/genhash.h

@@ -6,6 +6,9 @@
 
 #ifndef GENHASH_H
 #define GENHASH_H 1
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*! \mainpage genhash
  *
@@ -232,4 +235,7 @@ int genhash_string_hash(const void *k, lcb_size_t nkey);
  * @}
  */
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* GENHASH_H */

data/ext/libcouchbase/include/libcouchbase/auth.h

@@ -95,6 +95,16 @@ LIBCOUCHBASE_API
 void
 lcbauth_unref(lcb_AUTHENTICATOR *auth);
 
+/**
+ * Makes a copy of an existing lcb_AUTHENTICATOR object. The returned
+ * authenticator object has a reference count of 1.
+ * @param src the authenticator object to clone
+ * @return the cloned authenticator.
+ */
+LIBCOUCHBASE_API
+lcb_AUTHENTICATOR *
+lcbauth_clone(const lcb_AUTHENTICATOR *src);
+
 #ifdef __cplusplus
 }
 #endif

data/ext/libcouchbase/include/libcouchbase/couchbase.h

@@ -3679,6 +3679,16 @@ lcb_histogram_read(const lcb_HISTOGRAM *hg, const void *cookie,
 LCB_INTERNAL_API
 void lcb_histogram_print(lcb_HISTOGRAM* hg, FILE* stream);
 
+struct hostlist_st;
+
+LCB_INTERNAL_API
+lcb_error_t
+lcb_dnssrv_query(const char *, struct hostlist_st*);
+
+LCB_INTERNAL_API
+struct hostlist_st*
+lcb_dnssrv_getbslist(const char *, int, lcb_error_t*);
+
 /* Post-include some other headers */
 #ifdef __cplusplus
 }

data/ext/libcouchbase/include/libcouchbase/error.h

@@ -566,6 +566,13 @@ int lcb_get_errtype(lcb_error_t err);
 LIBCOUCHBASE_API
 const char *lcb_strerror(lcb_t instance, lcb_error_t error);
 
+/**
+ * Get a shorter textual description of an error message. This is the
+ * constant name
+ */
+LCB_INTERNAL_API
+const char *lcb_strerror_short(lcb_error_t error);
+
 /**
  * This may be used in conjunction with the errmap callback if it wishes
  * to fallback for default behavior for the given code.

data/ext/libcouchbase/include/libcouchbase/n1ql.h

@@ -261,6 +261,15 @@ lcb_n1p_mkcmd(lcb_N1QLPARAMS *params, lcb_CMDN1QL *cmd);
 /** @private The lcb_CMDN1QL::query member is an internal JSON structure */
 #define LCB_CMDN1QL_F_JSONQUERY 1<<17
 
+/**
+ * This is an analytics query. Use the `host` field to specify the host/port
+ * to target. When this flag is set, things like prepared queries and
+ * parametrized statements will not work.
+ *
+ * @uncommited
+ */
+#define LCB_CMDN1QL_F_CBASQUERY 1<<18
+
 /**
  * Command structure for N1QL queries. Typically an application will use the
  * lcb_N1QLPARAMS structure to populate the #query and #content_type fields.
@@ -287,7 +296,10 @@ struct lcb_CMDN1QL {
     /** Length of the query data */
     size_t nquery;
 
-    /** Ignored since version 2.5.3 */
+    /**
+     * Ignored since version 2.5.3.
+     * Starting from version 2.7.3, is used for experimental CBAS support
+     */
     const char *host;
 
     /** Ignored since version 2.5.3 */

data/ext/libcouchbase/include/libcouchbase/plugins/io/bsdio-inl.c

@@ -284,7 +284,7 @@ cntl_getset_impl(lcb_io_opt_t io, lcb_socket_t sock, int mode, int oslevel,
     #ifndef _WIN32
     socklen_t dummy = optsize;
     #else
-    int dummy = optsize;
+    char dummy = optsize;
     #endif
 
     if (mode == LCB_IO_CNTL_GET) {

data/ext/libcouchbase/include/libcouchbase/subdoc.h

@@ -180,6 +180,15 @@ typedef struct {
 /** Create document if it does not exist */
 #define LCB_SDSPEC_F_MKDOCUMENT (1<<17)
 
+/** Access document XATTR path */
+#define LCB_SDSPEC_F_XATTRPATH (1<<18)
+
+/** Access document virtual/materialized path. Implies F_XATTRPATH */
+#define LCB_SDSPEC_F_XATTR_MACROVALUES (1<<19)
+
+/** Access Xattrs of deleted documents */
+#define LCB_SDSPEC_F_XATTR_DELETED_OK (1<<20)
+
 /**
  * Set the path for an @ref lcb_SDSPEC structure
  * @param s pointer to spec