couchbase 3.0.0.alpha.5-universal-darwin-19 → 3.0.0.beta.1-universal-darwin-19

data/ext/test/main.cxx

@@ -22,11 +22,11 @@
 #include <ruby.h>
 
 void
-run_script(const char* script)
+run_script(const std::string & script)
 {
     spdlog::info("run script:\n----------------------------------------{}---------------------------------------\n", script);
     int status = 0;
-    rb_eval_string_protect(script, &status);
+    rb_eval_string_protect(script.c_str(), &status);
     if (status != 0) {
         VALUE rbError = rb_funcall(rb_gv_get("$!"), rb_intern("message"), 0);
         spdlog::critical("ruby execution failure: {}", StringValuePtr(rbError));
@@ -34,25 +34,103 @@ run_script(const char* script)
     }
 }
 
+extern "C" {
+void rb_encdb_declare(const char *name);
+int rb_encdb_alias(const char *alias, const char *orig);
+}
+
 int
-main()
+main(int argc, char **argv)
 {
-    ruby_init();
-    ruby_init_loadpath();
+    ruby_sysinit(&argc, &argv);
+    {
+        RUBY_INIT_STACK;
+
+        ruby_init();
+        ruby_init_loadpath();
 
-    rb_require(LIBCOUCHBASE_EXT_PATH);
-    rb_require("json");
-    run_script(R"(
+        rb_encdb_declare("ASCII-8BIT");
+        rb_encdb_declare("US-ASCII");
+        rb_encdb_declare("UTF-8");
+        rb_encdb_alias("BINARY", "ASCII-8BIT");
+        rb_encdb_alias("ASCII", "US-ASCII");
+
+
+        rb_require(LIBCOUCHBASE_EXT_PATH);
+        run_script(R"(
+require "rubygems"
+require "json"
 p Couchbase::VERSION
-B = Couchbase::Backend.new
-B.open("localhost", "Administrator", "password")
+include Couchbase
 
-pp B.document_view("beer-sample", "test", "get_all", :development, {
-   keys: [JSON.generate("21st_amendment_brewery_cafe-563_stout")]
-})
-)");
+# begin
+#   load "/home/avsej/code/couchbase-ruby-client/test/query_test.rb"
+# rescue => ex
+#   p ex
+#   puts ex.backtrace
+#   raise
+# end
 
+backend = Backend.new
+begin
+  options = {
+  }
+  connstr = "couchbases://192.168.42.101?trust_certificate=/tmp/couchbase-ssl-certificate.pem"
+  # curl http://localhost:8091/pools/default/certificate > /tmp/couchbase-ssl-certificate.pem
+  connstr = "couchbases://localhost.avsej.net?trust_certificate=/tmp/couchbase-ssl-certificate.pem"
+  connstr = "couchbases://mars.local?trust_certificate=/tmp/couchbase-ssl-certificate.pem"
+  p open: backend.open(connstr, "Administrator", "password", options)
+rescue => ex
+  p err: ex
+  puts ex.backtrace
+end
+# p bucket: backend.open_bucket("default", true)
+# ('aaa'..'zzz').to_a.sample(10).each do |key|
+#     p set: backend.document_upsert("default", "_default._default", key, 10_000, JSON.generate(foo: "bar"), 0, {})
+#     p get: backend.document_get("default", "_default._default", key, nil)
+# end
+p query: backend.document_query('select "ruby rules" as greeting', {})
+p close: backend.close
 
-    ruby_finalize();
+# backend = Backend.new
+# begin
+#   p open: backend.open("couchbase://localhost", "Administrator", "password")
+# rescue => ex
+#   p err: ex
+#   puts ex.backtrace
+# end
+# backend.close
+
+# 100.times do |idx|
+#   puts "------ #{idx} -----"
+#   backend = Backend.new
+#   p open: backend.open("couchbase://192.168.42.101", "Administrator", "password")
+#   p bucket: backend.open_bucket("default", false)
+#   p set: backend.document_upsert("default", "_default._default", "hello", 10_000, JSON.generate(foo: "bar"), 0, {})
+#   p get: backend.document_get("default", "_default._default", "hello", nil)
+#   p close: backend.close
+# end
+
+# backend = Backend.new
+# p open: backend.open("couchbase://localhost", "Administrator", "password")
+# p query1: (begin; backend.document_query('select curl("https://rubygems.org/api/v1/versions/couchbase.json")', {timeout: 100})[:meta]; rescue => ex; ex; end)
+# p query2: backend.document_query('select curl("https://rubygems.org/api/v1/versions/couchbase.json")', {})[:meta]
+# p query3: backend.document_query('select curl("https://rubygems.org/api/v1/versions/couchbase.json")', {})[:meta]
+# p close: backend.close
+
+# 100.times do
+#   %w[query crud subdoc].each do |suite|
+#     begin
+#       load "/home/avsej/code/couchbase-ruby-client/test/#{suite}_test.rb"
+#     rescue => ex
+#       p ex
+#       puts ex.backtrace
+#     end
+#   end
+# end
+)");
+
+        ruby_finalize();
+    }
     return 0;
 }

