rroonga 6.0.4-x86-mingw32 → 6.0.5-x86-mingw32

data/test/test-database.rb

@@ -366,4 +366,25 @@ class DatabaseTest < Test::Unit::TestCase
                    @database.disk_usage)
     end
   end
+
+  class LastModifiedTest < self
+    setup :setup_database
+
+    def test_touch
+      assert_equal(Time.at(0), @database.last_modified)
+      @database.touch
+      assert_equal(Time.now.sec, @database.last_modified.sec)
+    end
+
+    def test_dirty?
+      omit("TODO: Enable this after Groonga 6.0.6 is released.")
+      assert do
+        not @database.dirty?
+      end
+      @database.touch
+      assert do
+        @database.dirty?
+      end
+    end
+  end
 end

data/test/test-id.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2016  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class IDTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  test "NIL" do
+    assert_equal(0, Groonga::ID::NIL)
+  end
+
+  test "MAX" do
+    assert_equal(2 ** 30 - 1, Groonga::ID::MAX)
+  end
+
+  sub_test_case(".builtin?") do
+    test "true" do
+      assert do
+        Groonga::ID.builtin?(Groonga::Type::INT32)
+      end
+    end
+
+    test "false" do
+      Groonga::Schema.define do |schema|
+        schema.create_table("Users", :type => :hash)
+      end
+      users_id = Groonga["Users"].id
+
+      assert do
+        not Groonga::ID.builtin?(users_id)
+      end
+    end
+  end
+end

data/test/test-name.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2016  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class NameTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  sub_test_case(".column?") do
+    test "true" do
+      assert do
+        Groonga::Name.column?("Users.age")
+      end
+    end
+
+    test "false" do
+      assert do
+        not Groonga::Name.column?("Users")
+      end
+    end
+  end
+end

data/test/test-table.rb

@@ -561,7 +561,7 @@ class TableTest < Test::Unit::TestCase
     ruby_bookmarks = bookmarks.select {|record| (record["title"] == "Ruby") &
                                                 (record["title"] == "Ruby") }
     all_bookmarks = bookmarks.select
-    assert_equal([["groonga", 1], ["Ruby", 2]],
+    assert_equal([["groonga", 1.0], ["Ruby", 3.0]],
                  all_bookmarks.merge!(ruby_bookmarks).collect do |record|
                    [record[".title"], record.score]
                  end)

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

@@ -30,6 +30,7 @@
 #include "groonga/file_reader.h"
 #include "groonga/geo.h"
 #include "groonga/hash.h"
+#include "groonga/id.h"
 #include "groonga/ii.h"
 #include "groonga/obj.h"
 #include "groonga/operator.h"

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

@@ -1606,6 +1606,11 @@ struct _grn_table_scan_hit {
   unsigned int length;
 };
 
+typedef struct {
+  int64_t tv_sec;
+  int32_t tv_nsec;
+} grn_timeval;
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -0,0 +1,30 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2016 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API grn_bool grn_id_is_builtin(grn_ctx *ctx, grn_id id);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *str);
+GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *utf8);
 
 #ifdef __cplusplus
 }

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

