rroonga 1.2.7 → 1.2.8

data/ext/groonga/Makefile

@@ -3,7 +3,7 @@ SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
-srcdir = /home/kou/work/ruby/rroonga/ext/groonga
+srcdir = /home/yue/work/rroonga/ext/groonga
 topdir = /usr/include/ruby-1.9.1
 hdrdir = /usr/include/ruby-1.9.1
 arch_hdrdir = /usr/include/ruby-1.9.1/$(arch)
@@ -54,13 +54,13 @@ COUTFLAG = -o
 
 RUBY_EXTCONF_H = 
 cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3
-debugflags = -ggdb
+optflags = -O0
+debugflags = -ggdb3
 warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long
-CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC -Wall -I/tmp/local/include/groonga 
+CFLAGS   = -fPIC -fno-strict-aliasing -ggdb3 -O0 -fPIC -Wall -I/tmp/local/include/groonga 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=5 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
+CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=1 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) -fno-strict-aliasing -g
 ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib
 dldflags = 
@@ -105,8 +105,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED)  -lgroonga -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = rb-grn-exception.c rb-grn-view-accessor.c rb-grn-hash-cursor.c rb-grn-query.c rb-grn-record.c rb-grn-variable.c rb-grn-view.c rb-grn-table-cursor-key-support.c rb-grn-fix-size-column.c rb-grn-context.c rb-grn-plugin.c rb-grn-hash.c rb-grn-variable-size-column.c rb-grn-index-column.c rb-grn-operator.c rb-grn-table-key-support.c rb-grn-patricia-trie.c rb-grn-table-cursor.c rb-grn-object.c rb-grn-table.c rb-grn-procedure.c rb-grn-snippet.c rb-grn-encoding-support.c rb-grn-view-record.c rb-grn-patricia-trie-cursor.c rb-grn-array.c rb-grn-database.c rb-grn-view-cursor.c rb-grn-column.c rb-grn-index-cursor.c rb-grn-type.c rb-grn-accessor.c rb-grn-posting.c rb-groonga.c rb-grn-array-cursor.c rb-grn-utils.c rb-grn-logger.c rb-grn-expression.c rb-grn-encoding.c rb-grn-expression-builder.c
-OBJS = rb-grn-exception.o rb-grn-view-accessor.o rb-grn-hash-cursor.o rb-grn-query.o rb-grn-record.o rb-grn-variable.o rb-grn-view.o rb-grn-table-cursor-key-support.o rb-grn-fix-size-column.o rb-grn-context.o rb-grn-plugin.o rb-grn-hash.o rb-grn-variable-size-column.o rb-grn-index-column.o rb-grn-operator.o rb-grn-table-key-support.o rb-grn-patricia-trie.o rb-grn-table-cursor.o rb-grn-object.o rb-grn-table.o rb-grn-procedure.o rb-grn-snippet.o rb-grn-encoding-support.o rb-grn-view-record.o rb-grn-patricia-trie-cursor.o rb-grn-array.o rb-grn-database.o rb-grn-view-cursor.o rb-grn-column.o rb-grn-index-cursor.o rb-grn-type.o rb-grn-accessor.o rb-grn-posting.o rb-groonga.o rb-grn-array-cursor.o rb-grn-utils.o rb-grn-logger.o rb-grn-expression.o rb-grn-encoding.o rb-grn-expression-builder.o
+SRCS = rb-grn-snippet.c rb-grn-view.c rb-grn-query.c rb-grn-encoding-support.c rb-grn-record.c rb-grn-utils.c rb-grn-index-column.c rb-grn-index-cursor.c rb-grn-view-accessor.c rb-grn-object.c rb-grn-patricia-trie.c rb-grn-expression-builder.c rb-grn-variable.c rb-grn-hash-cursor.c rb-grn-fix-size-column.c rb-grn-variable-size-column.c rb-grn-table-key-support.c rb-grn-table.c rb-groonga.c rb-grn-table-cursor.c rb-grn-hash.c rb-grn-exception.c rb-grn-logger.c rb-grn-plugin.c rb-grn-encoding.c rb-grn-view-record.c rb-grn-view-cursor.c rb-grn-column.c rb-grn-procedure.c rb-grn-posting.c rb-grn-accessor.c rb-grn-operator.c rb-grn-type.c rb-grn-array.c rb-grn-patricia-trie-cursor.c rb-grn-context.c rb-grn-database.c rb-grn-array-cursor.c rb-grn-expression.c rb-grn-table-cursor-key-support.c
+OBJS = rb-grn-snippet.o rb-grn-view.o rb-grn-query.o rb-grn-encoding-support.o rb-grn-record.o rb-grn-utils.o rb-grn-index-column.o rb-grn-index-cursor.o rb-grn-view-accessor.o rb-grn-object.o rb-grn-patricia-trie.o rb-grn-expression-builder.o rb-grn-variable.o rb-grn-hash-cursor.o rb-grn-fix-size-column.o rb-grn-variable-size-column.o rb-grn-table-key-support.o rb-grn-table.o rb-groonga.o rb-grn-table-cursor.o rb-grn-hash.o rb-grn-exception.o rb-grn-logger.o rb-grn-plugin.o rb-grn-encoding.o rb-grn-view-record.o rb-grn-view-cursor.o rb-grn-column.o rb-grn-procedure.o rb-grn-posting.o rb-grn-accessor.o rb-grn-operator.o rb-grn-type.o rb-grn-array.o rb-grn-patricia-trie-cursor.o rb-grn-context.o rb-grn-database.o rb-grn-array-cursor.o rb-grn-expression.o rb-grn-table-cursor-key-support.o
 TARGET = groonga
 DLLIB = $(TARGET).so
 EXTSTATIC = 
