rroonga 1.3.1 → 2.0.0

data/Gemfile

@@ -21,7 +21,7 @@ gem 'pkg-config'
 gem 'json'
 
 group :development, :test do
-  gem "test-unit"
+  gem "test-unit", ">= 2.4.6"
   gem "test-unit-notify"
   gem "rake"
   gem "rake-compiler"

data/Rakefile

@@ -104,10 +104,6 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 document_task = Packnga::DocumentTask.new(spec) do |t|
-  t.yard do |yard_task|
-    yard_task.files += FileList["ext/**/*.c"]
-    yard_task.options += ["--markup", "textile"]
-  end
 end
 
 namespace :reference do
@@ -131,7 +127,7 @@ module YARD
     class Proxy
       alias_method :initialize_original, :initialize
       def initialize(namespace, name)
-        name = name.gsub(/\AGrn(.*)\z/) do
+        name = name.to_s.gsub(/\AGrn(.*)\z/) do
           suffix = $1
           case suffix
           when ""
@@ -203,10 +199,9 @@ end
 
 Rake::ExtensionTask.new("groonga", spec) do |ext|
   if groonga_win32_i386_p
-    ext.cross_platform = ["x86-mingw32", "i386-mswin32"]
+    ext.cross_platform = ["x86-mingw32"]
   else
     ext.cross_platform = ["x64-mingw32"]
-    # ext.cross_platform << "x64-mswin64" # We need to build with VC++ 2010. :<
   end
   if windows?
     ext.gem_spec.files += collect_binary_files(relative_binary_dir)

data/bug.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'groonga'
+
+Groonga::Logger.log_path = "/tmp/groonga.log" 
+Groonga::Logger.query_log_path = "/tmp/groonga-query.log" 
+
+i = 0
+loop do
+  path = "/tmp/db/db" 
+  FileUtils.rm_rf(File.dirname(path))
+  FileUtils.mkdir_p(File.dirname(path))
+  Groonga::Context.default = nil
+  database = Groonga::Database.create(:path => path)
+  Groonga::Schema.define do |schema|
+    schema.create_table("Users",
+                        :type => :hash,
+                        :key_type => "ShortText") do |table|
+      table.uint32("name_length")
+    end
+  end
+
+  users = Groonga["Users"]
+  10.times do
+    i += 1
+    exit if i > 100
+    name = i.to_s
+    users.add(name, :name_length => name.length)
+  end
+  builder = Groonga::RecordExpressionBuilder.new(users, nil)
+  builder.query = "name_length:3" 
+  builder.build
+  database.close
+  GC.start
+end

data/crash.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'groonga'
+
+context = Groonga::Context.default
+context.connect(:port => 10042)
+
+10000.times do |i|
+  p i
+  GC.stress = true
+  result = context.select("Program")
+  result.records.each do |record|
+    record["_key"]
+    record["unknown"]
+  end
+  GC.stress = false
+end

data/ext/groonga/Makefile