@@ -34,6 +34,7 @@ GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_column(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_reference_column(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_index_column(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_accessor(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_key_accessor(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_type(grn_ctx *ctx, grn_obj *obj);
@@ -55,8 +56,16 @@ GRN_API grn_rc grn_obj_cast(grn_ctx *ctx,
 
 GRN_API grn_rc grn_obj_reindex(grn_ctx *ctx, grn_obj *obj);
 
+GRN_API void grn_obj_touch(grn_ctx *ctx, grn_obj *obj, grn_timeval *tv);
+GRN_API uint32_t grn_obj_get_last_modified(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_dirty(grn_ctx *ctx, grn_obj *obj);
+
 GRN_API const char *grn_obj_type_to_string(uint8_t type);
 
+GRN_API grn_bool grn_obj_name_is_column(grn_ctx *ctx,
+                                        const char *name,
+                                        int name_len);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -114,7 +114,7 @@ GRN_API grn_posting *grn_index_cursor_next(grn_ctx *ctx, grn_obj *ic, grn_id *ti
 } while (0)
 
 #define GRN_TABLE_EACH_BEGIN(ctx, table, cursor, id) do {\
-  if (table) {\
+  if ((table)) {\
     grn_table_cursor *cursor;\
     cursor = grn_table_cursor_open((ctx), (table),\
                                    NULL, 0,\
@@ -124,6 +124,17 @@ GRN_API grn_posting *grn_index_cursor_next(grn_ctx *ctx, grn_obj *ic, grn_id *ti
       grn_id id;\
       while ((id = grn_table_cursor_next((ctx), cursor))) {
 
+#define GRN_TABLE_EACH_BEGIN_FLAGS(ctx, table, cursor, id, flags) do {\
+  if ((table)) {\
+    grn_table_cursor *cursor;\
+    cursor = grn_table_cursor_open((ctx), (table),\
+                                   NULL, 0,\
+                                   NULL, 0,\
+                                   0, -1, (flags));\
+    if (cursor) {\
+      grn_id id;\
+      while ((id = grn_table_cursor_next((ctx), cursor))) {
+
 #define GRN_TABLE_EACH_END(ctx, cursor)\
       }\
       grn_table_cursor_close((ctx), cursor);\

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

@@ -24,6 +24,18 @@
 extern "C" {
 #endif
 
+#define GRN_TIMEVAL_TO_MSEC(timeval)                    \
+  (((timeval)->tv_sec * GRN_TIME_MSEC_PER_SEC) +        \
+   ((timeval)->tv_nsec / GRN_TIME_NSEC_PER_MSEC))
+
+#define GRN_TIME_NSEC_PER_SEC 1000000000
+#define GRN_TIME_NSEC_PER_SEC_F 1000000000.0
+#define GRN_TIME_NSEC_PER_MSEC 1000000
+#define GRN_TIME_NSEC_PER_USEC (GRN_TIME_NSEC_PER_SEC / GRN_TIME_USEC_PER_SEC)
+#define GRN_TIME_MSEC_PER_SEC 1000
+#define GRN_TIME_NSEC_TO_USEC(nsec) ((nsec) / GRN_TIME_NSEC_PER_USEC)
+#define GRN_TIME_USEC_TO_NSEC(usec) ((usec) * GRN_TIME_NSEC_PER_USEC)
+
 #define GRN_TIME_USEC_PER_SEC 1000000
 #define GRN_TIME_PACK(sec, usec) ((int64_t)(sec) * GRN_TIME_USEC_PER_SEC + (usec))
 #define GRN_TIME_UNPACK(time_value, sec, usec) do {\
@@ -31,6 +43,8 @@ extern "C" {
   usec = (time_value) % GRN_TIME_USEC_PER_SEC;\
 } while (0)
 
+GRN_API grn_rc grn_timeval_now(grn_ctx *ctx, grn_timeval *tv);
+
 GRN_API void grn_time_now(grn_ctx *ctx, grn_obj *obj);
 
 #define GRN_TIME_NOW(ctx,obj) (grn_time_now((ctx), (obj)))

data/vendor/local/lib/groonga/plugins/expression_rewriters/optimizer.rb

@@ -122,7 +122,7 @@ module Groonga
         end
         return nil if greater_node.nil? or less_node.nil?
 
-        between = context["between"]
+        between = ExpressionTree::Procedure.new(context["between"])
         if greater_node.operator == Operator::GREATER
           greater_border = "exclude"
         else

data/vendor/local/lib/groonga/scripts/ruby/expression_size_estimator.rb

@@ -73,6 +73,8 @@ module Groonga
            Operator::GREATER,
            Operator::GREATER_EQUAL
         size = estimate_range(data, index_column)
+      when Operator::PREFIX
+        size = estimate_prefix(data, index_column)
       when Operator::CALL
         size = estimate_call(data, index_column)
       end
@@ -89,6 +91,17 @@ module Groonga
       index_column
     end
 
+    def sampling_cursor_limit(n_terms)
+      limit = n_terms * 0.01
+      if limit < 10
+        10
+      elsif limit > 1000
+        1000
+      else
+        limit.to_i
+      end
+    end
+
     def estimate_match(data, index_column)
       index_column.estimate_size(:query => data.query.value)
     end
@@ -113,8 +126,13 @@ module Groonga
 
     def estimate_range(data, index_column)
       lexicon = index_column.lexicon
+      n_terms = lexicon.size
+      return 0 if n_terms.zero?
+
       value = data.query.value
-      options = {}
+      options = {
+        :limit => sampling_cursor_limit(n_terms),
+      }
       case data.op
       when Operator::LESS
         options[:max] = value
@@ -130,7 +148,27 @@ module Groonga
         options[:flags] = TableCursorFlags::GE
       end
       TableCursor.open(lexicon, options) do |cursor|
-        index_column.estimate_size(:lexicon_cursor => cursor)
+        size = index_column.estimate_size(:lexicon_cursor => cursor)
+        size += 1 if cursor.next != ID::NIL
+        size
+      end
+    end
+
+    def estimate_prefix(data, index_column)
+      lexicon = index_column.lexicon
+      n_terms = lexicon.size
+      return 0 if n_terms.zero?
+
+      value = data.query.value
+      options = {
+        :min => value,
+        :limit => sampling_cursor_limit(n_terms),
+        :flags => TableCursorFlags::PREFIX,
+      }
+      TableCursor.open(lexicon, options) do |cursor|
+        size = index_column.estimate_size(:lexicon_cursor => cursor)
+        size += 1 if cursor.next != ID::NIL
+        size
       end
     end
 

data/vendor/local/lib/groonga/scripts/ruby/expression_tree.rb

@@ -1,5 +1,9 @@
+require "expression_tree/accessor"
 require "expression_tree/constant"
 require "expression_tree/binary_operation"
 require "expression_tree/function_call"
+require "expression_tree/index_column"
 require "expression_tree/logical_operation"
+require "expression_tree/options"
+require "expression_tree/procedure"
 require "expression_tree/variable"