data/ext/third_party/http_parser/Makefile

@@ -0,0 +1,160 @@
+# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
+HELPER ?=
+BINEXT ?=
+SOLIBNAME = libhttp_parser
+SOMAJOR = 2
+SOMINOR = 9
+SOREV   = 4
+ifeq (darwin,$(PLATFORM))
+SOEXT ?= dylib
+SONAME ?= $(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)
+LIBNAME ?= $(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)
+else ifeq (wine,$(PLATFORM))
+CC = winegcc
+BINEXT = .exe.so
+HELPER = wine
+else
+SOEXT ?= so
+SONAME ?= $(SOLIBNAME).$(SOEXT).$(SOMAJOR).$(SOMINOR)
+LIBNAME ?= $(SOLIBNAME).$(SOEXT).$(SOMAJOR).$(SOMINOR).$(SOREV)
+endif
+
+CC?=gcc
+AR?=ar
+
+CPPFLAGS ?=
+LDFLAGS ?=
+
+CPPFLAGS += -I.
+CPPFLAGS_DEBUG = $(CPPFLAGS) -DHTTP_PARSER_STRICT=1
+CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
+CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
+CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+CPPFLAGS_BENCH = $(CPPFLAGS_FAST)
+
+CFLAGS += -Wall -Wextra -Werror
+CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
+CFLAGS_BENCH = $(CFLAGS_FAST) -Wno-unused-parameter
+CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
+LDFLAGS_LIB = $(LDFLAGS) -shared
+
+INSTALL ?= install
+PREFIX ?= /usr/local
+LIBDIR = $(PREFIX)/lib
+INCLUDEDIR = $(PREFIX)/include
+
+ifeq (darwin,$(PLATFORM))
+LDFLAGS_LIB += -Wl,-install_name,$(LIBDIR)/$(SONAME)
+else
+# TODO(bnoordhuis) The native SunOS linker expects -h rather than -soname...
+LDFLAGS_LIB += -Wl,-soname=$(SONAME)
+endif
+
+test: test_g test_fast
+	$(HELPER) ./test_g$(BINEXT)
+	$(HELPER) ./test_fast$(BINEXT)
+
+test_g: http_parser_g.o test_g.o
+	$(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o test_g.o -o $@
+
+test_g.o: test.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c test.c -o $@
+
+http_parser_g.o: http_parser.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c http_parser.c -o $@
+
+test_fast: http_parser.o test.o http_parser.h
+	$(CC) $(CFLAGS_FAST) $(LDFLAGS) http_parser.o test.o -o $@
+
+test.o: test.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c test.c -o $@
+
+bench: http_parser.o bench.o
+	$(CC) $(CFLAGS_BENCH) $(LDFLAGS) http_parser.o bench.o -o $@
+
+bench.o: bench.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_BENCH) $(CFLAGS_BENCH) -c bench.c -o $@
+
+http_parser.o: http_parser.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c
+
+test-run-timed: test_fast
+	while(true) do time $(HELPER) ./test_fast$(BINEXT) > /dev/null; done
+
+test-valgrind: test_g
+	valgrind ./test_g
+
+libhttp_parser.o: http_parser.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+
+library: libhttp_parser.o
+	$(CC) $(LDFLAGS_LIB) -o $(LIBNAME) $<
+
+package: http_parser.o
+	$(AR) rcs libhttp_parser.a http_parser.o
+
+url_parser: http_parser.o contrib/url_parser.c
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o $@
+
+url_parser_g: http_parser_g.o contrib/url_parser.c
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) $^ -o $@
+
+parsertrace: http_parser.o contrib/parsertrace.c
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o parsertrace$(BINEXT)
+
+parsertrace_g: http_parser_g.o contrib/parsertrace.c
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) $^ -o parsertrace_g$(BINEXT)
+
+tags: http_parser.c http_parser.h test.c
+	ctags $^
+
+install: library
+	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
+
+install-strip: library
+	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+	$(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
+
+uninstall:
+	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+	rm $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
+	rm $(DESTDIR)$(LIBDIR)/$(SONAME)
+	rm $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+
+clean:
+	rm -f *.o *.a tags test test_fast test_g \
+		http_parser.tar libhttp_parser.so.* \
+		url_parser url_parser_g parsertrace parsertrace_g \
+		*.exe *.exe.so
+
+contrib/url_parser.c:	http_parser.h
+contrib/parsertrace.c:	http_parser.h
+
+.PHONY: clean package test-run test-run-timed test-valgrind install install-strip uninstall

data/ext/third_party/json/Makefile

@@ -0,0 +1,77 @@
+# The Art of C++
+# Copyright (c) 2015-2020 Dr. Colin Hirsch and Daniel Frey
+# Please see LICENSE for license or visit https://github.com/taocpp/json
+
+.SUFFIXES:
+.SECONDARY:
+
+ifeq ($(OS),Windows_NT)
+UNAME_S := $(OS)
+ifeq ($(shell gcc -dumpmachine),mingw32)
+MINGW_CXXFLAGS = -U__STRICT_ANSI__
+endif
+else
+UNAME_S := $(shell uname -s)
+endif
+
+# For Darwin (Mac OS X / macOS) we assume that the default compiler
+# clang++ is used; when $(CXX) is some version of g++, then
+# $(CXXSTD) has to be set to -std=c++17 (or newer) so
+# that -stdlib=libc++ is not automatically added.
+
+ifeq ($(CXXSTD),)
+CXXSTD := -std=c++17
+ifeq ($(UNAME_S),Darwin)
+CXXSTD += -stdlib=libc++
+endif
+endif
+
+# Ensure strict standard compliance and no warnings, can be
+# changed if desired.
+
+CPPFLAGS ?= -pedantic
+CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS)
+
+CLANG_TIDY ?= clang-tidy
+
+HEADERS := $(filter-out include/tao/json/external/% include/tao/json/internal/endian_win.hpp,$(shell find include -name '*.hpp')) $(filter-out src/test/json/main.hpp,$(shell find src -name '*.hpp'))
+SOURCES := $(shell find src -name '*.cpp')
+DEPENDS := $(SOURCES:%.cpp=build/%.d)
+BINARIES := $(SOURCES:%.cpp=build/%)
+
+UNIT_TESTS := $(filter build/src/test/%,$(BINARIES))
+
+.PHONY: all
+all: compile check
+
+.PHONY: compile
+compile: $(BINARIES)
+
+.PHONY: check
+check: $(UNIT_TESTS)
+	@set -e; for T in $(UNIT_TESTS); do echo $$T; $$T > /dev/null; done
+
+.PHONY: clean
+clean:
+	@rm -rf build/src
+	@find . -name '*~' -delete
+
+build/%.d: %.cpp Makefile
+	@mkdir -p $(@D)
+	$(CXX) $(CXXSTD) -Iinclude $(CPPFLAGS) -MM -MQ $@ $< -o $@
+
+build/%: %.cpp build/%.d
+	$(CXX) $(CXXSTD) -Iinclude $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
+build/%.clang-tidy: %
+	$(CLANG_TIDY) -extra-arg "-Iinclude" -extra-arg "-std=c++17" -checks=*,-fuchsia-*,-google-runtime-references,-google-runtime-int,-google-readability-todo,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-*-avoid-c-arrays,-*-magic-numbers,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-macro-usage,-hicpp-no-array-decay,-hicpp-signed-bitwise,-modernize-raw-string-literal,-misc-sizeof-expression,-misc-non-private-member-variables-in-classes,-bugprone-sizeof-expression,-bugprone-exception-escape -warnings-as-errors=* $< 2>/dev/null
+	@mkdir -p $(@D)
+	@touch $@
+
+.PHONY: clang-tidy
+clang-tidy: $(HEADERS:%=build/%.clang-tidy) $(SOURCES:%=build/%.clang-tidy)
+	@echo "All $(words $(HEADERS) $(SOURCES)) clang-tidy tests passed."
+
+ifeq ($(findstring $(MAKECMDGOALS),clean),)
+-include $(DEPENDS)
+endif