@@ -0,0 +1,260 @@
+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
+#### Start of system configuration section. ####
+
+srcdir = /home/kou/work/ruby/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)
+
+NULLCMD = :
+
+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 = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
+CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -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=3 -DGRN_MICRO_VERSION=0 -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 = rmdir --ignore-fail-on-non-empty -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-procedure.c rb-grn-column.c rb-grn-index-column.c rb-grn-encoding-support.c rb-grn-variable.c rb-grn-table.c rb-grn-hash-cursor.c rb-grn-table-cursor-key-support.c rb-grn-object.c rb-grn-double-array-trie.c rb-grn-view-accessor.c rb-grn-table-key-support.c rb-grn-array.c rb-grn-patricia-trie.c rb-grn-double-array-trie-cursor.c rb-grn-utils.c rb-grn-record.c rb-groonga.c rb-grn-exception.c rb-grn-variable-size-column.c rb-grn-encoding.c rb-grn-expression-builder.c rb-grn-operator.c rb-grn-snippet.c rb-grn-array-cursor.c rb-grn-type.c rb-grn-table-cursor.c rb-grn-fix-size-column.c rb-grn-view-cursor.c rb-grn-logger.c rb-grn-plugin.c rb-grn-database.c rb-grn-view-record.c rb-grn-patricia-trie-cursor.c rb-grn-index-cursor.c rb-grn-view.c rb-grn-accessor.c rb-grn-context.c rb-grn-posting.c rb-grn-expression.c rb-grn-hash.c
+OBJS = rb-grn-procedure.o rb-grn-column.o rb-grn-index-column.o rb-grn-encoding-support.o rb-grn-variable.o rb-grn-table.o rb-grn-hash-cursor.o rb-grn-table-cursor-key-support.o rb-grn-object.o rb-grn-double-array-trie.o rb-grn-view-accessor.o rb-grn-table-key-support.o rb-grn-array.o rb-grn-patricia-trie.o rb-grn-double-array-trie-cursor.o rb-grn-utils.o rb-grn-record.o rb-groonga.o rb-grn-exception.o rb-grn-variable-size-column.o rb-grn-encoding.o rb-grn-expression-builder.o rb-grn-operator.o rb-grn-snippet.o rb-grn-array-cursor.o rb-grn-type.o rb-grn-table-cursor.o rb-grn-fix-size-column.o rb-grn-view-cursor.o rb-grn-logger.o rb-grn-plugin.o rb-grn-database.o rb-grn-view-record.o rb-grn-patricia-trie-cursor.o rb-grn-index-cursor.o rb-grn-view.o rb-grn-accessor.o rb-grn-context.o rb-grn-posting.o rb-grn-expression.o rb-grn-hash.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) 2> /dev/null || true
+
+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-default:
+	$(ECHO) installing default groonga libraries
+pre-install-rb: $(RUBYLIBDIR)/groonga
+install-rb: $(RUBYLIBDIR)/groonga/schema.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/expression-builder-19.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/expression-builder-19.rb: $(srcdir)/../../lib/groonga/expression-builder-19.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder-19.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/pagination.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/pagination.rb: $(srcdir)/../../lib/groonga/pagination.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/pagination.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/view-record.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/query-log.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/query-log.rb: $(srcdir)/../../lib/groonga/query-log.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/query-log.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/patricia-trie.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/patricia-trie.rb: $(srcdir)/../../lib/groonga/patricia-trie.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/patricia-trie.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/grntest-log.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/grntest-log.rb: $(srcdir)/../../lib/groonga/grntest-log.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/grntest-log.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/dumper.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/posting.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/context.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/context.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/record.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb $(RUBYLIBDIR)/groonga
+$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
+pre-install-rb: $(RUBYLIBDIR)
+install-rb: $(RUBYLIBDIR)/groonga.rb $(RUBYLIBDIR)
+$(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
+	$(Q) $(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
+pre-install-rb:
+	$(ECHO) installing groonga libraries
+$(RUBYARCHDIR):
+	$(Q) $(MAKEDIRS) $@
+$(RUBYLIBDIR)/groonga:
+	$(Q) $(MAKEDIRS) $@
+$(RUBYLIBDIR):
+	$(Q) $(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

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

@@ -179,51 +179,48 @@ rb_grn_column_get_local_name (VALUE self)
  * ているGroonga::Expressionを取得できる。
  * Groonga::Expression#snippetを使うことにより、指定した条件
  * 用のスニペットを簡単に生成できる。
- * <pre>
- *   results = description_column.select do |column|
- *     column =~ "groonga"
- *   end
- *   snippet = results.expression.snippet([["<em>", "</em>"]])
- *   results.each do |record|
- *     puts "#{record['name']}の説明文の中で「groonga」が含まれる部分"
- *     snippet.execute(record["description"].each do |snippet|
- *       puts "---"
- *       puts "#{snippet}..."
- *       puts "---"
- *     end
+ *
+ * bc. !!!ruby
+ * results = description_column.select do |column|
+ *   column =~ "groonga"
+ * end
+ * snippet = results.expression.snippet([["<em>", "</em>"]])
+ * results.each do |record|
+ *   puts "#{record['name']}の説明文の中で「groonga」が含まれる部分"
+ *   snippet.execute(record["description"]).each do |snippet|
+ *     puts "---"
+ *     puts "#{snippet}..."
+ *     puts "---"
  *   end
+ * end
+ *
  * 出力例
- *   Ruby/groongaの説明文の中で「groonga」が含まれる部分
- *   ---
- *   Ruby/<em>groonga</em>は<em>groonga</em>のいわゆるDB-APIの層の...
- *   ---
- * </pre>
+ *
+ * pre. rroongaの説明文の中で「groonga」が含まれる部分
+ * ---
+ * rroongaは<em>groonga</em>のいわゆるDB-APIの層の...
+ * ---
  *
  * _query_ には「[カラム名]:[演算子][値]」という書式で条件を
  * 指定する。演算子は以下の通り。
  *
- * [なし]
- *   [カラム値] == [値]
- * [<tt>!</tt>]
- *   [カラム値] != [値]
- * [<tt><</tt>]
- *   [カラム値] < [値]
- * [<tt>></tt>]
- *   [カラム値] > [値]
- * [<tt><=</tt>]
- *   [カラム値] <= [値]
- * [<tt>>=</tt>]
- *   [カラム値] >= [値]
- * [<tt>@</tt>]
- *   [カラム値]が[値]を含んでいるかどうか
+ * - なし := [カラム値] == [値]
+ * - @!@ := [カラム値] != [値]
+ * - @<@ := [カラム値] < [値]
+ * - @>@ := [カラム値] > [値]
+ * - @<=@ := [カラム値] <= [値]
+ * - @>=@ := [カラム値] >= [値]
+ * - @@@ := [カラム値]が[値]を含んでいるかどうか
  *
  * 例:
- *   "groonga" # _column_ カラムの値が"groonga"のレコードにマッチ
- *   "name:daijiro" # _column_ カラムが属しているテーブルの
- *                  # "name"カラムの値が"daijiro"のレコードにマッチ
- *   "description:@groonga" # _column_ カラムが属しているテーブルの
- *                          # "description"カラムが
- *                          # "groonga"を含んでいるレコードにマッチ
+ *
+ * - @"groonga"@ := _column_ カラムの値が @"groonga"@ のレコードにマッチ
+ * - @"name:daijiro"@ :=
+ *   _column_ カラムが属しているテーブルの @"name"@ カラムの値が
+ *   @"daijiro"@ のレコードにマッチ  =:
+ * - @"description:@@@groonga"@ :=
+ *   _column_ カラムが属しているテーブルの @"description"@ カラムが
+ *   @"groonga"@ を含んでいるレコードにマッチ =:
  *
  * _expression_ には既に作成済みのGroonga::Expressionを渡す
  *