rroonga 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906eec26cd4e15e41fa821f5712aa677c379f100
-  data.tar.gz: 2bcd9e5ffbb3ea7b063d1f5b83f7ef211c7a1d87
+  metadata.gz: fd29ed62575d3db06ed7cdf23cef22b2d3e82f93
+  data.tar.gz: 3347850c6d34e77c4513b39123a85488f92d02ab
 SHA512:
-  metadata.gz: 8ab67483c99f8b0e5b29f60fdabe90966c57bb2b6a8c9302df32195c7fd25da4d1a12a1ab94f82f56e8cfdad2e1aa814fd3e03ecb70ff6fde6d6e3929441bb3d
-  data.tar.gz: e27e4a1c4e96f3c717959a6aa3935871e6a2824137538b833c9bfd74e831f90f11632f8027a5f8b4d4edc021571583d81b14343274856ab82fbf3694c902aa5f
+  metadata.gz: 00d22aee2a5ad87495f4ff6e47a7d094d2e484efb9949a814e84027c701e0f4978c2c5518d5c157f33bb2a1361b01112f4ae313c8786ca93358aec85c54a0ca1
+  data.tar.gz: 357757448937499624e178775995844e217f54412c253d703034f93300a0974f88075daf865f1818b736568fbc64662cdf1fdfffc194c2e9b1154503871d99e0

data/README.textile

@@ -2,21 +2,21 @@ h1. README
 
 h2. Name
 
-rroonga
+Rroonga
 
 h2. Description
 
-Ruby bindings for groonga that provide full text search and
+Ruby bindings for Groonga that provide full text search and
 column store features.
 
-rroonga is an extension library to use groonga's DB-API
-layer. rroonga provides Rubyish readable and writable API
-not C like API. You can use groonga's fast and highly
+Rroonga is an extension library to use Groonga's DB-API
+layer. Rroonga provides Rubyish readable and writable API
+not C like API. You can use Groonga's fast and highly
 functional features from Ruby with Rubyish form.
 
-See the following URL about groonga.
+See the following URL about Groonga.
 
-* "The groonga official site":http://groonga.org/
+* "The Groonga official site":http://groonga.org/
 
 h2. Authors
 
@@ -36,8 +36,8 @@ contributed patches.)
 
 h2. Dependencies
 
-* Ruby >= 1.8 (including 1.9.2)
-* groonga >= 1.2.0
+* Ruby >= 1.9.3
+* Groonga >= 3.0.8
 
 h2. Install
 
@@ -58,7 +58,7 @@ h2. Mailing list
 
 h2. Thanks
 
-* Daijiro MORI: sent patches to support the latest groonga.
+* Daijiro MORI: sent patches to support the latest Groonga.
 * Tasuku SUENAGA: sent bug reports.
 * niku: sent bug reports.
 * dara:

data/bin/groonga-database-inspect

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# -*- 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
+
+require "ostruct"
+require "optparse"
+require "pathname"
+
+require "groonga"
+
+options = OpenStruct.new
+
+parser = OptionParser.new
+parser.banner += " DB_PATH"
+args = parser.parse!(ARGV)
+
+if args.size != 1
+  puts(parser.help)
+  exit(false)
+end
+db_path = args[0]
+
+Groonga::Database.open(db_path) do |database|
+  inspector = Groonga::DatabaseInspector.new(database)
+  inspector.report
+end

data/doc/text/news.textile

@@ -1,5 +1,24 @@
 h1. NEWS
 
