libcouchbase 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf6d5e626047b95ba0715ab37e4a10f93a6ee6a
-  data.tar.gz: f01f640c657ac0c1efae62261f399bd1ff2359f3
+  metadata.gz: 5997fa863626ca0ef4723becd7d60ddbbcb3425f
+  data.tar.gz: 43edae591acdd1a6146db06da0c97c4267e6c1ef
 SHA512:
-  metadata.gz: 33ae11acb6c44814f8904ac8b11b66b35b44dacb56d0eb7ea88272c63a5db6f6b5fed432799464f41a3567298f423e151596814c9549475086698cd45e2c33fe
-  data.tar.gz: cabebbf191fcd28a9771a149652a6a2f47b06894a26c3099f92dc9a0b2b724c9f97d848ed022f657c8a6f774fc02e6ad394df9aefa6dc573bfd9a81281f70cf8
+  metadata.gz: 5357cad71cf73c2e3c649a74692c613cd386cd07bb3d0c2f97117f3ca75f3d912230bf6d122e5fb59d0634acaec279caddbab2fe1b26f5bd64e13c3a5afe40a2
+  data.tar.gz: be6d945d52b776287dd469a61781a2c5099f7eabf905be786fd946bfcb21c16ae387a97478f59fe5e0e58db006588d45f63bea79ef1270392880d1baa540cffa

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - jruby-9.1.5.0
   - jruby-head
   - rubinius
-# - rubinius-3.62 # blocked by https://github.com/rubinius/rubinius/issues/3706
+  - rubinius-3.76
 branches:
   only:
     - master

data/README.md

