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

data/ext/couchbase/version.hxx

@@ -18,5 +18,7 @@
 #pragma once
 
 #define BACKEND_VERSION_MAJOR 0
-#define BACKEND_VERSION_MINOR 1
+#define BACKEND_VERSION_MINOR 5
 #define BACKEND_VERSION_PATCH 0
+
+#include <build_version.hxx>

data/ext/extconf.rb

@@ -1,7 +1,9 @@
 require "mkmf"
-require "fileutils"
 require "tempfile"
 
+require_relative "../lib/couchbase/version"
+SDK_VERSION = Couchbase::VERSION[:sdk]
+
 unless find_executable("cmake")
   abort "ERROR: CMake is required to build couchbase extension."
 end
@@ -12,27 +14,42 @@ def sys(*cmd)
   system(*cmd)
 end
 
+
 build_type = ENV["DEBUG"] ? "Debug" : "RelWithDebInfo"
-cmake_flags = [
-  "-DCMAKE_BUILD_TYPE=#{build_type}",
-  "-DRUBY_HDR_DIR=#{RbConfig::CONFIG["rubyhdrdir"]}",
-  "-DRUBY_ARCH_HDR_DIR=#{RbConfig::CONFIG["rubyarchhdrdir"]}",
-  "-DTAOCPP_JSON_BUILD_TESTS=OFF",
-  "-DTAOCPP_JSON_BUILD_EXAMPLES=OFF",
+cmake_flags = %W[
+  -DCMAKE_BUILD_TYPE=#{build_type}
+  -DRUBY_HDR_DIR=#{RbConfig::CONFIG["rubyhdrdir"]}
+  -DRUBY_ARCH_HDR_DIR=#{RbConfig::CONFIG["rubyarchhdrdir"]}
+  -DTAOCPP_JSON_BUILD_TESTS=OFF
+  -DTAOCPP_JSON_BUILD_EXAMPLES=OFF
+  -DSNAPPY_BUILD_TESTS=OFF
+  -DSNAPPY_INSTALL=OFF
 ]
+
+if ENV["CB_CC"]
+  cmake_flags << "-DCMAKE_C_COMPILER=#{ENV["CB_CC"]}"
+end
+if ENV["CB_CXX"]
+  cmake_flags << "-DCMAKE_CXX_COMPILER=#{ENV["CB_CXX"]}"
+end
+if ENV["CB_STATIC"]
+  cmake_flags << "-DSTATIC_STDLIB=ON"
+end
+
 openssl_root = `brew --prefix openssl 2> /dev/null`.strip
-if openssl_root
+unless openssl_root.empty?
   cmake_flags << "-DOPENSSL_ROOT_DIR=#{openssl_root}"
 end
 
 project_path = File.expand_path(File.join(__dir__))
-build_dir = File.join(Dir.tmpdir, "couchbase-rubygem-#{build_type}-#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}-#{RUBY_PLATFORM}")
+build_dir = ENV['CB_EXT_BUILD_DIR'] || File.join(Dir.tmpdir, "cb-#{build_type}-#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}-#{RUBY_PLATFORM}-#{SDK_VERSION}")
 FileUtils.mkdir_p(build_dir)
 Dir.chdir(build_dir) do
+  puts "-- build #{build_type} extension #{SDK_VERSION} for ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}-#{RUBY_PLATFORM}"
   sys("cmake", *cmake_flags, project_path)
   sys("make -j4 VERBOSE=1")
 end
-extension_name = "libcouchbase.#{RbConfig::CONFIG["SOEXT"]}"
+extension_name = "libcouchbase.#{RbConfig::CONFIG["SOEXT"] || RbConfig::CONFIG["DLEXT"]}"
 extension_path = File.expand_path(File.join(build_dir, extension_name))
 unless File.file?(extension_path)
   abort "ERROR: failed to build extension in #{extension_path}"
@@ -41,4 +58,23 @@ extension_name.gsub!(/\.dylib/, '.bundle')
 install_path = File.expand_path(File.join(__dir__, "..", "lib", "couchbase", extension_name))
 puts "-- copy extension to #{install_path}"
 FileUtils.cp(extension_path, install_path)
+ext_directory = File.expand_path(__dir__)
 create_makefile("libcouchbase")
+if ENV["CB_REMOVE_EXT_DIRECTORY"]
+  puts "-- CB_REMOVE_EXT_DIRECTORY is set, remove #{ext_directory}"
+  Dir
+      .glob("#{ext_directory}/*", File::FNM_DOTMATCH)
+      .reject { |path| %w[. .. extconf.rb].include?(File.basename(path)) || File.basename(path).start_with?(".gem") }
+      .each do |entry|
+    puts "-- remove #{entry}"
+    FileUtils.rm_rf(entry)
+  end
+  File.truncate("#{ext_directory}/extconf.rb", 0)
+  puts "-- truncate #{ext_directory}/extconf.rb"
+  File.write("#{ext_directory}/Makefile", <<EOF)
+.PHONY: all clean install
+all:
+clean:
+install:
+EOF
+end

data/ext/test/main.cxx

@@ -15,129 +15,122 @@
  *   limitations under the License.
  */
 
-#include <asio.hpp>
+#include <generated_config.hxx>
 
-#include <cluster.hxx>
+#include <spdlog/spdlog.h>
 
-#include <errors.hxx>
-#include <operations/get.hxx>
-#include <operations/upsert.hxx>
-#include <operations/lookup_in.hxx>
-#include <operations/query.hxx>
+#include <ruby.h>
 
-static int num_ops = 4;
-
-bool
-done()
+void
+run_script(const std::string & script)
 {
-    --num_ops;
-    spdlog::info("------ num_ops={}", num_ops);
-    return num_ops == 0;
+    spdlog::info("run script:\n----------------------------------------{}---------------------------------------\n", script);
+    int status = 0;
+    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));
+        exit(EXIT_FAILURE);
+    }
+}
+
+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)
 {
-    spdlog::set_level(spdlog::level::trace);
-    spdlog::set_pattern("[%Y-%m-%d %T.%e] [%P,%t] [%^%l%$] %v");
-    asio::io_context ctx;
-
-    couchbase::cluster cluster{ ctx };
-
-    couchbase::origin options;
-    options.hostname = "192.168.42.103";
-    options.hostname = "127.0.0.1";
-    options.username = "Administrator";
-    options.password = "password";
-
-    //  std::string bucket_name = "default";
-    //  std::string collection_name = "_default._default";
-
-    cluster.open(options, [&](std::error_code ec1) {
-        spdlog::info("cluster has been opened: {}", ec1.message());
-        couchbase::operations::query_request req{ "select random()" };
-        cluster.execute(req, [&](couchbase::operations::query_response resp) {
-            spdlog::info("QUERY {}: ec={}, body={}",
-                         couchbase::uuid::to_string(resp.client_context_id),
-                         resp.ec.message(),
-                         resp.payload.meta_data.metrics.result_size);
-            for (auto &r : resp.payload.rows) {
-                spdlog::info("ROW: {}", r);
-            }
-            if (resp.payload.meta_data.profile) {
-                spdlog::info("PROFILE: {}", *resp.payload.meta_data.profile);
-            }
-            cluster.close();
-        });
-#if 0
-      cluster.open_bucket(bucket_name, [&](std::error_code ec2) {
-            if (!ec2) {
-                couchbase::operations::mutate_in_request req{
-                    couchbase::operations::document_id{ bucket_name, collection_name, "foo" },
-                };
-                req.specs.add_spec(couchbase::protocol::subdoc_opcode::dict_upsert, false, false, false, "test", R"({"name":"sergey"})");
-                req.specs.add_spec(couchbase::protocol::subdoc_opcode::counter, false,  false, false,"num", 24);
-                cluster.execute(req, [&](couchbase::operations::mutate_in_response resp) {
-                    spdlog::info("MUTATE_IN {}: ec={}, cas={}, fields={}", resp.id, resp.ec.message(), resp.cas, resp.fields.size());
-                    size_t idx = 0;
-                    for (const auto& field : resp.fields) {
-                        spdlog::info("  {}. {}: {} {}", idx++, field.path, field.status, field.value);
-                    }
-                    // if (done()) {
-                    cluster.close();
-                    //}
-                });
-                couchbase::operations::lookup_in_request req{
-                    couchbase::operations::document_id{ bucket_name, collection_name, "foo" },
-                };
-                req.access_deleted = true;
-                req.specs.add_spec(couchbase::protocol::subdoc_opcode::get, true, "$document");
-                req.specs.add_spec(couchbase::protocol::subdoc_opcode::exists, false, "bar");
-                req.specs.add_spec(couchbase::protocol::subdoc_opcode::get, false, "foo");
-                cluster.execute(req, [&](couchbase::operations::lookup_in_response resp) {
-                    spdlog::info("LOOKUP_IN {}: ec={}, cas={}, fields={}", resp.id, resp.ec.message(), resp.cas, resp.fields.size());
-                    size_t idx = 0;
-                    for (const auto &field : resp.fields) {
-                        spdlog::info("  {}. {}{}: {}", idx++, field.path, field.exists ? "(hit) " : "(miss)", field.value);
-                    }
-                    //if (done()) {
-                        cluster.close();
-                    //}
-                });
-                cluster.execute(
-                  couchbase::operations::get_request{
-                    couchbase::operations::document_id{ bucket_name, collection_name, "foo" },
-                  },
-                  [&](couchbase::operations::get_response resp) {
-                      spdlog::info("GET {}: ec={}, cas={}\n{}", resp.id, resp.ec.message(), resp.cas, resp.value);
-                      if (done()) {
-                          cluster.close();
-                      }
-                  });
-                cluster.execute(
-                  couchbase::operations::get_request{
-                    couchbase::operations::document_id{ bucket_name, collection_name, "bar" },
-                  },
-                  [&](couchbase::operations::get_response resp) {
-                      spdlog::info("GET {}: ec={}, cas={}\n{}", resp.id, resp.ec.message(), resp.cas, resp.value);
-                      if (done()) {
-                          cluster.close();
-                      }
-                  });
-                cluster.execute(
-                  couchbase::operations::upsert_request{ couchbase::operations::document_id{ bucket_name, collection_name, "foo" },
-                                                         "{\"prop\":42}" },
-                  [&](couchbase::operations::upsert_response resp) {
-                      spdlog::info("UPSERT {}: ec={}, cas={}", resp.id, resp.ec.message(), resp.cas);
-                      if (done()) {
-                          cluster.close();
-                      }
-                  });
-            } else {
-                spdlog::info("unable to open the bucket: {}", ec2.message());
-            }
-        });
-#endif
-    });
-    ctx.run();
-}
+    ruby_sysinit(&argc, &argv);
+    {
+        RUBY_INIT_STACK;
+
+        ruby_init();
+        ruby_init_loadpath();
+
+        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
+include Couchbase
+
+# 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
+
+# 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