riak-client 2.4.1 → 2.5.0

data/spec/integration/yokozuna/queries_spec.rb

@@ -75,7 +75,7 @@ describe "Yokozuna queries", test_client: true, integration: true do
 
     it "supports utf8" do
       build_json_obj(@bucket, "ja", {"text_ja"=>"私はハイビスカスを食べるのが 大好き"})
-      sleep 1.1  # pause for index commit to trigger
+      sleep 2.1  # pause for index commit to trigger
       resp = @client.search(@index, "text_ja:大好き")
       expect(resp).to include('docs')
       expect(resp['docs'].size).to eq 1

data/spec/integration/yokozuna/schema_spec.rb

@@ -1,49 +1,49 @@
-require 'spec_helper'
-require 'riak'
-
-describe "Yokozuna", test_client: true, integration: true do
-  before(:all) do
-    @client = test_client
-
-    @index = 'yz_spec-' + random_key
-    @schema = 'yz_spec-' + random_key
-  end
-
-  context 'with no schema' do
-    it 'allows schema creation' do
-      @client.create_search_schema(@schema, SCHEMA_CONTENT)
-      wait_until{ !@client.get_search_schema(@schema).nil? }
-      expect(@client.get_search_schema(@schema)).not_to be_nil
-    end
-  end
-  context 'with a schema' do
-    it 'has a readable schema' do
-      @client.create_search_schema(@schema, SCHEMA_CONTENT)
-      wait_until{ !@client.get_search_schema(@schema).nil? }
-      schema_resp = @client.get_search_schema(@schema)
-      expect(schema_resp.name).to eq(@schema)
-      expect(schema_resp.content).to eq(SCHEMA_CONTENT)
-    end
-  end
-
-  SCHEMA_CONTENT = <<-XML
-<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
-<schema name=\"#{@index}\" version=\"1.5\">
-<fields>
-   <field name=\"_yz_id\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\" required=\"true\" />
-   <field name=\"_yz_ed\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_pn\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_fpn\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_vtag\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_rk\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_rb\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_rt\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-   <field name=\"_yz_err\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
-</fields>
-<uniqueKey>_yz_id</uniqueKey>
-<types>
-    <fieldType name=\"_yz_str\" class=\"solr.StrField\" sortMissingLast=\"true\" />
-</types>
-</schema>
-      XML
-end
+require 'spec_helper'
+require 'riak'
+
+describe "Yokozuna", test_client: true, integration: true do
+  before(:all) do
+    @client = test_client
+
+    @index = 'yz_spec-' + random_key
+    @schema = 'yz_spec-' + random_key
+  end
+
+  context 'with no schema' do
+    it 'allows schema creation' do
+      @client.create_search_schema(@schema, SCHEMA_CONTENT)
+      wait_until{ !@client.get_search_schema(@schema).nil? }
+      expect(@client.get_search_schema(@schema)).not_to be_nil
+    end
+  end
+  context 'with a schema' do
+    it 'has a readable schema' do
+      @client.create_search_schema(@schema, SCHEMA_CONTENT)
+      wait_until{ !@client.get_search_schema(@schema).nil? }
+      schema_resp = @client.get_search_schema(@schema)
+      expect(schema_resp.name).to eq(@schema)
+      expect(schema_resp.content).to eq(SCHEMA_CONTENT)
+    end
+  end
+
+  SCHEMA_CONTENT = <<-XML
+<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+<schema name=\"#{@index}\" version=\"1.5\">
+<fields>
+   <field name=\"_yz_id\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\" required=\"true\" />
+   <field name=\"_yz_ed\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_pn\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_fpn\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_vtag\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_rk\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_rb\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_rt\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+   <field name=\"_yz_err\" type=\"_yz_str\" indexed=\"true\" stored=\"true\" multiValued=\"false\"/>
+</fields>
+<uniqueKey>_yz_id</uniqueKey>
+<types>
+    <fieldType name=\"_yz_str\" class=\"solr.StrField\" sortMissingLast=\"true\" />
+</types>
+</schema>
+      XML
+end

data/spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb

@@ -61,6 +61,28 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
     end
   end
 
+  describe 'operating on a hyper_log_log' do
+    let(:added_element){ 'added_element' }
+    let(:operation) do
+      Riak::Crdt::Operation::Update.new.tap do |op|
+        op.type = :hll
+        op.value = {
+          add: [added_element]
+        }
+      end
+    end
+
+    it 'serializes a hyper_log_log operation into protobuffs' do
+      result = subject.serialize operation
+
+      expect{result.encode}.to_not raise_error
+
+      expect(result).to be_a backend_class::DtOp
+      expect(result.hll_op).to be_a backend_class::HllOp
+      expect(result.hll_op.adds).to eq [added_element]
+    end
+  end
+
   describe 'operating on a map' do
     it 'serializes inner counter operations' do
       counter_op = Riak::Crdt::Operation::Update.new.tap do |op|

data/spec/riak/core_ext/to_param_spec.rb

