aerospike_native 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d71f1edfd8c586f26365cc3d4164e82bd3edf7
-  data.tar.gz: c3a672ce0944477a43dae020b55e5656b438e933
+  metadata.gz: a5ac04c52b55cb401bde39b9679e8fa73501e212
+  data.tar.gz: 5e1123f5afc9602e456c8b3f974f850039f281e5
 SHA512:
-  metadata.gz: 2f47a757e7d62cc85edec99c5912b581892d286b9fea1b630d4bd95f55e3d7d34159877304aa9d858995e176e23b23fe463bb2d401ebd79ba71ca1dd69af9430
-  data.tar.gz: ded5c49c747f022322ddd58c3a4cdf257f0a01195e31315cd7759d87fb7c5cfd16da4b1fae529d0c6b84043d86cfb3b5852bbffa7c34706704ce54e2296ed0af
+  metadata.gz: 498fc7414a0759ae4961cd2450e31b6d321031c71a27f1f5ec6ec1f6cdb5fa08ff4135205da193ad9f5229b1254ddedbe85312d0922ec9b4db9c982ea506314e
+  data.tar.gz: 56446e89c9ae3923d583bcaa29122a97ab5830601a4e017daf8141963c2b71e7e2fd494beebf66441fa2517fb2188dcc116e6bc89f8e9c23992d7a58cf0a6c9c

data/README.md

@@ -26,7 +26,10 @@ Or install it yourself as:
 * `remove` command
 * `select` command
 * `exixts?` command
-* `query` command (where and select support)
+* `query` command (where, select and udf support)
+* `scan` command (select and udf support)
+* `batch` command (get and exists support)
+* `udf` command (udf management: put, remove, list, get)
 * 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
@@ -36,7 +39,19 @@ Or install it yourself as:
 
 ## Examples
 
-In path `examples`
+Located in path `examples`
+
+Execute in gem root path command `ruby -Ilib:ext -r aerospike_native ./examples/batch.rb` or another example
+
+Here is a list of examples:
+
+* _batch.rb_ - batch command example
+* _operate.rb_ - operate command example
+* _put_get_remove.rb_ - key-value operatations example
+* _query_and_index.rb_ - create/drop index and execute query
+* _query_udf.rb_ - apply udf function to query operation
+* _scan.rb_ - scan records
+* _scan_udf.rb_ - apply udf function to scan operation
 
 ## Usage
 

data/Rakefile

@@ -2,7 +2,7 @@
 
 require 'rake/extensiontask'
 require 'rubygems/package_task'
-require 'aerospike_native/version'
+require_relative './lib/aerospike_native/version'
 
 ##
 # Rake::ExtensionTask comes from the rake-compiler and understands how to
@@ -20,17 +20,30 @@ Rake::ExtensionTask.new 'aerospike_native' do |ext|
   ext.lib_dir = 'lib/aerospike_native'
 end
 
-s = Gem::Specification.new 'aerospike_native', AerospikeNative::VERSION do |s|
-  s.summary = 'Aerospike ruby client with c extension'
-  s.authors = %w[zyablitskiy@gmail.com]
-
-  # this tells RubyGems to build an extension upon install
-
-  s.extensions = %w[ext/aerospike_native/extconf.rb]
-
-  # naturally you must include the extension source in the gem
-
-  s.files = `git ls-files`.split($/)
+s = Gem::Specification.new 'aerospike_native', AerospikeNative::VERSION do |spec|
+  spec.name          = "aerospike_native"
+  spec.version       = AerospikeNative::VERSION
+  spec.platform      = Gem::Platform::RUBY
+  spec.authors       = ["Vladimir Ziablitskii"]
+  spec.email         = ["zyablitskiy@gmail.com"]
+  spec.summary       = %q{Aerospike native client}
+  spec.description   = %q{Unofficial Aerospike Client for ruby with c extension (official aerospike c client)}
+  spec.homepage      = "https://github.com/rainlabs/aerospike_native"
+  spec.license       = "MIT"
+  #  spec.required_ruby_version = '>= 1.9.3'
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  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"
+  spec.add_development_dependency "rspec", "~> 3.3"
 end
 
 # The package task builds the gem in pkg/my_malloc-1.0.gem so you can test

data/examples/common/common.rb

