tablestore-ruby-sdk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86177da99a4888d0a61d1b52b20f90b43fb3624d
-  data.tar.gz: 37ad84d31c752483becbd23dcebc212ce054607c
+  metadata.gz: 2f7be149c8559324647e8e01f7a5478659af2752
+  data.tar.gz: 35c6271e490bb2788487c9b5027a03ac1ac04d81
 SHA512:
-  metadata.gz: ffcd6971f6c6b5e7311e5495bec618db4f2eef6797f7e8dd701e594252ee60f6ac05e3a3ab047e36f86862c348c6d463f777b2c1d60543a9ad6c1a49726810f1
-  data.tar.gz: 6aadd6fb901ddab23eab2dbe74bcd78e283f7cf7f16f1f3b05f3627c9a39c3a395ed7e261ef28ad51866c5ff862b15a55ddfe44ea8c3c6b3aa525c7c3c404051
+  metadata.gz: 57db261be3591b37f77f4e652e0962ffb31eff63e3c36e9ba503a8c5b404ad9a8efe2c18d9173aefecfc76c18212dbfb1b716874ba6dbeb14a8aa06f56d76bb0
+  data.tar.gz: b264e2454e8a6f2709af4b3140139faf173193e5ad14fbb94a3e351d6bda69ec43fae11be68cf09bddb94761a558ecddb9f49be326997bb977bb138ae49aa84e

data/lib/tablestore/plain_buffer_coded_output_stream.rb

@@ -47,16 +47,16 @@ class  PlainBufferCodedOutputStream
       cell_check_sum = PlainBufferCrc8.crc_int64(cell_check_sum, value)
     elsif value.is_a?(String)
       prefix_length = LITTLE_ENDIAN_32_SIZE + 1
-      @output_stream.write_raw_little_endian32(prefix_length + value.length)
+      @output_stream.write_raw_little_endian32(prefix_length + value.bytes.length)
       @output_stream.write_raw_byte(VT_STRING)
       @output_stream.write_raw_little_endian32(value.length)
       @output_stream.write_bytes(value)
       cell_check_sum = PlainBufferCrc8.crc_int8(cell_check_sum, VT_STRING)
-      cell_check_sum = PlainBufferCrc8.crc_int32(cell_check_sum, value.length)
+      cell_check_sum = PlainBufferCrc8.crc_int32(cell_check_sum, value.bytes.length)
       cell_check_sum = PlainBufferCrc8.crc_string(cell_check_sum, value)
     # elsif value.is_a?()
     else
-      raise TableStoreClientError.new("Unsupported primary key type: " + value.class)
+      raise TableStoreClientError.new("Unsupported primary key type: #{value.class}")
     end
     cell_check_sum
   end
@@ -81,12 +81,12 @@ class  PlainBufferCodedOutputStream
       cell_check_sum = PlainBufferCrc8.crc_int64(cell_check_sum, value)
     elsif value.is_a?(String)
       prefix_length = LITTLE_ENDIAN_32_SIZE + 1
-      @output_stream.write_raw_little_endian32(prefix_length + value.length)
+      @output_stream.write_raw_little_endian32(prefix_length + value.bytes.length)
       @output_stream.write_raw_byte(VT_STRING)
-      @output_stream.write_raw_little_endian32(value.length)
+      @output_stream.write_raw_little_endian32(value.bytes.length)
       @output_stream.write_bytes(value)
       cell_check_sum = PlainBufferCrc8.crc_int8(cell_check_sum, VT_STRING)
-      cell_check_sum = PlainBufferCrc8.crc_int32(cell_check_sum, value.length)
+      cell_check_sum = PlainBufferCrc8.crc_int32(cell_check_sum, value.bytes.length)
       cell_check_sum = PlainBufferCrc8.crc_string(cell_check_sum, value)
     elsif value.is_a?(Float)
       if SYS_BITS == 64
@@ -100,7 +100,7 @@ class  PlainBufferCodedOutputStream
       cell_check_sum = PlainBufferCrc8.crc_int8(cell_check_sum, VT_DOUBLE)
       cell_check_sum = PlainBufferCrc8.crc_int64(cell_check_sum, double_in_long)
     else
-      raise TableStoreClientError.new("Unsupported column type: " + value.class)
+      raise TableStoreClientError.new("Unsupported column type: #{value.class}")
     end
     cell_check_sum
   end
@@ -113,13 +113,13 @@ class  PlainBufferCodedOutputStream
       @output_stream.write_raw_little_endian64(value)
     elsif value.is_a?(String)
       @output_stream.write_raw_byte(VT_STRING)
-      @output_stream.write_raw_little_endian32(value.length)
+      @output_stream.write_raw_little_endian32(value.bytes.length)
       @output_stream.write_bytes(value)
     elsif value.is_a?(Float)
       @output_stream.write_raw_byte(VT_DOUBLE)
       @output_stream.write_double(value)
     else
-      raise TableStoreClientError.new("Unsupported column type: " + value.class)
+      raise TableStoreClientError.new("Unsupported column type: #{value.class}")
     end
   end
 
@@ -140,7 +140,7 @@ class  PlainBufferCodedOutputStream
     cell_check_sum = write_cell_name(column_name, cell_check_sum)
     cell_check_sum = write_column_value_with_checksum(column_value, cell_check_sum)
 
-    unless timestamp.nil?
+    if timestamp
       write_tag(TAG_CELL_TIMESTAMP)
       @output_stream.write_raw_little_endian64(timestamp)
       cell_check_sum = PlainBufferCrc8.crc_int64(cell_check_sum, timestamp)

data/lib/tablestore/table_store_client.rb

@@ -16,6 +16,9 @@ class TableStoreClient
     proto.exclusive_end_primary_key = serialize_primary_key(request[:exclusive_end_primary_key])
     proto.max_versions = request[:max_version]
     proto.limit = request[:limit]
+    if request[:column_filter]
+      proto.filter = make_column_condition(request[:column_filter]).serialize_to_string
+    end
     proto.serialize_to_string
   end
 
@@ -498,7 +501,7 @@ class TableStoreClient
     elsif value.is_a?(Float)
       size += LITTLE_ENDIAN_64_SIZE
     else
-      raise TableStoreClientError.new("Unsupported column type: " + value.class)
+      raise TableStoreClientError.new("Unsupported column type: #{value.class}" )
     end
     size
   end
@@ -520,7 +523,7 @@ class TableStoreClient
             elsif columns.length >= 2
               compute_column_size2(column[0], column[1], update_type)
             else
-              #raise OTSClientError("Unsupported column type:" + str(type(columns)))
+              raise OTSClientError("Unsupported column type:#{columns.class}")
             end
           end
         end

data/lib/tablestore-ruby-sdk.rb

@@ -94,8 +94,8 @@ class TableStore
     url = base_url + '/' + api_name
     begin
       RestClient.post(url, body, headers)
-    rescue => e
-      raise '请检查传入参数'
+    rescue RestClient::ExceptionWithResponse => e
+      raise e.response
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablestore-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - seveninches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client