riak-client 2.4.1 → 2.5.0

data/spec/fixtures/bitcask.txt

@@ -1,25 +1,25 @@
-Bitcask is an Erlang application that provides an API for storing and retrieving key/value data into a log-structured hash table that provides very fast access. The design owes a lot to the principles found in log-structured file systems and draws inspiration from a number of designs that involve log file merging.
-
-Strengths
-Low latency per item read or written
-This is due to the write-once, append-only nature of the Bitcask database files. High throughput, especially when writing an incoming stream of random items Because the data being written doesn't need to be ordered on disk and because the log structured design allows for minimal disk head movement during writes these operations generally saturate the I/O and disk bandwidth.
-
-Ability to handle datasets larger than RAM w/o degradation
-Because access to data in Bitcask is direct lookup from an in-memory hash table finding data on disk is very efficient, even when data sets are very large.
-
-Single Seek to Retrieve Any Value
-Bitcask's in-memory hash-table of keys point directly to locations on disk where the data lives. Bitcask never uses more than one disk seek to read a value and sometimes, due to file-system caching done by the operating system, even that isn't necessary.
-
-Predictable Lookup and Insert Performance
-As you might expect from the description above, read operations have a fixed, predictable behavior. What you might not expect is that this is also true for writes. Write operations are at most a seek to the end of the current file open writing and an append to that file.
-
-Fast, bounded Crash Recovery
-Due to the append-only write once nature of Bitcask files, recovery is easy and fast. The only items that might be lost are partially written records at the tail of the file last opened for writes. Recovery need only review the last record or two written and verify CRC data to ensure that the data is consistent.
-
-Easy Backup
-In most systems backup can be very complicated but here again Bitcask simplifies this process due to its append-only write once disk format. Any utility that archives or copies files in disk-block order will properly backup or copy a Bitcask database.
-
-Weakness
-Keys Must Fit In Memory
-Bitcask keeps all keys in memory at all times, this means that your system must have enough memory to contain your entire keyspace with room for other operational components and operating system resident filesystem buffer space.
-
+Bitcask is an Erlang application that provides an API for storing and retrieving key/value data into a log-structured hash table that provides very fast access. The design owes a lot to the principles found in log-structured file systems and draws inspiration from a number of designs that involve log file merging.
+
+Strengths
+Low latency per item read or written
+This is due to the write-once, append-only nature of the Bitcask database files. High throughput, especially when writing an incoming stream of random items Because the data being written doesn't need to be ordered on disk and because the log structured design allows for minimal disk head movement during writes these operations generally saturate the I/O and disk bandwidth.
+
+Ability to handle datasets larger than RAM w/o degradation
+Because access to data in Bitcask is direct lookup from an in-memory hash table finding data on disk is very efficient, even when data sets are very large.
+
+Single Seek to Retrieve Any Value
+Bitcask's in-memory hash-table of keys point directly to locations on disk where the data lives. Bitcask never uses more than one disk seek to read a value and sometimes, due to file-system caching done by the operating system, even that isn't necessary.
+
+Predictable Lookup and Insert Performance
+As you might expect from the description above, read operations have a fixed, predictable behavior. What you might not expect is that this is also true for writes. Write operations are at most a seek to the end of the current file open writing and an append to that file.
+
+Fast, bounded Crash Recovery
+Due to the append-only write once nature of Bitcask files, recovery is easy and fast. The only items that might be lost are partially written records at the tail of the file last opened for writes. Recovery need only review the last record or two written and verify CRC data to ensure that the data is consistent.
+
+Easy Backup
+In most systems backup can be very complicated but here again Bitcask simplifies this process due to its append-only write once disk format. Any utility that archives or copies files in disk-block order will properly backup or copy a Bitcask database.
+
+Weakness
+Keys Must Fit In Memory
+Bitcask keeps all keys in memory at all times, this means that your system must have enough memory to contain your entire keyspace with room for other operational components and operating system resident filesystem buffer space.
+

data/spec/fixtures/multipart-basic-conflict.txt

