aerospike_native 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3d554ba14a9cdc3064e7f710e1fd8e2f5303c9
-  data.tar.gz: 06b57fc85d271be4c845838f0918daf4e334a771
+  metadata.gz: 7ac94d9b34b064822cc15dd0976ed7ced4b76c27
+  data.tar.gz: 085fe5f23cb779c0ff29a7cb74d82ecef51de905
 SHA512:
-  metadata.gz: 71bcee1166282f8a9cfb6a4df0ecb04f91ab86abc78f988c45fcee6c42f018b2b410a028b6ea74b4975c6bbe975d5a4db2c84b4a65933fe2ab43727a9798fa46
-  data.tar.gz: 688f5da01520a1686952f2f376bb093dd5b1450a181fdc7d5c727a955692b6ef56aadbff20b6440e6f718884bdff84e946beec9c1437bf59f72861dc19a9baf5
+  metadata.gz: 95e3ce1b3fb8a94c61a88bb839790769f1f9112abc1ed7526c464e1c9cfb1195b13d8e4c0bdb40fa09d84c3dab6b289cc119f0f95b53d4f58b463409b2e18a9a
+  data.tar.gz: 9384e2914162cbcc79aa1bb0e2bd850685e158c0617c59c0b8ab338da4d50782a794715779a69d113b8fc13ccb1d55c835593813fedc2b9752d67b7a3545a27f

data/README.md

@@ -26,13 +26,18 @@ Or install it yourself as:
 * `remove` command
 * `select` command
 * `exixts?` command
-* `where` command (query support)
-* :disappointed: Raw (bytes) type is not supported
+* `query` command (where and select support)
+* Supported bytes type for non-native object types(string or fixnum) via [msgpack](https://github.com/msgpack/msgpack-ruby)
+* lists and maps for bin value not supported yet (stored as bytes at the moment)
 * Supported policies with all parameters for described commands
 * Supported digest keys
 * Supported exceptions (`AerospikeNative::Exception`) with several error codes constants `AerospikeNative::Exception.constants`
 * Index management (`create_index` and `drop_index`)
 
+## Examples
+
+In path `examples`
+
 ## Usage
 
 ### Basic

data/aerospike_native.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "ext"]
   spec.extensions    = %w[ext/aerospike_native/extconf.rb]
 
+  spec.add_dependency "msgpack", "~> 0.6"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler", "~> 0.9"

data/examples/common/common.rb

@@ -0,0 +1,38 @@
+require 'aerospike_native'
+require 'logger'
+
+module Common
+  class Common
+    class << self
+      def namespace; 'test' end
+      def set; 'examples' end
+      def client; @@client ||= AerospikeNative::Client.new([{'host' => '127.0.0.1', 'port' => 3010}]) end
+
+      def cleanup
+        client.query(namespace, set).exec{ |record| client.remove(record.key) }
+      end
+
+      def custom_logger
+        @@logger = Logger.new(STDOUT, Logger::DEBUG)
+      end
+
+      def set_custom_logger
+        AerospikeNative::Client.set_logger custom_logger
+        AerospikeNative::Client.set_log_level :debug
+      end
+
+      def init
+        set_custom_logger
+        client
+      end
+
+      def run_example
+        init
+        custom_logger.info "Example started"
+        yield(client, namespace, set, custom_logger)
+        cleanup
+        custom_logger.info "Example finished"
+      end
+    end
+  end
+end

data/examples/operate.rb

@@ -0,0 +1,31 @@
+require './common/common'
+
+def main
+  Common::Common.run_example do |client, namespace, set, logger|
+    key = AerospikeNative::Key.new(namespace, set, "operate_test")
+    bins = []
+    bins << AerospikeNative::Operation.write('value', 'beep')
+    bins << AerospikeNative::Operation.write('incr', 5)
+
+    record = client.operate(key, bins)
+    logger.info "Without read or touch: #{record.inspect}"
+
+    bins = []
+    bins << AerospikeNative::Operation.touch
+    bins << AerospikeNative::Operation.append('value', '_once')
+    bins << AerospikeNative::Operation.increment('incr', 10)
+
+    record = client.operate(key, bins)
+    logger.info "With touch: #{record.inspect}"
+
+    bins = []
+    bins << AerospikeNative::Operation.read('value')
+    bins << AerospikeNative::Operation.read('incr')
+    bins << AerospikeNative::Operation.prepend('value', 'twice_')
+
+    record = client.operate(key, bins)
+    logger.info "With read: #{record.inspect}"
+  end
+end
+
+main

data/examples/query_and_index.rb

@@ -0,0 +1,19 @@
+require './common/common'
+
+def main
+  Common::Common.run_example do |client, namespace, set, logger|
+    index_name = "number_#{set}_idx"
+    client.create_index(namespace, set, 'number', index_name)
+
+    20.times do |i|
+      client.put(AerospikeNative::Key.new(namespace, set, i), {'number' => i, 'key' => 'number', 'testbin' => i.to_s})
+    end
+
+    records = client.query(namespace, set).select(:number, :testbin).where(number: [10, 15]).exec
+    logger.info records.inspect
+
+    client.drop_index(namespace, index_name)
+  end
+end
+
+main

data/ext/aerospike_native/client.c

