rroonga 1.3.0 → 1.3.1

data/test/test-table-select.rb

@@ -53,27 +53,37 @@ class TableSelectTest < Test::Unit::TestCase
                     :user => "darashi")
   end
 
+  setup
+  def setup_variables
+    @result = nil
+  end
+
+  teardown
+  def teardown_expression_close
+    @result.expression.close if @result # TODO: We want to remove it.
+  end
+
   def test_sub_expression
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record.match("Hello", "content") &
         (record["created_at"] < Time.parse("2009-08-01"))
     end
-    assert_equal_select_result([@comment2], result)
+    assert_equal_select_result([@comment2], @result)
   end
 
   def test_query
-    result = @comments.select("content:@Hello")
-    assert_equal_select_result([@comment1, @comment2], result)
+    @result = @comments.select("content:@Hello")
+    assert_equal_select_result([@comment1, @comment2], @result)
   end
 
   def test_query_with_parser
-    result = @comments.select("content @ \"Hello\"", :syntax => :script)
-    assert_equal_select_result([@comment1, @comment2], result)
+    @result = @comments.select("content @ \"Hello\"", :syntax => :script)
+    assert_equal_select_result([@comment1, @comment2], @result)
   end
 
   def test_query_with_default_column
-    result = @comments.select("Hello", {:default_column => 'content'})
-    assert_equal_select_result([@comment1, @comment2], result)
+    @result = @comments.select("Hello", {:default_column => 'content'})
+    assert_equal_select_result([@comment1, @comment2], @result)
   end
 
   def test_expression
@@ -82,104 +92,105 @@ class TableSelectTest < Test::Unit::TestCase
     expression.append_object(variable)
     expression.parse("content:@Hello", :syntax => :query)
     expression.compile
-    result = @comments.select(expression)
-    assert_equal(expression, result.expression)
-    assert_equal_select_result([@comment1, @comment2], result)
+    @result = @comments.select(expression)
+    assert_equal(expression, @result.expression)
+    assert_equal_select_result([@comment1, @comment2], @result)
   end
 
   def test_query_with_block
-    result = @comments.select("content:@Hello") do |record|
+    @result = @comments.select("content:@Hello") do |record|
       record["created_at"] < Time.parse("2009-08-01")
     end
-    assert_equal_select_result([@comment2], result)
+    assert_equal_select_result([@comment2], @result)
   end
 
   def test_query_with_block_match
-    result = @comments.select("content:@Hello") do |record|
+    @result = @comments.select("content:@Hello") do |record|
       record.match("World", "content")
     end
-    assert_equal_select_result([@comment2], result)
+    assert_equal_select_result([@comment2], @result)
   end
 
   def test_without_block
+    @result = @comments.select
     assert_equal_select_result([@comment1, @comment2,
                                 @comment3, @japanese_comment],
-                               @comments.select)
+                               @result)
   end
 
   def test_query_japanese
-    result = @comments.select("content:@ボロTV")
-    assert_equal_select_result([@japanese_comment], result)
+    @result = @comments.select("content:@ボロTV")
+    assert_equal_select_result([@japanese_comment], @result)
   end
 
   def test_but_query
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record["content"].match "Hello -World"
     end
-    assert_equal_select_result([@comment1], result)
+    assert_equal_select_result([@comment1], @result)
   end
 
   def test_query_with_three_terms
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record["content"].match "Say Hello World"
     end
-    assert_equal_select_result([], result)
+    assert_equal_select_result([], @result)
   end
 
   def test_query_with_brackets
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record["content"].match "Say (Hello World)"
     end
-    assert_equal_select_result([], result)
+    assert_equal_select_result([], @result)
   end
 
   def test_equal_reference_column_by_key
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record["user"] == "darashi"
     end
-    assert_equal_select_result([@japanese_comment], result)
+    assert_equal_select_result([@japanese_comment], @result)
   end
 
   def test_not_equal_reference_column_by_key
-    result = @comments.select('user != "darashi"', :syntax => :script)
+    @result = @comments.select('user != "darashi"', :syntax => :script)
     assert_equal_select_result([@comment1, @comment2, @comment3],
-                               result)
+                               @result)
   end
 
   def test_not_equal_block
     only_ruby19
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record.user != "darashi"
     end
     assert_equal_select_result([@comment1, @comment2, @comment3],
-                               result)
+                               @result)
   end
 
   def test_equal_reference_column_by_nonexistent_key
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record["user"] == "nonexistent"
     end
-    assert_equal_select_result([], result)
+    assert_equal_select_result([], @result)
   end
 
   def test_query_key
-    result = @users.select do |record|
+    @result = @users.select do |record|
       record["_key"] =~ "mori"
     end
-    assert_equal_select_result([@users["morita"]], result)
+    assert_equal_select_result([@users["morita"]], @result)
   end
 
   def test_symbol
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record[:content].match("Say Hello World")
     end
