priam 0.0.5 → 0.0.6

data/Gemfile

@@ -7,6 +7,7 @@ gem "thrift", "~> 0.7.0"
 gem "thrift_client", "~> 0.7.1"
 gem "simple_uuid", "~> 0.2.0"
 gem "cassandra", "~> 0.12.1"
+gem "json", ">= 1.6.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -38,6 +38,7 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   cassandra (~> 0.12.1)
   jeweler (~> 1.8.4)
+  json (>= 1.6.5)
   rcov
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/README.rdoc

@@ -24,6 +24,14 @@ insert value:
  [2012-12-12 10:16:46](INFO) insert into cassandra://cassandra-server:9160/TestKS/TestCF
  [2012-12-12 10:16:46](INFO) inserted 2 columns into cassandra://cassandra-server:9160/TestKS/TestCF
 
+insert json:
+ $ cat input.txt
+ key1	{"d":"val2"}
+ key2	{"d":"val2"}
+ $ cat input.txt | priam insert -h cassandra-server -p 9160 --keyspace TestKS --column-family TestCF --json --verbose
+ [2012-12-12 10:16:46](INFO) insert into cassandra://cassandra-server:9160/TestKS/TestCF
+ [2012-12-12 10:16:46](INFO) inserted 2 columns into cassandra://cassandra-server:9160/TestKS/TestCF
+
 get record in json:
  $ cat keys.txt
  key1

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/priam/command/help.rb

@@ -5,19 +5,20 @@ module Priam::Command
 usage: priam COMMAND [-h HOST] [-p PORT]
             [--keyspace KEYSPACE] [--column-family COLUMN_FAMILY]
             [--super-column SUPER_COLUMN] [--value-column COLUMN_NAME]
-            [--retry COUNT] [--weight MSEC]
+            [--json] [--retry COUNT] [--weight MSEC]
             [--raise-exception] [--unit-size COUNT] [--verbose]
   -h HOST                        cassandra server address. default is localhost. 
   -p PORT                        port number. default is 9160.
   --keyspace KEYSPACE            keyspace.
   --column-family COLUMN_FAMILY  column-family.
   --super-column SUPER_COLUMN    super-column.
-  --value-column COLUMN_NAME     column name for each column.
-  --retry COUNT                  max retry count for put/get.
-  --weight MSEC                  weight time for retry.
-  --raise-exception              raise exception.
-  --unit-size COUNT              unit size for log.
-  --verbose                      turn on verbose output, with all the available data.
+  --value-column COLUMN_NAME     column name for each column. default is 'd' only in insert.
+  --json                         put column value in json format. default is off.
+  --retry COUNT                  max retry count for put/get. default is 0.
+  --weight MSEC                  weight time for retry. default is 1000.
+  --raise-exception              raise exception. default is off.
+  --unit-size COUNT              unit size for log. default is 10000.
+  --verbose                      turn on verbose output, with all the available data. default is off.
       EOF
       return 0
     end

data/lib/priam/command/insert.rb

@@ -13,6 +13,7 @@ module Priam::Command
       weight_second = params[:weight_second]
       retry_max_count = params[:retry_max_count]
       count_log_path = params[:count_log_path]
+      json_flag = params[:json_flag]
 
       keyspace = argv.shift if 0 < argv.length
       column_family = argv.shift if 0 < argv.length
@@ -72,10 +73,15 @@ module Priam::Command
         begin
       #    STDERR.puts "#{retry_count} #{retry_max_count}"
       #    raise "Test Error"
+          if json_flag
+            column = JSON.parse(value)
+          else
+            column = {value_column=>value}
+          end
           if super_column then
-            client.insert(column_family, super_column, {key=>{value_column=>value}})
+            client.insert(column_family, super_column, {key=>column})
           else
-            client.insert(column_family, key, {value_column=>value})
+            client.insert(column_family, key, column)
           end
           count += 1
           if count % unit_size == 0 then

data/lib/priam/core/common.rb

@@ -7,12 +7,14 @@ module Priam::Core
       
       unit_size = 10000
       retry_max_count = 0
+      weight_second = 1
 
       check_exist_flag = false
       output_keys_flag = false
       
       replication_factor = 1
       
+      json_flag = false
       verbose_flag = false
       
       next_argv = []
@@ -50,6 +52,8 @@ module Priam::Core
           output_keys_flag = true
         when '--replication-factor'
           replication_factor = argv.shift.to_i
+        when '--json'
+          json_flag = true
         when '--verbose'
           verbose_flag = true
         else 
@@ -80,6 +84,7 @@ module Priam::Core
         :check_exist_flag=>check_exist_flag,
         :output_keys_flag=>output_keys_flag,
         :replication_factor=>replication_factor,
+        :json_flag=>json_flag,
         :verbose_flag=>verbose_flag
       }
     end

data/priam.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "priam"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<json>, [">= 1.6.5"])
       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"])
@@ -73,6 +74,7 @@ Gem::Specification.new do |s|
       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<json>, [">= 1.6.5"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
     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<json>, [">= 1.6.5"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/bin/priam_spec.rb

@@ -42,26 +42,51 @@ describe "bin/priam" do
   end
   
   context "when command = insert" do
-    it "should insert values" do
-      input = [
-        ["key1", "val10"],
-        ["key2", "val2"]
-      ]
-      tmpfile = Tempfile.new("bin_priam")
-      input.each do |record|
-        tmpfile.puts record.join("\t")
+    context "with json option" do
+      it "should insert values" do
+        input = [
+          ["key3", {"data"=>"val3"}.to_json],
+          ["key4", {"data"=>"val4"}.to_json]
+        ]
+        tmpfile = Tempfile.new("bin_priam")
+        input.each do |record|
+          tmpfile.puts record.join("\t")
+        end
+        tmpfile.close
+        `cat #{tmpfile.path} | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam insert --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --json --verbose #{@stderr_dst}`
+        tmpfile.unlink
+  
+        result = `echo key3 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --value-column data 2> /dev/null`
+        result.chomp!
+        result.should == "val3"
+        
+        result = `echo key4 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --value-column data 2> /dev/null`
+        result.chomp!
+        result.should == "val4"
+      end
+    end
+    context "without json option" do
+      it "should insert values" do
+        input = [
+          ["key1", "val10"],
+          ["key2", "val2"]
+        ]
+        tmpfile = Tempfile.new("bin_priam")
+        input.each do |record|
+          tmpfile.puts record.join("\t")
+        end
+        tmpfile.close
+        `cat #{tmpfile.path} | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam insert --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --verbose #{@stderr_dst}`
+        tmpfile.unlink
+  
+        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 2> /dev/null`
+        result.chomp!
+        result.should == "val10"
+        
+        result = `echo key2 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d 2> /dev/null`
+        result.chomp!
+        result.should == "val2"
       end
-      tmpfile.close
-      `cat #{tmpfile.path} | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam insert --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --verbose #{@stderr_dst}`
-      tmpfile.unlink
-
-      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 2> /dev/null`
-      result.chomp!
-      result.should == "val10"
-      
-      result = `echo key2 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d 2> /dev/null`
-      result.chomp!
-      result.should == "val2"
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kenji Hara
@@ -81,11 +81,27 @@ dependencies:
         - 1
         version: 0.12.1
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +112,12 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +127,12 @@ dependencies:
         - 3
         - 12
         version: "3.12"
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,12 +143,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,12 +159,12 @@ dependencies:
         - 8
         - 4
         version: 1.8.4
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -157,7 +173,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
+  version_requirements: *id010
 description: Command-base client for Cassandra.
 email: haracane@gmail.com
 executables: