rroonga 2.1.2 → 2.1.3

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -113,7 +113,6 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
       case GRN_CURSOR_TABLE_PAT_KEY:
       case GRN_CURSOR_TABLE_DAT_KEY:
       case GRN_CURSOR_TABLE_NO_KEY:
-      case GRN_CURSOR_TABLE_VIEW:
 	break;
       case GRN_TABLE_HASH_KEY:
       case GRN_TABLE_PAT_KEY:
@@ -122,7 +121,6 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
 					   RB_GRN_TABLE_KEY_SUPPORT(rb_grn_object));
 	break;
       case GRN_TABLE_NO_KEY:
-      case GRN_TABLE_VIEW:
 	rb_grn_table_finalizer(context, grn_object,
 			       RB_GRN_TABLE(rb_grn_object));
 	break;
@@ -238,18 +236,12 @@ rb_grn_object_to_ruby_class (grn_obj *object)
       case GRN_TABLE_NO_KEY:
 	klass = rb_cGrnArray;
 	break;
-      case GRN_TABLE_VIEW:
-	klass = rb_cGrnView;
-	break;
       case GRN_TYPE:
 	klass = rb_cGrnType;
 	break;
       case GRN_ACCESSOR:
 	klass = rb_cGrnAccessor;
 	break;
-      case GRN_ACCESSOR_VIEW:
-	klass = rb_cGrnViewAccessor;
-	break;
       case GRN_SNIP:
 	klass = rb_cGrnSnippet;
 	break;
@@ -280,9 +272,6 @@ rb_grn_object_to_ruby_class (grn_obj *object)
       case GRN_CURSOR_TABLE_NO_KEY:
 	klass = rb_cGrnArrayCursor;
 	break;
-      case GRN_CURSOR_TABLE_VIEW:
-	klass = rb_cGrnViewCursor;
-	break;
       default:
 	rb_raise(rb_eTypeError,
 		 "unsupported groonga object type for class detection: 0x%x",
@@ -416,7 +405,6 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
 	klass == rb_cGrnPatriciaTrieCursor ||
 	klass == rb_cGrnDoubleArrayTrieCursor ||
 	klass == rb_cGrnArrayCursor ||
-	klass == rb_cGrnViewCursor ||
 	klass == rb_cGrnIndexCursor ||
 	klass == rb_cGrnProcedure ||
 	klass == rb_cGrnVariable) {
@@ -450,12 +438,6 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
 	rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,
 				  context, object);
 	rb_grn_accessor_bind(RB_GRN_ACCESSOR(rb_grn_object), context, object);
-    } else if (klass == rb_cGrnViewAccessor) {
-	rb_grn_object = ALLOC(RbGrnNamedObject);
-	rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,
-				  context, object);
-	rb_grn_named_object_bind(RB_GRN_NAMED_OBJECT(rb_grn_object),
-				 context, object);
     } else if (klass == rb_cGrnExpression) {
 	rb_grn_object = ALLOC(RbGrnExpression);
 	rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,
@@ -815,8 +797,6 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected,
 	    rb_ary_push(inspected_flags, rb_str_new2("TABLE_DAT_KEY"));
 	if (flags & GRN_OBJ_TABLE_NO_KEY)
 	    rb_ary_push(inspected_flags, rb_str_new2("TABLE_NO_KEY"));
-	if (flags & GRN_OBJ_TABLE_VIEW)
-	    rb_ary_push(inspected_flags, rb_str_new2("TABLE_VIEW"));
     }
 
     switch (object->header.type) {
@@ -1245,7 +1225,6 @@ rb_grn_object_array_reference (VALUE self, VALUE rb_id)
 	break;
       case GRN_TYPE:
       case GRN_ACCESSOR: /* FIXME */
-      case GRN_ACCESSOR_VIEW: /* FIXME */
 	GRN_OBJ_INIT(&value, GRN_BULK, 0, range_id);
 	break;
       case GRN_COLUMN_VAR_SIZE:
@@ -1301,7 +1280,6 @@ rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
       case GRN_TABLE_PAT_KEY:
       case GRN_TABLE_DAT_KEY:
       case GRN_TABLE_NO_KEY:
-      case GRN_TABLE_VIEW:
 	first_element = rb_ary_entry(rb_value, 0);
 	if (rb_respond_to(first_element, rb_intern("record_raw_id"))) {
 	    return GRN_TRUE;

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -299,5 +299,4 @@ rb_grn_init_table_cursor (VALUE mGrn)
     rb_grn_init_hash_cursor(mGrn);
     rb_grn_init_patricia_trie_cursor(mGrn);
     rb_grn_init_double_array_trie_cursor(mGrn);
-    rb_grn_init_view_cursor(mGrn);
 }

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -2278,5 +2278,4 @@ rb_grn_init_table (VALUE mGrn)
     rb_grn_init_hash(mGrn);
     rb_grn_init_patricia_trie(mGrn);
     rb_grn_init_double_array_trie(mGrn);
-    rb_grn_init_view(mGrn);
 }

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -62,8 +62,6 @@ rb_grn_inspect_type (unsigned char type)
     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:
@@ -80,8 +78,6 @@ rb_grn_inspect_type (unsigned char type)
     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:
@@ -428,7 +424,7 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
 
     string_p = rb_type(object) == T_STRING;
     table_type_p = (GRN_TABLE_HASH_KEY <= type->header.type &&
-		    type->header.type <= GRN_TABLE_VIEW);
+		    type->header.type <= GRN_TABLE_NO_KEY);
 
     switch (type_id) {
       case GRN_DB_INT32:
@@ -834,7 +830,7 @@ rb_grn_value_from_ruby_object (VALUE object, grn_ctx *context,
 
     string_p = rb_type(object) == T_STRING;
     table_type_p = (GRN_TABLE_HASH_KEY <= type->header.type &&
-		    type->header.type <= GRN_TABLE_VIEW);
+		    type->header.type <= GRN_TABLE_NO_KEY);
     if (!string_p) {
 	return RVAL2GRNBULK_WITH_TYPE(object, context, value, type_id, type);
     }

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -76,7 +76,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 2
 #define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MICRO_VERSION 3
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -90,7 +90,6 @@ RB_GRN_BEGIN_DECLS
 #define RB_GRN_COLUMN(object) ((RbGrnColumn *)(object))
 #define RB_GRN_INDEX_COLUMN(object) ((RbGrnIndexColumn *)(object))
 #define RB_GRN_ACCESSOR(object) ((RbGrnAccessor *)(object))
-#define RB_GRN_ACCESSOR_VIEW(object) ((RbGrnAccessor *)(object))
 #define RB_GRN_EXPRESSION(object) ((RbGrnExpression *)(object))
 #define RB_GRN_SNIPPET(object) ((RbGrnSnippet *)(object))
 #define RB_GRN_UNBIND_FUNCTION(function) ((RbGrnUnbindFunction)(function))
@@ -222,13 +221,11 @@ RB_GRN_VAR VALUE rb_cGrnHash;
 RB_GRN_VAR VALUE rb_cGrnPatriciaTrie;
 RB_GRN_VAR VALUE rb_cGrnDoubleArrayTrie;
 RB_GRN_VAR VALUE rb_cGrnArray;
-RB_GRN_VAR VALUE rb_cGrnView;
 RB_GRN_VAR VALUE rb_cGrnTableCursor;
 RB_GRN_VAR VALUE rb_mGrnTableCursorKeySupport;
 RB_GRN_VAR VALUE rb_cGrnHashCursor;
 RB_GRN_VAR VALUE rb_cGrnPatriciaTrieCursor;
 RB_GRN_VAR VALUE rb_cGrnDoubleArrayTrieCursor;
-RB_GRN_VAR VALUE rb_cGrnViewCursor;
 RB_GRN_VAR VALUE rb_cGrnArrayCursor;
 RB_GRN_VAR VALUE rb_cGrnType;
 RB_GRN_VAR VALUE rb_cGrnProcedure;
@@ -238,12 +235,10 @@ RB_GRN_VAR VALUE rb_cGrnVariableSizeColumn;
 RB_GRN_VAR VALUE rb_cGrnIndexColumn;
 RB_GRN_VAR VALUE rb_cGrnIndexCursor;
 RB_GRN_VAR VALUE rb_cGrnAccessor;
-RB_GRN_VAR VALUE rb_cGrnViewAccessor;
 RB_GRN_VAR VALUE rb_cGrnGeoPoint;
 RB_GRN_VAR VALUE rb_cGrnTokyoGeoPoint;
 RB_GRN_VAR VALUE rb_cGrnWGS84GeoPoint;
 RB_GRN_VAR VALUE rb_cGrnRecord;
-RB_GRN_VAR VALUE rb_cGrnViewRecord;
 RB_GRN_VAR VALUE rb_cGrnLogger;
 RB_GRN_VAR VALUE rb_cGrnSnippet;
 RB_GRN_VAR VALUE rb_cGrnVariable;
@@ -267,14 +262,12 @@ void           rb_grn_init_array                    (VALUE mGrn);
 void           rb_grn_init_hash                     (VALUE mGrn);
 void           rb_grn_init_patricia_trie            (VALUE mGrn);
 void           rb_grn_init_double_array_trie        (VALUE mGrn);
-void           rb_grn_init_view                     (VALUE mGrn);
 void           rb_grn_init_table_cursor             (VALUE mGrn);
 void           rb_grn_init_table_cursor_key_support (VALUE mGrn);
 void           rb_grn_init_array_cursor             (VALUE mGrn);
 void           rb_grn_init_hash_cursor              (VALUE mGrn);
 void           rb_grn_init_patricia_trie_cursor     (VALUE mGrn);
 void           rb_grn_init_double_array_trie_cursor (VALUE mGrn);
-void           rb_grn_init_view_cursor              (VALUE mGrn);
 void           rb_grn_init_type                     (VALUE mGrn);
 void           rb_grn_init_procedure                (VALUE mGrn);
 void           rb_grn_init_column                   (VALUE mGrn);
@@ -284,10 +277,8 @@ void           rb_grn_init_index_column             (VALUE mGrn);
 void           rb_grn_init_index_cursor             (VALUE mGrn);
 void           rb_grn_init_posting                  (VALUE mGrn);
 void           rb_grn_init_accessor                 (VALUE mGrn);
-void           rb_grn_init_view_accessor            (VALUE mGrn);
 void           rb_grn_init_geo_point                (VALUE mGrn);
 void           rb_grn_init_record                   (VALUE mGrn);
-void           rb_grn_init_view_record              (VALUE mGrn);
 void           rb_grn_init_variable                 (VALUE mGrn);
 void           rb_grn_init_operator                 (VALUE mGrn);
 void           rb_grn_init_expression               (VALUE mGrn);
@@ -538,11 +529,6 @@ VALUE          rb_grn_record_new_raw                (VALUE table,
 						     VALUE id,
 						     VALUE values);
 
-VALUE          rb_grn_view_record_new               (VALUE    view,
-						     grn_obj *id);
-VALUE          rb_grn_view_record_new_raw           (VALUE view,
-						     VALUE id);
-
 VALUE          rb_grn_record_expression_builder_new (VALUE table,
 						     VALUE name);
 VALUE          rb_grn_record_expression_builder_build

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2013  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
@@ -135,10 +135,8 @@ Init_groonga (void)
     rb_grn_init_procedure(mGrn);
     rb_grn_init_column(mGrn);
     rb_grn_init_accessor(mGrn);
-    rb_grn_init_view_accessor(mGrn);
     rb_grn_init_geo_point(mGrn);
     rb_grn_init_record(mGrn);
-    rb_grn_init_view_record(mGrn);
     rb_grn_init_variable(mGrn);
     rb_grn_init_operator(mGrn);
     rb_grn_init_expression(mGrn);

data/lib/groonga.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2013  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
@@ -98,4 +98,5 @@ require 'groonga/dumper'
 require 'groonga/schema'
 require 'groonga/pagination'
 require 'groonga/grntest-log'
+require 'groonga/logger'
 require 'groonga/query-logger'

data/lib/groonga/context.rb

@@ -75,5 +75,32 @@ module Groonga
       select = Command::Select.new(self, table, options)
       select.exec
     end
+
+    # Restore commands dumped by "grndump" command.
+    #
+    # @example
+    #   dumped_commands = File.read("dump.grn")
+    #   context.restore(dumped_commands)
+    #
+    # @param [String] dumped_commands commands dumped by grndump.
+    def restore(dumped_commands)
+      buffer = ""
+      dumped_commands.each_line do |line|
+        line = line.chomp
+        case line
+        when /\\\z/
+          buffer << $PREMATCH
+        else
+          buffer << line
+          send(buffer)
+          receive
+          buffer.clear
+        end
+      end
+      unless buffer.empty?
+        send(buffer)
+        receive
+      end
+    end
   end
 end

data/lib/groonga/dumper.rb

@@ -31,6 +31,16 @@ module Groonga
 
   # データベースの内容をgrn式形式の文字列として出力するクラス。
   class DatabaseDumper
+    class << self
+      # Dump database
+      #
+      # TODO: document options paramter
+      def dump(options={})
+        dumper = new(options)
+        dumper.dump
+      end
+    end
+
     def initialize(options={})
       @options = options
     end
@@ -54,11 +64,13 @@ module Groonga
       dump_plugins(options) if options[:dump_plugins]
       if options[:dump_schema]
         schema_dumper.dump_tables
-        options[:output].write("\n")
-        schema_dumper.dump_reference_columns
+        if schema_dumper.have_reference_columns?
+          options[:output].write("\n")
+          schema_dumper.dump_reference_columns
+        end
       end
       dump_tables(options) if options[:dump_tables]
-      if options[:dump_schema]
+      if options[:dump_schema] and schema_dumper.have_index_columns?
         options[:output].write("\n")
         schema_dumper.dump_index_columns
       end
@@ -143,12 +155,24 @@ module Groonga
       end
     end
 
+    def have_reference_columns?
+      run do |syntax|
+        syntax.have_reference_columns?
+      end
+    end
+
     def dump_reference_columns
       run do |syntax|
         syntax.dump_reference_columns
       end
     end
 
+    def have_index_columns?
+      run do |syntax|
+        syntax.have_index_columns?
+      end
+    end
+
     def dump_index_columns
       run do |syntax|
         syntax.dump_index_columns
@@ -210,6 +234,10 @@ module Groonga
         end
       end
 
+      def have_reference_columns?
+        not reference_columns.empty?
+      end
+
       def dump_reference_columns
         group_columns(reference_columns).each do |table, columns|
           change_table(table) do
@@ -220,6 +248,10 @@ module Groonga
         end
       end
 
+      def have_index_columns?
+        not index_columns.empty?
+      end
+
       def dump_index_columns
         group_columns(index_columns).each do |table, columns|
           change_table(table) do

data/lib/groonga/logger.rb

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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
+  class Logger
+    module Flags
+      LABELS = {
+        TIME     => "time",
+        TITLE    => "title",
+        MESSAGE  => "message",
+        LOCATION => "location",
+      }
+
+      class << self
+        def parse(input, base_flags)
+          # TODO
+          base_flags
+        end
+
+        def label(flags)
+          labels = []
+          LABELS.each do |flag, label|
+            flags << label if (flags & flag) == flag
+          end
+          labels << "none" if labels.empty?
+          labels.join("|")
+        end
+      end
+    end
+
+    def log(level, timestamp, title, message, location)
+      guard do
+        puts("#{timestamp}|#{mark(level)}|#{title} #{message} #{location}")
+      end
+    end
+
+    def reopen
+    end
+
+    def fin
+    end
+
+    private
+    def guard
+      begin
+        yield
+      rescue Exception
+        $stderr.puts("#{$!.class}: #{$!.message}")
+        $stderr.puts($@)
+      end
+    end
+
+    LEVEL_TO_MARK = {
+      :none      => " ",
+      :emergency => "E",
+      :alert     => "A",
+      :critical  => "C",
+      :error     => "e",
+      :warning   => "w",
+      :notice    => "n",
+      :debug     => "d",
+      :dump      => "d",
+    }
+    def mark(level)
+      LEVEL_TO_MARK[level] || "-"
+    end
+  end
+
+  class FileLogger < Logger
+    def initialize(file_name)
+      super()
+      @file = nil
+      @file_name = file_name
+    end
+
+    def reopen
+      guard do
+        return unless @file
+        @file.close
+        @file = nil
+      end
+    end
+
+    def fin
+      guard do
+        return unless @file
+        @file.close
+      end
+    end
+
+    private
+    def ensure_open
+      return if @file
+      @file = File.open(@file_name, "ab")
+    end
+
+    def puts(*arguments)
+      ensure_open
+      @file.puts(*arguments)
+      @file.flush
+    end
+  end
+
+  class CallbackLogger < Logger
+    def initialize(callback)
+      super()
+      @callback = callback
+    end
+
+    def log(level, timestamp, title, message, location)
+      guard do
+        @callback.call(:log, level, timestamp, title, message, location)
+      end
+    end
+
+    def reopen
+      guard do
+        @callback.call(:reopen)
+      end
+    end
+
+    def fin
+      guard do
+        @callback.call(:fin)
+      end
+    end
+  end
+end