couchbase 4.2.3 → 4.2.4

package/deps/couchbase-cxx-client/CMakeLists.txt

@@ -80,6 +80,7 @@ add_subdirectory(core/tracing)
 add_subdirectory(core/metrics)
 
 set(couchbase_cxx_client_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
         core/agent.cxx
         core/agent_config.cxx
         core/agent_group.cxx
@@ -256,41 +257,75 @@ set(couchbase_cxx_client_FILES
         core/utils/split_string.cxx
         core/utils/url_codec.cxx
         core/impl/analytics.cxx
+        core/impl/search.cxx
         core/impl/analytics_error_category.cxx
         core/impl/append.cxx
         core/impl/best_effort_retry_strategy.cxx
+        core/impl/boolean_field_query.cxx
+        core/impl/boolean_query.cxx
         core/impl/build_deferred_query_indexes.cxx
-        core/impl/collection_query_index_manager.cxx
         core/impl/cluster.cxx
+        core/impl/collection_query_index_manager.cxx
         core/impl/common_error_category.cxx
         core/impl/configuration_profiles_registry.cxx
+        core/impl/conjunction_query.cxx
         core/impl/create_query_index.cxx
+        core/impl/date_range.cxx
+        core/impl/date_range_facet.cxx
+        core/impl/date_range_facet_result.cxx
+        core/impl/date_range_query.cxx
         core/impl/decrement.cxx
+        core/impl/disjunction_query.cxx
         core/impl/dns_srv_tracker.cxx
         core/impl/drop_query_index.cxx
         core/impl/exists.cxx
         core/impl/expiry.cxx
         core/impl/fail_fast_retry_strategy.cxx
         core/impl/field_level_encryption_error_category.cxx
+        core/impl/geo_bounding_box_query.cxx
+        core/impl/geo_distance_query.cxx
+        core/impl/geo_polygon_query.cxx
         core/impl/get.cxx
+        core/impl/get_all_query_indexes.cxx
         core/impl/get_all_replicas.cxx
         core/impl/get_and_lock.cxx
         core/impl/get_and_touch.cxx
-        core/impl/get_all_query_indexes.cxx
         core/impl/get_any_replica.cxx
         core/impl/get_replica.cxx
         core/impl/increment.cxx
         core/impl/insert.cxx
+        core/impl/internal_date_range_facet_result.cxx
+        core/impl/internal_numeric_range_facet_result.cxx
+        core/impl/internal_search_error_context.cxx
+        core/impl/internal_search_meta_data.cxx
+        core/impl/internal_search_result.cxx
+        core/impl/internal_search_row.cxx
+        core/impl/internal_search_row_locations.cxx
+        core/impl/internal_term_facet_result.cxx
         core/impl/key_value_error_category.cxx
+        core/impl/key_value_error_context.cxx
         core/impl/lookup_in.cxx
         core/impl/management_error_category.cxx
+        core/impl/match_all_query.cxx
+        core/impl/match_none_query.cxx
+        core/impl/match_phrase_query.cxx
+        core/impl/match_query.cxx
         core/impl/mutate_in.cxx
         core/impl/network_error_category.cxx
+        core/impl/numeric_range.cxx
+        core/impl/numeric_range_facet.cxx
+        core/impl/numeric_range_facet_result.cxx
+        core/impl/numeric_range_query.cxx
         core/impl/observe_poll.cxx
         core/impl/observe_seqno.cxx
+        core/impl/phrase_query.cxx
+        core/impl/prefix_query.cxx
         core/impl/prepend.cxx
         core/impl/query.cxx
         core/impl/query_error_category.cxx
+        core/impl/query_error_context.cxx
+        core/impl/query_string_query.cxx
+        core/impl/regexp_query.cxx
         core/impl/remove.cxx
         core/impl/replace.cxx
         core/impl/retry_action.cxx
@@ -314,6 +349,20 @@ set(couchbase_cxx_client_FILES
         core/impl/subdoc/remove.cxx
         core/impl/subdoc/replace.cxx
         core/impl/subdoc/upsert.cxx
+        core/impl/search.cxx
+        core/impl/search_error_context.cxx
+        core/impl/search_meta_data.cxx
+        core/impl/search_result.cxx
+        core/impl/search_row.cxx
+        core/impl/search_row_location.cxx
+        core/impl/search_row_locations.cxx
+        core/impl/search_sort_field.cxx
+        core/impl/search_sort_id.cxx
+        core/impl/search_sort_score.cxx
+        core/impl/term_facet.cxx
+        core/impl/term_facet_result.cxx
+        core/impl/term_query.cxx
+        core/impl/term_range_query.cxx
         core/impl/touch.cxx
         core/impl/transaction_error_category.cxx
         core/impl/transaction_get_result.cxx
@@ -322,6 +371,7 @@ set(couchbase_cxx_client_FILES
         core/impl/upsert.cxx
         core/impl/view_error_category.cxx
         core/impl/watch_query_indexes.cxx
+        core/impl/wildcard_query.cxx
         core/io/dns_client.cxx
         core/io/dns_config.cxx
         core/io/http_parser.cxx
@@ -405,9 +455,9 @@ endif ()
 if (NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
     if (TARGET PkgConfig::PKG_CONFIG_OPENSSL)
         target_link_libraries(couchbase_cxx_client PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
-    else()
+    else ()
         target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-    endif()
+    endif ()
 endif ()
 
 option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" TRUE)

package/deps/couchbase-cxx-client/README.md

@@ -7,6 +7,7 @@
 
 This repo is under active development and is not yet ready for release as a public SDK.
 
+Release notes and API reference: https://github.com/couchbaselabs/couchbase-cxx-client/releases.
 
 ## Getting the Source Code
 

package/deps/couchbase-cxx-client/bin/create-search-index

@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby
+
+#  Copyright 2020-2021 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.
+
+require "timeout"
+require "net/http"
+require "json"
+require "openssl"
+
+class API
+  def initialize(options)
+    @options = options
+    connect
+  end
+
+  def connect
+    puts "# CONNECT #{@options}"
+    @client = Net::HTTP.start(@options[:host], @options[:port],
+                              use_ssl: @options[:strict_encryption],
+                              verify_mode: OpenSSL::SSL::VERIFY_NONE)
+  end
+
+  def url(path)
+    "#{@client.use_ssl? ? 'https' : 'http'}://#{@options[:username]}@#{@options[:host]}:#{@options[:port]}#{path}"
+  end
+
+  def decode_response(response)
+    payload =
+      if response['content-type'] =~ /application\/json/
+        JSON.parse(response.body)
+      else
+        response.body
+      end
+    p payload if @options[:verbose]
+    payload
+  end
+
+  def setup_request(request)
+    request.basic_auth(@options[:username], @options[:password])
+    request['accept'] = "application/json"
+  end
+
+  def get(path)
+    puts "# GET #{url(path)}"
+    req = Net::HTTP::Get.new(path)
+    setup_request(req)
+    res = @client.request(req)
+    decode_response(res)
+  rescue EOFError
+    connect
+    retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
+
+  def post_form(path, fields = {})
+    puts "# POST #{url(path)} #{fields}"
+    req = Net::HTTP::Post.new(path)
+    setup_request(req)
+    req.form_data = fields
+    res = @client.request(req)
+    decode_response(res)
+  rescue EOFError
+    connect
+    retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
+
+  def post_json(path, object)
+    data = JSON.generate(object)
+    puts "# POST #{url(path)} #{data}"
+    req = Net::HTTP::Post.new(path)
+    req['content-type'] = "application/json"
+    setup_request(req)
+    res = @client.request(req, data)
+    decode_response(res)
+  rescue EOFError
+    connect
+    retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
+
+  def put_json(path, object)
+    data = JSON.generate(object)
+    puts "# PUT #{url(path)} #{data}"
+    req = Net::HTTP::Put.new(path)
+    req['content-type'] = "application/json"
+    setup_request(req)
+    res = @client.request(req, data)
+    decode_response(res)
+  rescue EOFError
+    connect
+    retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
+end
+
+def service_port_for_bucket(api, service, bucket, options)
+  port_key = options[:strict_encryption] ? "#{service}SSL" : service
+  port = 0
+  while port.zero?
+    config = api.get("/pools/default/b/#{bucket}")
+    port = config["nodesExt"].find{|n| n["services"].key?(port_key)}["services"][port_key].to_i rescue 0
+    sleep 1
+  end
+  port
+end
+
+options = {
+  host: ARGV[0] || "127.0.0.1",
+  strict_encryption: ARGV[1] == "true" || ARGV[1] == "1",
+  username: ARGV[2] || "Administrator",
+  password: ARGV[3] || "password",
+  bucket: "travel-sample",
+  verbose: true,
+}
+p options: options
+
+management_api = API.new(options.merge(port: options[:strict_encryption] ? 18091 : 8091))
+search_service_port = service_port_for_bucket(management_api, "fts", options[:bucket], options)
+
+has_v6_nodes = 
+  management_api.get("/pools/default")["nodes"]
+  .any? { |node| node["version"] =~ /^6\./ && node["services"].include?("fts") }
+
+search_api = API.new(options.merge(port: search_service_port))
+index_definition_path = File.join(__dir__, "travel-sample-index#{"-v6" if has_v6_nodes}.json")
+puts "using index definition: #{File.basename(index_definition_path)}"
+index_definition = JSON.load(File.read(index_definition_path))
+search_api.put_json("/api/index/travel-sample-index", index_definition)
+
+expected_number_of_the_documents = 1000
+indexed_documents = 0
+
+Timeout.timeout(10 * 60) do # give it 10 minutes to index
+  while indexed_documents < expected_number_of_the_documents
+    resp = search_api.get("/api/index/travel-sample-index/count")
+    indexed_documents = resp['count'].to_i
+    sleep 1
+  end
+end

package/deps/couchbase-cxx-client/bin/init-cluster

@@ -15,7 +15,9 @@
 #  limitations under the License.
 
 require "set"
+require "timeout"
 require "optparse"
+require "openssl"
 
 class Object
   def to_b
@@ -117,6 +119,24 @@ class API
     data = JSON.generate(object)
     puts "# POST #{url(path)} #{data}"
     req = Net::HTTP::Post.new(path)
+    req['content-type'] = "application/json"
+    setup_request(req)
+    res = @client.request(req, data)
+    decode_response(res)
+  rescue EOFError
+    connect
+    retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
+
+  def put_json(path, object)
+    data = JSON.generate(object)
+    puts "# PUT #{url(path)} #{data}"
+    req = Net::HTTP::Put.new(path)
+    req['content-type'] = "application/json"
     setup_request(req)
     res = @client.request(req, data)
     decode_response(res)
@@ -219,21 +239,46 @@ api.post_json("/sampleBuckets/install", options[:sample_buckets].to_a) if option
 
 api.post_form("/settings/developerPreview", enabled: true) if options[:enable_developer_preview]
 
-def query_port_for_bucket(api, name, options)
-  query_port_key = options[:strict_encryption] ? "n1qlSSL" : "n1ql"
-  query_port = 0
-  while query_port.zero?
-    config = api.get("/pools/default/b/#{name}")
-    query_port = config["nodesExt"][0]["services"][query_port_key].to_i
+def service_port_for_bucket(api, service, bucket, options)
+  port_key = options[:strict_encryption] ? "#{service}SSL" : service
+  port = 0
+  while port.zero?
+    config = api.get("/pools/default/b/#{bucket}")
+    port = config["nodesExt"].find{|n| n["services"].key?(port_key)}["services"][port_key].to_i rescue 0
     sleep 1
   end
-  query_port
+  port
 end
 
-
-query_api = API.new(options.merge(port: query_port_for_bucket(api, options[:bucket], options)))
+query_api = API.new(options.merge(port: service_port_for_bucket(api, "n1ql", options[:bucket], options)))
 query_api.post_form("/query/service", statement: "CREATE PRIMARY INDEX ON `#{options[:bucket]}` USING GSI")
 options[:sample_buckets].each do |bucket|
-  query_port_for_bucket(api, bucket, options)
+  service_port_for_bucket(api, "n1ql", bucket, options)
   query_api.post_form("/query/service", statement: "CREATE PRIMARY INDEX ON `#{bucket}` USING GSI")
 end
+
+puts service_port_for_bucket(api, "fts", options[:bucket], options)
+
+if options[:sample_buckets].include?("travel-sample") && services.include?("fts")
+  search_api = API.new(options.merge(port: service_port_for_bucket(api, "fts", options[:bucket], options)))
+
+  has_v6_nodes = 
+    api.get("/pools/default")["nodes"]
+    .any? { |node| node["version"] =~ /^6\./ && node["services"].include?("fts") }
+
+  index_definition_path = File.join(__dir__, "travel-sample-index#{"-v6" if has_v6_nodes}.json")
+  puts "using index definition: #{File.basename(index_definition_path)}"
+  index_definition = JSON.load(File.read(index_definition_path))
+  search_api.put_json("/api/index/travel-sample-index", index_definition)
+
+  expected_number_of_the_documents = 1000
+  indexed_documents = 0
+  Timeout.timeout(10 * 60) do # give it 10 minutes to index
+    while indexed_documents < expected_number_of_the_documents
+      resp = search_api.get("/api/index/travel-sample-index/count")
+      indexed_documents = resp['count'].to_i
+      sleep 1
+    end
+  end
+end
+

package/deps/couchbase-cxx-client/bin/run-unit-tests

@@ -37,7 +37,55 @@ fi
 
 cd "${BUILD_DIR}"
 
-cat /proc/sys/kernel/core_pattern
+CB_USE_GOCAVES=${CB_USE_GOCAVES:-""}
+GOCAVES_PID=
+GOCAVES_CONNECTION_STRING=
+if [ "$CB_USE_GOCAVES" = "yes" -o "$CB_USE_GOCAVES" = "1" ]
+then
+    GOCAVES=
+    case "$(uname -sm)" in
+        "Darwin x86_64")
+            GOCAVES="gocaves-macos"
+            ;;
+
+        "Darwin arm64")
+            GOCAVES="gocaves-macos-arm64"
+            ;;
+
+        "Linux x86_64")
+            GOCAVES="gocaves-linux-amd64"
+            ;;
+
+        "Linux aarch64")
+            GOCAVES="gocaves-linux-arm64"
+            ;;
+    esac
+    echo "GOCAVES=${GOCAVES}"
+    if [ "${GOCAVES}x" != "x" ]
+    then
+        GOCAVES_VERSION="v0.0.1-78"
+        echo "GOCAVES_VERSION=${GOCAVES_VERSION}"
+        GOCAVES_PATH="${BUILD_DIR}/${GOCAVES}-${GOCAVES_VERSION}"
+        if [ ! -e "${GOCAVES_PATH}" ]
+        then
+            curl -L -o "${GOCAVES_PATH}" https://github.com/couchbaselabs/gocaves/releases/download/${GOCAVES_VERSION}/${GOCAVES}
+            chmod u+x "${GOCAVES_PATH}"
+        fi
+        ${GOCAVES_PATH} -mock-only > gocaves.txt 2>&1 &
+        sleep 1
+        GOCAVES_PID=$!
+        GOCAVES_CONNECTION_STRING=$(grep -o 'couchbase://[^"]\+' gocaves.txt)
+        echo "GOCAVES_CONNECTION_STRING=${GOCAVES_CONNECTION_STRING}"
+        if [ ! -z "${GOCAVES_CONNECTION_STRING}" ]
+        then
+            export TEST_CONNECTION_STRING="${GOCAVES_CONNECTION_STRING}"
+            export TEST_USE_GOCAVES=1
+            trap "kill -9 ${GOCAVES_PID}" SIGINT SIGTERM
+        fi
+    fi
+fi
+
+[ -f /proc/sys/kernel/core_pattern ] && cat /proc/sys/kernel/core_pattern
 if [ -e /usr/bin/apport-unpack ]
 then
     mkdir -p $HOME/.config/apport
@@ -52,6 +100,11 @@ ulimit -c unlimited
 ${CB_CTEST} --output-on-failure --label-regex 'integration|unit' --output-junit results.xml
 STATUS=$?
 
+if [ ! -z "${GOCAVES_PID}" ]
+then
+    kill -9 ${GOCAVES_PID}
+fi
+
 if [ "x${STATUS}" != "x0" ]
 then
     if [ -e /usr/bin/coredumpctl ]
@@ -74,11 +127,14 @@ then
     fi
     for core in /tmp/core.* "${PWD}/core*"
     do
-        echo $core
-        executable=$(file $core | ruby -e "print ARGF.read[/execfn: '([^']+)'/, 1]")
-        echo $executable
-        gdb $executable $core --batch -ex "thread apply all bt"
-        rm -f $core
+        if [ -f $core ]
+        then
+            echo $core
+            executable=$(file $core | ruby -e "print ARGF.read[/execfn: '([^']+)'/, 1]")
+            echo $executable
+            gdb $executable $core --batch -ex "thread apply all bt"
+            rm -f $core
+        fi
     done
 fi
 

package/deps/couchbase-cxx-client/bin/travel-sample-index-v6.json

@@ -0,0 +1,184 @@
+{
+    "name": "travel-sample-index",
+    "type": "fulltext-index",
+    "params": {
+        "doc_config": {
+            "docid_prefix_delim": "",
+            "docid_regexp": "",
+            "mode": "type_field",
+            "type_field": "type"
+        },
+        "mapping": {
+            "default_analyzer": "standard",
+            "default_datetime_parser": "dateTimeOptional",
+            "default_field": "_all",
+            "default_mapping": {
+                "dynamic": true,
+                "enabled": true
+            },
+            "default_type": "_default",
+            "docvalues_dynamic": true,
+            "index_dynamic": true,
+            "store_dynamic": false,
+            "type_field": "_type",
+            "types": {
+                "airline": {
+                    "dynamic": true,
+                    "enabled": true,
+                    "properties": {
+                        "country": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "country",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "name": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "name",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        }
+                    }
+                },
+                "hotel": {
+                    "dynamic": true,
+                    "enabled": true,
+                    "properties": {
+                        "reviews": {
+                            "dynamic": true,
+                            "enabled": true,
+                            "properties": {
+                                "ratings": {
+                                    "dynamic": true,
+                                    "enabled": true,
+                                    "properties": {
+                                        "Overall": {
+                                            "enabled": true,
+                                            "dynamic": false,
+                                            "fields": [
+                                                {
+                                                    "docvalues": true,
+                                                    "include_in_all": true,
+                                                    "include_term_vectors":
+                                                      true,
+                                                    "index": true,
+                                                    "name": "Overall",
+                                                    "store": true,
+                                                    "type": "number"
+                                                }
+                                            ]
+                                        }
+                                    }
+                                },
+                                "content": {
+                                    "enabled": true,
+                                    "dynamic": false,
+                                    "fields": [
+                                        {
+                                            "docvalues": true,
+                                            "include_in_all": true,
+                                            "include_term_vectors": true,
+                                            "index": true,
+                                            "name": "content",
+                                            "store": true,
+                                            "type": "text"
+                                        }
+                                    ]
+                                }
+                            }
+                        },
+                        "city": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "city",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "country": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "country",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "description": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "description",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "title": {
+                            "enabled": true,
+                            "dynamic": false,
+                            "fields": [
+                                {
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "title",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "store": {
+            "indexType": "scorch"
+        }
+    },
+    "sourceType": "couchbase",
+    "sourceName": "travel-sample",
+    "sourceParams": {},
+    "planParams": {
+        "maxPartitionsPerPIndex": 171,
+        "indexPartitions": 6,
+        "numReplicas": 0
+    }
+}