priam 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/priam/command/get.rb

@@ -1,5 +1,38 @@
 module Priam::Command
   module Get
+    
+    def self.get(client, column_family, super_column, key, options={})
+      raise_exception_flag = options[:raise_exception_flag]
+      retry_max_count = options[:retry_max_count] || 0
+      weight_second = options[:weight_second] || 1
+      
+      retry_count = 0
+      begin
+        if super_column
+          record = client.get(column_family, super_column, key)
+        else
+          record = client.get(column_family, key)
+        end
+      rescue Exception => e
+        if retry_max_count <= retry_count then
+          if raise_exception_flag then
+            raise e
+          else
+            backtrace = e.backtrace.map{|s| "  #{s}"}.join("\n")
+            Priam.logger.warn(" #{e.message}(#{e.class.name}): #{backtrace}")
+            return {}
+          end
+        else
+          retry_count += 1
+          Priam.logger.warn(" #{e.message}(#{e.class.name})")
+          Priam.logger.info(" retry(#{retry_count})")
+          sleep(weight_second) if weight_second
+          retry
+        end
+      end
+      return record
+    end
+    
     def self.run(argv, input_stream=$stdin, output_stream=$stdout)
       params = Priam::Core::Common.parse_opts(argv)
       host = params[:host]
@@ -8,7 +41,7 @@ module Priam::Command
       column_family = params[:column_family]
       super_column = params[:super_column]
       name = params[:name]
-      
+
       client = Cassandra.new(keyspace, "#{host}:#{port}")
       
       Priam.logger.debug "Cluster Name: #{client.cluster_name}"
@@ -25,25 +58,17 @@ module Priam::Command
           next
         end
       
-        begin
-          if super_column then
-            record = client.get(column_family, super_column, key)
-          else
-            record = client.get(column_family, key)
-          end
-          
-          if name then
-            output_stream.puts "#{record[name]}"
-          else
-            output_stream.puts record.to_json
-          end
-          count += 1
-          if count % 10 == 0 then
-            Priam.logger.info " GET [#{key_list.join(',')}]"
-            key_list.clear
-          end
-        rescue Exception => e
-          raise e.class, "#{e.message}, key list = #{key_list.inspect}"
+        record = self.get(client, column_family, super_column, key, params)    
+        
+        if name then
+          output_stream.puts "#{record[name]}"
+        else
+          output_stream.puts record.to_json
+        end
+        count += 1
+        if count % 10 == 0 then
+          Priam.logger.info " GET [#{key_list.join(',')}]"
+          key_list.clear
         end
       end
       

data/lib/priam/command/insert.rb

@@ -86,7 +86,8 @@ module Priam::Command
             if raise_exception_flag then
               raise e
             else
