rroonga 4.0.6-x86-mingw32 → 4.0.7-x86-mingw32

data/test/test-expression.rb

@@ -77,8 +77,17 @@ class ExpressionTest < Test::Unit::TestCase
     expression.append_operation(Groonga::Operation::PLUS, 2)
     expression.compile
 
-    assert_equal("#<Groonga::Expression noname(){21,01,0PLUS}>",
-                 expression.inspect)
+    assert_equal(<<-INSPECTED.chomp, expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:2, value:1>,
+    1:<push(), modify:0, value:1>,
+    2:<plus(), modify:0, value:(NULL)>
+  }
+>>
+    INSPECTED
   end
 
   def test_snippet
@@ -162,14 +171,28 @@ class ExpressionTest < Test::Unit::TestCase
         @expression.append_object(Groonga["TokenBigram"],
                                   Groonga::Operator::PUSH,
                                   1)
-        assert_equal("#<Groonga::Expression noname(){0TokenBigram}>",
-                     @expression.inspect)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:0, value:#<proc:tokenizer TokenBigram arguments:[$1, $2, $3]>>
+  }
+>>
+        INSPECTED
       end
 
       def test_name
         @expression.append_object(Groonga["TokenBigram"], "push", 1)
-        assert_equal("#<Groonga::Expression noname(){0TokenBigram}>",
-                     @expression.inspect)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:0, value:#<proc:tokenizer TokenBigram arguments:[$1, $2, $3]>>
+  }
+>>
+        INSPECTED
       end
     end
   end
@@ -183,14 +206,28 @@ class ExpressionTest < Test::Unit::TestCase
     class OperatorTest < self
       def test_constant
         @expression.append_constant(29, Groonga::Operator::PUSH, 1)
-        assert_equal("#<Groonga::Expression noname(){029}>",
-                     @expression.inspect)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:0, value:29>
+  }
+>>
+        INSPECTED
       end
 
       def test_name
         @expression.append_constant(29, "push", 1)
-        assert_equal("#<Groonga::Expression noname(){029}>",
-                     @expression.inspect)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:0, value:29>
+  }
+>>
+        INSPECTED
       end
     end
   end
@@ -205,14 +242,32 @@ class ExpressionTest < Test::Unit::TestCase
 
     def test_constant
       @expression.append_operation(Groonga::Operator::PLUS, 2)
-      assert_equal("#<Groonga::Expression noname(){229,092,0PLUS}>",
-                   @expression.inspect)
+      assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:2, value:29>,
+    1:<push(), modify:0, value:92>,
+    2:<plus(), modify:0, value:(NULL)>
+  }
+>>
+      INSPECTED
     end
 
     def test_name
       @expression.append_operation("plus", 2)
-      assert_equal("#<Groonga::Expression noname(){229,092,0PLUS}>",
-                   @expression.inspect)
+      assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+  },
+  codes:{
+    0:<push(), modify:2, value:29>,
+    1:<push(), modify:0, value:92>,
+    2:<plus(), modify:0, value:(NULL)>
+  }
+>>
+      INSPECTED
     end
   end
 
@@ -244,48 +299,48 @@ class ExpressionTest < Test::Unit::TestCase
 
     class DefaultOperatorTest < self
       def test_nil
-        assert_equal("AND", parse(nil))
+        assert_equal("and", parse(nil))
       end
 
       def test_name
-        assert_equal("OR", parse("or"))
+        assert_equal("or", parse("or"))
       end
 
       def test_name_symbol
-        assert_equal("OR", parse(:or))
+        assert_equal("or", parse(:or))
       end
 
       def test_symbol
-        assert_equal("OR", parse("||"))
+        assert_equal("or", parse("||"))
       end
 
       def test_integer
-        assert_equal("ADJUST", parse(Groonga::Operator::ADJUST))
+        assert_equal("adjust", parse(Groonga::Operator::ADJUST))
       end
 
       private
       def parse(default_operator)
         @expression.parse("_id:1 _id:2", :default_operator => default_operator)
-        operator = @expression.inspect[/\d([a-zA-Z_-]+)}/, 1]
+        operator = @expression.inspect[/6:<([a-zA-Z_-]+)/, 1]
         operator
       end
     end
 
     class DefaultModeTest < self
       def test_nil
-        assert_equal("MATCH", parse(nil))
+        assert_equal("match", parse(nil))
       end
 
       def test_name
-        assert_equal("EQUAL", parse("equal"))
+        assert_equal("equal", parse("equal"))
       end
 
       def test_symbol
-        assert_equal("EQUAL", parse(:equal))
+        assert_equal("equal", parse(:equal))
       end
 
       def test_integer
-        assert_equal("EQUAL", parse(Groonga::Operator::EQUAL))
+        assert_equal("equal", parse(Groonga::Operator::EQUAL))
       end
 
       private
@@ -293,7 +348,7 @@ class ExpressionTest < Test::Unit::TestCase
         @expression.parse("query",
                           :default_column => "_id",
                           :default_mode => default_mode)
-        operator = @expression.inspect[/\d([a-zA-Z_-]+)}/, 1]
+        operator = @expression.inspect[/2:<([a-zA-Z_-]+)/, 1]
         operator
       end
     end

data/test/test-index-column.rb

@@ -500,4 +500,45 @@ class IndexColumnTest < Test::Unit::TestCase
       end
     end
   end