+h2(#3-1-0). 3.1.0: 2013-11-29
+
+h3. Improvements
+
+* Reduced build failure by automatically Groonga build.
+  [Reported by SHIMADA Koji]
+* Added @groonga-database-inspect@ command that inspects passed database.
+* {Groonga::Database#tables} ignores missing objects rather than raising
+  an exception. Because the method is interested in only existing tables.
+
+h3. Fixes
+
+* Fixed a bug that {Groonga::Expression#parse} doesn't accept all
+  mode and operators.
+
+h3. Thanks
+
+* SHIMADA Koji
+
 h2(#3-0-9). 3.0.9: 2013-10-29
 
 h3. Improvements

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env 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
@@ -159,6 +159,8 @@ def configure_command_line(prefix)
   command_line << "--prefix=#{prefix}"
   command_line << "--disable-static"
   command_line << "--disable-document"
+  command_line << "--disable-benchmark"
+  command_line << "--without-cutter"
   escaped_command_line = command_line.collect do |command|
     Shellwords.escape(command)
   end

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

@@ -381,7 +381,7 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
     if (!NIL_P(rb_default_mode))
         default_mode = RVAL2GRNOPERATOR(rb_default_mode);
     if (!NIL_P(rb_default_operator))
-        default_operator = RVAL2GRNOPERATOR(rb_default_operator);
+        default_operator = RVAL2GRNSETOPERATOR(rb_default_operator);
 
     if (NIL_P(rb_syntax) ||
         rb_grn_equal_option(rb_syntax, "query")) {

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

@@ -22,12 +22,225 @@ VALUE rb_mGrnOperator;
 
 grn_operator
 rb_grn_operator_from_ruby_object (VALUE rb_operator)
+{
+    grn_operator operator;
+
+    if (NIL_P(rb_operator)) {
+        operator = GRN_OP_OR;
+    } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_operator, rb_cInteger))) {
+        operator = NUM2UINT(rb_operator);
+    } else if (rb_grn_equal_option(rb_operator, "push")) {
+        operator = GRN_OP_PUSH;
+    } else if (rb_grn_equal_option(rb_operator, "pop")) {
+        operator = GRN_OP_POP;
+    } else if (rb_grn_equal_option(rb_operator, "no-operation") ||
+               rb_grn_equal_option(rb_operator, "no_operation")) {
+        operator = GRN_OP_NOP;
+    } else if (rb_grn_equal_option(rb_operator, "call")) {
+        operator = GRN_OP_CALL;
+    } else if (rb_grn_equal_option(rb_operator, "intern")) {
+        operator = GRN_OP_INTERN;
+    } else if (rb_grn_equal_option(rb_operator, "get-reference") ||
+               rb_grn_equal_option(rb_operator, "get_reference")) {
+        operator = GRN_OP_GET_REF;
+    } else if (rb_grn_equal_option(rb_operator, "get-value") ||
+               rb_grn_equal_option(rb_operator, "get_value")) {
+        operator = GRN_OP_GET_VALUE;
+    } else if (rb_grn_equal_option(rb_operator, "and")) {
+        operator = GRN_OP_AND;
+    } else if (rb_grn_equal_option(rb_operator, "but") ||
+               rb_grn_equal_option(rb_operator, "not") ||
+               rb_grn_equal_option(rb_operator, "and-not") ||
+               rb_grn_equal_option(rb_operator, "and_not")) {
+        operator = GRN_OP_AND_NOT;
+    } else if (rb_grn_equal_option(rb_operator, "or")) {
+        operator = GRN_OP_OR;
+    } else if (rb_grn_equal_option(rb_operator, "assign")) {
+        operator = GRN_OP_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "star-assign") ||
+               rb_grn_equal_option(rb_operator, "star_assign")) {
+        operator = GRN_OP_STAR_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "slash-assign") ||
+               rb_grn_equal_option(rb_operator, "slash_assign")) {
+        operator = GRN_OP_SLASH_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "modulo-assign") ||
+               rb_grn_equal_option(rb_operator, "modulo_assign")) {
+        operator = GRN_OP_MOD_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "plus-assign") ||
+               rb_grn_equal_option(rb_operator, "plus_assign")) {
+        operator = GRN_OP_PLUS_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "minus-assign") ||
+               rb_grn_equal_option(rb_operator, "minus_assign")) {
+        operator = GRN_OP_MINUS_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "shiftl-assign") ||
+               rb_grn_equal_option(rb_operator, "shiftl_assign")) {
+        operator = GRN_OP_SHIFTL_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "shiftr-assign") ||
+               rb_grn_equal_option(rb_operator, "shiftr_assign")) {
+        operator = GRN_OP_SHIFTR_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "shiftrr-assign") ||
+               rb_grn_equal_option(rb_operator, "shiftrr_assign")) {
+        operator = GRN_OP_SHIFTRR_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "and-assign") ||
+               rb_grn_equal_option(rb_operator, "and_assign")) {
+        operator = GRN_OP_AND_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "xor-assign") ||
+               rb_grn_equal_option(rb_operator, "xor_assign")) {
+        operator = GRN_OP_XOR_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "or-assign") ||
+               rb_grn_equal_option(rb_operator, "or_assign")) {
+        operator = GRN_OP_OR_ASSIGN;
+    } else if (rb_grn_equal_option(rb_operator, "jump")) {
+        operator = GRN_OP_JUMP;
+    } else if (rb_grn_equal_option(rb_operator, "cjump")) {
+        operator = GRN_OP_CJUMP;
+    } else if (rb_grn_equal_option(rb_operator, "comma")) {
+        operator = GRN_OP_COMMA;
+    } else if (rb_grn_equal_option(rb_operator, "bitwise-or") ||
+               rb_grn_equal_option(rb_operator, "bitwise_or")) {
+        operator = GRN_OP_BITWISE_OR;
+    } else if (rb_grn_equal_option(rb_operator, "bitwise-xor") ||
+               rb_grn_equal_option(rb_operator, "bitwise_xor")) {
+        operator = GRN_OP_BITWISE_XOR;
+    } else if (rb_grn_equal_option(rb_operator, "bitwise-and") ||
+               rb_grn_equal_option(rb_operator, "bitwise_and")) {
+        operator = GRN_OP_BITWISE_AND;
+    } else if (rb_grn_equal_option(rb_operator, "bitwise-not") ||
+               rb_grn_equal_option(rb_operator, "bitwise_not")) {
+        operator = GRN_OP_BITWISE_NOT;
+    } else if (rb_grn_equal_option(rb_operator, "equal")) {
+        operator = GRN_OP_EQUAL;
+    } else if (rb_grn_equal_option(rb_operator, "not-equal") ||
+               rb_grn_equal_option(rb_operator, "not_equal")) {
+        operator = GRN_OP_NOT_EQUAL;
+    } else if (rb_grn_equal_option(rb_operator, "less")) {
+        operator = GRN_OP_LESS;
+    } else if (rb_grn_equal_option(rb_operator, "greater")) {
+        operator = GRN_OP_GREATER;
+    } else if (rb_grn_equal_option(rb_operator, "less-equal") ||
+               rb_grn_equal_option(rb_operator, "less_equal")) {
+        operator = GRN_OP_LESS_EQUAL;
+    } else if (rb_grn_equal_option(rb_operator, "greater-equal") ||
+               rb_grn_equal_option(rb_operator, "greater_equal")) {
+        operator = GRN_OP_GREATER_EQUAL;
+    } else if (rb_grn_equal_option(rb_operator, "in")) {
+        operator = GRN_OP_IN;
+    } else if (rb_grn_equal_option(rb_operator, "match")) {
+        operator = GRN_OP_MATCH;
+    } else if (rb_grn_equal_option(rb_operator, "near")) {
+        operator = GRN_OP_NEAR;
+    } else if (rb_grn_equal_option(rb_operator, "near2")) {
+        operator = GRN_OP_NEAR2;
+    } else if (rb_grn_equal_option(rb_operator, "term-extract") ||
+               rb_grn_equal_option(rb_operator, "term_extract")) {
+        operator = GRN_OP_TERM_EXTRACT;
+    } else if (rb_grn_equal_option(rb_operator, "shiftl")) {
+        operator = GRN_OP_SHIFTL;
+    } else if (rb_grn_equal_option(rb_operator, "shiftr")) {
+        operator = GRN_OP_SHIFTR;
+    } else if (rb_grn_equal_option(rb_operator, "shiftrr")) {
+        operator = GRN_OP_SHIFTRR;
+    } else if (rb_grn_equal_option(rb_operator, "plus")) {
+        operator = GRN_OP_PLUS;
+    } else if (rb_grn_equal_option(rb_operator, "minus")) {
+        operator = GRN_OP_MINUS;
+    } else if (rb_grn_equal_option(rb_operator, "star")) {
+        operator = GRN_OP_STAR;
+    } else if (rb_grn_equal_option(rb_operator, "modulo")) {
+        operator = GRN_OP_MOD;
+    } else if (rb_grn_equal_option(rb_operator, "delete")) {
+        operator = GRN_OP_DELETE;
+    } else if (rb_grn_equal_option(rb_operator, "increment")) {
+        operator = GRN_OP_INCR;
+    } else if (rb_grn_equal_option(rb_operator, "decrement")) {
+        operator = GRN_OP_DECR;
+    } else if (rb_grn_equal_option(rb_operator, "increment-post") ||
+               rb_grn_equal_option(rb_operator, "increment_post")) {
+        operator = GRN_OP_INCR_POST;
+    } else if (rb_grn_equal_option(rb_operator, "decrement-post") ||
+               rb_grn_equal_option(rb_operator, "decrement_post")) {
+        operator = GRN_OP_DECR_POST;
+    } else if (rb_grn_equal_option(rb_operator, "not")) {
+        operator = GRN_OP_NOT;
+    } else if (rb_grn_equal_option(rb_operator, "adjust")) {
+        operator = GRN_OP_ADJUST;
+    } else if (rb_grn_equal_option(rb_operator, "exact")) {
+        operator = GRN_OP_EXACT;
+    } else if (rb_grn_equal_option(rb_operator, "lcp") ||
+               rb_grn_equal_option(rb_operator, "longest-common-prefix") ||
+               rb_grn_equal_option(rb_operator, "longest_common_prefix")) {
+        operator = GRN_OP_LCP;
+    } else if (rb_grn_equal_option(rb_operator, "partial")) {
+        operator = GRN_OP_PARTIAL;
+    } else if (rb_grn_equal_option(rb_operator, "unsplit")) {
+        operator = GRN_OP_UNSPLIT;
+    } else if (rb_grn_equal_option(rb_operator, "prefix")) {
+        operator = GRN_OP_PREFIX;
+    } else if (rb_grn_equal_option(rb_operator, "suffix")) {
+        operator = GRN_OP_SUFFIX;
+    } else if (rb_grn_equal_option(rb_operator, "geo-distance1") ||
+               rb_grn_equal_option(rb_operator, "geo_distance1")) {
+        operator = GRN_OP_GEO_DISTANCE1;
+    } else if (rb_grn_equal_option(rb_operator, "geo-distance2") ||
+               rb_grn_equal_option(rb_operator, "geo_distance2")) {
+        operator = GRN_OP_GEO_DISTANCE2;
+    } else if (rb_grn_equal_option(rb_operator, "geo-distance3") ||
+               rb_grn_equal_option(rb_operator, "geo_distance3")) {
+        operator = GRN_OP_GEO_DISTANCE3;
+    } else if (rb_grn_equal_option(rb_operator, "geo-distance4") ||
+               rb_grn_equal_option(rb_operator, "geo_distance4")) {
+        operator = GRN_OP_GEO_DISTANCE4;
+    } else if (rb_grn_equal_option(rb_operator, "geo-withinp5") ||
+               rb_grn_equal_option(rb_operator, "geo_withinp5")) {
+        operator = GRN_OP_GEO_WITHINP5;
+    } else if (rb_grn_equal_option(rb_operator, "geo-withinp6") ||
+               rb_grn_equal_option(rb_operator, "geo_withinp6")) {
+        operator = GRN_OP_GEO_WITHINP6;
+    } else if (rb_grn_equal_option(rb_operator, "geo-withinp8") ||
+               rb_grn_equal_option(rb_operator, "geo_withinp8")) {
+        operator = GRN_OP_GEO_WITHINP8;
+    } else if (rb_grn_equal_option(rb_operator, "object-search") ||
+               rb_grn_equal_option(rb_operator, "object_search")) {
+        operator = GRN_OP_OBJ_SEARCH;
+    } else if (rb_grn_equal_option(rb_operator, "expression-get-variable") ||
+               rb_grn_equal_option(rb_operator, "expression_get_variable")) {
+        operator = GRN_OP_EXPR_GET_VAR;
+    } else if (rb_grn_equal_option(rb_operator, "table-create") ||
+               rb_grn_equal_option(rb_operator, "table_create")) {
+        operator = GRN_OP_TABLE_CREATE;
+    } else if (rb_grn_equal_option(rb_operator, "table-select") ||
+               rb_grn_equal_option(rb_operator, "table_select")) {
+        operator = GRN_OP_TABLE_SELECT;
+    } else if (rb_grn_equal_option(rb_operator, "table-sort") ||
+               rb_grn_equal_option(rb_operator, "table_sort")) {
+        operator = GRN_OP_TABLE_SORT;
+    } else if (rb_grn_equal_option(rb_operator, "table-group") ||
+               rb_grn_equal_option(rb_operator, "table_group")) {
+        operator = GRN_OP_TABLE_GROUP;
+    } else if (rb_grn_equal_option(rb_operator, "json-put") ||
+               rb_grn_equal_option(rb_operator, "json_put")) {
+        operator = GRN_OP_JSON_PUT;
+    } else {
+        rb_raise(rb_eArgError,
+                 "operator should be one of "
+                 "[nil, Integer, name as String, name as Symbol]: <%s>",
+                 rb_grn_inspect(rb_operator));
+    }
+
+    return operator;
+}
+
+grn_operator
+rb_grn_set_operator_from_ruby_object (VALUE rb_operator)
 {
     grn_operator operator = GRN_OP_OR;
 
-    if (NIL_P(rb_operator) ||
-        rb_grn_equal_option(rb_operator, "or") ||
-        rb_grn_equal_option(rb_operator, "||")) {
+    if (NIL_P(rb_operator)) {
+        operator = GRN_OP_OR;
+    } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_operator, rb_cInteger))) {
+        operator = NUM2UINT(rb_operator);
+    } else if (rb_grn_equal_option(rb_operator, "or") ||
+               rb_grn_equal_option(rb_operator, "||")) {
         operator = GRN_OP_OR;
     } else if (rb_grn_equal_option(rb_operator, "and") ||
                rb_grn_equal_option(rb_operator, "+") ||
@@ -40,14 +253,11 @@ rb_grn_operator_from_ruby_object (VALUE rb_operator)
                rb_grn_equal_option(rb_operator, "-") ||
                rb_grn_equal_option(rb_operator, "&!")) {
         operator = GRN_OP_AND_NOT;
-    } else if (rb_grn_equal_option(rb_operator, "adjust") ||
-               rb_grn_equal_option(rb_operator, ">")) {
-        operator = GRN_OP_ADJUST;
     } else {
         rb_raise(rb_eArgError,
                  "operator should be one of "
-                 "[:or, :||, :and, :+, :&&, :but, :not, :and_not, :-, :&!, "
-                 ":adjust, :>]: <%s>",
+                 "[:or, :||, :and, :+, :&&, :but, :not, :and_not, :-, :&!]: "
+                 "<%s>",
                  rb_grn_inspect(rb_operator));
     }
 