-              Priam.logger.warn(" #{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
+              backtrace = e.backtrace.map{|s| "  #{s}"}.join("\n")
+              Priam.logger.warn(" #{e.message}(#{e.class.name}): #{backtrace}")
             end
           else
             retry_count += 1

data/priam.gemspec

@@ -0,0 +1,92 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "priam"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kenji Hara"]
+  s.date = "2012-12-12"
+  s.description = "Command-base client for Cassandra."
+  s.email = "haracane@gmail.com"
+  s.executables = ["priam"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/priam",
+    "lib/priam.rb",
+    "lib/priam/command.rb",
+    "lib/priam/command/cql.rb",
+    "lib/priam/command/cql/create.rb",
+    "lib/priam/command/delete.rb",
+    "lib/priam/command/get.rb",
+    "lib/priam/command/insert.rb",
+    "lib/priam/command/put.rb",
+    "lib/priam/core.rb",
+    "lib/priam/core/common.rb",
+    "priam.gemspec",
+    "spec/bin/priam_spec.rb",
+    "spec/lib/priam/command/delete_spec.rb",
+    "spec/lib/priam/command/get_spec.rb",
+    "spec/lib/priam/command/insert_spec.rb",
+    "spec/lib/priam/command/put_spec.rb",
+    "spec/lib/priam/core/common_spec.rb",
+    "spec/lib/priam_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/haracane/priam"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "Command-base client for Cassandra."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thrift>, ["~> 0.7.0"])
+      s.add_runtime_dependency(%q<thrift_client>, ["~> 0.7.1"])
+      s.add_runtime_dependency(%q<simple_uuid>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<cassandra>, ["~> 0.12.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<thrift>, ["~> 0.7.0"])
+      s.add_dependency(%q<thrift_client>, ["~> 0.7.1"])
+      s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
+      s.add_dependency(%q<cassandra>, ["~> 0.12.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thrift>, ["~> 0.7.0"])
+    s.add_dependency(%q<thrift_client>, ["~> 0.7.1"])
+    s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
+    s.add_dependency(%q<cassandra>, ["~> 0.12.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/spec/bin/priam_spec.rb

@@ -61,7 +61,6 @@ describe "bin/priam" do
   context "when command = get" do
     context "when key&value exists" do
       it "should output value" do
-        
         result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --verbose #{@stderr_dst}`
         result.chomp!
         result.should == "val1"
@@ -74,6 +73,13 @@ describe "bin/priam" do
         result.should == ""
       end
     end
+    context "when retry option is enabled" do
+      it "should output value" do
+        result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --retry 5 --weight 1000 --verbose #{@stderr_dst}`
+        result.chomp!
+        result.should == "val1"
+      end
+    end
   end
 
   context "when command = delete" do

data/spec/lib/priam/core/common_spec.rb

@@ -1,6 +1,49 @@
 require "spec_helper"
 
 describe Priam::Core::Common do
-  it "should success" do
+  describe ".parse_opts(argv)" do
+    context "when argv = []" do
+      it "should return defalut hash" do
+        result = Priam::Core::Common.parse_opts([])
+        result[:host].should == "localhost"
+        result[:port].should == 9160
+        result[:raise_exception_flag].should == false
+        result[:value_column].should == "d"
+        result[:retry_max_count].should == 0
+        result[:check_exist_flag].should == false
+        result[:output_keys_flag].should == false
+        result[:replication_factor].should == 1
+        result[:verbose_flag].should == false
+      end
+    end
+
+    argv = ("-h cassandra-server -p 19160" \
+      + " --keyspace KeySpace --column-family ColumnFamily" \
+      + " --super-column SuperColumn --name name" \
+      + " --raise-exception --unit-size 10 --value-column value_column" \
+      + " --weight 11000 --retry 12 --count-log count.log" \
+      + " --check-exist --output-keys --replication-factor 13 --verbose").split(/ /)
+
+    context "when argv = #{argv.inspect}" do
+      it "should return valid hash" do
+        result = Priam::Core::Common.parse_opts(argv)
+        result[:host].should == "cassandra-server"
+        result[:port].should == 19160
+        result[:keyspace].should == "KeySpace"
+        result[:column_family].should == "ColumnFamily"
+        result[:super_column].should == "SuperColumn"
+        result[:name].should == "name"
+        result[:raise_exception_flag].should == true
+        result[:unit_size].should == 10
+        result[:value_column].should == "value_column"
+        result[:weight_second].should == 11
+        result[:retry_max_count].should == 12
+        result[:count_log_path].should == "count.log"
+        result[:check_exist_flag].should == true
+        result[:output_keys_flag].should == true
+        result[:replication_factor].should == 13
+        result[:verbose_flag].should == true
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kenji Hara
@@ -187,6 +187,7 @@ files:
 - lib/priam/command/put.rb
 - lib/priam/core.rb
 - lib/priam/core/common.rb
+- priam.gemspec
 - spec/bin/priam_spec.rb
 - spec/lib/priam/command/delete_spec.rb
 - spec/lib/priam/command/get_spec.rb