@@ -1,15 +1,15 @@
-
-describe Riak do
-  require 'riak/core_ext/to_param'
-
-  it "converts params correctly" do
-    expect({ :name => 'David', :nationality => 'Danish' }.to_param).to eq("name=David&nationality=Danish")
-  end
-
-  # Based on the activesupport implementation.
-  # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/to_param.rb
-  it "converts namespaced params correctly" do
-    expect({ :name => 'David', :nationality => 'Danish' }.to_param('user')).to eq("user%5Bname%5D=David&user%5Bnationality%5D=Danish")
-  end
-
-end
+
+describe Riak do
+  require 'riak/core_ext/to_param'
+
+  it "converts params correctly" do
+    expect({ :name => 'David', :nationality => 'Danish' }.to_param).to eq("name=David&nationality=Danish")
+  end
+
+  # Based on the activesupport implementation.
+  # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/to_param.rb
+  it "converts namespaced params correctly" do
+    expect({ :name => 'David', :nationality => 'Danish' }.to_param('user')).to eq("user%5Bname%5D=David&user%5Bnationality%5D=Danish")
+  end
+
+end

data/spec/riak/crdt/hyper_log_log_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require_relative 'shared_examples'
+
+describe Riak::Crdt::HyperLogLog, hll: true do
+  let(:bucket) do
+    double('bucket').tap do |b|
+      allow(b).to receive(:name).and_return('bucket')
+      allow(b).to receive(:is_a?).with(Riak::Bucket).and_return(true)
+      allow(b).to receive(:is_a?).with(Riak::BucketTyped::Bucket).and_return(false)
+    end
+  end
+
+  it 'initializes with bucket, key, and bucket-type' do
+    expect{described_class.new bucket, 'key', 'bucket type'}.
+      to_not raise_error
+  end
+
+  subject{ described_class.new bucket, 'key' }
+
+  describe 'with a client' do
+    let(:response){ double 'response', key: nil }
+    let(:operator){ double 'operator' }
+    let(:loader){ double 'loader', get_loader_for_value: nil }
+    let(:backend){ double 'backend' }
+    let(:client){ double 'client' }
+
+    before(:each) do
+      allow(bucket).to receive(:client).and_return(client)
+      allow(client).to receive(:backend).and_yield(backend)
+      allow(backend).to receive(:crdt_operator).and_return(operator)
+      allow(backend).to receive(:crdt_loader).and_return(loader)
+    end
+
+    include_examples 'HyperLogLog CRDT'
+
+    it 'batches properly' do
+      expect(operator).
+        to receive(:operate) { |bucket, key, type, operations|
+          expect(bucket).to eq bucket
+          expect(key).to eq 'key'
+          expect(type).to eq subject.bucket_type
+
+          expect(operations).to be_a Riak::Crdt::Operation::Update
+          expect(operations.value).to eq({add: %w{alpha bravo}})
+        }.
+        and_return(response)
+
+      subject.instance_variable_set :@context, 'placeholder'
+
+      subject.batch do |s|
+        s.add 'alpha'
+        s.add 'bravo'
+      end
+    end
+  end
+end

data/spec/riak/crdt/inner_counter_spec.rb

@@ -1,21 +1,21 @@
-require 'spec_helper'
-require_relative 'shared_examples'
-
-describe Riak::Crdt::InnerCounter do
-  let(:parent){ double 'parent' }
-  let(:counter_name){ 'counter name' }
-  subject do
-    described_class.new(parent, 0).tap do |c|
-      c.name = counter_name
-    end
-  end
-
-  include_examples 'Counter CRDT'
-
-  it 'sends increments to the parent' do
-    expect(parent).to receive(:increment).
-      with(counter_name, 1)
-
-    subject.increment
-  end
-end
+require 'spec_helper'
+require_relative 'shared_examples'
+
+describe Riak::Crdt::InnerCounter do
+  let(:parent){ double 'parent' }
+  let(:counter_name){ 'counter name' }
+  subject do
+    described_class.new(parent, 0).tap do |c|
+      c.name = counter_name
+    end
+  end
+
+  include_examples 'Counter CRDT'
+
+  it 'sends increments to the parent' do
+    expect(parent).to receive(:increment).
+      with(counter_name, 1)
+
+    subject.increment
+  end
+end

data/spec/riak/crdt/inner_set_spec.rb