@@ -1,15 +1,15 @@
---8XZD3w6ttFTHIz6LCmhVxn9Ex0K
-Content-Type: text/plain
-Link: </buckets/test>; rel="up"
-Etag: 2baUwethOoLrVkwnMqzBRW
-Last-Modified: Mon, 15 Oct 2012 19:36:06 GMT
-
-bar
---8XZD3w6ttFTHIz6LCmhVxn9Ex0K
-Content-Type: text/plain
-Link: </buckets/test>; rel="up"
-Etag: 6NtlHf8Lc3TEcCTKOVqEkl
-Last-Modified: Mon, 15 Oct 2012 19:35:57 GMT
-
-foo
---8XZD3w6ttFTHIz6LCmhVxn9Ex0K--
+--8XZD3w6ttFTHIz6LCmhVxn9Ex0K
+Content-Type: text/plain
+Link: </buckets/test>; rel="up"
+Etag: 2baUwethOoLrVkwnMqzBRW
+Last-Modified: Mon, 15 Oct 2012 19:36:06 GMT
+
+bar
+--8XZD3w6ttFTHIz6LCmhVxn9Ex0K
+Content-Type: text/plain
+Link: </buckets/test>; rel="up"
+Etag: 6NtlHf8Lc3TEcCTKOVqEkl
+Last-Modified: Mon, 15 Oct 2012 19:35:57 GMT
+
+foo
+--8XZD3w6ttFTHIz6LCmhVxn9Ex0K--

data/spec/fixtures/multipart-blank.txt

@@ -1,7 +1,7 @@
-
---73NmmA8dJxSB5nL2dVerpFIi8ze
-Content-Type: multipart/mixed; boundary=8fPXq9XfV15txMoV1IbA3hovEij
-
---8fPXq9XfV15txMoV1IbA3hovEij--
-
---73NmmA8dJxSB5nL2dVerpFIi8ze--
+
+--73NmmA8dJxSB5nL2dVerpFIi8ze
+Content-Type: multipart/mixed; boundary=8fPXq9XfV15txMoV1IbA3hovEij
+
+--8fPXq9XfV15txMoV1IbA3hovEij--
+
+--73NmmA8dJxSB5nL2dVerpFIi8ze--

data/spec/fixtures/multipart-mapreduce.txt

@@ -1,10 +1,10 @@
-
---NT6cqYFYCfbYZsocVt15tNWCpG9
-Content-Type: application/json
-
-{"phase":0,"data":["source :gemcutter\n\ngem 'i18n'\ngem 'builder'\ngem 'rspec', \"~>2.0.0\"\ngem 'fakeweb', \">=1.2\"\ngem 'rack', '>=1.0'\ngem 'rake'\ngem 'bundler'\ngem 'excon', \"~>0.3.4\"\n\nif defined? JRUBY_VERSION\n  gem 'json'\n  gem 'jruby-openssl'\nelse\n  gem 'curb', '>=0.6'\n  gem 'yajl-ruby'\nend\n\ngroup :integration do\n  gem 'activesupport', '~>3.0'\nend\n"]}
---NT6cqYFYCfbYZsocVt15tNWCpG9
-Content-Type: application/json
-
-{"phase":0,"data":["source \"http://rubygems.org\"\n\ngem 'rake'\ngem 'gollum-site'\ngem 'rdiscount'\ngem 'RedCloth'\ngem 'rspec'\n"]}
---NT6cqYFYCfbYZsocVt15tNWCpG9--
+
+--NT6cqYFYCfbYZsocVt15tNWCpG9
+Content-Type: application/json
+
+{"phase":0,"data":["source :gemcutter\n\ngem 'i18n'\ngem 'builder'\ngem 'rspec', \"~>2.0.0\"\ngem 'fakeweb', \">=1.2\"\ngem 'rack', '>=1.0'\ngem 'rake'\ngem 'bundler'\ngem 'excon', \"~>0.3.4\"\n\nif defined? JRUBY_VERSION\n  gem 'json'\n  gem 'jruby-openssl'\nelse\n  gem 'curb', '>=0.6'\n  gem 'yajl-ruby'\nend\n\ngroup :integration do\n  gem 'activesupport', '~>3.0'\nend\n"]}
+--NT6cqYFYCfbYZsocVt15tNWCpG9
+Content-Type: application/json
+
+{"phase":0,"data":["source \"http://rubygems.org\"\n\ngem 'rake'\ngem 'gollum-site'\ngem 'rdiscount'\ngem 'RedCloth'\ngem 'rspec'\n"]}
+--NT6cqYFYCfbYZsocVt15tNWCpG9--

