rroonga 1.2.0 → 1.2.1

data/example/bookmark.rb

@@ -124,23 +124,23 @@ p(records = comments.select do |record|
   end)
 
 records.each do |record|
-  record = record.key
-  p [record.id,
-     record.issued,
-     record.item.title,
-     record.author.name,
-     record.content]
+  comment = record.key
+  p [comment.id,
+     comment.issued,
+     comment.item.title,
+     comment.author.name,
+     comment.content]
 end
 
 p records
 
 records.sort([{:key => "issued", :order => "descending"}]).each do |record|
-  record = record.key
-  p [record.id,
-     record.issued,
-     record.item.title,
-     record.author.name,
-     record.content]
+  comment = record.key
+  p [comment.id,
+     comment.issued,
+     comment.item.title,
+     comment.author.name,
+     comment.content]
 end
 
 records.group("item").each do |record|

data/ext/groonga/Makefile

@@ -0,0 +1,233 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+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)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/usr
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(DESTDIR)/usr/lib/ruby/vendor_ruby
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(prefix)/share/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(prefix)/share/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(DESTDIR)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(DESTDIR)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(prefix)/lib/ruby1.9.1
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+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 -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=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 = 
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -shared
+LDSHAREDXX = $(CXX) -shared
+AR = ar
+EXEEXT = 
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby1.9.1
+RUBY_SO_NAME = ruby-1.9.1
+arch = x86_64-linux
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /usr/bin/ruby1.9.1
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+MAKEDIRS = /bin/mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lgroonga -lpthread -lrt -ldl -lcrypt -lm   -lc
+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 = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS)
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+pre-install-rb: $(RUBYLIBDIR)
+install-rb: $(RUBYLIBDIR)/groonga.rb
+$(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/dumper.rb
+$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
+	@-$(MAKEDIRS) $(@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)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/pagination.rb $(@D)
+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/expression-builder.rb
+$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
+	@-$(MAKEDIRS) $(@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/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
+	@-$(MAKEDIRS) $(@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):
+	$(MAKEDIRS) $@
+$(RUBYLIBDIR)/groonga:
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $(@)
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/groonga/extconf.rb

@@ -47,7 +47,7 @@ checking_for(checking_message("GCC")) do
 end
 
 checking_for(checking_message("Win32 OS")) do
-  win32 = /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
+  win32 = /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
   if win32
     $defs << "-DRB_GRN_PLATFORM_WIN32"
     import_library_name = "libruby-#{module_name}.a"

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

@@ -561,7 +561,7 @@ rb_grn_column_is_locked (int argc, VALUE *argv, VALUE self)
  * _column_の値がテーブルのレコードとなる場合は+true+を返し、
  * そうでない場合は+false+を返す。
  *
- * @since: 1.0.5
+ * @since 1.0.5
  */
 static VALUE
 rb_grn_column_reference_p (VALUE self)
@@ -599,7 +599,7 @@ rb_grn_column_reference_p (VALUE self)
  * _column_がGroonga::IndexColumnの場合は+true+を返し、
  * そうでない場合は+false+を返す。
  *
- * @since: 1.0.5
+ * @since 1.0.5
  */
 static VALUE
 rb_grn_column_index_p (VALUE self)
@@ -627,7 +627,7 @@ rb_grn_column_index_p (VALUE self)
  * _column_がベクターカラムの場合は+true+を返し、
  * そうでない場合は+false+を返す。
  *
- * @since: 1.0.5
+ * @since 1.0.5
  */
 static VALUE
 rb_grn_column_vector_p (VALUE self)
@@ -657,7 +657,7 @@ rb_grn_column_vector_p (VALUE self)
  * _column_がスカラーカラムの場合は+true+を返し、
  * そうでない場合は+false+を返す。
  *
- * @since: 1.0.5
+ * @since 1.0.5
  */
 static VALUE
 rb_grn_column_scalar_p (VALUE self)
@@ -692,7 +692,7 @@ rb_grn_column_scalar_p (VALUE self)
  *
  * _operation_を実行できる_column_のインデックスを返す。
  *
- * @since: 1.0.9
+ * @since 1.0.9
  */
 static VALUE
 rb_grn_column_get_indexes (int argc, VALUE *argv, VALUE self)

data/ext/groonga/rb-grn-index-column.c

@@ -546,6 +546,35 @@ rb_grn_index_column_with_position_p (VALUE self)
     return CBOOL2RVAL(column->header.flags & GRN_OBJ_WITH_POSITION);
 }
 
+static VALUE
+rb_grn_index_column_open_cursor (VALUE self, VALUE rb_table_cursor)
+{
+    grn_ctx *context;
+    grn_obj *column;
+    grn_table_cursor *table_cursor;
+    grn_id rid_min = GRN_ID_NIL;
+    grn_id rid_max = GRN_ID_MAX;
+    int flags = 0;
+    grn_obj *index_cursor;
+    VALUE rb_cursor;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+				    NULL, NULL,
+				    NULL, NULL, NULL, NULL,
+				    NULL, NULL);
+    table_cursor = RVAL2GRNTABLECURSOR(rb_table_cursor, NULL);
+
+    index_cursor = grn_index_cursor_open(context, table_cursor,
+					 column, rid_min, rid_max, flags);
+
+    rb_cursor = GRNINDEXCURSOR2RVAL(context, index_cursor);
+
+    if (rb_block_given_p())
+	return rb_ensure(rb_yield, rb_cursor, rb_grn_object_close, rb_cursor);
+    else
+	return rb_cursor;
+}
+
 void
 rb_grn_init_index_column (VALUE mGrn)
 {
@@ -571,4 +600,6 @@ rb_grn_init_index_column (VALUE mGrn)
 		     rb_grn_index_column_with_weight_p, 0);
     rb_define_method(rb_cGrnIndexColumn, "with_position?",
 		     rb_grn_index_column_with_position_p, 0);