@@ -160,18 +160,10 @@ $(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
 pre-install-rb: $(RUBYLIBDIR)/groonga
-install-rb: $(RUBYLIBDIR)/groonga/record.rb
-$(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/view-record.rb
-$(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/context.rb
-$(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
+install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
+$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/context.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/pagination.rb
 $(RUBYLIBDIR)/groonga/pagination.rb: $(srcdir)/../../lib/groonga/pagination.rb
 	@-$(MAKEDIRS) $(@D)
@@ -180,22 +172,30 @@ install-rb: $(RUBYLIBDIR)/groonga/schema.rb
 $(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/posting.rb
-$(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
+install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb
+$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/patricia-trie.rb
 $(RUBYLIBDIR)/groonga/patricia-trie.rb: $(srcdir)/../../lib/groonga/patricia-trie.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/patricia-trie.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb
-$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
+install-rb: $(RUBYLIBDIR)/groonga/view-record.rb
+$(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
-$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/context.rb
+$(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/context.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/record.rb
+$(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/posting.rb
+$(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
 $(RUBYARCHDIR):
 	$(MAKEDIRS) $@
 $(RUBYLIBDIR):

data/ext/groonga/rb-grn-context.c

@@ -59,12 +59,29 @@ rb_grn_context_from_ruby_object (VALUE object)
     return rb_grn_context->context;
 }
 
+static void
+rb_grn_context_unlink_database (grn_ctx *context)
+{
+    grn_obj *database;
+
+    database = grn_ctx_db(context);
+    debug("context:database: %p:%p\n", context, database);
+    if (database && database->header.type == GRN_DB) {
+       debug("context:database: %p:%p: unlink\n", context, database);
+       grn_obj_unlink(context, database);
+    }
+    debug("context:database: %p:%p: done\n", context, database);
+}
+
 void
 rb_grn_context_fin (grn_ctx *context)
 {
     if (context->stat == GRN_CTX_FIN)
 	return;
 
+    if (!(context->flags & GRN_CTX_PER_DB)) {
+	rb_grn_context_unlink_database(context);
+    }
     grn_ctx_fin(context);
 }
 
@@ -99,6 +116,10 @@ rb_grn_context_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 
     rb_grn_context = user_data->ptr;
 
+    if (!(context->flags & GRN_CTX_PER_DB)) {
+	rb_grn_context_unlink_database(context);
+    }
+
     GRN_CTX_USER_DATA(context)->ptr = NULL;
     grn_ctx_set_finalizer(context, NULL);
 
@@ -298,7 +319,7 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 {
     RbGrnContext *rb_grn_context;
     grn_ctx *context;
-    int flags = GRN_CTX_PER_DB;
+    int flags = 0; /* TODO: GRN_CTX_PER_DB */
     VALUE options, default_options;
     VALUE rb_encoding;
 

data/ext/groonga/rb-grn-database.c

@@ -174,6 +174,7 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
     const char *path = NULL;
     VALUE rb_database;
     VALUE rb_path, options, rb_context, builtin_type_names;
+    grn_bool owner;
 
     rb_scan_args(argc, argv, "01", &options);
 
@@ -195,7 +196,8 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
 	grn_obj_unlink(context, old_database);
     database = grn_db_create(context, path, &create_args);
     rb_grn_context_check(context, rb_ary_new4(argc, argv));
-    rb_database = GRNOBJECT2RVAL(klass, context, database, GRN_FALSE);
+    owner = (context->flags & GRN_CTX_PER_DB) ? GRN_FALSE : GRN_TRUE;
+    rb_database = GRNOBJECT2RVAL(klass, context, database, owner);
     rb_iv_set(rb_database, "@context", rb_context);
     if (!NIL_P(rb_context))
 	rb_iv_set(rb_context, "database", rb_database);

data/ext/groonga/rb-grn-object.c

@@ -88,9 +88,10 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
 
     grn_obj_set_finalizer(context, grn_object, NULL);
 
-    debug("finalize: %p:%p:%p:%p:%p 0x%x\n",
+    debug("finalize: %p:%p:%p:%p:%p %s(%#x)\n",
 	  context, grn_object, rb_grn_object,
 	  rb_grn_object->context, rb_grn_object->object,
+	  rb_grn_inspect_type(grn_object->header.type),
 	  grn_object->header.type);
 
     rb_grn_object->context = NULL;
@@ -99,6 +100,10 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
 
     switch (grn_object->header.type) {
       case GRN_DB:
+	if (!(context->flags & GRN_CTX_PER_DB)) {
+	    grn_ctx_use(context, NULL);
+	}
+	break;
       case GRN_TYPE:
       case GRN_PROC:
       case GRN_CURSOR_TABLE_HASH_KEY:
@@ -137,7 +142,8 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
 	break;
       default:
 	rb_raise(rb_eTypeError,
-		 "unsupported groonga object type for finalizer: 0x%x",
+		 "unsupported groonga object type for finalizer: %s(%#x)",
+		 rb_grn_inspect_type(grn_object->header.type),
 		 grn_object->header.type);
 	break;
     }
@@ -178,7 +184,8 @@ rb_grn_object_free (RbGrnObject *rb_grn_object)
 	if (rb_grn_object->have_finalizer) {
 	    user_data = grn_obj_user_data(context, grn_object);
 	}
-	debug("type: %#x; need_close: %d; user_data: %p; ptr: %p\n",
+	debug("type: %s(%#x); need_close: %d; user_data: %p; ptr: %p\n",
+	      rb_grn_inspect_type(grn_object->header.type),
 	      grn_object->header.type,
 	      rb_grn_object->need_close,
 	      user_data,
@@ -313,23 +320,27 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 
     user_data = grn_obj_user_data(context, object);
     if (user_data) {
-	debug("set-finalizer: %p:%p:%p %#x\n",
+	debug("set-finalizer: %p:%p:%p %s(%#x)\n",
 	      context, object, rb_grn_object,
+	      rb_grn_inspect_type(object->header.type),
 	      object->header.type);
 	user_data->ptr = rb_grn_object;
 	grn_obj_set_finalizer(context, object, rb_grn_object_finalizer);
 	rb_grn_object->have_finalizer = GRN_TRUE;
     } else if (object->header.type == GRN_ACCESSOR) {
-	debug("set-finalizer(implicit): %p:%p:%p %#x\n",
+	debug("set-finalizer(implicit): %p:%p:%p %s(%#x)\n",
 	      context, object, rb_grn_object,
+	      rb_grn_inspect_type(object->header.type),
 	      object->header.type);
-	rb_grn_object->have_finalizer = GRN_TRUE;
+	 /* TODO: We want to call finalizer for GRN_ACCESSOR. */
+	rb_grn_object->have_finalizer = GRN_FALSE;
     }
 
     switch (object->header.type) {
       case GRN_DB:
       case GRN_PROC:
       case GRN_TYPE:
+      case GRN_ACCESSOR: /* TODO: We want to close GRN_ACCESSOR. */
 	rb_grn_object->need_close = GRN_FALSE;
 	break;
       default:
@@ -422,14 +433,16 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
 			       context, object);
     } else {
 	rb_raise(rb_eTypeError,
-		 "unsupported groonga object type for assignment: 0x%x",
+		 "unsupported groonga object type for assignment: %s(%#x)",
+		 rb_grn_inspect_type(object->header.type),
 		 object->header.type);
     }
 
     rb_iv_set(self, "@context", rb_context);
 
-    debug("assign: %p:%p:%p 0x%x\n", context, object, rb_grn_object,
-	   object->header.type);
+    debug("assign: %p:%p:%p %s(%#x)\n",
+	  context, object, rb_grn_object,
+	  rb_grn_inspect_type(object->header.type), object->header.type);
 }
 
 void
@@ -459,14 +472,17 @@ rb_grn_named_object_set_name (RbGrnNamedObject *rb_grn_named_object,
 	rb_grn_named_object->name = NULL;
     }
     if (name_size > 0) {
+	RbGrnObject *rb_grn_object;
 	rb_grn_named_object->name = ALLOC_N(char, name_size + 1);
 	memcpy(rb_grn_named_object->name, name, name_size);
 	rb_grn_named_object->name[name_size] = '\0';
-	debug("set-name: %p:%p:%p 0x%x: <%.*s>\n",
-	      RB_GRN_OBJECT(rb_grn_named_object)->context,
-	      RB_GRN_OBJECT(rb_grn_named_object)->object,
+	rb_grn_object = RB_GRN_OBJECT(rb_grn_named_object);
+	debug("set-name: %p:%p:%p %s(%#x): <%.*s>\n",
+	      rb_grn_object->context,
+	      rb_grn_object->object,
 	      rb_grn_named_object,
-	      RB_GRN_OBJECT(rb_grn_named_object)->object->header.type,
+	      rb_grn_inspect_type(rb_grn_object->object->header.type),
+	      rb_grn_object->object->header.type,
 	      name_size, name);
     }
     rb_grn_named_object->name_size = name_size;

data/ext/groonga/rb-grn-table.c

@@ -1741,6 +1741,22 @@ rb_grn_table_is_locked (int argc, VALUE *argv, VALUE self)
  * ブロックで条件を指定する場合は
  * Groonga::RecordExpressionBuilderを参照。
  *
+ * Ruby1.9以降では、ブロックで条件を指定する際に
+ * Groonga::ColumnExpressionBuilderの他に"!="も使用可能。
+ * 例:
+ *  comments = Groonga::Array.create(:name => "Comments")
+ *  comments.define_column("content", "Text")
+ *
+ *  comments.add(:content => "Hello Good-bye!")
+ *  comments.add(:content => "Hello World")
+ *  comments.add(:content => "test")
+ *
+ *  result = comments.select do |record|
+ *    record.content != "test"
+ *  end
+ *  p result.collect {|record| record.content}
+ *    # => ["Hello Good-bye!", "Hello World"]
+ *
  * _options_に指定可能な値は以下の通り。
  *
  * [+:default_column+]

data/ext/groonga/rb-grn-utils.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby" -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -30,20 +30,86 @@ rb_grn_inspect (VALUE object)
     return StringValueCStr(inspected);
 }
 
+const char *
+rb_grn_inspect_type (unsigned char type)
+{
+  switch (type) {
+  case GRN_VOID:
+    return "void";
+  case GRN_BULK:
+    return "bulk";
+  case GRN_PTR:
+    return "ptr";
+  case GRN_UVECTOR:
+    return "uvector";
+  case GRN_PVECTOR:
+    return "pvector";
+  case GRN_MSG:
+    return "msg";
+  case GRN_QUERY:
+    return "query";
+  case GRN_ACCESSOR:
+    return "accessor";
+  case GRN_SNIP:
+    return "snip";
+  case GRN_PATSNIP:
+    return "patsnip";
+  case GRN_CURSOR_TABLE_HASH_KEY:
+    return "cursor-table-hash-key";
+  case GRN_CURSOR_TABLE_PAT_KEY:
+    return "cursor-table-pat-key";
+  case GRN_CURSOR_TABLE_DAT_KEY:
+    return "cursor-table-dat-key";
+  case GRN_CURSOR_TABLE_NO_KEY:
+    return "cursor-table-no-key";
+  case GRN_CURSOR_TABLE_VIEW:
+    return "cursor-table-view";
+  case GRN_CURSOR_COLUMN_INDEX:
+    return "cursor-column-index";
+  case GRN_TYPE:
+    return "type";
+  case GRN_PROC:
+    return "proc";
+  case GRN_EXPR:
+    return "expr";
+  case GRN_TABLE_HASH_KEY:
+    return "table-hash-key";
+  case GRN_TABLE_PAT_KEY:
+    return "table-pat-key";
+  case GRN_TABLE_DAT_KEY:
+    return "table-dat-key";
+  case GRN_TABLE_NO_KEY:
+    return "table-no-key";
+  case GRN_TABLE_VIEW:
+    return "table-view";
+  case GRN_DB:
+    return "db";
+  case GRN_COLUMN_FIX_SIZE:
+    return "column-fix-size";
+  case GRN_COLUMN_VAR_SIZE:
+    return "column-var-size";
+  case GRN_COLUMN_INDEX:
+    return "column-index";
+  default:
+    return "unknown";
+  }
+}
+
 void
 rb_grn_scan_options (VALUE options, ...)
 {
+    VALUE original_options = options;
     VALUE available_keys;
     const char *key;
     VALUE *value;
     va_list args;
 
-    if (NIL_P(options))
+    options = rb_check_convert_type(options, T_HASH, "Hash", "to_hash");
+    if (NIL_P(options)) {
         options = rb_hash_new();
-    else
+    } else if (options == original_options) {
         options = rb_funcall(options, rb_intern("dup"), 0);
-
-    Check_Type(options, T_HASH);
+    }
 
     available_keys = rb_ary_new();
     va_start(args, options);
@@ -622,8 +688,10 @@ rb_grn_value_to_ruby_object (grn_ctx *context,
 	break;
       default:
 	rb_raise(rb_eGrnError,
-		 "unsupported value type: 0x%0x: %s",
-		 value->header.type, rb_grn_inspect(related_object));
+		 "unsupported value type: %s(%#x): %s",
+		 rb_grn_inspect_type(value->header.type),
+		 value->header.type,
+		 rb_grn_inspect(related_object));
 	break;
     }
 
@@ -775,7 +843,8 @@ rb_grn_obj_to_ruby_object (VALUE klass, grn_ctx *context,
       /* case GRN_COLUMN_INDEX: */
       default:
 	rb_raise(rb_eTypeError,
-		 "unsupported groonga object: 0x%x: <%s>",
+		 "unsupported groonga object: %s(%#x): <%s>",
+		 rb_grn_inspect_type(obj->header.type),
 		 obj->header.type,
 		 rb_grn_inspect(related_object));
 	break;

data/ext/groonga/rb-grn.h

@@ -24,6 +24,9 @@
 #ifdef HAVE_RUBY_ENCODING_H
 #  include <ruby/encoding.h>
 #endif
+#ifdef HAVE_RUBY_INTERN_H
+#  include <ruby/intern.h>
+#endif
 
 #include <groonga.h>
 
@@ -69,7 +72,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 2
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MICRO_VERSION 8
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -290,6 +293,7 @@ grn_obj       *rb_grn_context_get_backward_compatibility
 						     unsigned int name_size);
 
 const char    *rb_grn_inspect                       (VALUE object);
+const char    *rb_grn_inspect_type                  (unsigned char type);
 void           rb_grn_scan_options                  (VALUE options, ...)
                                                      RB_GRN_GNUC_NULL_TERMINATED;
 grn_bool       rb_grn_equal_option                  (VALUE option,

data/lib/groonga/dumper.rb

@@ -266,13 +266,19 @@ module Groonga
       def define_column(table, column)
         type = column_method(column)
         name = column.local_name
-        write("  table.#{type}(#{name.inspect})\n")
+        options = column_options(column)
+        arguments = [dump_object(name), options].compact.join(", ")
+        write("  table.#{type}(#{arguments})\n")
       end
 
       def define_reference_column(table, column)
         name = column.local_name
         reference = column.range
-        write("  table.reference(#{name.dump}, #{reference.name.dump})\n")
+        options = column_options(column)
+        arguments = [dump_object(name),
+                     dump_object(reference.name),
+                     options].compact.join(", ")
+        write("  table.reference(#{arguments})\n")
       end
 
       def define_index_column(table, column)
@@ -280,14 +286,15 @@ module Groonga
         sources = column.sources
         source_names = sources.collect do |source|
           if source.is_a?(Groonga::Table)
-            "_key".dump
+            name = "_key"
           else
-            source.local_name.dump
+            name = source.local_name
           end
+          dump_object(name)
         end.join(", ")
-        arguments = [target_table_name.dump,
+        arguments = [dump_object(target_table_name),
                      sources.size == 1 ? source_names : "[#{source_names}]",
-                     ":name => #{column.local_name.dump}"]
+                     ":name => #{dump_object(column.local_name)}"]
         write("  table.index(#{arguments.join(', ')})\n")
       end
 
@@ -316,6 +323,28 @@ module Groonga
           raise ArgumentError, "unsupported column: #{column.inspect}"
         end
       end
+
+      def column_options(column)
+        options = {}
+        options[:type] = :vector if column.vector?
+        return nil if options.empty?
+
+        dumped_options = ""
+        options.each do |key, value|
+          dumped_key = dump_object(key)
+          dumped_value = dump_object(value)
+          dumped_options << "#{dumped_key} => #{dumped_value}"
+        end
+        dumped_options
+      end
+
+      def dump_object(object)
+        if object.respond_to?(:dump)
+          object.dump
+        else
+          object.inspect
+        end
+      end
     end
 
     class CommandSyntax < BaseSyntax # :nodoc:

data/lib/groonga/expression-builder-19.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+module Groonga
+  module ExpressionBuildable
+    class ColumnValueExpressionBuilder
+      def !=(other)
+        NotEqualExpressionBuilder.new(self, normalize(other))
+      end
+    end
+
+    # @private
+    class NotEqualExpressionBuilder < BinaryExpressionBuilder
+      def initialize(column_value_builder, value)
+        super(Groonga::Operation::NOT_EQUAL, column_value_builder, value)
+      end
+    end
+  end
+
+  # @private
+  class ColumnExpressionBuilder
+    def !=(other)
+      column_value_builder != other
+    end
+  end
+end

data/lib/groonga/expression-builder.rb

@@ -564,3 +564,7 @@ module Groonga
     end
   end
 end
+
+if RUBY_VERSION >= "1.9"
+  require "groonga/expression-builder-19"
+end

data/test/groonga-test-utils.rb

@@ -128,4 +128,12 @@ module GroongaTestUtils
                  actual.collect(&normalizer),
                  actual.expression.inspect)
   end
+
+  def ruby19?
+    RUBY_VERSION >= "1.9"
+  end
+
+  def only_ruby19
+    omit("Ruby 1.9 is needed.") unless ruby19?
+  end
 end

data/test/test-schema-dumper.rb

@@ -23,6 +23,7 @@ class SchemaDumperTest < Test::Unit::TestCase
     Groonga::Schema.define do |schema|
       schema.create_table("Posts") do |table|
         table.short_text :title
+        table.short_text :comments, :type => :vector
       end
     end
   end
@@ -40,6 +41,7 @@ class SchemaDumperTest < Test::Unit::TestCase
       schema.create_table("Comments") do |table|
         table.reference("item", "Items")
         table.reference("author", "Users")
+        table.reference("children", "Items", :type => :vector)
         table.text("content")
         table.time("issued")
       end
@@ -71,6 +73,7 @@ class SchemaDumperTest < Test::Unit::TestCase
       assert_equal(<<-EOS, dump)
 create_table("Posts",
              :force => true) do |table|
+  table.short_text("comments", :type => :vector)
   table.short_text("title")
 end
 EOS
@@ -97,6 +100,7 @@ end
 
 change_table("Comments") do |table|
   table.reference("author", "Users")
+  table.reference("children", "Items", :type => :vector)
   table.reference("item", "Items")
 end
 EOS
@@ -138,6 +142,7 @@ EOS
       define_simple_schema
       assert_equal(<<-EOS, dump)
 table_create Posts TABLE_NO_KEY
+column_create Posts comments COLUMN_VECTOR ShortText
 column_create Posts title COLUMN_SCALAR ShortText
 EOS
     end
@@ -156,6 +161,7 @@ table_create Users TABLE_NO_KEY
 column_create Users name COLUMN_SCALAR ShortText
 
 column_create Comments author COLUMN_SCALAR Users
+column_create Comments children COLUMN_VECTOR Items
 column_create Comments item COLUMN_SCALAR Items
 EOS
     end

data/test/test-table-select.rb

@@ -146,6 +146,15 @@ class TableSelectTest < Test::Unit::TestCase
                                result)
   end
 
+  def test_not_equal_block
+    only_ruby19
+    result = @comments.select do |record|
+      record.user != "darashi"
+    end
+    assert_equal_select_result([@comment1, @comment2, @comment3],
+                               result)
+  end
+
   def test_equal_reference_column_by_nonexistent_key
     result = @comments.select do |record|
       record["user"] == "nonexistent"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,9 +19,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-28 00:00:00 Z
+date: 2011-09-16 00:00:00 +09:00
+default_executable: grndump
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: pkg-config
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +35,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: pkg-config
-  prerelease: false
-  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: test-unit
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +49,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: test-unit
-  prerelease: false
-  type: :development
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: test-unit-notify
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +63,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: test-unit-notify
-  prerelease: false
-  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rake
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +77,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  prerelease: false
-  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rake-compiler
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,11 +91,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake-compiler
-  prerelease: false
-  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +105,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: jeweler
-  prerelease: false
-  type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: yard
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +119,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: yard
-  prerelease: false
-  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: packnga
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,9 +133,6 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: packnga
-  prerelease: false
-  type: :development
   requirement: *id008
 description: |-
   rroonga is an extension library to use groonga's DB-API
@@ -163,51 +164,93 @@ files:
 - ext/groonga/Makefile
 - ext/groonga/extconf.rb
 - ext/groonga/groonga.def
+- ext/groonga/groonga.so
 - ext/groonga/rb-grn-accessor.c
+- ext/groonga/rb-grn-accessor.o
 - ext/groonga/rb-grn-array-cursor.c
+- ext/groonga/rb-grn-array-cursor.o
 - ext/groonga/rb-grn-array.c
+- ext/groonga/rb-grn-array.o
 - ext/groonga/rb-grn-column.c
+- ext/groonga/rb-grn-column.o
 - ext/groonga/rb-grn-context.c
+- ext/groonga/rb-grn-context.o
 - ext/groonga/rb-grn-database.c
+- ext/groonga/rb-grn-database.o
 - ext/groonga/rb-grn-encoding-support.c
+- ext/groonga/rb-grn-encoding-support.o
 - ext/groonga/rb-grn-encoding.c
+- ext/groonga/rb-grn-encoding.o
 - ext/groonga/rb-grn-exception.c
+- ext/groonga/rb-grn-exception.o
 - ext/groonga/rb-grn-expression-builder.c
+- ext/groonga/rb-grn-expression-builder.o
 - ext/groonga/rb-grn-expression.c
+- ext/groonga/rb-grn-expression.o
 - ext/groonga/rb-grn-fix-size-column.c
+- ext/groonga/rb-grn-fix-size-column.o
 - ext/groonga/rb-grn-hash-cursor.c
+- ext/groonga/rb-grn-hash-cursor.o
 - ext/groonga/rb-grn-hash.c
+- ext/groonga/rb-grn-hash.o
 - ext/groonga/rb-grn-index-column.c
+- ext/groonga/rb-grn-index-column.o
 - ext/groonga/rb-grn-index-cursor.c
+- ext/groonga/rb-grn-index-cursor.o
 - ext/groonga/rb-grn-logger.c
+- ext/groonga/rb-grn-logger.o
 - ext/groonga/rb-grn-object.c
+- ext/groonga/rb-grn-object.o
 - ext/groonga/rb-grn-operator.c
+- ext/groonga/rb-grn-operator.o
 - ext/groonga/rb-grn-patricia-trie-cursor.c
+- ext/groonga/rb-grn-patricia-trie-cursor.o
 - ext/groonga/rb-grn-patricia-trie.c
+- ext/groonga/rb-grn-patricia-trie.o
 - ext/groonga/rb-grn-plugin.c
+- ext/groonga/rb-grn-plugin.o
 - ext/groonga/rb-grn-posting.c
+- ext/groonga/rb-grn-posting.o
 - ext/groonga/rb-grn-procedure.c
+- ext/groonga/rb-grn-procedure.o
 - ext/groonga/rb-grn-query.c
+- ext/groonga/rb-grn-query.o
 - ext/groonga/rb-grn-record.c
+- ext/groonga/rb-grn-record.o
 - ext/groonga/rb-grn-snippet.c
+- ext/groonga/rb-grn-snippet.o
 - ext/groonga/rb-grn-table-cursor-key-support.c
+- ext/groonga/rb-grn-table-cursor-key-support.o
 - ext/groonga/rb-grn-table-cursor.c
+- ext/groonga/rb-grn-table-cursor.o
 - ext/groonga/rb-grn-table-key-support.c
+- ext/groonga/rb-grn-table-key-support.o
 - ext/groonga/rb-grn-table.c
+- ext/groonga/rb-grn-table.o
 - ext/groonga/rb-grn-type.c
+- ext/groonga/rb-grn-type.o
 - ext/groonga/rb-grn-utils.c
+- ext/groonga/rb-grn-utils.o
 - ext/groonga/rb-grn-variable-size-column.c
+- ext/groonga/rb-grn-variable-size-column.o
 - ext/groonga/rb-grn-variable.c
+- ext/groonga/rb-grn-variable.o
 - ext/groonga/rb-grn-view-accessor.c
+- ext/groonga/rb-grn-view-accessor.o
 - ext/groonga/rb-grn-view-cursor.c
+- ext/groonga/rb-grn-view-cursor.o
 - ext/groonga/rb-grn-view-record.c
+- ext/groonga/rb-grn-view-record.o
 - ext/groonga/rb-grn-view.c
+- ext/groonga/rb-grn-view.o
 - ext/groonga/rb-grn.h
 - ext/groonga/rb-groonga.c
+- ext/groonga/rb-groonga.o
 - extconf.rb
 - lib/groonga.rb
 - lib/groonga/context.rb
 - lib/groonga/dumper.rb
+- lib/groonga/expression-builder-19.rb
 - lib/groonga/expression-builder.rb
 - lib/groonga/pagination.rb
 - lib/groonga/patricia-trie.rb
@@ -219,52 +262,53 @@ files:
 - rroonga-build.rb
 - README.textile
 - TODO
+- test/test-database.rb
+- test/test-array.rb
+- test/test-table-offset-and-limit.rb
+- test/run-test.rb
+- test/test-schema-type.rb
 - test/test-remote.rb
 - test/test-table-cursor.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/test-context-select.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
-- test/test-table.rb
-- test/test-variable-size-column.rb
-- test/test-plugin.rb
-- test/test-hash.rb
+- test/test-table-select.rb
 - test/test-encoding.rb
-- test/test-schema-create-table.rb
 - test/test-type.rb
-- test/test-database.rb
-- test/test-variable.rb
-- test/test-table-select.rb
-- test/test-patricia-trie.rb
+- test/test-table.rb
+- test/test-query.rb
+- test/test-table-select-weight.rb
 - test/test-expression-builder.rb
-- test/test-logger.rb
-- test/test-array.rb
-- test/test-record.rb
-- test/test-column.rb
-- test/test-fix-size-column.rb
-- test/run-test.rb
+- test/test-exception.rb
+- test/test-plugin.rb
+- test/test-schema-view.rb
 - test/test-procedure.rb
+- test/test-snippet.rb
+- test/groonga-test-utils.rb
+- test/test-variable-size-column.rb
+- test/test-database-dumper.rb
+- test/test-pagination.rb
+- test/test-variable.rb
+- test/test-version.rb
 - test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/test-hash.rb
+- test/test-logger.rb
 - test/test-view.rb
+- test/test-schema.rb
+- test/test-accessor.rb
 - test/test-table-select-mecab.rb
 - test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-schema-view.rb
 - test/test-index-cursor.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-query.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
+- test/test-fix-size-column.rb
+- test/test-schema-create-table.rb
+- test/test-context-select.rb
+- test/test-expression.rb
 - test/test-gqtp.rb
 - test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
+- test/test-record.rb
+- test/test-column.rb
+- test/test-index-column.rb
+- test/test-patricia-trie.rb
+has_rdoc: true
 homepage: http://groonga.rubyforge.org/
 licenses: 
 - LGPLv2
@@ -294,54 +338,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for groonga that provide full text search and column store features.
 test_files: 
+- test/test-database.rb
+- test/test-array.rb
+- test/test-table-offset-and-limit.rb
+- test/run-test.rb
+- test/test-schema-type.rb
 - test/test-remote.rb
 - test/test-table-cursor.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/test-context-select.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
-- test/test-table.rb
-- test/test-variable-size-column.rb
-- test/test-plugin.rb
-- test/test-hash.rb
+- test/test-table-select.rb
 - test/test-encoding.rb
-- test/test-schema-create-table.rb
 - test/test-type.rb
-- test/test-database.rb
-- test/test-variable.rb
-- test/test-table-select.rb
-- test/test-patricia-trie.rb
+- test/test-table.rb
+- test/test-query.rb
+- test/test-table-select-weight.rb
 - test/test-expression-builder.rb
-- test/test-logger.rb
-- test/test-array.rb
-- test/test-record.rb
-- test/test-column.rb
-- test/test-fix-size-column.rb
-- test/run-test.rb
+- test/test-exception.rb
+- test/test-plugin.rb
+- test/test-schema-view.rb
 - test/test-procedure.rb
+- test/test-snippet.rb
+- test/groonga-test-utils.rb
+- test/test-variable-size-column.rb
+- test/test-database-dumper.rb
+- test/test-pagination.rb
+- test/test-variable.rb
+- test/test-version.rb
 - test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/test-hash.rb
+- test/test-logger.rb
 - test/test-view.rb
+- test/test-schema.rb
+- test/test-accessor.rb
 - test/test-table-select-mecab.rb
 - test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-schema-view.rb
 - test/test-index-cursor.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-query.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
+- test/test-fix-size-column.rb
+- test/test-schema-create-table.rb
+- test/test-context-select.rb
+- test/test-expression.rb
 - test/test-gqtp.rb
 - test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
+- test/test-record.rb
+- test/test-column.rb
+- test/test-index-column.rb
+- test/test-patricia-trie.rb