data/spec/fixtures/multipart-with-body.txt

@@ -1,16 +1,16 @@
-
---5EiMOjuGavQ2IbXAqsJPLLfJNlA
-Content-Type: multipart/mixed; boundary=7extjTzvYIKVMVHowUiTn0LfvSs
-
---7extjTzvYIKVMVHowUiTn0LfvSs
-X-Riak-Vclock: a85hYGBgyWDKBVHMr9s3ZzAlMuaxMtyZcPAIH1RYyObHDqiwxIZjcOG1M98chAq3bUQIz7SSFQEKM4FUbwMKZwEA
-Location: /riak/foo/baz
-Content-Type: text/plain
-Link: </riak/foo>; rel="up"
-Etag: 6JdI51eFrvv5lDwY6un7a2
-Last-Modified: Sat, 16 Jan 2010 22:13:44 GMT
-
-SCP sloooow....
---7extjTzvYIKVMVHowUiTn0LfvSs--
-
---5EiMOjuGavQ2IbXAqsJPLLfJNlA--
+
+--5EiMOjuGavQ2IbXAqsJPLLfJNlA
+Content-Type: multipart/mixed; boundary=7extjTzvYIKVMVHowUiTn0LfvSs
+
+--7extjTzvYIKVMVHowUiTn0LfvSs
+X-Riak-Vclock: a85hYGBgyWDKBVHMr9s3ZzAlMuaxMtyZcPAIH1RYyObHDqiwxIZjcOG1M98chAq3bUQIz7SSFQEKM4FUbwMKZwEA
+Location: /riak/foo/baz
+Content-Type: text/plain
+Link: </riak/foo>; rel="up"
+Etag: 6JdI51eFrvv5lDwY6un7a2
+Last-Modified: Sat, 16 Jan 2010 22:13:44 GMT
+
+SCP sloooow....
+--7extjTzvYIKVMVHowUiTn0LfvSs--
+
+--5EiMOjuGavQ2IbXAqsJPLLfJNlA--

data/spec/fixtures/multipart-with-marked-tombstones.txt

@@ -1,17 +1,17 @@
-
---ADqgQtdmA5iQgyR5UGzX6V3HZtI
-Content-Type: multipart/mixed; boundary=Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
-
---Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
-X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvrNPcuWwZTIlMfKIOotdIIvCwA=
-Location: /buckets/links/keys/target
-Content-Type: application/octet-stream
-Link: </buckets/links>; rel="up"
-Etag: 5bUNdzHJhZDdCr7KlWxXq
-Last-Modified: Tue, 18 Oct 2011 19:10:13 GMT
-X-Riak-Deleted: true
-
-
---Ljz1mP3hZzqPu6DH1Y4L8k7hfxy--
-
---ADqgQtdmA5iQgyR5UGzX6V3HZtI--
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI
+Content-Type: multipart/mixed; boundary=Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvrNPcuWwZTIlMfKIOotdIIvCwA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 5bUNdzHJhZDdCr7KlWxXq
+Last-Modified: Tue, 18 Oct 2011 19:10:13 GMT
+X-Riak-Deleted: true
+
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy--
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI--

data/spec/fixtures/multipart-with-unmarked-tombstone.txt

@@ -1,16 +1,16 @@
-
---CvfrSTCWwIiwezy0Zt1B2zwKgS7
-Content-Type: multipart/mixed; boundary=E9n2ZOKHIazIoPHzXj9XsWYWJjJ
-
---E9n2ZOKHIazIoPHzXj9XsWYWJjJ
-X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvpN53+WwZTIlMfKcNVJ6ARfFgA=
-Location: /buckets/links/keys/target
-Content-Type: application/octet-stream
-Link: </buckets/links>; rel="up"
-Etag: 50FOyLo7juvEVUO33MRJwP
-Last-Modified: Tue, 18 Oct 2011 18:35:01 GMT
-
-
---E9n2ZOKHIazIoPHzXj9XsWYWJjJ--
-
---CvfrSTCWwIiwezy0Zt1B2zwKgS7--
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7
+Content-Type: multipart/mixed; boundary=E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvpN53+WwZTIlMfKcNVJ6ARfFgA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 50FOyLo7juvEVUO33MRJwP
+Last-Modified: Tue, 18 Oct 2011 18:35:01 GMT
+
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ--
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7--