+
+  class EstimateSizeTest < self
+    setup
+    def setup_schema
+      Groonga::Schema.define do |schema|
+        schema.create_table("Articles") do |table|
+          table.text("content")
+        end
+
+        schema.create_table("Terms",
+                            :type => :hash,
+                            :key_type => "ShortText",
+                            :default_tokenizer => "TokenBigram",
+                            :normalizer => "NormalizerAuto") do |table|
+          table.index("Articles.content",
+                      :name => "articles_content",
+                      :with_position => true,
+                      :with_section => true)
+        end
+      end
+
+      @articles = Groonga["Articles"]
+      @terms = Groonga["Terms"]
+      @index = Groonga["Terms.articles_content"]
+    end
+
+    setup
+    def setup_data
+      @articles.add(:content => "Groonga is fast")
+      @articles.add(:content => "Rroonga is fast")
+      @articles.add(:content => "Mroonga is fast")
+    end
+
+    def test_id
+      assert_equal(7, @index.estimate_size(@terms["fast"].id))
+    end
+
+    def test_record
+      assert_equal(7, @index.estimate_size(@terms["fast"]))
+    end
+  end
 end

data/test/test-index-cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  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
@@ -66,6 +66,26 @@ class IndexCursorTest < Test::Unit::TestCase
     assert_true(opened)
   end
 
+  def test_each_reuse_posting_object
+    opened = false
+    @terms.open_cursor do |table_cursor|
+      @content_index.open_cursor(table_cursor) do |cursor|
+        posting_object_ids = []
+        postings = []
+        cursor.each(:reuse_posting_object => true) do |posting|
+          posting_object_ids << posting.object_id
+          postings << posting.to_hash
+        end
+        assert_equal([posting_object_ids.first] * posting_object_ids.size,
+                     posting_object_ids)
+        assert_equal(expected_postings, postings)
+        opened = true
+      end
+    end
+
+    assert_true(opened)
+  end
+
   def test_record
     record = nil
     @terms.open_cursor do |table_cursor|

data/test/test-table-key-support.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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,6 +76,64 @@ class TableKeySupportTest < Test::Unit::TestCase
     end
   end
 
+  class CastTest < self
+    def test_int8
+      key = "-1"
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int8")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_uint8
+      key = "1"
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt8")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_int16
+      key = (-(2 ** 8)).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int16")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_uint16
+      key = (2 ** 8).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt16")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_int32
+      key = (-(2 ** 16)).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int32")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_uint32
+      key = (2 ** 16).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt32")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_int64
+      key = (-(2 ** 32)).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int64")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+
+    def test_uint64
+      key = (2 ** 32).to_s
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt64")
+      id = ids.add(key)
+      assert_equal(key.to_i, id.key)
+    end
+  end
+
   class TokenizeTest < self
     class TableTypeTest < self
       def test_hash

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/kou/work/c/groonga.clean/packages/windows/dist-x86
+prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /home/kou/work/c/groonga.clean/packages/windows/dist-x86/libexec/mecab
+       	echo /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/bin/onig-config

@@ -27,7 +27,7 @@ if test $# -eq 0; then
   show_usage
 fi
 
-prefix=/home/kou/work/c/groonga.clean/packages/windows/dist-x86
+prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 is_set_exec_prefix=no
 

data/vendor/local/etc/groonga/groonga.conf

@@ -4,7 +4,7 @@
 # port = 10041
 # server-id = groonga.example.com
 # max-threads = 2
-# admin-html-path = /usr/share/groonga/admin_html
+# admin-html-path = /usr/share/groonga/html/admin
 # protocol = http
 # log-path = /var/log/groonga/groonga.log
 # query-log-path = /var/log/groonga/query.log

data/vendor/local/etc/groonga/httpd/fastcgi.conf

@@ -0,0 +1,25 @@
+
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

data/vendor/local/etc/groonga/httpd/fastcgi.conf.default

@@ -0,0 +1,25 @@
+
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

data/vendor/local/etc/groonga/httpd/fastcgi_params

@@ -0,0 +1,24 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

data/vendor/local/etc/groonga/httpd/fastcgi_params.default

@@ -0,0 +1,24 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -15,7 +15,7 @@ http {
   keepalive_timeout 65;
 
   # The default groonga database path.
-  groonga_database /home/kou/work/c/groonga.clean/packages/windows/dist-x86/var/lib/groonga/db/db;
+  groonga_database /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/var/lib/groonga/db/db;
 
   # Create a groonga database automatically if the groonga database doesn't
   # exist.
@@ -45,7 +45,7 @@ http {
     }
 
     location / {
-      root /home/kou/work/c/groonga.clean/packages/windows/dist-x86/share/groonga/html/admin;
+      root /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/share/groonga/html/admin;
       index index.html;
     }
 

data/vendor/local/etc/groonga/httpd/html/50x.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Error</title>
+<style>
+    body {
+        width: 35em;
+        margin: 0 auto;
+        font-family: Tahoma, Verdana, Arial, sans-serif;
+    }
+</style>
+</head>
+<body>
+<h1>An error occurred.</h1>
+<p>Sorry, the page you are looking for is currently unavailable.<br/>
+Please try again later.</p>
+<p>If you are the system administrator of this resource then you should check
+the <a href="http://nginx.org/r/error_log">error log</a> for details.</p>
+<p><em>Faithfully yours, nginx.</em></p>
+</body>
+</html>

data/vendor/local/etc/groonga/httpd/html/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to nginx!</title>
+<style>
+    body {
+        width: 35em;
+        margin: 0 auto;
+        font-family: Tahoma, Verdana, Arial, sans-serif;
+    }
+</style>
+</head>
+<body>
+<h1>Welcome to nginx!</h1>
+<p>If you see this page, the nginx web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="http://nginx.org/">nginx.org</a>.<br/>
+Commercial support is available at
+<a href="http://nginx.com/">nginx.com</a>.</p>
+
+<p><em>Thank you for using nginx.</em></p>
+</body>
+</html>