@@ -1,33 +1,33 @@
-require 'spec_helper'
-require_relative 'shared_examples'
-
-describe Riak::Crdt::InnerSet do
-  let(:parent){ double 'parent' }
-  let(:set_name){ 'set name' }
-  subject do
-    described_class.new(parent, []).tap do |s|
-      s.name = set_name
-    end
-  end
-
-  include_examples 'Set CRDT'
-
-  it 'sends additions to the parent' do
-    expect(parent).to receive(:operate) do |name, op|
-      expect(name).to eq set_name
-      expect(op.type).to eq :set
-      expect(op.value).to eq add: 'el'
-    end
-
-    subject.add 'el'
-
-    expect(parent).to receive(:operate) do |name, op|
-      expect(name).to eq set_name
-      expect(op.type).to eq :set
-      expect(op.value).to eq remove: 'el2'
-    end
-    allow(parent).to receive(:context?).and_return(true)
-
-    subject.remove 'el2'
-  end
-end
+require 'spec_helper'
+require_relative 'shared_examples'
+
+describe Riak::Crdt::InnerSet do
+  let(:parent){ double 'parent' }
+  let(:set_name){ 'set name' }
+  subject do
+    described_class.new(parent, []).tap do |s|
+      s.name = set_name
+    end
+  end
+
+  include_examples 'Set CRDT'
+
+  it 'sends additions to the parent' do
+    expect(parent).to receive(:operate) do |name, op|
+      expect(name).to eq set_name
+      expect(op.type).to eq :set
+      expect(op.value).to eq add: 'el'
+    end
+
+    subject.add 'el'
+
+    expect(parent).to receive(:operate) do |name, op|
+      expect(name).to eq set_name
+      expect(op.type).to eq :set
+      expect(op.value).to eq remove: 'el2'
+    end
+    allow(parent).to receive(:context?).and_return(true)
+
+    subject.remove 'el2'
+  end
+end

data/spec/riak/crdt/set_spec.rb

@@ -1,61 +1,61 @@
-require 'spec_helper'
-require_relative 'shared_examples'
-
-describe Riak::Crdt::Set do
-  let(:bucket) do
-    double('bucket').tap do |b|
-      allow(b).to receive(:name).and_return('bucket')
-      allow(b).to receive(:is_a?).with(Riak::Bucket).and_return(true)
-      allow(b).to receive(:is_a?).with(Riak::BucketTyped::Bucket).and_return(false)
-    end
-  end
-
-  it 'initializes with bucket, key, and optional bucket-type' do
-    expect{described_class.new bucket, 'key', 'optional bucket type'}.
-      to_not raise_error
-  end
-
-  subject{ described_class.new bucket, 'key' }
-
-  describe 'with a client' do
-    let(:response){ double 'response', key: nil }
-    let(:operator){ double 'operator' }
-    let(:loader){ double 'loader', get_loader_for_value: nil }
-    let(:backend){ double 'backend' }
-    let(:client){ double 'client' }
-
-    before(:each) do
-      allow(bucket).to receive(:client).and_return(client)
-      allow(client).to receive(:backend).and_yield(backend)
-      allow(backend).to receive(:crdt_operator).and_return(operator)
-      allow(backend).to receive(:crdt_loader).and_return(loader)
-    end
-
-    include_examples 'Set CRDT'
-
-    it 'batches properly' do
-      expect(operator).
-        to receive(:operate) { |bucket, key, type, operations|
-
-        expect(bucket).to eq bucket
-        expect(key).to eq 'key'
-        expect(type).to eq subject.bucket_type
-
-        expect(operations).to be_a Riak::Crdt::Operation::Update
-        expect(operations.value).to eq({
-                                         add: %w{alpha bravo},
-                                         remove: %w{foxtrot}
-                                       })
-      }.
-        and_return(response)
-
-      subject.instance_variable_set :@context, 'placeholder'
-
-      subject.batch do |s|
-        s.add 'alpha'
-        s.add 'bravo'
-        s.remove 'foxtrot'
-      end
-    end
-  end
-end
+require 'spec_helper'
+require_relative 'shared_examples'
+
+describe Riak::Crdt::Set do
+  let(:bucket) do
+    double('bucket').tap do |b|
+      allow(b).to receive(:name).and_return('bucket')
+      allow(b).to receive(:is_a?).with(Riak::Bucket).and_return(true)
+      allow(b).to receive(:is_a?).with(Riak::BucketTyped::Bucket).and_return(false)
+    end
+  end
+
+  it 'initializes with bucket, key, and optional bucket-type' do
+    expect{described_class.new bucket, 'key', 'optional bucket type'}.
+      to_not raise_error
+  end
+
+  subject{ described_class.new bucket, 'key' }
+
+  describe 'with a client' do
+    let(:response){ double 'response', key: nil }
+    let(:operator){ double 'operator' }
+    let(:loader){ double 'loader', get_loader_for_value: nil }
+    let(:backend){ double 'backend' }
+    let(:client){ double 'client' }
+
+    before(:each) do
+      allow(bucket).to receive(:client).and_return(client)
+      allow(client).to receive(:backend).and_yield(backend)
+      allow(backend).to receive(:crdt_operator).and_return(operator)
+      allow(backend).to receive(:crdt_loader).and_return(loader)
+    end
+
+    include_examples 'Set CRDT'
+
+    it 'batches properly' do
+      expect(operator).
+        to receive(:operate) { |bucket, key, type, operations|
+
+        expect(bucket).to eq bucket
+        expect(key).to eq 'key'
+        expect(type).to eq subject.bucket_type
+
+        expect(operations).to be_a Riak::Crdt::Operation::Update
+        expect(operations.value).to eq({
+                                         add: %w{alpha bravo},
+                                         remove: %w{foxtrot}
+                                       })
+      }.
+        and_return(response)
+
+      subject.instance_variable_set :@context, 'placeholder'
+
+      subject.batch do |s|
+        s.add 'alpha'
+        s.add 'bravo'
+        s.remove 'foxtrot'
+      end
+    end
+  end
+end