@@ -6,7 +6,7 @@ module 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 client; @@client ||= AerospikeNative::Client.new([{host: '127.0.0.1', port: 3010}], {lua: {system_path: udf_system_path, user_path: udf_user_path}}) end
 
       def cleanup
         client.query(namespace, set).exec{ |record| client.remove(record.key) }
@@ -26,6 +26,14 @@ module Common
         client
       end
 
+      def udf_system_path
+        './ext/aerospike_native/aerospike-client-c/modules/lua-core/src'
+      end
+
+      def udf_user_path
+        './examples/lua'
+      end
+
       def run_example
         init
         custom_logger.info "Example started"
@@ -35,4 +43,4 @@ module Common
       end
     end
   end
-end
+end

data/examples/lua/test_udf.lua

@@ -0,0 +1,16 @@
+local function get_number(rec)
+        return rec['number']
+end
+
+local function add(a, b)
+        return a + b
+end
+
+function sum_number(stream)
+        return stream : map(get_number) : reduce(add)
+end
+
+function add_testbin_to_number(rec)
+        rec['number'] = rec['number'] + rec['testbin'];
+        aerospike:update(rec)
+end

data/examples/query_udf.rb

@@ -0,0 +1,31 @@
+require_relative './common/common'
+
+def main
+  Common::Common.run_example do |client, namespace, set, logger|
+    logger.info "Found user scripts: #{client.udf.list}"
+
+    ruby_sum = 0
+    20.times do |i|
+      ruby_sum += i
+      client.put(AerospikeNative::Key.new(namespace, set, i), {'number' => i, 'key' => 'number', 'testbin' => i.to_s})
+    end
+
+    client.udf.put("./examples/lua/test_udf.lua")
+    logger.info "adding user script..."
+    client.udf.wait("test_udf.lua", 1000)
+    logger.info "Found user scripts: #{client.udf.list}"
+    logger.info "user script already added"
+
+    logger.info "perform a aggregate query"
+    sum = client.query(namespace, set).apply("test_udf", "sum_number").exec.first
+    logger.info "ruby sum #{ruby_sum}"
+    logger.info "aerospike sum #{sum}"
+
+    logger.info "removing user script..."
+    client.udf.remove("test_udf.lua")
+    logger.info "Found user scripts: #{client.udf.list}"
+  end
+end
+
+main
+

data/examples/scan_udf.rb

@@ -0,0 +1,36 @@
+require_relative './common/common'
+
+def main
+  Common::Common.run_example do |client, namespace, set, logger|
+    logger.info "Found user scripts: #{client.udf.list}"
+
+    3.times do |i|
+      client.put(AerospikeNative::Key.new(namespace, set, i), {'number' => i, 'key' => 'number', 'testbin' => i})
+    end
+
+    client.udf.put("./examples/lua/test_udf.lua")
+    logger.info "adding user script..."
+    client.udf.wait("test_udf.lua", 1000)
+    logger.info "Found user scripts: #{client.udf.list}"
+    logger.info "user script already added"
+
+    logger.info "performing update scan..."
+    scan_id = client.scan(namespace, set).apply("test_udf", "add_testbin_to_number").exec
+    loop do
+      info = client.scan_info(scan_id)
+      logger.info "scan info: #{info}"
+      break if info['status'] == AerospikeNative::Scan::STATUS_COMPLETED
+      sleep 1
+    end
+    records = client.query(namespace, set).exec
+    logger.info records.map(&:bins).inspect
+
+    logger.info "removing user script..."
+    client.udf.remove("test_udf.lua")
+    logger.info "Found user scripts: #{client.udf.list}"
+  end
+end
+
+main
+
+

data/ext/aerospike_native/aerospike_native.c

@@ -7,6 +7,7 @@
 #include "query.h"
 #include "batch.h"
 #include "scan.h"
+#include "udf.h"
 
 VALUE AerospikeNativeClass;
 VALUE MsgPackClass;
@@ -17,6 +18,7 @@ void Init_aerospike_native()
     AerospikeNativeClass = rb_define_module("AerospikeNative");
     define_exception();
     define_logger();
+    define_udf();
     define_query();
     define_scan();
     define_batch();

data/ext/aerospike_native/client.c

@@ -5,6 +5,7 @@
 #include "query.h"
 #include "batch.h"
 #include "scan.h"
