libcouchbase 0.3.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e109b474ba52c5f517c1d56bb11decfcce96079
-  data.tar.gz: 0bf3dcda70e298bdd5121199875a0a05552b304d
+  metadata.gz: 5b03238b1f0df8df19845655e411bf25ae979db6
+  data.tar.gz: 6eb8fafcf9034065fc808872a9e0355ed1e2bd84
 SHA512:
-  metadata.gz: 5e46bd8fe2c97bc6ed242cbe49b16d670407839a5a39bea4ba872b68a2065d2bf0e41e52bb4116f919d1cd95b3c46a6e7937d70ab3550e2c877dae04b0410700
-  data.tar.gz: 641f6bb07307a0e4c95937c11c9278100dc486d165de84e4ecc677d20534555b0157e52aa8913278f11cb719cb1b19d1af443012182bde6f53e1bdc2ab0163d4
+  metadata.gz: 18caa5677e2311da9b67c11cf914308e23ef1af4fcf792cbaa84f43027a0b1b08056a0010a3ae652587b0603de62296ce59958c9ff45cbbf13a146deb0adc389
+  data.tar.gz: 2d553e956bba44dab297bb838b022adaf99e5831f0502ef306346431c0c46ec641c96b7ffcae4d76f6b4774a4eae6ad7b44fe1de1fa5b6590986643aba461e8a

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.3.jar)
+SET(COUCHBASE_MOCK_VERSION CouchbaseMock-LATEST.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)
+    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,234 @@
 # Release Notes
 