data/spec/fixtures/server.cert.crt

@@ -1,15 +1,15 @@
------BEGIN CERTIFICATE-----
-MIICPzCCAagCCQDfZhEdJjSgTDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCTkMxEjAQBgNVBAcTCUNoYXJsb3R0ZTEOMAwGA1UEChMFQmFz
-aG8xEDAOBgNVBAsTB1N1cHBvcnQxEjAQBgNVBAMTCTEyNy4wLjAuMTAeFw0xMTAz
-MjYxNjMzMzNaFw0zODA4MTAxNjMzMzNaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-EwJOQzESMBAGA1UEBxMJQ2hhcmxvdHRlMQ4wDAYDVQQKEwVCYXNobzEQMA4GA1UE
-CxMHU3VwcG9ydDESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
-Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
-qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAIqt1A5Ah7s2oUoYQ8YCKC83fKbXbbNCiLFLwIzy
-TGYXd8j7JTfeY8ettbtitlYgP+ouf23LzonuMo47GRuMgVKRWm4l+ZVMP5Qbkx9t
-uspx+6lHUWnMT9aRdP9/2I7dscyfuhtzs0UxddADLzL9Cif4Y06E1NhR/KK+zo46
-Nep8
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICPzCCAagCCQDfZhEdJjSgTDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCTkMxEjAQBgNVBAcTCUNoYXJsb3R0ZTEOMAwGA1UEChMFQmFz
+aG8xEDAOBgNVBAsTB1N1cHBvcnQxEjAQBgNVBAMTCTEyNy4wLjAuMTAeFw0xMTAz
+MjYxNjMzMzNaFw0zODA4MTAxNjMzMzNaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+EwJOQzESMBAGA1UEBxMJQ2hhcmxvdHRlMQ4wDAYDVQQKEwVCYXNobzEQMA4GA1UE
+CxMHU3VwcG9ydDESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAIqt1A5Ah7s2oUoYQ8YCKC83fKbXbbNCiLFLwIzy
+TGYXd8j7JTfeY8ettbtitlYgP+ouf23LzonuMo47GRuMgVKRWm4l+ZVMP5Qbkx9t
+uspx+6lHUWnMT9aRdP9/2I7dscyfuhtzs0UxddADLzL9Cif4Y06E1NhR/KK+zo46
+Nep8
+-----END CERTIFICATE-----

data/spec/fixtures/server.cert.key

@@ -1,15 +1,15 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
-Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
-qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
-AoGBAJIguzdPPgBTId8VKSes+lVupie9oo3qy8NaeBfGGCIixAnisbmHzIpNcUb/
-3CcuggQ4LODcrWvTtiTr2QBZx1FL7E4POBJl/N7zJMaQd+pGjmrJGfv5haSSQN+H
-r74Ix3HCd0RPdSgt5pmlT4KfsqkfRmqsPd6Nw54zbyLFMlTpAkEA4ar3ZJi2+Y+u
-FH3AycXuPdDtVW0tKFtxfvKlS48gshB6gmkd06Ugss5eZkdbSY0voAp88Tr2shOJ
-+pXc++Zl6wJBAMTN9K9k728cVCf41pR6mDVxIaaqjJeY4DWppGQFSqw/fmYz/Quu
-PlTvk6pGRYiGN6y9CZFNoL2I/SWcd4ukrXMCQCyfYOHsbKn2Zka5Awki8VQZ3wQ4
-XWiQhGXE1ziUqbNsHL1yyaoTCd8xfWseCwgFOficek49CZD22h7JyXOqAFcCQCn2
-mFPFu9//NFqJjod+VHIgu0IkX3H7oOMQVwMUtcVgjH0SXMRe1N+bbesCrNTdeYWV
-kTKwULPZP9EDOeJGrM0CQQCsX+8VZ15yKTy6ADINrOt26PNpD4ib4552TE6T/1wG
-LKdjn5l0qB5K7ILc22z3LCenNBa0Uxbg5/RSdoX57aHA
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+AoGBAJIguzdPPgBTId8VKSes+lVupie9oo3qy8NaeBfGGCIixAnisbmHzIpNcUb/
+3CcuggQ4LODcrWvTtiTr2QBZx1FL7E4POBJl/N7zJMaQd+pGjmrJGfv5haSSQN+H
+r74Ix3HCd0RPdSgt5pmlT4KfsqkfRmqsPd6Nw54zbyLFMlTpAkEA4ar3ZJi2+Y+u
+FH3AycXuPdDtVW0tKFtxfvKlS48gshB6gmkd06Ugss5eZkdbSY0voAp88Tr2shOJ
++pXc++Zl6wJBAMTN9K9k728cVCf41pR6mDVxIaaqjJeY4DWppGQFSqw/fmYz/Quu
+PlTvk6pGRYiGN6y9CZFNoL2I/SWcd4ukrXMCQCyfYOHsbKn2Zka5Awki8VQZ3wQ4
+XWiQhGXE1ziUqbNsHL1yyaoTCd8xfWseCwgFOficek49CZD22h7JyXOqAFcCQCn2
+mFPFu9//NFqJjod+VHIgu0IkX3H7oOMQVwMUtcVgjH0SXMRe1N+bbesCrNTdeYWV
+kTKwULPZP9EDOeJGrM0CQQCsX+8VZ15yKTy6ADINrOt26PNpD4ib4552TE6T/1wG
+LKdjn5l0qB5K7ILc22z3LCenNBa0Uxbg5/RSdoX57aHA
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/test.pem