data/lib/couchbase/analytics_options.rb

@@ -26,10 +26,7 @@ module Couchbase
       # @return [:not_bounded, :request_plus] specifies level of consistency for the query
       attr_accessor :scan_consistency
 
-      # @return [Integer] The maximum duration (in milliseconds) the query engine is willing to wait before failing.
-      attr_accessor :scan_wait
-
-      # @return [Boolean] Allows explicitly marking a query as being readonly and not mutating and documents on the server side.
+      # @return [Boolean] Allows explicitly marking a query as being readonly and not mutating any documents on the server side.
       attr_accessor :readonly
 
       # @return [Boolean] Allows to give certain requests higher priority than others
@@ -38,6 +35,10 @@ module Couchbase
       # @return [JsonTranscoder] transcoder to use on rows
       attr_accessor :transcoder
 
+      # @api private
+      # @return [Hash<String => #to_json>]
+      attr_reader :raw_parameters
+
       # @yieldparam [AnalyticsOptions] self
       def initialize
         @transcoder = JsonTranscoder.new
@@ -56,6 +57,13 @@ module Couchbase
         @named_parameters = nil
       end
 
+      # @api private
+      # @return [Array<String>, nil]
+      def export_positional_parameters
+        @positional_parameters.map { |p| JSON.dump(p) } if @positional_parameters
+      end
+
+
       # Sets named parameters for the query
       #
       # @param [Hash] named the key/value map of the parameters to substitute in the statement
