riak-client 1.2.0 → 1.4.0

data/lib/riak/node.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 require 'riak/util/translation'
 require 'riak/node/defaults'
 require 'riak/node/configuration'

data/lib/riak/node/configuration.rb

@@ -3,16 +3,20 @@ require 'yaml'
 
 module Riak
   class Node
+
+    # do not copy these directories to the test node
+    NODE_DIR_SKIP_LIST = [:data, :pipe]
+
     # The directories (and accessor methods) that will be created
     # under the generated node.
-    NODE_DIRECTORIES = [:bin, :etc, :log, :data, :ring, :pipe]
+    NODE_DIRECTORIES = [:bin, :etc, :log, :data, :pipe]
 
+    # Makes accessor methods for all the node directories that
+    # return Pathname objects.
     NODE_DIRECTORIES.each do |dir|
-      # Makes accessor methods for all the node directories that
-      # return Pathname objects.
       class_eval %Q{
         def #{dir}
-          root + '#{dir}'
+          root + '#{dir}/'
         end
       }
     end
@@ -55,9 +59,14 @@ module Riak
       env[:riak_core][:http][0][1]
     end
 
+    def pb_config_section
+      return :riak_kv if version < '1.4.0'
+      return :riak_api
+    end
+
     # @return [Fixnum] the port to which the Protocol Buffers API is connected.
     def pb_port
-      env[:riak_kv][:pb_port]
+      env[pb_config_section][:pb_port]
     end
 
     # @return [String] the interface to which the HTTP API is connected
@@ -67,7 +76,7 @@ module Riak
 
     # @return [String] the interface to which the Protocol Buffers API is connected
     def pb_ip
-      env[:riak_kv][:pb_ip]
+      env[pb_config_section][:pb_ip]
     end
 
     # @return [Symbol] the storage backend for Riak Search.
@@ -93,8 +102,7 @@ module Riak
     end
 
     # The source of the Riak installation from where the {Node} will
-    # be generated. This should point to the directory that contains
-    # the 'riak[search]' and 'riak[search]-admin' scripts.
+    # be generated.
     # @return [Pathname] the source Riak installation
     attr_reader :source
 
@@ -103,16 +111,19 @@ module Riak
     # @return [Pathname] the root directory of the node
     attr_reader :root
 
+    def env_script
+      @env_script ||= root + 'lib' + 'env.sh'
+    end
+
     # The script for starting, stopping and pinging the Node.
     # @return [Pathname] the path to the control script
     def control_script
       @control_script ||= root + 'bin' + control_script_name
     end
 
-    # The name of the 'riak' or 'riaksearch' control script.
-    # @return [String] 'riak' or 'riaksearch'
+    # The name of the 'riak' control script.
     def control_script_name
-      @control_script_name ||= (source + 'riaksearch').exist? ? 'riaksearch' : 'riak'
+      @control_script_name ||= 'riak'
     end
 
     # The script for controlling non-lifecycle features of Riak like
@@ -155,10 +166,10 @@ module Riak
       env[:bitcask][:data_root] ||= (data + 'bitcask').expand_path.to_s
       env[:eleveldb][:data_root] ||= (data + 'leveldb').expand_path.to_s
       env[:merge_index][:data_root] ||= (data + 'merge_index').expand_path.to_s
-      env[:riak_core][:ring_state_dir] ||= ring.expand_path.to_s
       env[:riak_core][:slide_private_dir] ||= (data + 'slide-data').expand_path.to_s
+      env[:riak_core][:ring_state_dir] ||= (data + 'ring').expand_path.to_s
+
       NODE_DIRECTORIES.each do |dir|
-        next if [:ring, :pipe].include?(dir)
         env[:riak_core][:"platform_#{dir}_dir"] ||= send(dir).to_s
       end
     end
@@ -169,11 +180,11 @@ module Riak
         env[:lager][:handlers] = {
           :lager_console_backend => :info,
           :lager_file_backend => [
-                                  Tuple[(log+"error.log").expand_path.to_s, :error],
-                                  Tuple[(log+"console.log").expand_path.to_s, :info]
+                                  Tuple[(log + "error.log").expand_path.to_s, :error],
+                                  Tuple[(log + "console.log").expand_path.to_s, :info]
                                  ]
         }
-        env[:lager][:crash_log] = (log+"crash.log").to_s
+        env[:lager][:crash_log] = (log + "crash.log").to_s
       else
         # TODO: Need a better way to detect this, the defaults point
         # to 1.0-style configs. Maybe there should be some kind of