@@ -1 +1 @@
-i-am-a-pem
+i-am-a-pem

data/spec/integration/riak/bucket_types_spec.rb

@@ -266,5 +266,43 @@ describe 'Bucket Types', test_client: true, integration: true do
         expect{ bucket.get set.key, type: bucket_type }.to raise_error /not_found/
       end
     end
+
+    describe 'performing CRDT HLL operations', hll: true do
+      before(:each) do
+        begin
+          hlls = test_client.bucket_type Riak::Crdt::DEFAULT_BUCKET_TYPES[:hll]
+          hlls.properties
+        rescue Riak::ProtobuffsErrorResponse
+          skip('HyperLogLog bucket-type not found or active.')
+        end
+      end
+
+      let(:bucket_type){ Riak::Crdt::DEFAULT_BUCKET_TYPES[:hll] }
+      let(:hll) do
+        hyper_log_log = Riak::Crdt::HyperLogLog.new bucket, random_key, bucket_type
+        hyper_log_log.add random_key
+        hyper_log_log
+      end
+      let(:empty_hll) do
+        Riak::Crdt::HyperLogLog.new bucket, random_key, bucket_type
+      end
+
+      it 'defaults to 0 for a new key' do
+        expect(empty_hll.cardinality).to eq 0
+      end
+
+      it 'retrieves the HLL blob via key-value using a bucket type' do
+        expect{ bucket.get hll.key }.to raise_error /not_found/
+        expect(bucket.get hll.key, type: bucket_type).to be
+      end
+
+      it 'deletes the HLL blob through the bucket type' do
+        expect(bucket.delete hll.key).to be
+        expect{ bucket.get hll.key, type: bucket_type }.to_not raise_error
+
+        expect(bucket.delete hll.key, type: bucket_type).to be
+        expect{ bucket.get hll.key, type: bucket_type }.to raise_error /not_found/
+      end
+    end
   end
 end

data/spec/integration/riak/crdt/configuration_spec.rb

@@ -2,16 +2,17 @@ require 'spec_helper'
 require 'riak'
 
 describe "CRDT configuration", integration: true, test_client: true do
+  SETS = Riak::Crdt::DEFAULT_BUCKET_TYPES[:set]
   let(:bucket) { random_bucket }
 
   it "allows default bucket-types to be configured for each data type" do
-    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
+    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq SETS
 
     Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'new_set_default'
     expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'new_set_default'
 
-    Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'sets'
-    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
+    Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = SETS
+    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq SETS
   end
 
   describe 'overriding bucket-types' do

data/spec/integration/riak/crdt_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'riak'
+require 'riak/errors/failed_request'
 
 describe "CRDTs", integration: true, test_client: true do
   let(:bucket) { random_bucket }
@@ -82,6 +83,7 @@ describe "CRDTs", integration: true, test_client: true do
       it { is_expected.to eq similar }
     end
   end