@@ -78,10 +78,17 @@ VALUE client_initialize(int argc, VALUE* argv, VALUE self)
     if (TYPE(ary) == T_ARRAY) {
         idx = RARRAY_LEN(ary);
         for(n = 0; n < idx; n++) {
+            VALUE vHost, vPort;
             VALUE hash = rb_ary_entry(ary, n);
-            VALUE host = rb_hash_aref(hash, rb_str_new2("host"));
-            VALUE port = rb_hash_aref(hash, rb_str_new2("port"));
-            as_config_add_host(&config, StringValueCStr(host), NUM2UINT(port));
+            vHost = rb_hash_aref(hash, rb_str_new2("host"));
+            if (TYPE(vHost) == T_NIL) {
+                vHost = rb_hash_aref(hash, ID2SYM( rb_intern("host") ));
+            }
+            vPort = rb_hash_aref(hash, rb_str_new2("port"));
+            if (TYPE(vPort) == T_NIL) {
+                vPort = rb_hash_aref(hash, ID2SYM( rb_intern("port") ));
+            }
+            as_config_add_host(&config, StringValueCStr(vHost), NUM2UINT(vPort));
         }
     }
 
@@ -159,10 +166,17 @@ VALUE client_put(int argc, VALUE* vArgs, VALUE vSelf)
         case T_FIXNUM:
             as_record_set_int64(&record, StringValueCStr(bin_name), NUM2LONG(bin_value));
             break;
-        default:
-            rb_raise(rb_eTypeError, "wrong argument type for bin value (expected Nil, Fixnum or String)");
+//        case T_ARRAY:
+//        case T_HASH:
+//            rb_raise(rb_eTypeError, "wrong argument type for bin value (hashes and arrays not supported yet)");
+//            break;
+        default: {
+            VALUE vBytes = rb_funcall(bin_value, rb_intern("to_msgpack"), 0);
+            int strSize = RSTRING_LEN(vBytes);
+            as_record_set_raw(&record, StringValueCStr(bin_name), StringValuePtr(vBytes), strSize);
             break;
         }
+        }
      }
 
     Data_Get_Struct(vKey, as_key, key);
@@ -285,10 +299,17 @@ VALUE client_operate(int argc, VALUE* vArgs, VALUE vSelf)
             case T_FIXNUM:
                 as_operations_add_write_int64(&ops, StringValueCStr( bin_name ), NUM2LONG( bin_value ));
                 break;
-            default:
-                rb_raise(rb_eTypeError, "wrong argument type for bin value (expected Nil, Fixnum or String)");
+//            case T_ARRAY:
+//            case T_HASH:
+//                rb_raise(rb_eTypeError, "wrong argument type for bin value (hashes and arrays not supported yet)");
+//                break;
+            default: {
+                VALUE vBytes = rb_funcall(bin_value, rb_intern("to_msgpack"), 0);
+                int strSize = RSTRING_LEN(vBytes);
+                as_operations_add_write_raw(&ops, StringValueCStr(bin_name), StringValuePtr(vBytes), strSize);
                 break;
             }
+            }
 
             break;
         case OPERATION_READ:
@@ -602,9 +623,9 @@ VALUE client_drop_index(int argc, VALUE* vArgs, VALUE vSelf)
 
 /*
  * call-seq:
- *   where(namespace, set) -> AerospikeNative::Query
+ *   query(namespace, set) -> AerospikeNative::Query
  *
- * Instanciate new query
+ * Instantiate new query
  */
 VALUE client_query(VALUE vSelf, VALUE vNamespace, VALUE vSet)
 {

data/ext/aerospike_native/record.c

@@ -29,6 +29,7 @@ VALUE rb_record_from_c(as_record* record, as_key* key)
 {
     VALUE vKeyParams[5], vParams[4];
     VALUE vLogger;
+    VALUE vMsgPackClass;
     as_key current_key;
     as_bin bin;
     int n;
@@ -60,6 +61,7 @@ VALUE rb_record_from_c(as_record* record, as_key* key)
     vParams[2] = UINT2NUM(record->gen);
     vParams[3] = UINT2NUM(record->ttl);
 
+    vMsgPackClass = rb_const_get(rb_cObject, rb_intern("MessagePack"));
     for(n = 0; n < record->bins.size; n++) {
         bin = record->bins.entries[n];
         switch( as_val_type(bin.valuep) ) {
@@ -72,6 +74,11 @@ VALUE rb_record_from_c(as_record* record, as_key* key)
         case AS_STRING:
             rb_hash_aset(vParams[1], rb_str_new2(bin.name), rb_str_new2(bin.valuep->string.value));
             break;
+        case AS_BYTES: {
+            VALUE vString = rb_str_new(bin.valuep->bytes.value, bin.valuep->bytes.size);
+            rb_hash_aset(vParams[1], rb_str_new2(bin.name), rb_funcall(vMsgPackClass, rb_intern("unpack"), 1, vString));
+            break;
+        }
         case AS_UNDEF:
         default:
             vLogger = rb_cv_get(ClientClass, "@@logger");

data/lib/aerospike_native.rb

@@ -1,4 +1,5 @@
 require "aerospike_native/version"
+require "msgpack"
 
 module AerospikeNative
   # Your code goes here...

data/lib/aerospike_native/version.rb

@@ -1,3 +1,3 @@
 module AerospikeNative
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aerospike_native
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vladimir Ziablitskii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,9 @@ files:
 - README.md
 - Rakefile
 - aerospike_native.gemspec
+- examples/common/common.rb
+- examples/operate.rb
+- examples/query_and_index.rb
 - ext/aerospike_native/aerospike_native.c
 - ext/aerospike_native/aerospike_native.h
 - ext/aerospike_native/client.c