@@ -43,7 +43,7 @@ The library is designed to run anywhere [Rails](http://rubyonrails.org/) runs:
 
 * Ruby 2.2+
 * JRuby 9.1+
-* Rubinius (currently blocked due to [#3706](https://github.com/rubinius/rubinius/issues/3706))
+* Rubinius 3.76+
 
 
 Tested on the following Operating Systems:

data/ext/libcouchbase/CMakeLists.txt

@@ -21,7 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 # These variables can be modified as needed
 
 # Couchbase mock path to download
-SET(COUCHBASE_MOCK_VERSION CouchbaseMock-1.4.7.jar)
+SET(COUCHBASE_MOCK_VERSION CouchbaseMock-1.4.3.jar)
 # Maven repository where ${COUCHBASE_MOCK_VERSION} is to be found
 SET(COUCHBASE_MOCK_DLSERVER http://packages.couchbase.com/clients/c/mock)
 project(libcouchbase)
@@ -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 dnsapi.lib)
+    SET(lcb_plat_libs ws2_32.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 resolv)
+        SET(lcb_plat_libs ${lcb_plat_libs} dl)
     ELSE()
         # BSD _and_ DTrace
         IF(LCB_BUILD_DTRACE)
@@ -205,7 +205,6 @@ 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})
@@ -215,7 +214,6 @@ 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)
@@ -247,6 +245,10 @@ 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)
@@ -259,11 +261,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
-<https://issues.couchbase.com>. Sign up for an account and file an issue
+<http://couchbase.com/issues>. 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/wcummings/cberl)
+    * [cberl - Couchbase NIF](https://github.com/chitika/cberl)
     * [Perl client](https://github.com/mnunberg/perl-Couchbase-Client)
 
 ## Documentation

data/ext/libcouchbase/RELEASE_NOTES.markdown

@@ -1,91 +1,5 @@
 # Release Notes
 
-## 2.7.3 (March 21 2017)
-
-* Provide the ability to send the `SELECT_BUCKET` when establishing a
-  to a server. This is a building block allowing us to use 'RBAC'/username
-  auth in the future.
-  Note that this requires the `select_bucket=true` option in the connection
-  string or equivalent, and that this feature as a whole is considered
-  experimental.
-  * Priority: Major
-  * Issues: [CCBC-758](https://issues.couchbase.com/browse/CCBC-758)
-
-* Provide an option to disable DNS-SRV lookups. Because DNS SRV lookups often
-  result in no result (i.e. `NXDOMAIN`) - which takes longer, allowing to
-  disable such lookups may speed up startup time.
-  This option is available via the connection string, using `dnssrv=off`
-  * Priority: Minor
-  * Issues: [CCBC-756](https://issues.couchbase.com/browse/CCBC-756)
-
-* Send client/user-specific identifier in `User-Agent` HTTP header.
-  The library already does this for data nodes (Memcached). Using it in HTTP
-  services allows better supportability when diagnosing issues by reading the
-  HTTP logs.
-  * Priority: Major
-  * Issues: [CCBC-755](https://issues.couchbase.com/browse/CCBC-755)
-
-* Fix bug where DNS SRV hostnames would not be used.
-  While DNS SRV lookup was working, the library would not actually attempt
-  bootstrap off those received hostnames.
-  * Priority: Major
-  * Issues: [CCBC-753](https://issues.couchbase.com/browse/CCBC-753)
-
-* Provide experimental Analytics support.
-  This allows access to the Couchbase Analytics Service, available in
-  some pre-release builds. API and syntax wise, Analytics is very similar
-  to N1QL.
-  To use the analytics service, set the `LCB_CMDN1QL_F_CBASQUERY` bit in
-  `lcb_CMDN1QL::cmdflags`, and provide the appropriate _host:port_ combination
-  in the `lcb_CMDN1QL::host` field. - Currently, analytics support is not
-  used in the cluster map/configuration.
-  * Priority: Major
-  * Issues: [CCBC-734](https://issues.couchbase.com/browse/CCBC-734)
-
-## 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

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

@@ -11,17 +11,6 @@ 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,7 +9,6 @@ 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)
@@ -23,7 +22,6 @@ 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,8 +22,7 @@ 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-variadic-macros)
+    -Wno-strict-aliasing -Wextra -Winit-self -Wno-missing-field-initializers)
 
 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.7.3")
+    SET(LCB_VERSION "2.7.0")
 ENDIF()
 IF (NOT LCB_VERSION_CHANGESET)
     SET(LCB_VERSION_CHANGESET "0xdeadbeef")
 ENDIF()
 IF (NOT LCB_VERSION_HEX)
-    SET(LCB_VERSION_HEX 0x020703)
+    SET(LCB_VERSION_HEX 0x020700)
 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.43")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.40")
 
 MESSAGE(STATUS
     "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")

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

@@ -31,8 +31,6 @@
 #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,3 +4,5 @@ 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,11 +10,11 @@ SET(LCB_UTILS_SRC
     src/hashtable.c
     src/list.c
     src/logging.c
-    src/ringbuffer.c)
+    src/ringbuffer.c
+    src/simplestring.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)
@@ -29,6 +29,7 @@ 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")
@@ -38,57 +39,40 @@ SET(LCB_CORE_SRC
     ${LCB_OP_SRC}
     ${LCB_BCONF_SRC}
     ${LCB_N1QL_SRC}
+    src/bootstrap.c
     src/callbacks.c
     src/legacy.c
     # src/mcserver/negotiate.c
     src/iofactory.c
+    src/retrychk.c
     src/settings.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/errmap.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/retrychk.cc
     src/retryq.cc
-    src/views/docreq.cc
-    src/views/viewreq.cc
     src/cntl.cc
     src/wait.cc)

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

@@ -95,16 +95,6 @@ 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/cntl.h

@@ -924,34 +924,8 @@ typedef const char *lcb_BUCKETCRED[2];
  */
 #define LCB_CNTL_READ_CHUNKSIZE 0x42
 
-/**
- * Enable/Disable the Error Map feature. This is disabled by default.
- * Works only on servers which support error map
- *
- * Use `enable_errmap` in the connection string
- *
- * @volatile
- * @cntl_arg_both{int* (as boolean)}
- */
-#define LCB_CNTL_ENABLE_ERRMAP 0x43
-
-/**
- * Enable/Disable sending the SELECT_BUCKET command after authentication.
- * This is useful to test auth, and should not be set by end-users.
- *
- * Note that even if this feature is enabled (the default), the client will
- * only send `SELECT_BUCKET` if the server indicates that it is supported
- * during negotiation.
- *
- * Use `select_bucket` in the connection string
- *
- * @volatile
- * @cntl_arg_both{int* (as boolean)}
- */
-#define LCB_CNTL_SELECT_BUCKET 0x44
-
 /** This is not a command, but rather an indicator of the last item */
-#define LCB_CNTL__MAX                    0x45
+#define LCB_CNTL__MAX                    0x43
 /**@}*/
 
 #ifdef __cplusplus

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

@@ -502,14 +502,7 @@ typedef enum {
     X(LCB_UNKNOWN_SDCMD, 0x4D, LCB_ERRTYPE_INPUT, "Unknown subdocument command") \
     X(LCB_ENO_COMMANDS, 0x4E, LCB_ERRTYPE_INPUT, "No commands specified") \
     X(LCB_QUERY_ERROR, 0x4F, LCB_ERRTYPE_SRVGEN, \
-        "Query execution failed. Inspect raw response object for information") \
-    \
-    X(LCB_GENERIC_TMPERR, 0x50, LCB_ERRTYPE_TRANSIENT|LCB_ERRTYPE_SRVGEN, \
-        "Generic temporary error received from server") \
-    X(LCB_GENERIC_SUBDOCERR, 0x51, LCB_ERRTYPE_SUBDOC|LCB_ERRTYPE_SRVGEN, \
-        "Generic subdocument error received from server") \
-    X(LCB_GENERIC_CONSTRAINT_ERR, 0x52, LCB_ERRTYPE_INPUT|LCB_ERRTYPE_SRVGEN, \
-        "Generic constraint error received from server")
+        "Query execution failed. Inspect raw response object for information")
 
 /** Error codes returned by the library. */
 typedef enum {
@@ -573,13 +566,6 @@ 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.