couchbase 3.0.0.alpha.4-universal-darwin-19 → 3.0.0.alpha.5-universal-darwin-19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8b1be7d23cb5c725e448db3ac54370e4dda4a4df9490ad1a78bdf66b0a2309
-  data.tar.gz: 22da4d1bf78ec51e65f6104b788e67769a1f48a3f6394fe821adde0115a376fb
+  metadata.gz: 87dcd3df3d46f4af2d6602541c0daf3e2a0f9f36f9ca1601fdc713358ac2adc3
+  data.tar.gz: 6252f8320fe2bbeb9c8c0da1cfceb1b58649cb464cf34a310e3093cb2260f97f
 SHA512:
-  metadata.gz: 741cd0b8ac16cd488af9d386c75483a9813b078e5d6f26a62c8b2569d5e3197df73bea32cd51a1048a0a6ed36dd78c5c32538b5f3ec4fb6d561bf95b4c71382c
-  data.tar.gz: 9ad2b0bf5c7178eb42620c079dabaec6e977bad7f40bdc6d554122c38856c88388b20d5bc8a0b55ccd50ad9c77da8fef54fe9e2fe03d20c95798dc19c657c64a
+  metadata.gz: b95dced52e79cd8515da3efadd65f836ab23f2e9aed6b1d8df34d539c908068fb9afe3ebff726236616d43258d860156fcc1dbd79348ec989aee9d7308043840
+  data.tar.gz: '01928bf4b1661f9cc6c4cc6351ee41fdf3b8b30425d32bc4e7316e99c130ad37eb0c61f497b4eb678b7e086d713be8459a84b5bbae14a9ff4866327bea65e28a'

data/README.md

