zookeeper 1.4.11-java → 1.5.3-java

data/ext/patches/zkc-3.4.5-fetch-and-add.patch

@@ -0,0 +1,16 @@
+diff -ur zkc-3.4.5-orig/c/src/mt_adaptor.c zkc-3.4.5/c/src/mt_adaptor.c
+--- zkc-3.4.5-orig/c/src/mt_adaptor.c	2012-09-30 10:53:32.000000000 -0700
++++ zkc-3.4.5/c/src/mt_adaptor.c	2016-09-07 16:55:13.787553837 -0700
+@@ -484,11 +484,7 @@
+ {
+ #ifndef WIN32
+     int32_t result;
+-    asm __volatile__(
+-         "lock xaddl %0,%1\n"
+-         : "=r"(result), "=m"(*(int *)operand)
+-         : "0"(incr)
+-         : "memory");
++    result = __sync_fetch_and_add(operand, incr);
+    return result;
+ #else
+     volatile int32_t result;

data/ext/zkrb.c

@@ -203,7 +203,6 @@ inline static int we_are_forked(zkrb_instance_data_t *zk) {
   return rv;
 }
 
-
 static int destroy_zkrb_instance(zkrb_instance_data_t* zk) {
   int rv = ZOK;
 
@@ -245,6 +244,11 @@ static void free_zkrb_instance_data(zkrb_instance_data_t* ptr) {
   destroy_zkrb_instance(ptr);
 }
 
+VALUE alloc_zkrb_instance(VALUE klass) {
+  zkrb_instance_data_t* zk = ZALLOC_N(zkrb_instance_data_t, 1);
+  return Data_Wrap_Struct(klass, NULL, free_zkrb_instance_data, zk);
+}
+
 static void print_zkrb_instance_data(zkrb_instance_data_t* ptr) {
   fprintf(stderr, "zkrb_instance_data (%p) {\n", ptr);
   fprintf(stderr, "      zh = %p\n",           ptr->zh);
@@ -1013,7 +1017,7 @@ static void zkrb_define_methods(void) {
   DEFINE_METHOD(close_handle, 0);
   DEFINE_METHOD(deterministic_conn_order, 1);
   DEFINE_METHOD(is_unrecoverable, 0);
-  DEFINE_METHOD(recv_timeout, 1);
+  DEFINE_METHOD(recv_timeout, 0);
   DEFINE_METHOD(zkrb_state, 0);
   DEFINE_METHOD(sync, 2);
   DEFINE_METHOD(zkrb_iterate_event_loop, 0);
@@ -1063,6 +1067,7 @@ void Init_zookeeper_c() {
 
   /* initialize CZookeeper class */
   CZookeeper = rb_define_class_under(mZookeeper, "CZookeeper", rb_cObject);
+  rb_define_alloc_func(CZookeeper, alloc_zkrb_instance);
   zkrb_define_methods();
 
   ZookeeperClientId = rb_define_class_under(CZookeeper, "ClientId", rb_cObject);

data/java/java_base.rb

@@ -183,13 +183,11 @@ class JavaBase
   attr_reader :event_queue
 
   def reopen(timeout=10, watcher=nil, opts = {})
-#     watcher ||= @default_watcher
-
     @mutex.synchronize do
       @req_registry.clear_watchers!
 
       replace_jzk!(opts)
-      wait_until_connected
+      wait_until_connected(timeout)
     end
 
     state
@@ -490,7 +488,7 @@ class JavaBase
 
     def replace_jzk!(opts = {})
       orig_jzk = @jzk
-      if opts.has_key?(:session_id) && opts.has_key(:session_passwd)
+      if opts.has_key?(:session_id) && opts.has_key?(:session_passwd)
         @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self), opts.fetch(:session_id), opts.fetch(:session_passwd).to_java_bytes)
       else
         @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self))

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.11'
+  VERSION = '1.5.3'
   DRIVER_VERSION = '3.4.5'
 end

data/spec/forked_connection_spec.rb

@@ -4,7 +4,7 @@ unless defined?(::JRUBY_VERSION)
   describe %[forked connection] do
     let(:path) { "/_zktest_" }
     let(:pids_root) { "#{path}/pids" }
-    let(:data) { "underpants" } 
+    let(:data) { "underpants" }
     let(:connection_string) { Zookeeper.default_cnx_str }
 
     def process_alive?(pid)
@@ -15,7 +15,7 @@ unless defined?(::JRUBY_VERSION)
     end
 
     LBORDER = ('-' * 35) << '< '
-    RBORDER = ' >' << ('-' * 35) 
+    RBORDER = ' >' << ('-' * 35)
 
     def mark(thing)
       logger << "\n#{LBORDER}#{thing}#{RBORDER}\n\n"
@@ -25,8 +25,6 @@ unless defined?(::JRUBY_VERSION)
       mark "BEFORE: START"
       if defined?(::Rubinius)
         pending("this test is currently broken in rbx")
-#       elsif ENV['TRAVIS']
-#         pending("this test is currently hanging in travis")
       else
         @zk = Zookeeper.new(connection_string)
         rm_rf(@zk, path)
@@ -105,7 +103,7 @@ unless defined?(::JRUBY_VERSION)
       @zk.resume_after_fork_in_parent
 
       event_waiter_th = Thread.new do
-        @latch.await(5) unless @event 
+        @latch.await(5) unless @event
         @event
       end
 

data/spec/shared/connection_examples.rb

@@ -1051,7 +1051,11 @@ shared_examples_for "connection" do
           zk.close
         end
 
-        zk.stat(:path => path, :callback => evil_cb)
+        begin
+          zk.stat(:path => path, :callback => evil_cb)
+        rescue IOError
+          # captures flaky IOError: stream closed in another thread
+        end
 
         wait_until { zk.closed? }
         zk.should be_closed

data/spec/support/10_spawn_zookeeper.rb

@@ -3,10 +3,6 @@ module Zookeeper
     !!ENV['SPAWN_ZOOKEEPER']
   end
 
-  def self.travis?
-    !!ENV['TRAVIS']
-  end
-
   def self.default_cnx_host
     ENV['ZK_DEFAULT_HOST'] || 'localhost'
   end

data/zookeeper.gemspec

@@ -6,13 +6,21 @@ Gem::Specification.new do |s|
   s.name        = 'zookeeper'
   s.version     = Zookeeper::VERSION
 
-  s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
+  s.authors     = [
+    "Phillip Pearson", 
+    "Eric Maland", 
+    "Evan Weaver", 
+    "Brian Wickman", 
+    "Neil Conway",
+    "Jonathan D. Simms",
+    "Mal McKay",
+  ]
   s.email       = ["slyphon@gmail.com"]
   s.summary     = %q{Apache ZooKeeper driver for Rubies}
   s.description = <<-EOS
 A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
 friendlier interface, see http://github.com/slyphon/zk. Currently supported:
-MRI: {1.8.7, 1.9.2, 1.9.3}, JRuby: ~> 1.6.7, Rubinius: 2.0.testing, REE 1.8.7.
+MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
 
 This library uses version #{Zookeeper::DRIVER_VERSION} of zookeeper bindings.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.5.3
 platform: java
 authors:
 - Phillip Pearson
@@ -10,10 +10,11 @@ authors:
 - Brian Wickman
 - Neil Conway
 - Jonathan D. Simms
-autorequire: 
+- Mal McKay
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slyphon-log4j
@@ -43,31 +44,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.3.5
-description: ! 'A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
-  For a
-
+description: |+
+  A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
   friendlier interface, see http://github.com/slyphon/zk. Currently supported:
-
-  MRI: {1.8.7, 1.9.2, 1.9.3}, JRuby: ~> 1.6.7, Rubinius: 2.0.testing, REE 1.8.7.
-
+  MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
 
   This library uses version 3.4.5 of zookeeper bindings.
 
-
-'
 email:
 - slyphon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .ctags_paths
-- .dotfiles/ruby-gemset
-- .dotfiles/ruby-version
-- .dotfiles/rvmrc
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".ctags_paths"
+- ".dotfiles/ruby-gemset"
+- ".dotfiles/ruby-version"
+- ".dotfiles/rvmrc"
+- ".github/workflows/build.yml"
+- ".gitignore"
+- ".gitmodules"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -87,6 +83,9 @@ files:
 - ext/extconf.rb
 - ext/generate_gvl_code.rb
 - ext/patches/zkc-3.3.5-network.patch
+- ext/patches/zkc-3.4.5-buffer-overflow.patch
+- ext/patches/zkc-3.4.5-config.patch
+- ext/patches/zkc-3.4.5-fetch-and-add.patch
 - ext/patches/zkc-3.4.5-logging.patch
 - ext/patches/zkc-3.4.5-out-of-order-ping.patch
 - ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch
@@ -145,25 +144,24 @@ files:
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - java
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Apache ZooKeeper driver for Rubies
 test_files:
@@ -184,3 +182,4 @@ test_files:
 - spec/support/progress_formatter.rb
 - spec/support/zookeeper_spec_helpers.rb
 - spec/zookeeper_spec.rb
+...

data/.travis.yml

@@ -1,39 +0,0 @@
----
-notifications:
-  email:
-    - slyphon@gmail.com
-    - eric@5stops.com
-
-# pull in releaseops submodule
-before_install:
-  - git submodule update --init --recursive
-
-env:
-  - SPAWN_ZOOKEEPER='true'
-
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - ree
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-matrix:
-  allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-
-bundler_args: --without development docs coverage
-
-# blacklist
-branches:
-  except:
-#     - 'dev/zookeeper-st'
-