@@ -71,6 +79,12 @@ module Couchbase
       def raw(key, value)
         @raw_parameters[key] = JSON.generate(value)
       end
+
+      # @api private
+      # @return [Hash<String => String>, nil]
+      def export_named_parameters
+        @named_parameters.each_with_object({}) { |(n, v), o| o[n.to_s] = JSON.dump(v) } if @named_parameters
+      end
     end
 
     class AnalyticsWarning

data/lib/couchbase/binary_collection.rb

@@ -54,7 +54,7 @@ module Couchbase
                                          {
                                              delta: options.delta,
                                              initial_value: options.initial,
-                                             expiration: options.expiration,
+                                             expiry: options.expiry,
                                              durability_level: options.durability_level,
                                          })
       CounterResult.new do |res|
@@ -76,7 +76,7 @@ module Couchbase
                                          {
                                              delta: options.delta,
                                              initial_value: options.initial,
-                                             expiration: options.expiration,
+                                             expiry: options.expiry,
                                              durability_level: options.durability_level,
                                          })
       CounterResult.new do |res|

data/lib/couchbase/binary_collection_options.rb

@@ -44,7 +44,7 @@ module Couchbase
       attr_accessor :initial
 
       # @return [Integer] if set, holds the expiration for the operation
-      attr_accessor :expiration
+      attr_accessor :expiry
 
       # @return [:none, :majority, :majority_and_persist_to_active, :persist_to_majority] level of durability
       attr_accessor :durability_level
@@ -71,7 +71,7 @@ module Couchbase
       attr_accessor :initial
 
       # @return [Integer] if set, holds the expiration for the operation
-      attr_accessor :expiration
+      attr_accessor :expiry
 
       # @return [:none, :majority, :majority_and_persist_to_active, :persist_to_majority] level of durability
       attr_accessor :durability_level