-    assert_equal_select_result([], result)
+    assert_equal_select_result([], @result)
   end
 
   def test_method
-    result = @comments.select do |record|
+    @result = @comments.select do |record|
       record.content.match("Say Hello World")
     end
-    assert_equal_select_result([], result)
+    assert_equal_select_result([], @result)
   end
 end

data/test/test-variable-size-column.rb

@@ -62,6 +62,36 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     assert_not_predicate(@nick_names, :scalar?)
   end
 
+  def test_compressed?
+    description = @users.define_column("description", "ShortText",
+                                       :compress => :zlib)
+    if context.support_zlib?
+      assert_predicate(description, :compressed?)
+    else
+      assert_not_predicate(description, :compressed?)
+    end
+  end
+
+  def test_compressed_zlib?
+    description = @users.define_column("description", "ShortText",
+                                       :compress => :zlib)
+    if context.support_zlib?
+      assert_send([description, :compressed?, :zlib])
+    else
+      assert_not_send([description, :compressed?, :zlib])
+    end
+  end
+
+  def test_compressed_lzo?
+    description = @users.define_column("description", "ShortText",
+                                       :compress => :lzo)
+    if context.support_lzo?
+      assert_send([description, :compressed?, :lzo])
+    else
+      assert_not_send([description, :compressed?, :lzo])
+    end
+  end
+
   def test_inspect
     assert_equal("#<Groonga::VariableSizeColumn " +
                  "id: <#{@name.id}>, " +

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -206,7 +206,6 @@ files:
 - ext/groonga/rb-grn-plugin.c
 - ext/groonga/rb-grn-posting.c
 - ext/groonga/rb-grn-procedure.c
-- ext/groonga/rb-grn-query.c
 - ext/groonga/rb-grn-record.c
 - ext/groonga/rb-grn-snippet.c
 - ext/groonga/rb-grn-table-cursor-key-support.c
@@ -225,6 +224,7 @@ files:
 - ext/groonga/rb-groonga.c
 - extconf.rb
 - lib/groonga.rb
+- lib/groonga/command.rb
 - lib/groonga/context.rb
 - lib/groonga/dumper.rb
 - lib/groonga/expression-builder-19.rb
@@ -241,54 +241,53 @@ files:
 - rroonga-build.rb
 - README.textile
 - TODO
-- test/test-remote.rb
+- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/run-test.rb
 - test/test-table-cursor.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/test-context-select.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
-- test/test-table.rb
-- test/test-variable-size-column.rb
-- test/test-plugin.rb
+- test/test-procedure.rb
 - test/test-hash.rb
+- test/test-expression.rb
+- test/test-version.rb
+- test/test-remote.rb
+- test/test-table-offset-and-limit.rb
+- test/test-expression-builder.rb
 - test/test-encoding.rb
-- test/test-schema-create-table.rb
+- test/test-snippet.rb
+- test/test-index-cursor.rb
 - test/test-type.rb
-- test/test-database.rb
-- test/test-variable.rb
-- test/test-table-select.rb
-- test/test-patricia-trie.rb
-- test/test-expression-builder.rb
+- test/test-table-dumper.rb
+- test/test-table.rb
+- test/test-pagination.rb
+- test/groonga-test-utils.rb
 - test/test-logger.rb
+- test/test-context.rb
+- test/test-table-select-weight.rb
+- test/test-exception.rb
+- test/test-table-select-normalize.rb
+- test/test-command-select.rb
+- test/test-gqtp.rb
+- test/test-database-dumper.rb
+- test/test-index-column.rb
+- test/test-plugin.rb
+- test/test-query-log.rb
+- test/test-variable-size-column.rb
+- test/test-schema-create-table.rb
 - test/test-array.rb
-- test/test-record.rb
-- test/test-column.rb
 - test/test-fix-size-column.rb
-- test/run-test.rb
-- test/test-procedure.rb
-- test/test-query-log.rb
-- test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-schema-type.rb
+- test/test-table-select.rb
+- test/test-schema-view.rb
 - test/test-view.rb
+- test/test-variable.rb
+- test/test-column.rb
+- test/test-patricia-trie.rb
 - test/test-table-select-mecab.rb
-- test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-schema-view.rb
-- test/test-index-cursor.rb
+- test/test-accessor.rb
+- test/test-database.rb
 - test/test-double-array-trie.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-query.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
+- test/test-record.rb
 homepage: http://groonga.rubyforge.org/
 licenses: 
 - LGPLv2
@@ -318,56 +317,55 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for groonga that provide full text search and column store features.
 test_files: 
-- test/test-remote.rb
+- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/run-test.rb
 - test/test-table-cursor.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/test-context-select.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
-- test/test-table.rb
-- test/test-variable-size-column.rb
-- test/test-plugin.rb
+- test/test-procedure.rb
 - test/test-hash.rb
+- test/test-expression.rb
+- test/test-version.rb
+- test/test-remote.rb
+- test/test-table-offset-and-limit.rb
+- test/test-expression-builder.rb
 - test/test-encoding.rb
-- test/test-schema-create-table.rb
+- test/test-snippet.rb
+- test/test-index-cursor.rb
 - test/test-type.rb
-- test/test-database.rb
-- test/test-variable.rb
-- test/test-table-select.rb
-- test/test-patricia-trie.rb
-- test/test-expression-builder.rb
+- test/test-table-dumper.rb
+- test/test-table.rb
+- test/test-pagination.rb
+- test/groonga-test-utils.rb
 - test/test-logger.rb
+- test/test-context.rb
+- test/test-table-select-weight.rb
+- test/test-exception.rb
+- test/test-table-select-normalize.rb
+- test/test-command-select.rb
+- test/test-gqtp.rb
+- test/test-database-dumper.rb
+- test/test-index-column.rb
+- test/test-plugin.rb
+- test/test-query-log.rb
+- test/test-variable-size-column.rb
+- test/test-schema-create-table.rb
 - test/test-array.rb
-- test/test-record.rb
-- test/test-column.rb
 - test/test-fix-size-column.rb
-- test/run-test.rb
-- test/test-procedure.rb
-- test/test-query-log.rb
-- test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-schema-type.rb
+- test/test-table-select.rb
+- test/test-schema-view.rb
 - test/test-view.rb
+- test/test-variable.rb
+- test/test-column.rb
+- test/test-patricia-trie.rb
 - test/test-table-select-mecab.rb
-- test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-schema-view.rb
-- test/test-index-cursor.rb
+- test/test-accessor.rb
+- test/test-database.rb
 - test/test-double-array-trie.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-query.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
+- test/test-record.rb

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

@@ -1,260 +0,0 @@
-/* -*- coding: utf-8; c-file-style: "ruby" -*- */
-/*
-  Copyright (C) 2009  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
-*/
-
-#include "rb-grn.h"
-
-/*
- * Document-class: Groonga::Query
- *
- * インデックスを用いた検索用のクエリのためのオブジェクト。
- * Groonga::IndexColumn#searchに渡すことができる。(このクラ
- * スは非推奨で、代わりにGroonga::Expressionを使用すること)
- * 
- */
-
-#define SELF(object) (rb_rb_grn_query_from_ruby_object(object))
-
-typedef struct _RbGrnQuery RbGrnQuery;
-struct _RbGrnQuery
-{
-    grn_ctx *context;
-    grn_query *query;
-    grn_bool owner;
-};
-
-VALUE rb_cGrnQuery;
-
-static RbGrnQuery *
-rb_rb_grn_query_from_ruby_object (VALUE object)
-{
-    RbGrnQuery *rb_grn_query;
-
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnQuery))) {
-	rb_raise(rb_eTypeError, "not a groonga query");
-    }
-
-    Data_Get_Struct(object, RbGrnQuery, rb_grn_query);
-    if (!rb_grn_query)
-	rb_raise(rb_eGrnError, "groonga query is NULL");
-
-    return rb_grn_query;
-}
-
-grn_query *
-rb_grn_query_from_ruby_object (VALUE object)
-{
-    if (NIL_P(object))
-        return NULL;
-
-    return SELF(object)->query;
-}
-
-static void
-rb_rb_grn_query_free (void *object)
-{
-    RbGrnQuery *rb_grn_query = object;
-
-    if (rb_grn_query->owner && rb_grn_query->context && rb_grn_query->query)
-	grn_query_close(rb_grn_query->context, rb_grn_query->query);
-
-    xfree(object);
-}
-
-VALUE
-rb_grn_query_to_ruby_object (grn_ctx *context, grn_query *query)
-{
-    RbGrnQuery *rb_grn_query;
-
-    if (!query)
-        return Qnil;
-
-    rb_grn_query = ALLOC(RbGrnQuery);
-    rb_grn_query->context = context;
-    rb_grn_query->query = query;
-    rb_grn_query->owner = GRN_FALSE;
-
-    return Data_Wrap_Struct(rb_cGrnQuery, NULL,
-                            rb_rb_grn_query_free, rb_grn_query);
-}
-
-static VALUE
-rb_grn_query_alloc (VALUE klass)
-{
-    return Data_Wrap_Struct(klass, NULL, rb_rb_grn_query_free, NULL);
-}
-
-grn_operator
-rb_grn_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, "||")) {
-        operator = GRN_OP_OR;
-    } else if (rb_grn_equal_option(rb_operator, "and") ||
-               rb_grn_equal_option(rb_operator, "+") ||
-               rb_grn_equal_option(rb_operator, "&&")) {
-        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, "-")) {
-        operator = GRN_OP_BUT;
-    } 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, :-, :adjust, :>]: <%s>",
-                 rb_grn_inspect(rb_operator));
-    }
-
-    return operator;
-}
-
-/*
- * call-seq:
- *   query.new(string, options={})
- *
- * _string_ をパースした上で、クエリを作成する。作成されたオ
- * ブジェクトはGroonga::IndexColumn#searchに渡すことで使用す
- * ることができる。
- *
- * _options_ に指定可能な値は以下の通り。
- * @param options [::Hash] The name and value
- *   pairs. Omitted names are initialized as the default value.
- * @option options :context (Groonga::Context.default) The context
- *   クエリが利用するGroonga::Context。
- *
- * @option options :default_operator The default_operator
- *   演算子の既定値(演算子を省略した場合にどの演算を行うか)
- *   を指定する。
- *
- *   [Groonga::Operator::OR]
- *   [Groonga::Operator::AND]
- *   [Groonga::Operator::BUT]
- *   [Groonga::Operator::ADJUST]
- *     (FIXME: 挙動の違いを検証する必要性あり?
- *            Groonga::Expressionとの関連性は?)
- *
- * @option options :max_expressions
- *   検索クエリに指定する式の最大値を指定する。
- */
-static VALUE
-rb_grn_query_initialize (int argc, VALUE *argv, VALUE self)
-{
-    RbGrnQuery *rb_grn_query;
-    grn_ctx *context = NULL;
-    grn_query *query;
-    char *query_string;
-    unsigned int query_string_length;
-    grn_operator default_operator;
-    int max_expressions = RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS;
-    VALUE rb_query_string, options, rb_context, rb_default_operator;
-    VALUE rb_max_expressions;
-
-    rb_scan_args(argc, argv, "11", &rb_query_string, &options);
-
-    query_string = StringValuePtr(rb_query_string);
-    query_string_length = RSTRING_LEN(rb_query_string);
-
-    rb_grn_scan_options(options,
-                        "context", &rb_context,
-                        "default_operator", &rb_default_operator,
-                        "max_expressions", &rb_max_expressions,
-                        NULL);
-
-    context = rb_grn_context_ensure(&rb_context);
-
-    default_operator = RVAL2GRNOPERATOR(rb_default_operator);
-
-    if (!NIL_P(rb_max_expressions))
-        max_expressions = NUM2INT(rb_max_expressions);
-
-    query = grn_query_open(context, query_string, query_string_length,
-                           default_operator, max_expressions);
-    rb_grn_context_check(context, rb_ary_new4(argc, argv));
-
-    rb_grn_query = ALLOC(RbGrnQuery);
-    DATA_PTR(self) = rb_grn_query;
-    rb_grn_query->context = context;
-    rb_grn_query->query = query;
-    rb_grn_query->owner = GRN_TRUE;
-
-    rb_iv_set(self, "@context", rb_context);
-
-    return Qnil;
-}
-
-/*
- * call-seq:
- *   query.close
- *
- * _query_ が使用しているリソースを開放する。これ以降 _query_ を
- * 使うことはできない。
- */
-static VALUE
-rb_grn_query_close (VALUE self)
-{
-    RbGrnQuery *rb_grn_query;
-
-    rb_grn_query = SELF(self);
-    if (rb_grn_query->context && rb_grn_query->query) {
-        grn_rc rc;
-
-        rc = grn_query_close(rb_grn_query->context, rb_grn_query->query);
-        rb_grn_query->context = NULL;
-        rb_grn_query->query = NULL;
-        rb_grn_rc_check(rc, self);
-    }
-    return Qnil;
-}
-
-/*
- * call-seq:
- *   query.closed? -> true/false
- *
- * _query_ が開放済みの場合は +true+ を返し、そうでない場合は
- * +false+ を返す。
- */
-static VALUE
-rb_grn_query_closed_p (VALUE self)
-{
-    RbGrnQuery *rb_grn_query;
-
-    rb_grn_query = SELF(self);
-    if (rb_grn_query->context && rb_grn_query->query)
-        return Qfalse;
-    else
-        return Qtrue;
-}
-
-void
-rb_grn_init_query (VALUE mGrn)
-{
-    rb_cGrnQuery = rb_define_class_under(mGrn, "Query", rb_cObject);
-    rb_define_alloc_func(rb_cGrnQuery, rb_grn_query_alloc);
-
-    rb_define_method(rb_cGrnQuery, "initialize",
-                     rb_grn_query_initialize, -1);
-    rb_define_method(rb_cGrnQuery, "close",
-                     rb_grn_query_close, 0);
-    rb_define_method(rb_cGrnQuery, "closed?",
-                     rb_grn_query_closed_p, 0);
-}