@@ -184,9 +195,9 @@ module Riak
           :fmt_max_bytes => 65536
         }
         env[:sasl] = {
-          :sasl_error_logger => Tuple[:file, (log+"sasl-error.log").expand_path.to_s],
+          :sasl_error_logger => Tuple[:file, (log + "sasl-error.log").expand_path.to_s],
           :errlog_type => :error,
-          :error_logger_mf_dir => (log+"sasl").expand_path.to_s,
+          :error_logger_mf_dir => (log + "sasl").expand_path.to_s,
           :error_logger_mf_maxbytes => 10485760,
           :error_logger_mf_maxfiles => 5
         }
@@ -227,9 +238,9 @@ module Riak
         min_port += 1
       end
       env[:riak_core][:http] = env[:riak_core][:http].map {|pair| Tuple[*pair] }
-      env[:riak_kv][:pb_ip] = interface unless env[:riak_kv][:pb_ip]
-      unless env[:riak_kv][:pb_port]
-        env[:riak_kv][:pb_port] = min_port
+      env[pb_config_section][:pb_ip] = interface unless env[pb_config_section][:pb_ip]
+      unless env[pb_config_section][:pb_port]
+        env[pb_config_section][:pb_port] = min_port
         min_port += 1
       end
       unless env[:riak_core][:handoff_port]

data/lib/riak/node/defaults.rb

@@ -4,6 +4,8 @@ module Riak
   class Node
     # Settings based on Riak 1.1.
     ENV_DEFAULTS = {
+      :riak_api => {
+      },
       :riak_core => {
         :ring_creation_size => 64
       },

data/lib/riak/node/generation.rb

@@ -17,7 +17,7 @@ module Riak
     def create
       unless exist?
         touch_ssl_distribution_args
-        create_directories
+        copy_directories
         write_scripts
         write_vm_args
         write_app_config
@@ -52,9 +52,17 @@ module Riak
       root.rmtree if root.exist?
     end
 
-    def create_directories
+    def copy_directories
       root.mkpath
-      NODE_DIRECTORIES.each {|d| send(d).mkpath }
+      raise 'Source is not a directory!' unless base_dir.directory?
+
+      base_dir.each_child do |dir|
+        basename = dir.basename.to_s
+        next if NODE_DIR_SKIP_LIST.include? basename.to_sym
+        target = Pathname.new("#{root.to_s}")
+        target.mkpath
+        FileUtils.cp_r(dir.to_s,target)
+      end
     end
 
     def write_vm_args
@@ -72,18 +80,22 @@ module Riak
     end
 
     def write_scripts
-      [control_script, admin_script].each {|s| write_script(s.basename, s) }
+      if version >= '1.4.0'
+        [env_script].each {|s| write_script(s) }
+      else
+        [control_script, admin_script].each {|s| write_script(s) }
+      end
     end
 
-    def write_script(name, target)
-      source_script = source + name
+    def write_script(target)
+      source_script = source.parent + target.relative_path_from(target.parent.parent)
       target.open('wb') do |f|
         source_script.readlines.each do |line|
           line.sub!(/(RUNNER_SCRIPT_DIR=)(.*)/, '\1' + bin.to_s)
           line.sub!(/(RUNNER_ETC_DIR=)(.*)/, '\1' + etc.to_s)
           line.sub!(/(RUNNER_USER=)(.*)/, '\1')
           line.sub!(/(RUNNER_LOG_DIR=)(.*)/, '\1' + log.to_s)
-          line.sub!(/(PIPE_DIR=)(.*)/, '\1' + pipe.to_s + "/") # PIPE_DIR must have a trailing slash
+          line.sub!(/(PIPE_DIR=)(.*)/, '\1' + pipe.to_s)
           line.sub!(/(PLATFORM_DATA_DIR=)(.*)/, '\1' + data.to_s)
           line.sub!('grep "$RUNNER_BASE_DIR/.*/[b]eam"', 'grep "$RUNNER_ETC_DIR/app.config"')
           if line.strip == "RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*}"

data/lib/riak/node/version.rb

@@ -21,23 +21,9 @@ module Riak
       end
     end
 
-    # Determines the base_dir from source control script
+    # Determines the base_dir from source parent
     def configure_base_dir
-      # Use the script from the source directory so we don't require
-      # it to be generated first.
-      (source + control_script_name).each_line.find {|l| l =~ /^RUNNER_BASE_DIR=(.*)/ }
-
-      # There should only be one matching line, so the contents of $1
-      # will be the matched path. If there's nothing matched, we
-      # return nil.
-      case $1
-      when '${RUNNER_SCRIPT_DIR%/*}'
-        source.parent
-      when String
-        Pathname.new($1).expand_path
-      else
-        nil
-      end
+      source.parent
     end
   end
 end

data/lib/riak/robject.rb

@@ -126,6 +126,7 @@ module Riak
     def store(options={})
       raise Conflict, self if conflict?
       raise ArgumentError, t("content_type_undefined") unless content_type.present?
+      raise ArgumentError, t("zero_length_key") if key == ''
       @bucket.client.store_object(self, options)
       self
     end

data/lib/riak/secondary_index.rb

@@ -0,0 +1,67 @@
+require 'riak/index_collection'
+module Riak
+  class SecondaryIndex
+    include Util::Translation
+    include Client::FeatureDetection
+
+    # Create a Riak Secondary Index operation
+    # @param [Bucket] the {Riak::Bucket} we'll query against
+    # @param [String] the index name
+    # @param [String,Integer,Range<String,Integer>] a single value or
+    #   range of values to query for
+    def initialize(bucket, index, query, options={})
+      @bucket = bucket
+      @client = @bucket.client
+      @index = index
+      @query = query
+      @options = options
+
+      validate_options
+    end
+
+    def get_server_version
+      @client.backend{|b| b.send :get_server_version }
+    end
+
+    # Get the array of matched keys
+    def keys(&block)
+      @collection ||=
+        @client.backend do |b|
+          b.get_index @bucket, @index, @query, @options, &block
+        end
+    end
+
+    # Get the array of values
+    def values
+      @values ||= @bucket.get_many(self.keys).values
+    end
+
+    # Get a new SecondaryIndex fetch for the next page
+    def next_page
+      raise t('index.no_next_page') unless keys.continuation
+
+      self.class.new(@bucket, 
+                     @index, 
+                     @query, 
+                     @options.merge(:continuation => keys.continuation))
+    end
+
+    # Determine whether a SecondaryIndex fetch has a next page available
+    def has_next_page?
+      !!keys.continuation
+    end
+
+    private
+    def validate_options
+      raise t('index.pagination_not_available') if paginated? && !index_pagination?
+      raise t('index.return_terms_not_available') if @options[:return_terms] && !index_return_terms?
+      raise t('index.include_terms_is_wrong') if @options[:include_terms]
+
+      # raise t('index.streaming_not_available') if @options[:stream] && !index_streaming?
+    end
+
+    def paginated?
+      @options[:continuation] || @options[:max_results]
+    end
+  end
+end

data/lib/riak/version.rb

@@ -1,3 +1,3 @@
 module Riak
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/riak-client.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |gem|
   gem.version = Riak::VERSION
   gem.summary = %Q{riak-client is a rich client for Riak, the distributed database by Basho.}
   gem.description = %Q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP and Protocol Buffers interfaces including storage operations, bucket configuration, link-walking, secondary indexes and map-reduce.}
