rroonga 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/ext/groonga/rb-grn.h

@@ -72,7 +72,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 2
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MICRO_VERSION 3
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -106,7 +106,7 @@ typedef struct _RbGrnObject RbGrnObject;
 struct _RbGrnObject
 {
     VALUE self;
-    VALUE rb_context;
+    RbGrnContext *rb_grn_context;
     grn_ctx *context;
     grn_obj *object;
     grn_obj *domain;
@@ -296,6 +296,8 @@ void           rb_grn_context_register_floating_object
                                                     (RbGrnObject *rb_grn_object);
 void           rb_grn_context_unregister_floating_object
                                                     (RbGrnObject *rb_grn_object);
+void           rb_grn_context_close_floating_objects(RbGrnContext *rb_grn_context);
+void           rb_grn_context_reset_floating_objects(RbGrnContext *rb_grn_context);
 grn_ctx       *rb_grn_context_ensure                (VALUE *context);
 VALUE          rb_grn_context_get_default           (void);
 VALUE          rb_grn_context_to_exception          (grn_ctx *context,
@@ -357,6 +359,11 @@ VALUE          rb_grn_object_inspect_content        (VALUE object,
 VALUE          rb_grn_object_inspect_footer         (VALUE object,
 						     VALUE inspected);
 
+void           rb_grn_database_finalizer            (grn_ctx *context,
+						     RbGrnContext *rb_grn_context,
+						     grn_obj *column,
+						     RbGrnObject *rb_grn_database);
+
 void           rb_grn_named_object_bind             (RbGrnNamedObject *rb_grn_named_object,
 						     grn_ctx *context,
 						     grn_obj *object);

data/lib/groonga/dumper.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2012  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
@@ -479,7 +479,7 @@ module Groonga
     end
 
     def dump_records(columns)
-      @table.each do |record|
+      @table.each(:order_by => @options[:order_by]) do |record|
         write(",\n")
         values = columns.collect do |column|
           resolve_value(column[record.id])

data/lib/groonga/expression-builder.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2012  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
@@ -226,6 +226,10 @@ module Groonga
         SuffixSearchExpressionBuilder.new(self, normalize(other))
       end
 
+      def similar_search(other)
+        SimilarSearchExpressionBuilder.new(self, normalize(other))
+      end
+
       private
       def normalize(other)
         if @range.is_a?(Groonga::Table)
@@ -406,6 +410,13 @@ module Groonga
         super(Groonga::Operation::SUFFIX, column_value_builder, value)
       end
     end
+
+    # @private
+    class SimilarSearchExpressionBuilder < BinaryExpressionBuilder
+      def initialize(column_value_builder, value)
+        super(Groonga::Operation::SIMILAR, column_value_builder, value)
+      end
+    end
   end
 
   # @private
@@ -425,7 +436,7 @@ module Groonga
           "for table <#{@table.inspect}>"
         raise ArgumentError, message
       end
-      column_expression_builder(column, name)
+      column_value_expression_builder(column, name)
     end
 
     def id
@@ -471,7 +482,7 @@ module Groonga
         raise ArgumentError,
               "different index column: <#{name}>: #{object.inspect}"
       end
-      column_expression_builder(object, name)
+      column_value_expression_builder(object, name)
     end
 
     private
@@ -482,7 +493,7 @@ module Groonga
       end
     end
 
-    def column_expression_builder(column, name)
+    def column_value_expression_builder(column, name)
       ColumnValueExpressionBuilder.new(column,
                                        :table => @table,
                                        :column_name => name)
@@ -524,55 +535,59 @@ module Groonga
     end
 
     def ==(other)
-      column_value_builder == other
+      column_value_expression_builder == other
     end
 
     def =~(other)
-      column_value_builder =~ other
+      column_value_expression_builder =~ other
     end
 
     def <(other)
-      column_value_builder < other
+      column_value_expression_builder < other
     end
 
     def <=(other)
-      column_value_builder <= other
+      column_value_expression_builder <= other
     end
 
     def >(other)
-      column_value_builder > other
+      column_value_expression_builder > other
     end
 
     def >=(other)
-      column_value_builder >= other
+      column_value_expression_builder >= other
     end
 
     def +(other)
-      column_value_builder + other
+      column_value_expression_builder + other
     end
 
     def -(other)
-      column_value_builder - other
+      column_value_expression_builder - other
     end
 
     def *(other)
-      column_value_builder * other
+      column_value_expression_builder * other
     end
 
     def /(other)
-      column_value_builder / other
+      column_value_expression_builder / other
     end
 
     def %(other)
-      column_value_builder % other
+      column_value_expression_builder % other
     end
 
     def match(query, options={}, &block)
-      column_value_builder.match(query, options, &block)
+      column_value_expression_builder.match(query, options, &block)
+    end
+
+    def similar_search(text)
+      column_value_expression_builder.similar_search(text)
     end
 
     private
-    def column_value_builder
+    def column_value_expression_builder
       ColumnValueExpressionBuilder.new(@default_column,
                                        :table => @table,
                                        :column_name => @column_name,
@@ -583,7 +598,7 @@ module Groonga
       return super if block
       return super unless args.empty?
       if VALID_COLUMN_NAME_RE =~ name.to_s
-        column_value_builder.send(name)
+        column_value_expression_builder.send(name)
       else
         super
       end

data/rroonga-build.rb

@@ -19,7 +19,7 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 2
     MINOR = 0
-    MICRO = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/vendor/local/include/groonga/groonga.h

@@ -2639,13 +2639,13 @@ GRN_API grn_rc grn_array_set_value(grn_ctx *ctx, grn_array *array, grn_id id,
 GRN_API grn_array_cursor *grn_array_cursor_open(grn_ctx *ctx, grn_array *array,
                                                 grn_id min, grn_id max,
                                                 int offset, int limit, int flags);
-GRN_API grn_id grn_array_cursor_next(grn_ctx *ctx, grn_array_cursor *c);
-GRN_API int grn_array_cursor_get_value(grn_ctx *ctx, grn_array_cursor *c, void **value);
-GRN_API grn_rc grn_array_cursor_set_value(grn_ctx *ctx, grn_array_cursor *c,
+GRN_API grn_id grn_array_cursor_next(grn_ctx *ctx, grn_array_cursor *cursor);
+GRN_API int grn_array_cursor_get_value(grn_ctx *ctx, grn_array_cursor *cursor, void **value);
+GRN_API grn_rc grn_array_cursor_set_value(grn_ctx *ctx, grn_array_cursor *cursor,
                                           const void *value, int flags);
-GRN_API grn_rc grn_array_cursor_delete(grn_ctx *ctx, grn_array_cursor *c,
+GRN_API grn_rc grn_array_cursor_delete(grn_ctx *ctx, grn_array_cursor *cursor,
                                        grn_table_delete_optarg *optarg);
-GRN_API void grn_array_cursor_close(grn_ctx *ctx, grn_array_cursor *c);
+GRN_API void grn_array_cursor_close(grn_ctx *ctx, grn_array_cursor *cursor);
 GRN_API grn_rc grn_array_delete_by_id(grn_ctx *ctx, grn_array *array, grn_id id,
                                       grn_table_delete_optarg *optarg);
 

data/vendor/local/lib/pkgconfig/groonga.pc

@@ -8,10 +8,10 @@ datadir=${datarootdir}
 document_root=${datadir}/groonga/html/admin
 groonga=${bindir}/groonga.exe
 groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
-groonga_version=2.0.1
+groonga_version=2.0.2
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 2.0.1
-Libs: -L${libdir} -lgroonga -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib -lmsgpack
-Cflags: -I${includedir}/groonga -I/home/kou/work/c/groonga.clean/packages/windows/dist-x86/include
+Version: 2.0.2
+Libs: -L${libdir} -lgroonga
+Cflags: -I${includedir}/groonga

data/vendor/local/share/doc/groonga/en/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 9fa04971a9987b17aea0e92f94543b8a
+config: 1474d1b598d618ae9a7572a2b12ef5d9
 tags: fbb0d17656682115ca4d033fb2f83ba1