@@ -16,7 +16,7 @@ Please attach version information to ticket/post. To obtain this information use
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.0.0.alpha.4"
+gem "couchbase", "3.0.0.alpha.5"
 ```
 
 And then execute:

data/bin/fetch-stats

@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+
+require "json"
+require "net/http"
+require "pp"
+
+Net::HTTP.start("rubygems.org", use_ssl: true) do |client|
+  case resp = client.get("/api/v1/versions/couchbase.json")
+  when Net::HTTPSuccess
+    versions = JSON.parse(resp.body)
+    stats = Hash.new(0)
+    versions.each { |version| stats[version["number"]] += version["downloads_count"] }
+    puts JSON.pretty_generate(
+      versions: stats,
+      total: stats.values.sum,
+      total_3: stats.filter_map { |version, downloads| downloads if version =~ /^3.0.0/ }.sum,
+    )
+  end
+end

data/bin/init-cluster

@@ -14,49 +14,49 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-HOST=${HOST:-localhost}
-USERNAME=${USERNAME:-Administrator}
-PASSWORD=${PASSWOWRD:-password}
-QUOTA=${QUOTA:-256}
-DEVELOPER_PREVIEW=${DEVELOPER_PREVIEW:-no}
-BEER_SAMPLE=${BEER_SAMPLE:-no}
-TRAVEL_SAMPLE=${TRAVEL_SAMPLE:-no}
+CB_HOST=${CB_HOST:-localhost}
+CB_USERNAME=${CB_USERNAME:-Administrator}
+CB_PASSWORD=${CB_PASSWOWRD:-password}
+CB_QUOTA=${CB_QUOTA:-256}
+CB_DEVELOPER_PREVIEW=${CB_DEVELOPER_PREVIEW:-no}
+CB_BEER_SAMPLE=${CB_BEER_SAMPLE:-no}
+CB_TRAVEL_SAMPLE=${CB_TRAVEL_SAMPLE:-no}
 
-CREDS="${USERNAME}:${PASSWORD}"
+CB_CREDS="${CB_USERNAME}:${CB_PASSWORD}"
 
 sleep 1
 
 set -ex
 
 # Ping cluster
-curl -sS http://${HOST}:8091/pools
+curl -sS http://${CB_HOST}:8091/pools
 
 # Initialize Node
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/nodes/self/controller/settings \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/nodes/self/controller/settings \
      -d 'path=%2Fopt%2Fcouchbase%2Fvar%2Flib%2Fcouchbase%2Fdata' \
      -d 'index_path=%2Fopt%2Fcouchbase%2Fvar%2Flib%2Fcouchbase%2Fdata'
 
 # Setup Memory Quotas
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/pools/default \
-  -d "memoryQuota=${QUOTA}" \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/pools/default \
+  -d "memoryQuota=${CB_QUOTA}" \
   -d 'indexMemoryQuota=256'
 
 # Setup Services
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/node/controller/setupServices \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/node/controller/setupServices \
      -d 'services=kv%2Cn1ql%2Cindex%2Cfts%2Ccbas'
 
 # Setup Administrator username and password
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/settings/web \
-     -d "password=${PASSWORD}" \
-     -d "username=${USERNAME}" \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/settings/web \
+     -d "password=${CB_PASSWORD}" \
+     -d "username=${CB_USERNAME}" \
      -d "port=SAME"
 
 # Setup index settings
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/settings/indexes \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/settings/indexes \
      -d "storageMode=plasma"
 
 # Setup Bucket
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/pools/default/buckets \
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/pools/default/buckets \
      -d 'flushEnabled=1' \
      -d 'threadsNumber=3' \
      -d 'replicaIndex=0' \
@@ -66,17 +66,17 @@ curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/pools/default/buckets \
      -d 'bucketType=membase' \
      -d 'name=default'
 
-if [ "x${BEER_SAMPLE}" != "xno" ]; then
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/sampleBuckets/install \
+if [ "x${CB_BEER_SAMPLE}" != "xno" ]; then
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/sampleBuckets/install \
      -d '["beer-sample"]'
 fi
 
-if [ "x${TRAVEL_SAMPLE}" != "xno" ]; then
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/sampleBuckets/install \
+if [ "x${CB_TRAVEL_SAMPLE}" != "xno" ]; then
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/sampleBuckets/install \
      -d '["travel-sample"]'
 fi
 
-if [ "x${DEVELOPER_PREVIEW}" != "xno" ]; then
-curl -sS -w "\n" -u ${CREDS} http://${HOST}:8091/settings/developerPreview \
+if [ "x${CB_DEVELOPER_PREVIEW}" != "xno" ]; then
+curl -sS -w "\n" -u ${CB_CREDS} http://${CB_HOST}:8091/settings/developerPreview \
      -d "enabled=true"
 fi

data/bin/jenkins/build-extension

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+#    Copyright 2020 Couchbase, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+PROJECT_ROOT="$( cd "$(dirname "$0"/../..)" >/dev/null 2>&1 ; pwd -P )"
+
+set -x
+set -e
+
+CB_RUBY_VERSION=${CB_RUBY_VERSION:-2.7.1}
+
+export PATH="$(realpath ~/.cmake-3.17.2/bin):$PATH"
+
+source /usr/local/share/chruby/chruby.sh
+chruby ruby-${CB_RUBY_VERSION}
+
+ruby --version
+bundle --version
+bundle config set --local path ${PROJECT_ROOT}/vendor/bundle
+
+bundle install
+export EXT_BUILD_DIR="${PROJECT_ROOT}/build-${RUBY_VERSION}-${BUILD_NUMBER}"
+bundle exec rake compile

data/bin/jenkins/install-dependencies

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+#    Copyright 2020 Couchbase, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+PROJECT_ROOT="$( cd "$(dirname "$0"/../..)" >/dev/null 2>&1 ; pwd -P )"
+
+set -x
+set -e
+
+CB_RUBY_VERSION=${CB_RUBY_VERSION:-2.7.1}
+
+if  [ ! -x /usr/local/bin/ruby-install ]
+then
+    wget -O ruby-install-0.7.0.tar.gz https://github.com/postmodern/ruby-install/archive/v0.7.0.tar.gz
+    tar -xzvf ruby-install-0.7.0.tar.gz
+    cd ruby-install-0.7.0/
+    sudo make install
+fi
+
+if  [ ! -e /usr/local/share/chruby/chruby.sh ]
+then
+    wget -O chruby-0.3.9.tar.gz https://github.com/postmodern/chruby/archive/v0.3.9.tar.gz
+    tar -xzvf chruby-0.3.9.tar.gz
+    cd chruby-0.3.9/
+    sudo make install
+fi
+
+ruby-install --jobs=6 --no-reinstall ruby ${CB_RUBY_VERSION}
+
+if [ ! -d ~/.cmake-3.17.2 ]
+then
+    wget https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.tar.gz
+    tar xvf cmake-3.17.2-Linux-x86_64.tar.gz
+    mv cmake-3.17.2-Linux-x86_64 ~/.cmake-3.17.2
+fi

data/bin/jenkins/test-with-cbdyncluster

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+#    Copyright 2020 Couchbase, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+set -x
+set -e
+
+cbdyncluster info
+cbdyncluster ps -a
+
+CB_VERSION=${CB_VERSION:-6.5.1}
+CB_RUBY_VERSION=${CB_RUBY_VERSION:-2.7.1}
+
+CLUSTER_ID=$(cbdyncluster allocate --num-nodes=3 --server-version=${CB_VERSION})
+SERVICES="kv,index,n1ql,fts"
+cbdyncluster setup ${CLUSTER_ID} \
+    --bucket=default \
+    --enable-developer-preview \
+    --storage-mode=plasma \
+    --node=${SERVICES} \
+    --node=${SERVICES} \
+    --node=${SERVICES}
+sleep 30
+
+source /usr/local/share/chruby/chruby.sh
+chruby ruby-${CB_RUBY_VERSION}
+
+export COUCHBASE_BACKEND_LOG_LEVEL=debug
+# CB_TEST_NAME=test_exists_allows_to_check_document_existence
+
+if [ ! -z $CB_TEST_NAME ]
+then
+  export TESTOPTS="--name='/^${CB_TEST_NAME}$/'"
+fi
+export TEST_SERVER_VERSION=${CB_VERSION}
+export TEST_DEVELOPER_PREVIEW=yes
+export TEST_CONNECTION_STRING=$(cbdyncluster connstr ${CLUSTER_ID})
+set +e
+
+bundle exec rake test
+STATUS=$?
+set -e
+
+cbdyncluster rm ${CLUSTER_ID}
+
+exit ${STATUS}

data/couchbase.gemspec

@@ -32,7 +32,33 @@ Gem::Specification.new do |spec|
   spec.metadata["github_repo"] = "ssh://github.com/couchbase/couchbase-ruby-client"
 
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files --recurse-submodules -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|test_data)/}) }
+    exclude_paths = %w[
+        test
+        spec
+        features
+        test_data
+        ext/third_party/asio/asio/src/examples
+        ext/third_party/asio/asio/src/tests
+        ext/third_party/asio/asio/src/tools
+        ext/third_party/gsl/tests
+        ext/third_party/http_parser/contrib
+        ext/third_party/http_parser/fuzzers
+        ext/third_party/json/contrib
+        ext/third_party/json/doc
+        ext/third_party/json/src/example
+        ext/third_party/json/src/perf
+        ext/third_party/json/src/test
+        ext/third_party/json/tests
+        ext/third_party/snappy/testdata
+        ext/third_party/spdlog/bench
+        ext/third_party/spdlog/example
+        ext/third_party/spdlog/logos
+        ext/third_party/spdlog/scripts
+        ext/third_party/spdlog/tests
+    ]
+    `git ls-files --recurse-submodules -z`
+      .split("\x0")
+      .reject { |f| f.match(%r{^(#{Regexp.union(exclude_paths)})/}) }
   end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/examples/subdocument.rb

@@ -30,12 +30,12 @@ document = {
 collection.upsert("customer123", document)
 
 res = collection.mutate_in("customer123", [
-    MutateInSpec.dict_upsert("fax", "311-555-0151")
+    MutateInSpec.upsert("fax", "311-555-0151")
 ])
 puts "The document has been modified successfully: cas=#{res.cas}"
 
 res = collection.mutate_in("customer123", [
-    MutateInSpec.dict_upsert("_framework.model_type", "Customer").xattr,
+    MutateInSpec.upsert("_framework.model_type", "Customer").xattr,
     MutateInSpec.remove("addresses.billing[2]"),
     MutateInSpec.replace("email", "dougr96@hotmail.com"),
 ])

data/ext/build_version.hxx.in

@@ -22,5 +22,5 @@
 #define BACKEND_C_COMPILER "@CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@"
 #define BACKEND_SYSTEM "@CMAKE_SYSTEM@"
 #define BACKEND_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@"
-#define BACKEND_GIT_REVISION "bb2110dbfe863e98cd246a07a3ae54f87a7a20b1"
+#define BACKEND_GIT_REVISION "96d4d0b033b3d0ab2c198d755fa0180a54e9211f"
 

data/ext/couchbase/cluster.hxx

@@ -21,7 +21,7 @@
 #include <thread>
 
 #include <io/mcbp_session.hxx>
-#include <io/session_manager.hxx>
+#include <io/http_session_manager.hxx>
 #include <bucket.hxx>
 #include <operations.hxx>
 #include <operations/document_query.hxx>
@@ -53,11 +53,11 @@ class cluster
 {
   public:
     explicit cluster(asio::io_context& ctx)
-      : id_(uuid::random())
+      : id_(uuid::to_string(uuid::random()))
       , ctx_(ctx)
       , work_(asio::make_work_guard(ctx_))
       , session_(std::make_shared<io::mcbp_session>(id_, ctx_))
-      , session_manager_(std::make_shared<io::session_manager>(id_, ctx_))
+      , session_manager_(std::make_shared<io::http_session_manager>(id_, ctx_))
     {
     }
 
@@ -100,43 +100,44 @@ class cluster
             return handler(std::make_error_code(error::common_errc::invalid_argument));
         }
         configuration config = session_->config();
+        auto known_features = session_->supported_features();
         auto& node = config.nodes.front();
-        auto new_session = std::make_shared<io::mcbp_session>(id_, ctx_, bucket_name);
-        new_session->bootstrap(
-          node.hostname,
-          std::to_string(*node.services_plain.key_value),
-          origin_.get_username(),
-          origin_.get_password(),
-          [this, name = bucket_name, new_session, h = std::forward<Handler>(handler)](std::error_code ec, configuration cfg) mutable {
-              if (!ec) {
-                  if (!session_->supports_gcccp()) {
-                      session_manager_->set_configuration(cfg);
-                  }
-                  auto b = std::make_shared<bucket>(ctx_, name, cfg);
-                  size_t this_index = new_session->index();
-                  b->set_node(this_index, new_session);
-                  if (cfg.nodes.size() > 1) {
-                      for (const auto& n : cfg.nodes) {
-                          if (n.index != this_index) {
-                              auto s = std::make_shared<io::mcbp_session>(id_, ctx_, name);
-                              b->set_node(n.index, s);
-                              s->bootstrap(n.hostname,
-                                           std::to_string(*n.services_plain.key_value),
-                                           origin_.get_username(),
-                                           origin_.get_password(),
-                                           [s, i = n.index, b](std::error_code err, configuration /*config*/) {
-                                               if (err) {
-                                                   spdlog::warn("unable to bootstrap node: {}", err.message());
-                                                   b->remove_node(i);
+        auto new_session = std::make_shared<io::mcbp_session>(id_, ctx_, bucket_name, known_features);
+        new_session->bootstrap(node.hostname,
+                               std::to_string(*node.services_plain.key_value),
+                               origin_.get_username(),
+                               origin_.get_password(),
+                               [this, name = bucket_name, new_session, known_features, h = std::forward<Handler>(handler)](
+                                 std::error_code ec, configuration cfg) mutable {
+                                   if (!ec) {
+                                       if (!session_->supports_gcccp()) {
+                                           session_manager_->set_configuration(cfg);
+                                       }
+                                       auto b = std::make_shared<bucket>(ctx_, name, cfg);
+                                       size_t this_index = new_session->index();
+                                       b->set_node(this_index, new_session);
+                                       if (cfg.nodes.size() > 1) {
+                                           for (const auto& n : cfg.nodes) {
+                                               if (n.index != this_index) {
+                                                   auto s = std::make_shared<io::mcbp_session>(id_, ctx_, name, known_features);
+                                                   b->set_node(n.index, s);
+                                                   s->bootstrap(n.hostname,
+                                                                std::to_string(*n.services_plain.key_value),
+                                                                origin_.get_username(),
+                                                                origin_.get_password(),
+                                                                [s, i = n.index, b](std::error_code err, configuration /*config*/) {
+                                                                    if (err) {
+                                                                        spdlog::warn("unable to bootstrap node: {}", err.message());
+                                                                        b->remove_node(i);
+                                                                    }
+                                                                });
                                                }
-                                           });
-                          }
-                      }
-                  }
-                  buckets_.emplace(name, std::move(b));
-              }
-              h(ec);
-          });
+                                           }
+                                       }
+                                       buckets_.emplace(name, std::move(b));
+                                   }
+                                   h(ec);
+                               });
     }
 
     template<class Request, class Handler>
@@ -164,11 +165,11 @@ class cluster
     }
 
   private:
-    uuid::uuid_t id_;
+    std::string id_;
     asio::io_context& ctx_;
     asio::executor_work_guard<asio::io_context::executor_type> work_;
     std::shared_ptr<io::mcbp_session> session_;
-    std::shared_ptr<io::session_manager> session_manager_;
+    std::shared_ptr<io::http_session_manager> session_manager_;
     std::map<std::string, std::shared_ptr<bucket>> buckets_;
     origin origin_;
 };