+    rb_define_method(rb_cGrnIndexColumn, "open_cursor",
+		     rb_grn_index_column_open_cursor, 1);
 }

data/ext/groonga/rb-grn-index-cursor.c

@@ -0,0 +1,106 @@
+/* -*- c-file-style: "ruby" -*- */
+/*
+  Copyright (C) 2011  Haruka Yoshihara <yoshihara@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
+*/
+
+#include "rb-grn.h"
+
+#define SELF(object) ((RbGrnIndexCursor *)DATA_PTR(object))
+
+VALUE rb_cGrnIndexCursor;
+
+VALUE
+rb_grn_index_cursor_to_ruby_object (grn_ctx *context,
+				    grn_obj *cursor,
+				    grn_bool owner)
+{
+    return GRNOBJECT2RVAL(rb_cGrnIndexCursor, context, cursor, owner);
+}
+
+void
+rb_grn_index_cursor_deconstruct (RbGrnIndexCursor *rb_grn_index_cursor,
+				 grn_obj **cursor,
+				 grn_ctx **context,
+				 grn_id *domain_id,
+				 grn_obj **domain,
+				 grn_id *range_id,
+				 grn_obj **range)
+{
+    RbGrnObject *rb_grn_object;
+
+    rb_grn_object = RB_GRN_OBJECT(rb_grn_index_cursor);
+    rb_grn_object_deconstruct(rb_grn_object, cursor, context,
+			      domain_id, domain,
+			      range_id, range);
+}
+
+static VALUE
+rb_grn_index_cursor_next (VALUE self)
+{
+    VALUE rb_posting = Qnil;
+    grn_obj *cursor;
+    grn_ctx *context;
+
+    rb_grn_index_cursor_deconstruct(SELF(self), &cursor, &context,
+				    NULL, NULL, NULL, NULL);
+
+    if (context && cursor) {
+	grn_posting *posting;
+	grn_id tid;
+
+	posting = grn_index_cursor_next(context, cursor, &tid);
+
+	if (posting) {
+	    rb_posting = rb_grn_posting_new(posting, tid);
+	}
+    }
+
+    return rb_posting;
+
+}
+
+static VALUE
+rb_grn_index_cursor_each (VALUE self)
+{
+    grn_obj *cursor;
+    grn_ctx *context;
+
+    rb_grn_index_cursor_deconstruct(SELF(self), &cursor, &context,
+				    NULL, NULL, NULL, NULL);
+
+    if (context && cursor) {
+	grn_posting *posting;
+	grn_id tid;
+
+	while ((posting = grn_index_cursor_next(context, cursor, &tid))) {
+	    rb_yield(rb_grn_posting_new(posting, tid));
+	}
+    }
+
+    return Qnil;
+}
+
+void
+rb_grn_init_index_cursor (VALUE mGrn)
+{
+    rb_cGrnIndexCursor =
+	rb_define_class_under(mGrn, "IndexCursor", rb_cGrnObject);
+    rb_define_alloc_func(rb_cGrnIndexCursor, rb_grn_object_alloc);
+    rb_include_module(rb_cGrnIndexCursor, rb_mEnumerable);
+
+    rb_define_method(rb_cGrnIndexCursor, "next", rb_grn_index_cursor_next, 0);
+    rb_define_method(rb_cGrnIndexCursor, "each", rb_grn_index_cursor_each, 0);
+}