+#include "udf.h"
 #include <aerospike/as_key.h>
 #include <aerospike/as_operations.h>
 #include <aerospike/aerospike_key.h>
@@ -51,32 +52,76 @@ static VALUE client_allocate(VALUE klass)
  */
 VALUE client_initialize(int argc, VALUE* argv, VALUE self)
 {
-    VALUE ary = Qnil;
+    VALUE ary = Qnil, vSettings = Qnil;
     aerospike *ptr;
     as_config config;
     as_error err;
     long idx = 0, n = 0;
 
-    if (argc > 1) {  // there should only be 0 or 1 arguments
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
+    if (argc > 2) {  // there should only be 0, 1 or 2 arguments
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..2)", argc);
     }
 
     if (argc == 1) {
         ary = argv[0];
     }
 
-    switch (TYPE(ary)) {
+    switch (TYPE(argv[0])) {
     case T_NIL:
     case T_ARRAY:
+        ary = argv[0];
+        break;
+    case T_HASH:
+        vSettings = argv[0];
+        if (argc > 1) {
+            rb_raise(rb_eArgError, "wrong number of arguments (detected settings hash as first parameter)", argc);
+        }
         break;
     default:
         /* raise exception */
         Check_Type(ary, T_ARRAY);
         break;
     }
+
+    if(argc == 2) {
+        switch (TYPE(argv[1])) {
+        case T_NIL:
+        case T_HASH:
+            vSettings = argv[1];
+            break;
+        default:
+            /* raise exception */
+            Check_Type(ary, T_HASH);
+            break;
+        }
+    }
+
     Data_Get_Struct(self, aerospike, ptr);
 
     as_config_init(&config);
+    if (TYPE(vSettings) != T_NIL) {
+        VALUE vLua = rb_hash_aref(vSettings, rb_str_new2("lua"));
+        if (TYPE(vLua) == T_NIL) {
+            vLua = rb_hash_aref(vSettings, ID2SYM( rb_intern("lua") ));
+        }
+        if (TYPE(vLua) == T_HASH) {
+            VALUE vSystemPath = rb_hash_aref(vLua, rb_str_new2("system_path"));
+            VALUE vUserPath = rb_hash_aref(vLua, rb_str_new2("user_path"));
+            if (TYPE(vSystemPath) == T_NIL) {
+                vSystemPath = rb_hash_aref(vLua, ID2SYM( rb_intern("system_path") ));
+            }
+            if (TYPE(vUserPath) == T_NIL) {
+                vUserPath = rb_hash_aref(vLua, ID2SYM( rb_intern("user_path") ));
+            }
+
+            if (TYPE(vSystemPath) == T_STRING) {
+                strcpy(config.lua.system_path, StringValueCStr(vSystemPath));
+            }
+            if (TYPE(vUserPath) == T_STRING) {
+                strcpy(config.lua.user_path, StringValueCStr(vUserPath));
+            }
+        }
+    }
 
     if (TYPE(ary) == T_ARRAY) {
         idx = RARRAY_LEN(ary);
@@ -708,6 +753,14 @@ VALUE client_scan_info(int argc, VALUE* vArgs, VALUE vSelf)
     return rb_funcall2(ScanClass, rb_intern("info"), 3, vParams);
 }
 
+VALUE client_udf(VALUE vSelf)
+{
+    VALUE vParams[1];
+    vParams[0] = vSelf;
+
+    return rb_class_new_instance(1, vParams, UdfClass);
+}
+
 void define_client()
 {
     ClientClass = rb_define_class_under(AerospikeNativeClass, "Client", rb_cObject);
@@ -725,6 +778,7 @@ void define_client()
     rb_define_method(ClientClass, "batch", client_batch, 0);
     rb_define_method(ClientClass, "scan", client_scan, 2);
     rb_define_method(ClientClass, "scan_info", client_scan_info, -1);
+    rb_define_method(ClientClass, "udf", client_udf, 0);
 
     LoggerInstance = rb_class_new_instance(0, NULL, LoggerClass);
     rb_cv_set(ClientClass, "@@logger", LoggerInstance);

data/ext/aerospike_native/extconf.rb

@@ -10,7 +10,7 @@ have_library('crypto')
 
 headers_path = File.expand_path(File.join(File.dirname(__FILE__), "include"))
 lib_path = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
-aerospike_client_c_dir = File.expand_path(File.join(File.dirname(__FILE__), "aerospike-client-c"))
+aerospike_client_c_dir = "aerospike-client-c" #File.expand_path(File.join(File.dirname(__FILE__), "aerospike-client-c"))
 `git clone https://github.com/aerospike/aerospike-client-c.git`
 Dir.chdir(aerospike_client_c_dir) do
   `git reset --hard f4aa41fc237fca3e25110d15e72b7735262e6653`

data/ext/aerospike_native/query.c

@@ -143,26 +143,77 @@ VALUE query_where(VALUE vSelf, VALUE vHash)
     return vSelf;
 }
 
+VALUE query_apply(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    if (argc < 2 || argc > 3) {  // there should only be 2 or 3 arguments
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2..3)", argc);
+    }
+
+    Check_Type(vArgs[0], T_STRING);
+    Check_Type(vArgs[1], T_STRING);
+    rb_iv_set(vSelf, "@udf_module", vArgs[0]);
+    rb_iv_set(vSelf, "@udf_function", vArgs[1]);
+
+    if (argc == 3 && TYPE(vArgs[2]) != T_NIL) {
+        Check_Type(vArgs[2], T_ARRAY);
+    }
+
+    return vSelf;
+}
+
 bool query_callback(const as_val *value, void *udata) {
     VALUE vRecord;
-    as_record *record;
 
     if (value == NULL) {
         // query is complete
         return true;
     }
 
-    record = as_record_fromval(value);
-
-    if (record != NULL) {
-        vRecord = rb_record_from_c(record, NULL);
-
-        if ( rb_block_given_p() ) {
-            rb_yield(vRecord);
-        } else {
-            VALUE *vArray = (VALUE*) udata;
-            rb_ary_push(*vArray, vRecord);
+    switch(as_val_type(value)) {
+    case AS_REC: {
+        as_record* record = as_record_fromval(value);
+        if (record != NULL) {
+            vRecord = rb_record_from_c(record, NULL);
         }
+        break;
+    }
+    case AS_INTEGER: {
+        as_integer* integer = as_integer_fromval(value);
+        if (integer != NULL) {
+            vRecord = LONG2NUM( as_integer_get(integer) );
+        }
+        break;
+    }
+    case AS_STRING: {
+        as_string* string = as_string_fromval(value);
+        if (string != NULL) {
+            vRecord = LONG2NUM( as_string_get(string) );
+        }
+        break;
+    }
+    case AS_NIL:
+        vRecord = Qnil;
+        break;
+    case AS_BOOLEAN: {
+        as_integer* integer = as_integer_fromval(value);
+        if (integer != NULL) {
+            vRecord = LONG2NUM( as_integer_get(integer) );
+        }
+        break;
+    }
+    case AS_LIST:
+    case AS_MAP:
+    case AS_PAIR:
+    case AS_UNDEF:
+    default:
+        break;
+    }
+
+    if ( rb_block_given_p() ) {
+        rb_yield(vRecord);
+    } else {
+        VALUE *vArray = (VALUE*) udata;
+        rb_ary_push(*vArray, vRecord);
     }
 
     return true;
@@ -175,6 +226,7 @@ VALUE query_exec(int argc, VALUE* vArgs, VALUE vSelf)
     VALUE vArray;
     VALUE vClient;
     VALUE vWhere, vSelect, vOrder;
+    VALUE vUdfModule;
     VALUE vWhereKeys, vOrderKeys;
 
     aerospike *ptr;
@@ -293,6 +345,19 @@ VALUE query_exec(int argc, VALUE* vArgs, VALUE vSelf)
         }
     }
 
+    vUdfModule = rb_iv_get(vSelf, "@udf_module");
+    switch(TYPE(vUdfModule)) {
+    case T_NIL:
+        break;
+    case T_STRING: {
+        VALUE vUdfFunction = rb_iv_get(vSelf, "@udf_function");
+        as_query_apply(&query, StringValueCStr(vUdfModule), StringValueCStr(vUdfFunction), NULL);
+        break;
+    }
+    default:
+        rb_raise(rb_eTypeError, "wrong argument type for udf module (expected String or Nil)");
+    }
+
     vArray = rb_ary_new();
     if (aerospike_query_foreach(ptr, &err, &policy, &query, query_callback, &vArray) != AEROSPIKE_OK) {
         as_query_destroy(&query);
@@ -314,6 +379,7 @@ void define_query()
     rb_define_method(QueryClass, "select", query_select, -1);
     rb_define_method(QueryClass, "order", query_order, 1);
     rb_define_method(QueryClass, "where", query_where, 1);
+    rb_define_method(QueryClass, "apply", query_apply, -1);
     rb_define_method(QueryClass, "exec", query_exec, -1);
 
     rb_define_attr(QueryClass, "client", 1, 0);
@@ -322,4 +388,8 @@ void define_query()
     rb_define_attr(QueryClass, "select_bins", 1, 0);
     rb_define_attr(QueryClass, "where_bins", 1, 0);
     rb_define_attr(QueryClass, "order_bins", 1, 0);
+
+    rb_define_attr(QueryClass, "udf_module", 1, 0);
+    rb_define_attr(QueryClass, "udf_function", 1, 0);
+    rb_define_attr(QueryClass, "udf_arglist", 1, 0);
 }

data/ext/aerospike_native/scan.c

@@ -5,12 +5,6 @@
 
 VALUE ScanClass;
 
-static void scan_deallocate(void *p)
-{
-    as_scan* ptr = p;
-    as_scan_destroy(ptr);
-}
-
 VALUE scan_initialize(VALUE vSelf, VALUE vClient, VALUE vNamespace, VALUE vSet)
 {
     Check_Type(vNamespace, T_STRING);
@@ -90,9 +84,21 @@ VALUE scan_no_bins(VALUE vSelf, VALUE vValue)
     return vSelf;
 }
 
-VALUE scan_background(VALUE vSelf, VALUE vValue)
+VALUE scan_apply(int argc, VALUE* vArgs, VALUE vSelf)
 {
-    rb_iv_set(vSelf, "@background", vValue);
+    if (argc < 2 || argc > 3) {  // there should only be 2 or 3 arguments
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2..3)", argc);
+    }
+
+    Check_Type(vArgs[0], T_STRING);
+    Check_Type(vArgs[1], T_STRING);
+    rb_iv_set(vSelf, "@udf_module", vArgs[0]);
+    rb_iv_set(vSelf, "@udf_function", vArgs[1]);
+
+    if (argc == 3 && TYPE(vArgs[2]) != T_NIL) {
+        Check_Type(vArgs[2], T_ARRAY);
+    }
+
     return vSelf;
 }
 
@@ -109,7 +115,7 @@ VALUE scan_exec(int argc, VALUE* vArgs, VALUE vSelf)
 {
     VALUE vClient, vNamespace, vSet;
     VALUE vArray;
-    VALUE vConcurrent, vPercent, vPriority, vBins, vNoBins, vBackground;
+    VALUE vConcurrent, vPercent, vPriority, vBins, vNoBins, vUdfModule;
     as_scan scan;
     as_policy_scan policy;
     as_error err;
@@ -135,7 +141,6 @@ VALUE scan_exec(int argc, VALUE* vArgs, VALUE vSelf)
     vPriority = rb_iv_get(vSelf, "@priority");
     vNoBins = rb_iv_get(vSelf, "@no_bins");
     vBins = rb_iv_get(vSelf, "@select_bins");
-    vBackground = rb_iv_get(vSelf, "@background");
     as_scan_init(&scan, StringValueCStr(vNamespace), StringValueCStr(vSet));
 
     if (TYPE(vPercent) == T_FIXNUM) {
@@ -154,10 +159,6 @@ VALUE scan_exec(int argc, VALUE* vArgs, VALUE vSelf)
         as_scan_set_nobins(&scan, RTEST(vNoBins));
     }
 
-    if (TYPE(vBackground) != T_NIL) {
-        is_background = RTEST(vBackground);
-    }
-
     if (TYPE(vBins) == T_ARRAY && (idx = RARRAY_LEN(vBins)) > 0) {
         as_scan_select_inita(&scan, idx);
         for(n = 0; n < idx; n++) {
@@ -166,6 +167,20 @@ VALUE scan_exec(int argc, VALUE* vArgs, VALUE vSelf)
         }
     }
 
+    vUdfModule = rb_iv_get(vSelf, "@udf_module");
+    switch(TYPE(vUdfModule)) {
+    case T_NIL:
+        break;
+    case T_STRING: {
+        VALUE vUdfFunction = rb_iv_get(vSelf, "@udf_function");
+        as_scan_apply_each(&scan, StringValueCStr(vUdfModule), StringValueCStr(vUdfFunction), NULL);
+        is_background = true;
+        break;
+    }
+    default:
+        rb_raise(rb_eTypeError, "wrong argument type for udf module (expected String or Nil)");
+    }
+
     Data_Get_Struct(vClient, aerospike, ptr);
 
     vArray = rb_ary_new();
@@ -216,8 +231,8 @@ VALUE scan_info(int argc, VALUE* vArgs, VALUE vSelf)
     vClient = vArgs[0];
     check_aerospike_client(vClient);
 
-    Check_Type(vArgs[1], T_FIXNUM);
-    scan_id = FIX2ULONG(vArgs[1]);
+//    Check_Type(vArgs[1], T_BIGNUM);
+    scan_id = NUM2ULONG(vArgs[1]);
 
     as_policy_scan_init(&policy);
     if(argc == 3 && TYPE(vArgs[2]) != T_NIL) {
@@ -248,7 +263,7 @@ void define_scan()
     rb_define_method(ScanClass, "set_percent", scan_percent, 1);
     rb_define_method(ScanClass, "set_priority", scan_priority, 1);
     rb_define_method(ScanClass, "set_no_bins", scan_no_bins, 1);
-//    rb_define_method(ScanClass, "set_background", scan_background, 1);
+    rb_define_method(ScanClass, "apply", scan_apply, -1);
     rb_define_singleton_method(ScanClass, "info", scan_info, -1);
 
     rb_define_attr(ScanClass, "client", 1, 0);
@@ -257,7 +272,9 @@ void define_scan()
     rb_define_attr(ScanClass, "percent", 1, 0);
     rb_define_attr(ScanClass, "priority", 1, 0);
     rb_define_attr(ScanClass, "no_bins", 1, 0);
-    rb_define_attr(ScanClass, "background", 1, 0);
+    rb_define_attr(QueryClass, "udf_module", 1, 0);
+    rb_define_attr(QueryClass, "udf_function", 1, 0);
+    rb_define_attr(QueryClass, "udf_arglist", 1, 0);
 
     rb_define_const(ScanClass, "STATUS_UNDEFINED", INT2FIX(AS_SCAN_STATUS_UNDEF));
     rb_define_const(ScanClass, "STATUS_INPROGRESS", INT2FIX(AS_SCAN_STATUS_INPROGRESS));

data/ext/aerospike_native/udf.c

@@ -0,0 +1,245 @@
+#include "udf.h"
+#include "client.h"
+#include <aerospike/aerospike_udf.h>
+
+VALUE UdfClass;
+
+VALUE udf_initialize(VALUE vSelf, VALUE vClient)
+{
+    check_aerospike_client(vClient);
+    rb_iv_set(vSelf, "@client", vClient);
+
+    return vSelf;
+}
+
+VALUE udf_put(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    VALUE vClient;
+    FILE* file;
+    aerospike* ptr;
+//    uint8_t* content; //, p_write;
+    int read, size;
+    as_error err;
+    as_string base_string;
+    as_bytes udf_content;
+    as_policy_info policy;
+
+    if (argc > 2 || argc < 1) {  // there should only be 1 or 2 argument
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+    }
+
+    Check_Type(vArgs[0], T_STRING);
+    file = fopen(StringValueCStr(vArgs[0]), "r");
+
+    if (!file) {
+        rb_funcall(LoggerInstance, rb_intern("warn"), 1, rb_str_new2("register UDF: File Not Found"));
+        return Qfalse;
+    }
+
+    as_policy_info_init(&policy);
+    if(argc == 2 && TYPE(vArgs[1]) != T_NIL) {
+        SET_INFO_POLICY(policy, vArgs[1]);
+    }
+
+    // Read the file's content into a local buffer.
+
+    uint8_t* content = (uint8_t*)malloc(1024 * 1024);
+
+    if (! content) {
+        rb_funcall(LoggerInstance, rb_intern("warn"), 1, rb_str_new2("script content allocation failed"));
+        return Qfalse;
+    }
+
+    uint8_t* p_write = content;
+    read = (int)fread(p_write, 1, 512, file);
+    size = 0;
+
+    while (read) {
+        size += read;
+        p_write += read;
+        read = (int)fread(p_write, 1, 512, file);
+    }
+
+    fclose(file);
+
+    // Wrap the local buffer as an as_bytes object.
+    as_bytes_init_wrap(&udf_content, content, size, true);
+
+    vClient = rb_iv_get(vSelf, "@client");
+    Data_Get_Struct(vClient, aerospike, ptr);
+
+    // Register the UDF file in the database cluster.
+    if (aerospike_udf_put(ptr, &err, &policy, as_basename(&base_string, StringValueCStr(vArgs[0])), AS_UDF_TYPE_LUA,
+            &udf_content) != AEROSPIKE_OK) {
+        as_bytes_destroy(&udf_content);
+        raise_aerospike_exception(err.code, err.message);
+    }
+
+    // This frees the local buffer.
+    as_bytes_destroy(&udf_content);
+
+    return Qtrue;
+}
+
+VALUE udf_remove(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    VALUE vClient;
+    aerospike* ptr;
+    as_error err;
+    as_policy_info policy;
+
+    if (argc > 2 || argc < 1) {  // there should only be 1 or 2 argument
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+    }
+
+    Check_Type(vArgs[0], T_STRING);
+
+    as_policy_info_init(&policy);
+    if(argc == 2 && TYPE(vArgs[1]) != T_NIL) {
+        SET_INFO_POLICY(policy, vArgs[1]);
+    }
+
+    vClient = rb_iv_get(vSelf, "@client");
+    Data_Get_Struct(vClient, aerospike, ptr);
+
+    // Remove the UDF file in the database cluster.
+    if (aerospike_udf_remove(ptr, &err, &policy, StringValueCStr(vArgs[0])) != AEROSPIKE_OK) {
+        raise_aerospike_exception(err.code, err.message);
+    }
+
+    return Qtrue;
+}
+
+VALUE udf_list(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    VALUE vClient, vHash;
+    aerospike* ptr;
+    as_error err;
+    as_policy_info policy;
+    as_udf_files files;
+
+    int n;
+
+    if (argc > 1) {  // there should only be 0 or 1 argument
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
+    }
+
+    as_policy_info_init(&policy);
+    if(argc == 1 && TYPE(vArgs[0]) != T_NIL) {
+        SET_INFO_POLICY(policy, vArgs[0]);
+    }
+
+    vClient = rb_iv_get(vSelf, "@client");
+    Data_Get_Struct(vClient, aerospike, ptr);
+
+    vHash = rb_hash_new();
+    as_udf_files_init(&files, 0);
+    if (aerospike_udf_list(ptr, &err, &policy, &files) != AEROSPIKE_OK) {
+        raise_aerospike_exception(err.code, err.message);
+    }
+
+    for(n = 0; n < files.size; n++) {
+        as_udf_file file = files.entries[n];
+        VALUE vParamHash = rb_hash_new();
+        rb_hash_aset(vParamHash, rb_str_new2("type"), INT2FIX(file.type));
+        rb_hash_aset(vParamHash, rb_str_new2("hash"), rb_str_new(file.hash, AS_UDF_FILE_HASH_SIZE));
+        rb_hash_aset(vHash, rb_str_new2(file.name), vParamHash);
+    }
+
+    return vHash;
+}
+
+VALUE udf_get(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    VALUE vClient, vHash, vParamHash;
+    aerospike* ptr;
+    as_error err;
+    as_policy_info policy;
+    as_udf_file file;
+
+    if (argc > 2 || argc < 1) {  // there should only be 1 or 2 argument
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+    }
+
+    as_policy_info_init(&policy);
+    if(argc == 2 && TYPE(vArgs[1]) != T_NIL) {
+        SET_INFO_POLICY(policy, vArgs[1]);
+    }
+
+    vClient = rb_iv_get(vSelf, "@client");
+    Data_Get_Struct(vClient, aerospike, ptr);
+
+    vHash = rb_hash_new();
+    as_udf_file_init(&file);
+    if (aerospike_udf_get(ptr, &err, &policy, StringValueCStr(vArgs[0]), AS_UDF_TYPE_LUA, &file) != AEROSPIKE_OK) {
+        raise_aerospike_exception(err.code, err.message);
+    }
+
+    vParamHash = rb_hash_new();
+    rb_hash_aset(vParamHash, rb_str_new2("type"), INT2FIX(file.type));
+    rb_hash_aset(vParamHash, rb_str_new2("hash"), rb_str_new(file.hash, AS_UDF_FILE_HASH_SIZE));
+    rb_hash_aset(vHash, rb_str_new2(file.name), vParamHash);
+
+    return vHash;
+}
+
+VALUE udf_wait(int argc, VALUE* vArgs, VALUE vSelf)
+{
+    VALUE vClient, vSettings = Qnil;
+    aerospike* ptr;
+    as_error err;
+    as_policy_info policy;
+
+    uint32_t timeout = 1000;
+
+    if (argc > 3 || argc < 1) {  // there should only be 1, 2 or 3 argument
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", argc);
+    }
+
+    if (argc == 3) {
+        Check_Type(vArgs[1], T_FIXNUM);
+        timeout = FIX2ULONG(vArgs[1]);
+        vSettings = vArgs[2];
+    } else if (argc == 2) {
+        switch(TYPE(vArgs[1])) {
+        case T_NIL:
+            break;
+        case T_FIXNUM:
+            timeout = FIX2ULONG(vArgs[1]);
+            break;
+        case T_HASH:
+            vSettings = vArgs[1];
+            break;
+        default:
+            rb_raise(rb_eTypeError, "wrong argument type (expected Hash or Fixnum)");
+        }
+    }
+
+    as_policy_info_init(&policy);
+    if(TYPE(vSettings) != T_NIL) {
+        SET_INFO_POLICY(policy, vSettings);
+    }
+
+    vClient = rb_iv_get(vSelf, "@client");
+    Data_Get_Struct(vClient, aerospike, ptr);
+
+    if (aerospike_udf_put_wait(ptr, &err, &policy, StringValueCStr(vArgs[0]), timeout) != AEROSPIKE_OK) {
+        raise_aerospike_exception(err.code, err.message);
+    }
+
+    return Qtrue;
+}
+
+void define_udf()
+{
+    UdfClass = rb_define_class_under(AerospikeNativeClass, "Udf", rb_cObject);
+    rb_define_method(UdfClass, "initialize", udf_initialize, 1);
+    rb_define_method(UdfClass, "put", udf_put, -1);
+    rb_define_method(UdfClass, "remove", udf_remove, -1);
+    rb_define_method(UdfClass, "list", udf_list, -1);
+    rb_define_method(UdfClass, "get", udf_get, -1);
+    rb_define_method(UdfClass, "wait", udf_wait, -1);
+
+    rb_define_attr(UdfClass, "client", 1, 0);
+    rb_define_const(UdfClass, "LUA", INT2FIX(AS_UDF_TYPE_LUA));
+}

data/ext/aerospike_native/udf.h

@@ -0,0 +1,10 @@
+#ifndef UDF_H
+#define UDF_H
+
+#include "aerospike_native.h"
+
+RUBY_EXTERN VALUE UdfClass;
+void define_udf();
+
+#endif // UDF_H
+

data/lib/aerospike_native/version.rb

@@ -1,3 +1,3 @@
 module AerospikeNative
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerospike_native
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Vladimir Ziablitskii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -97,10 +97,14 @@ files:
 - aerospike_native.gemspec
 - examples/batch.rb
 - examples/common/common.rb
+- examples/lua/.keep
+- examples/lua/test_udf.lua
 - examples/operate.rb
 - examples/put_get_remove.rb
 - examples/query_and_index.rb
+- examples/query_udf.rb
 - examples/scan.rb
+- examples/scan_udf.rb
 - ext/aerospike_native/aerospike_native.c
 - ext/aerospike_native/aerospike_native.h
 - ext/aerospike_native/batch.c
@@ -128,6 +132,8 @@ files:
 - ext/aerospike_native/record.h
 - ext/aerospike_native/scan.c
 - ext/aerospike_native/scan.h
+- ext/aerospike_native/udf.c
+- ext/aerospike_native/udf.h
 - lib/aerospike_native.rb
 - lib/aerospike_native/version.rb
 homepage: https://github.com/rainlabs/aerospike_native
@@ -156,4 +162,3 @@ signing_key:
 specification_version: 4
 summary: Aerospike native client
 test_files: []
-has_rdoc: