aerospike_native 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a4c1501ed65384aa0a0d8dd90db474e0ff72de
-  data.tar.gz: 04e3a37359e96e9a753fb2dd88ab1251d68d9290
+  metadata.gz: f9adbd76e01717770aa172758d38a3e9340abbec
+  data.tar.gz: 5f95658e8a79c57d2021a5ae041c69300989372e
 SHA512:
-  metadata.gz: 9ceaf60e6dbe985eee662d96f931af9caf2a95573f3612a0b53411cf38fd57da4f0e9713092883eaf41301b665ea1bd29e8c1f9792356b62773d2978c54aa3d6
-  data.tar.gz: b962db5ee9f2f2d394424c3a7eeaee3f36ff14f613d727337e3251abbb4518881f3e4077fd5ba2591d5543cd5ae81332eb325dd39d9ee6500d5c30beb5e7f34d
+  metadata.gz: f27395cdf1605ca3fb553f77220951adecd99b124ce28570948f3e46e063f17c50b6b8ccd7fb7e858a8abec94a6042c0e3f2325946833f621293fe574b3f2e4e
+  data.tar.gz: 5220d3cc0b14b6c4f033e5831f092e9e485bddce1be9bd277fb9159ed47a322fd131e67c0abeecfb282b545ebb447f0b25d9e912f0a5e5d94134d634b4c66006

data/README.md

@@ -35,6 +35,8 @@ Or install it yourself as:
 
 ## Usage
 
+### Basic
+
 ```ruby
 require 'aerospike_native'
 
@@ -55,7 +57,17 @@ client.create_index('test', 'test', 'number', 'number_idx');
 
 records = []
 client.where('test', 'test', [AerospikeNative::Condition.range("number", 1, 7)]) { |record| records << record }
-records
+puts records.inspect
+records.each { |record| client.remove(record.key) }
+```
+
+### Logger
+
+You can specify logger and log level
+
+```ruby
+AerospikeNative::Client.set_logger Rails.logger    # stdout by default
+AerospikeNative::Client.set_log_level :debug       # :debug by default
 ```
 
 ## Contributing

data/aerospike_native.gemspec

@@ -6,12 +6,14 @@ require 'aerospike_native/version'
 Gem::Specification.new 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{Aerospike ruby client with c extension}
+  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) }
@@ -21,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake-compiler", "~> 0.9"
+  spec.add_development_dependency "rspec", "~> 3.3"
 end

data/ext/aerospike_native/aerospike_native.c

@@ -12,6 +12,7 @@ void Init_aerospike_native()
 {
     AerospikeNativeClass = rb_define_module("AerospikeNative");
     define_exception();
+    define_logger();
     define_client();
     define_native_key();
     define_record();

data/ext/aerospike_native/client.c

@@ -72,7 +72,6 @@ VALUE client_initialize(int argc, VALUE* argv, VALUE self)
             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"));
-            printf("host: %s:%d\n", StringValueCStr(host), NUM2UINT(port));
             as_config_add_host(&config, StringValueCStr(host), NUM2UINT(port));
         }
     }
@@ -701,6 +700,22 @@ VALUE client_exec_query(int argc, VALUE* vArgs, VALUE vSelf)
     return vArray;
 }
 
+VALUE client_set_logger(VALUE vSelf, VALUE vNewLogger)
+{
+    VALUE vLogger = rb_cv_get(vSelf, "@@logger");
+    rb_iv_set(vLogger, "@internal", vNewLogger);
+
+    return vLogger;
+}
+
+VALUE client_set_log_level(VALUE vSelf, VALUE vLevel)
+{
+    VALUE vLogger = rb_cv_get(vSelf, "@@logger");
+    Check_Type(vLevel, T_SYMBOL);
+
+    return rb_funcall(vLogger, rb_intern("set_level"), 1, vLevel);
+}
+
 void define_client()
 {
     ClientClass = rb_define_class_under(AerospikeNativeClass, "Client", rb_cObject);
@@ -715,4 +730,8 @@ void define_client()
     rb_define_method(ClientClass, "create_index", client_create_index, -1);
     rb_define_method(ClientClass, "drop_index", client_drop_index, -1);
     rb_define_method(ClientClass, "where", client_exec_query, -1);
+
+    rb_cv_set(ClientClass, "@@logger", rb_class_new_instance(0, NULL, LoggerClass));
+    rb_define_singleton_method(ClientClass, "set_logger", client_set_logger, 1);
+    rb_define_singleton_method(ClientClass, "set_log_level", client_set_log_level, 1);
 }

data/ext/aerospike_native/common.h

@@ -3,6 +3,7 @@
 
 #include <ruby.h>
 #include "exception.h"
+#include "logger.h"
 
 VALUE rb_hash_keys(VALUE hash);
 

data/ext/aerospike_native/key.c

@@ -50,7 +50,7 @@ VALUE key_initialize(int argc, VALUE* vArgs, VALUE vSelf)
 
     Data_Get_Struct(vSelf, as_key, ptr);
 
-    if(TYPE(vValue) == T_STRING) {
+    if(TYPE(vValue) == T_STRING || TYPE(vValue) == T_FIXNUM) {
         switch(TYPE(vValue)) {
         case T_FIXNUM:
             as_key_init_int64(ptr, StringValueCStr( vNamespace ), StringValueCStr( vSet ), FIX2LONG( vValue ));

data/ext/aerospike_native/logger.c

@@ -0,0 +1,158 @@
+#include "logger.h"
+#include "client.h"
+
+VALUE LoggerClass;
+
+bool aerospike_log_callback(as_log_level level, const char *func, const char *file,
+    uint32_t line, const char *fmt, ...)
+{
+    char msg[1024] = {0};
+    char log_msg[1500] = {0};
+    va_list ap;
+    VALUE vLogger = rb_cv_get(ClientClass, "@@logger");
+
+    va_start(ap, fmt);
+    vsnprintf(msg, 1024, fmt, ap);
+    msg[1023] = '\0';
+    va_end(ap);
+
+    sprintf(log_msg, "%d (Aerospike) - %s", level, msg);
+
+    if(TYPE(vLogger) != T_NIL) {
+        rb_funcall(vLogger, rb_intern("write"), 2, INT2FIX(level), rb_str_new2(log_msg));
+    }
+
+    return true;
+}
+
+VALUE logger_initialize(VALUE vSelf)
+{
+    int default_level = AS_LOG_LEVEL_DEBUG;
+    as_log_set_level(default_level);
+    as_log_set_callback(aerospike_log_callback);
+    rb_iv_set(vSelf, "@level", INT2FIX(default_level));
+    return vSelf;
+}
+
+VALUE logger_set_level(VALUE vSelf, VALUE vLevel)
+{
+    VALUE vInternalLogger = rb_iv_get(vSelf, "@internal");
+    int log_level = AS_LOG_LEVEL_INFO;
+    VALUE vError = ID2SYM( rb_intern("error") );
+    VALUE vWarn = ID2SYM( rb_intern("warn") );
+    VALUE vInfo = ID2SYM( rb_intern("info") );
+    VALUE vDebug = ID2SYM( rb_intern("debug") );
+    VALUE vTrace = ID2SYM( rb_intern("trace") );
+
+    Check_Type(vLevel, T_SYMBOL);
+    if (vLevel == vError) {
+        log_level = AS_LOG_LEVEL_ERROR;
+    } else if (vLevel == vWarn) {
+        log_level = AS_LOG_LEVEL_WARN;
+    } else if (vLevel == vInfo) {
+        log_level = AS_LOG_LEVEL_INFO;
+    } else if (vLevel == vDebug) {
+        log_level = AS_LOG_LEVEL_DEBUG;
+    } else if (vLevel == vTrace) {
+        log_level = AS_LOG_LEVEL_TRACE;
+    } else {
+        return Qfalse;
+    }
+
+    as_log_set_level(log_level);
+    rb_iv_set(vSelf, "@level", INT2FIX(log_level));
+
+    if (TYPE(vInternalLogger) != T_NIL) {
+        int internal_level = 3 - (log_level == AS_LOG_LEVEL_TRACE ? AS_LOG_LEVEL_DEBUG : log_level);
+        rb_iv_set(vInternalLogger, "@level", INT2FIX(internal_level));
+    }
+
+    return Qtrue;
+}
+
+VALUE logger_write(VALUE vSelf, VALUE vLevel, VALUE vMsg)
+{
+    int level;
+    VALUE vInternalLevel, vInternalLogger;
+    ID vMethod;
+    Check_Type(vLevel, T_FIXNUM);
+    Check_Type(vMsg, T_STRING);
+
+    vInternalLevel = rb_iv_get(vSelf, "@level");
+    vInternalLogger = rb_iv_get(vSelf, "@internal");
+    Check_Type(vInternalLevel, T_FIXNUM);
+    level = FIX2INT(vLevel);
+
+    switch(TYPE(vInternalLogger)) {
+    case T_NIL:
+        if (level <= FIX2INT(vInternalLevel)) {
+            // TODO: add default behavior with write into file
+            fprintf(stdout, "%s\n", StringValueCStr(vMsg));
+            return vMsg;
+        }
+        break;
+    case T_OBJECT:
+        switch(level) {
+        case AS_LOG_LEVEL_ERROR:
+            vMethod = rb_intern("error");
+            break;
+        case AS_LOG_LEVEL_WARN:
+            vMethod = rb_intern("warn");
+            break;
+        case AS_LOG_LEVEL_INFO:
+            vMethod = rb_intern("info");
+            break;
+        case AS_LOG_LEVEL_DEBUG:
+        case AS_LOG_LEVEL_TRACE:
+            vMethod = rb_intern("debug");
+            break;
+        default:
+            vMethod = rb_intern("unknown");
+            break;
+        }
+
+        return rb_funcall(vInternalLogger, vMethod, 1, vMsg);
+    }
+
+    return Qnil;
+}
+
+VALUE logger_error(VALUE vSelf, VALUE vMsg)
+{
+    return rb_funcall(vSelf, rb_intern("write"), 2, INT2FIX(AS_LOG_LEVEL_ERROR), vMsg);
+}
+
+VALUE logger_warn(VALUE vSelf, VALUE vMsg)
+{
+    return rb_funcall(vSelf, rb_intern("write"), 2, INT2FIX(AS_LOG_LEVEL_WARN), vMsg);
+}
+
+VALUE logger_info(VALUE vSelf, VALUE vMsg)
+{
+    return rb_funcall(vSelf, rb_intern("write"), 2, INT2FIX(AS_LOG_LEVEL_INFO), vMsg);
+}
+
+VALUE logger_debug(VALUE vSelf, VALUE vMsg)
+{
+    return rb_funcall(vSelf, rb_intern("write"), 2, INT2FIX(AS_LOG_LEVEL_DEBUG), vMsg);
+}
+
+VALUE logger_trace(VALUE vSelf, VALUE vMsg)
+{
+    return rb_funcall(vSelf, rb_intern("write"), 2, INT2FIX(AS_LOG_LEVEL_TRACE), vMsg);
+}
+
+void define_logger()
+{
+    LoggerClass = rb_define_class_under(AerospikeNativeClass, "Logger", rb_cObject);
+    rb_define_method(LoggerClass, "initialize", logger_initialize, 0);
+    rb_define_method(LoggerClass, "set_level", logger_set_level, 1);
+    rb_define_method(LoggerClass, "write", logger_write, 2);
+    rb_define_method(LoggerClass, "error", logger_error, 1);
+    rb_define_method(LoggerClass, "warn", logger_warn, 1);
+    rb_define_method(LoggerClass, "info", logger_info, 1);
+    rb_define_method(LoggerClass, "debug", logger_debug, 1);
+    rb_define_method(LoggerClass, "trace", logger_trace, 1);
+    rb_define_attr(LoggerClass, "level", 1, 0);
+    rb_define_attr(LoggerClass, "internal", 1, 1);
+}

data/ext/aerospike_native/logger.h

@@ -0,0 +1,10 @@
+#ifndef LOGGER_H
+#define LOGGER_H
+
+#include "aerospike_native.h"
+
+RUBY_EXTERN VALUE LoggerClass;
+void define_logger();
+
+#endif // LOGGER_H
+

data/lib/aerospike_native/version.rb

@@ -1,3 +1,3 @@
 module AerospikeNative
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerospike_native
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vladimir Ziablitskii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,31 +42,32 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Aerospike ruby client with c extension
+        version: '3.3'
+description: Unofficial Aerospike Client for ruby with c extension (official aerospike
+  c client)
 email:
 - zyablitskiy@gmail.com
 executables: []
@@ -95,6 +96,8 @@ files:
 - ext/aerospike_native/key.c
 - ext/aerospike_native/key.h
 - ext/aerospike_native/lib/.keep
+- ext/aerospike_native/logger.c
+- ext/aerospike_native/logger.h
 - ext/aerospike_native/operation.c
 - ext/aerospike_native/operation.h
 - ext/aerospike_native/policy.c