-  gem.email = ["sean@basho.com"]
+  gem.email = ["sean@basho.com", 'bryce@basho.com']
   gem.homepage = "http://github.com/basho/riak-ruby-client"
-  gem.authors = ["Sean Cribbs"]
+  gem.authors = ["Sean Cribbs", 'Bryce Kerley']
 
   # Deps
   gem.add_development_dependency "rspec", "~>2.13.0"
@@ -52,6 +52,7 @@ Gem::Specification.new do |gem|
     **/*.rbc
     **/.DS_Store
     spec/support/test_server.yml
+    .ruby-version
   }
 
   files = includes.map {|glob| Dir[glob] }.flatten.select {|f| File.file?(f) }.sort

data/spec/integration/riak/counters_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'riak'
+
+describe Riak::Counter, test_server: true, integration: true do
+  before :all do
+    opts = {
+      http_port: test_server.http_port,
+      pb_port: test_server.pb_port,
+      protocol: 'pbc'
+    }
+    test_server.start
+    @client = Riak::Client.new opts
+    @bucket = @client['counter_spec']
+    @bucket.allow_mult = true
+
+    @counter = Riak::Counter.new @bucket, 'counter_spec'
+  end
+
+
+  ['pbc', 'http'].each do |protocol|
+    describe protocol do
+      before :all do
+        @client.protocol = protocol
+      end
+      it 'should read and update' do
+        initial = @counter.value
+
+        @counter.increment
+        @counter.increment
+
+        @counter.value.should == (initial + 2)
+
+        @counter.decrement 2
+
+        @counter.value.should == initial
+
+        5.times do
+          amt = rand(10_000)
+          
+          @counter.increment amt
+          @counter.value.should == (initial + amt)
+
+          @counter.decrement (amt * 2)
+          @counter.value.should == (initial - amt)
+
+          @counter.increment_and_return(amt).should == initial
+        end
+      end
+    end
+  end
+end