data/ext/groonga/rb-grn.h

@@ -83,8 +83,8 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #define RB_GRN_MAJOR_VERSION 3
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 9
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -609,6 +609,7 @@ VALUE          rb_grn_column_expression_builder_build
     (rb_grn_accessor_to_ruby_object(context, accessor, owner))
 
 #define RVAL2GRNOPERATOR(object)      (rb_grn_operator_from_ruby_object(object))
+#define RVAL2GRNSETOPERATOR(object)   (rb_grn_set_operator_from_ruby_object(object))
 
 #define RVAL2GRNLOGGER(object)        (rb_grn_logger_from_ruby_object(object))
 #define RVAL2GRNQUERYLOGGER(object)   (rb_grn_query_logger_from_ruby_object(object))
@@ -719,6 +720,7 @@ VALUE          rb_grn_index_cursor_to_ruby_object   (grn_ctx *context,
                                                      grn_bool owner);
 
 grn_operator   rb_grn_operator_from_ruby_object     (VALUE object);
+grn_operator   rb_grn_set_operator_from_ruby_object (VALUE object);
 
 grn_logger_info *
                rb_grn_logger_from_ruby_object       (VALUE object);

data/lib/groonga.rb

@@ -35,7 +35,6 @@ if local_groonga_bin_dir.exist?
 end
 
 require "groonga/geo-point"
-require "groonga/view-record"
 require "groonga/record"
 require "groonga/expression-builder"
 require "groonga/posting"
@@ -91,10 +90,14 @@ module Groonga
 end
 
 require "groonga/context"
+require "groonga/statistic-measurer"
 require "groonga/database"
+require "groonga/table"
+require "groonga/column"
 require "groonga/patricia-trie"
 require "groonga/index-column"
 require "groonga/dumper"
+require "groonga/database-inspector"
 require "groonga/schema"
 require "groonga/pagination"
 require "groonga/grntest-log"