+## 2.7.6 (July 11 2017)
+
+* Expose enhanced errors for data commands. Couchbase Server 5 might return
+  additional information about errors in the response body. According to
+  SDK-RFC-28, the library allow user code to inspect this information using
+  following functions:
+
+    * `lcb_resp_get_error_context(int, const lcb_RESPBASE *)`
+    * `lcb_resp_get_error_ref(int, const lcb_RESPBASE *)`
+
+  They both return non-NULL strings if any of error information accessible.
+  The lifetime of these fields limited by lifetime of the response object.
+  * Issues: [CCBC-781](https://issues.couchbase.com/browse/CCBC-781)
+
+* Report contextualized error messages during negotiation. The event reference
+  could be used to find more details about authentication errors in the server
+  logs.
+  * Issues: [CCBC-780](https://issues.couchbase.com/browse/CCBC-780)
+
+* Specify correct protocol level for `SO_KEEPALIVE`. This fixes setting
+  `tcp_keepalive` option on connections.
+  * Issues: [CCBC-798](https://issues.couchbase.com/browse/CCBC-798)
+
+* Implement Error Map Retries. This implements the mechanics needed to retry
+  commands on various errors based on dynamic settings supplied via the error map.
+  * Issues: [CCBC-783](https://issues.couchbase.com/browse/CCBC-783)
+
+* Add cluster admin provider. This provider doesn't do anything except serve
+  as a source of management hostnames. And the library will fall back to it
+  when bucket is not specified for cluster management connections.
+  * Issues: [CCBC-797](https://issues.couchbase.com/browse/CCBC-797)
+
+* Implement RBAC user management in cbc tools. In addition to `examples/users`,
+  this can be a demonstration of new security APIs which appear in Couchbase
+  Server 5.
+  * Issues: [CCBC-757](https://issues.couchbase.com/browse/CCBC-757)
+
+* Allow to inspect query errors in `cbc-n1qlback`. The command will write
+  details for failed queries to file, specified with option `--error-log`.
+
+* Fix memory leak in io::Pool
+  * Issues: [CCBC-791](https://issues.couchbase.com/browse/CCBC-791)
+
+* Fix `LCB_SDCMD_GET_FULLDOC`. This would not actually work beforehand
+  because the opcode it's mapped to is 0, and we used 0 as a sentinel
+  value for an invalid opcode within the subdoc implementation.
+  * Issues: [CCBC-792](https://issues.couchbase.com/browse/CCBC-792)
+
+* Add LCB_NOT_AUTHORIZED error code. This error code maps to
+  Memcached's EACCESS
+
+* Don't send empty Authorization header for HTTP requests, If there's
+  no username and/or password
+  * Issues: [CCBC-789](https://issues.couchbase.com/browse/CCBC-789)
+
+* Internal refactoring:
+  - `io::Pool` - remove empty dtor
+  - Fix `BadPluginEnvironment` test on Fedora where libm.so is ld script
+  - Add missing commands for `cbc-help`
+
+* Documentation update:
+  - Add additional documentation for `lcb_n1ql_cancel()`
+  - Typos
+
+## 2.7.5 (May 17 2017)
+
+* Allow to disable sending the `HELLO` command when connecting to a server.
+  Sending `HELLO` will cause a bootstrap failure with Couchbase Server 2.0 and
+  older.
+  * Issues: [CCBC-786](https://issues.couchbase.com/browse/CCBC-786)
+
+* Fix error return value on reprepared query.
+  Previously an error was returned if a N1QL query was reprepared, because
+  the prior internal failure status was not updated.
+  * Issues: [CCBC-782](https://issues.couchbase.com/browse/CCBC-782)
+
+* Check for more N1QL error strings indicating the need to reprepare a statement.
+
+* Fix uninitialized memory issue when initializing `lcb::Server` and `mc_PIPELINE`
+
+* Couchbase 5.0 additions for Subdocument.
+  This adds new protocol extensions for Couchbase 5.0. This consists of:
+  * New `LCB_SDCMD_SET_FULLDOC` and `LCB_SDCMD_GET_FULLDOC` for full-doucument
+    gets and sets via the subdoc API. This allows to access xattrs atomically
+    with the document body.
+  * New 'document flags'. These are in the form of `LCB_CMDSUBDOC_F_`.
+  * Issues: [CCBC-774](https://issues.couchbase.com/browse/CCBC-774)
+
+* Fix bug where CCCP subsystem would be suspended indefinitely.
+  CCCP subsystem would hang if an error was received for the config request
+  itself.
+  * Issues: [CCBC-779](https://issues.couchbase.com/browse/CCBC-779)
+
+* Fix bootstrap with `LCB_TYPE_CLUSTER`. Previously bootstrap would fail because
+  the client would not send proper credentials. Note that at this point, the
+  `default` bucket must still exist.
+  * Issues: [CCBC-778](https://issues.couchbase.com/browse/CCBC-778)
+
+* Ignore empty DNS SRV replies.
+  Some buggy DNS configurations return positive replies to SRV queries, but
+  without actually containing any kind of A record as a response.
+  * Issues: [CCBC-776](https://issues.couchbase.com/browse/CCBC-776)
+
+* Enable background polling for configuration changes.
+  This allows the client to periodically poll for configuration changes. This
+  feature is disabled by default. You can use the `config_poll_interval`
+  setting to enable it in the connection string.
+  * Issues: [CCBC-627](https://issues.couchbase.com/browse/CCBC-627)
+
+* Enable TCP Keepalive for newly created sockets.
+  Newly created sockets have TCP keepalive enabled in order to avoid firewalls
+  breaking connections due to inactivity. TCP Keepalive does not yet work for
+  the libuv plugin (e.g. nodejs).
+  You can use the `tcp_keepalive=false` directive in the connection string
+  to disable it.
+  * Issues: [CCBC-690](https://issues.couchbase.com/browse/CCBC-690)
+
+## 2.7.4 (April 18 2017)
+
+* Send `SELECT_BUCKET` command by default if server supports it. This enables
+  new-style 'RBAC' authentication by default. In 2.7.3 users were required to
+  use `select_bucket=true` in the connection string to enable this feature.
+  In this version, the option is still available but is now mainly useful to
+  disable it.
+
+* Improve `lcb_AUTHENTICATOR` API. This provides better documentation and some
+  API/design/implementation fixes to the authenticator interface. The
+  authenticator may be useful for integrators/wrappers who wish to correlate
+  multiple credentials with their buckets.
+  Note that the use of `lcb_AUTHENTICATOR` is *not* required for RBAC support.
+  In order to use RBAC, simply make use of the `username` field in
+  the `lcb_create_st` struct, or the `username` parameter in the connection
+  string.
+  * Issues: [CCBC-751](https://issues.couchbase.com/browse/CCBC-751)
+
+* Fix bug where `lcb_get_server_list()` would return NULL.
+  * Issues: [CCBC-764](https://issues.couchbase.com/browse/CCBC-764)
+
+* Fix bug where client would not recover from failover. Clients from version
+  2.7.1 through 2.7.3 would not obtain a new cluster map after a node had
+  been failed over (e.g. by hitting the "fail over" button in the UI).
+  * Issues: [CCBC-761](https://issues.couchbase.com/browse/CCBC-761)
+
+## 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
@@ -2707,5 +2936,3 @@ These changes extend existing features with enhanced APIs
 * Basic TAP protocol implementation
 
 * Initial win32 support
-
-

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,23 @@ 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()
+
+SET(CMAKE_TEST_SHARED_OBJECT "libm.so")
+IF (WIN32)
+  SET(CMAKE_TEST_SHARED_OBJECT "kernel32.dll.")
+ELSEIF (APPLE)
+  SET(CMAKE_TEST_SHARED_OBJECT "libm.dylib")
+ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  EXECUTE_PROCESS(COMMAND ${CMAKE_LINKER} -lm -t
+    OUTPUT_VARIABLE LIBM_SO_TRACE
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  STRING(REGEX MATCH [a-z0-9/]+libm.so[.0-9]* LIBM_SO_PATH ${LIBM_SO_TRACE})
+  IF (EXISTS "${LIBM_SO_PATH}")
+    GET_FILENAME_COMPONENT(CMAKE_TEST_SHARED_OBJECT ${LIBM_SO_PATH} NAME)
+  ENDIF()
 ENDIF()
 
 CONFIGURE_FILE(

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

@@ -22,9 +22,10 @@ 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")
+IF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     LIST(APPEND LCB_GNUC_CPP_WARNINGS -Wno-cast-align -Wno-dollar-in-identifier-extension)
 ENDIF()
 

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.0")
+    SET(LCB_VERSION "2.7.6")
 ENDIF()
 IF (NOT LCB_VERSION_CHANGESET)
     SET(LCB_VERSION_CHANGESET "0xdeadbeef")
 ENDIF()
 IF (NOT LCB_VERSION_HEX)
-    SET(LCB_VERSION_HEX 0x020700)
+    SET(LCB_VERSION_HEX 0x020706)
 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.40")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.46")
 
 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
@@ -58,3 +60,5 @@
 
 #include "config_static.h"
 #endif
+
+#define TEST_SHARED_OBJECT "${CMAKE_TEST_SHARED_OBJECT}"

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,11 +10,11 @@ SET(LCB_UTILS_SRC
     src/hashtable.c
     src/list.c
     src/logging.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)
@@ -29,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")
@@ -39,40 +38,57 @@ 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_static.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)