data/spec/integration/riak/http_backends_spec.rb

@@ -106,29 +106,39 @@ describe "HTTP" do
     end
   end
 
-  class Reader < Array
+  class SizelessReader < Array
     def read(*args)
       shift
     end
 
-    def size
-      join.size
-    end
-  end
-
-  class SizelessReader < Reader
     undef :size
   end
 
   describe 'NetHTTPBackend' do
     subject { Riak::Client::NetHTTPBackend.new(@client, @client.node) }
-    let(:file) { File.open(__FILE__) }
-    let(:sized) { Reader.new(["foo", "bar", "baz"]) }
-    let(:sizeless) { SizelessReader.new(["foo", "bar", "baz"]) }
-    it "should set the content-length or transfer-encoding properly on IO uploads" do
-      lambda { subject.put(204, subject.object_path('nethttp', 'test-file'), file, {"Content-Type" => "text/plain"}) }.should_not raise_error
-      lambda { subject.put(204, subject.object_path('nethttp', 'test-sized'), sized, {"Content-Type" => "text/plain"}) }.should_not raise_error
-      lambda { subject.put(204, subject.object_path('nethttp', 'test-sizeless'), sizeless, {"Content-Type" => "text/plain"}) }.should_not raise_error
+    shared_examples "IO uploads" do |io|
+      it "should upload without error" do
+        lambda do
+          Timeout::timeout(2) do
+            subject.put(
+                        204,
+                        subject.object_path('nethttp', 'test-io'),
+                        io,
+                        {'Content-Type' => 'text/plain'}
+                        )
+          end
+        end.should_not raise_error
+      end
+    end
+    
+    context "File" do
+      include_examples "IO uploads", File.open(__FILE__)
+    end
+    context "Sized reader" do
+      include_examples "IO uploads", StringIO.new(%w{foo bar baz}.join)
+    end
+    context "Sizeless reader" do
+      include_examples "IO uploads", SizelessReader.new(%w{foo bar baz})
     end
   end
 end

data/spec/integration/riak/node_spec.rb

@@ -12,28 +12,6 @@ describe Riak::Node, :test_server => false, :slow => true, :nodegen => true do
   context "finding the base_dir and version" do
     its(:base_dir) { should be_directory }
     its(:version) { should match /^\d+.\d+.\d+$/ }
-
-    context "when the base directory is missing" do
-      before { Pathname.any_instance.stub(:each_line).and_return([]) }
-      its(:base_dir) { should be_nil }
-      its(:version)  { should be_nil }
-    end
-  end
-
-  context "when the source control script is a symlink" do
-    let(:symdir) { Pathname.new(".symlinkriak") }
-    let(:sourcedir) { Pathname.new(test_server_config['source']) }
-    let(:control_script){ (sourcedir + 'riaksearch').exist? ? 'riaksearch' : 'riak' }
-
-    subject { described_class.new(:root => ".ripplenode", :source => symdir) }
-
-    before do
-      symdir.mkpath
-      (symdir + control_script).make_symlink(sourcedir + control_script)
-    end
-    after { symdir.rmtree }
-
-    its(:source){ should == sourcedir }
   end
 
   context "creation" do
@@ -64,8 +42,8 @@ describe Riak::Node, :test_server => false, :slow => true, :nodegen => true do
         contents.should include('{handoff_port, 8082}')
       end
 
-      it "should set the ring directory to point to the node directory" do
-        contents.should include("{ring_state_dir, \"#{subject.root + 'ring'}\"}")
+      it "should set the ring directory to point to the node data directory" do
+        contents.should include("{ring_state_dir, \"#{subject.root + 'data/ring'}\"}")
       end
     end
 
@@ -86,8 +64,8 @@ describe Riak::Node, :test_server => false, :slow => true, :nodegen => true do
       end
     end
 
-    describe "generating the start script" do
-      let(:file) { subject.control_script }
+    describe "generating the environment script" do
+      let(:file) { (subject.version >= '1.4.0') ? subject.env_script : subject.control_script }
       let(:contents) { file.read }
 
       it "should create the script in the node directory" do
@@ -148,8 +126,8 @@ describe Riak::Node, :test_server => false, :slow => true, :nodegen => true do
       (subject.root + 'data').children.map {|dir| dir.children }.flatten.should be_empty
     end
 
-    it "should not remove the ring" do
-      (subject.root + 'ring').children.should_not be_empty
+    it "should remove the ring" do
+      (subject.root + 'data/ring').children.should be_empty
     end
   end