+
   describe 'sets' do
 
     subject { Riak::Crdt::Set.new bucket, random_key }
@@ -259,4 +261,72 @@ describe "CRDTs", integration: true, test_client: true do
       end
     end
   end
+
+  describe 'HLLs', hll: true do
+    before(:each) do
+      begin
+        hlls = test_client.bucket_type Riak::Crdt::DEFAULT_BUCKET_TYPES[:hll]
+        hlls.properties
+      rescue Riak::ProtobuffsErrorResponse
+        skip('HyperLogLog bucket-type not found or active.')
+      end
+    end
+
+    subject { Riak::Crdt::HyperLogLog.new bucket, random_key }
+
+    it 'allows straightforward HLL ops' do
+      addition = random_key
+
+      subject.add addition
+
+      expect(subject.value).to be_a(Integer)
+      expect(subject.value).to eq 1
+    end
+
+    it 'asks for and accepts a returned body by default' do
+      other = Riak::Crdt::HyperLogLog.new subject.bucket, subject.key
+
+      other.add 'coffee'
+
+      expect(other.value).to be_a(Integer)
+      expect(other.value).to eq 1
+
+      expect(subject.value).to eq 1
+
+      subject.add 'tea'
+
+      expect(subject.value).to be_a(Integer)
+      expect(subject.value).to eq 2
+
+      other.reload
+      expect(other.value).to eq 2
+
+      other.add 'juice'
+
+      expect(other.value).to be_a(Integer)
+      expect(other.value).to eq 3
+
+      # repeat input to verify the HLL value doesn't increment
+      other.add 'juice'
+
+      expect(other.value).to be_a(Integer)
+      expect(other.value).to eq 3
+
+      expect(subject.dirty?).to_not be
+    end
+
+    it 'allows batched HLL ops' do
+      subject.add 'zero'
+      subject.reload
+
+      subject.batch do |s|
+        s.add 'first'
+        s.add 'second'
+        s.add 'second'
+      end
+
+      expect(subject.value).to be_a(Integer)
+      expect(subject.value).to eq 3
+    end
+  end
 end

data/spec/integration/riak/encodings/crdt_spec.rb

@@ -6,13 +6,16 @@ require 'riak/util/string'
 describe 'Encoding and CRDTs', integration: true, search_config: true do
   shared_examples 'CRDTs with weird names' do
     let(:counter_bucket) do
-      test_client.bucket_type('counters').bucket(random_string)
+      test_client.bucket_type(Riak::Crdt::DEFAULT_BUCKET_TYPES[:counter]).bucket(random_string)
     end
     let(:map_bucket) do
-      test_client.bucket_type('maps').bucket(random_string)
+      test_client.bucket_type(Riak::Crdt::DEFAULT_BUCKET_TYPES[:map]).bucket(random_string)
     end
     let(:set_bucket) do
-      test_client.bucket_type('sets').bucket(random_string)
+      test_client.bucket_type(Riak::Crdt::DEFAULT_BUCKET_TYPES[:set]).bucket(random_string)
+    end
+    let(:hll_bucket) do
+      test_client.bucket_type(Riak::Crdt::DEFAULT_BUCKET_TYPES[:hll]).bucket(random_string)
     end
 
     it 'creates counters' do
@@ -76,6 +79,29 @@ describe 'Encoding and CRDTs', integration: true, search_config: true do
 
       expect(random_string.encoding.name).to eq expected_encoding
     end
+
+    it 'updates hyper_log_logs', hll: true do
+      begin
+        hlls = test_client.bucket_type Riak::Crdt::DEFAULT_BUCKET_TYPES[:hll]
+        hlls.properties
+      rescue Riak::ProtobuffsErrorResponse
+        skip('HyperLogLog bucket-type not found or active.')
+      end
+
+      hll = nil
+
+      expect(random_string.encoding.name).to eq expected_encoding
+
+      expect{ hll = Riak::Crdt::HyperLogLog.new hll_bucket, random_string }.to_not raise_error
+      expect(hll).to be_a Riak::Crdt::HyperLogLog
+
+      hll.add random_string
+
+      expect(hll.value).to be_a(Integer)
+      expect(hll.value).to eq 1
+
+      expect(random_string.encoding.name).to eq expected_encoding
+    end
   end
 
   describe 'with utf-8 strings' do