[Groonga-commit] groonga/groonga at 6b360cd [master] Just check table objects

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Jan 3 14:59:13 JST 2015


Kouhei Sutou	2015-01-03 14:59:13 +0900 (Sat, 03 Jan 2015)

  New Revision: 6b360cda44c69a4989359fd5e19c8667ab4bd8bd
  https://github.com/groonga/groonga/commit/6b360cda44c69a4989359fd5e19c8667ab4bd8bd

  Message:
    Just check table objects

  Modified files:
    lib/expr.c
    lib/mrb/scripts/scan_info_data.rb

  Modified: lib/expr.c (+4 -1)
===================================================================
--- lib/expr.c    2015-01-03 14:38:17 +0900 (e57c946)
+++ lib/expr.c    2015-01-03 14:59:13 +0900 (c14818e)
@@ -4663,7 +4663,10 @@ scan_info_build_match(grn_ctx *ctx, scan_info *si)
               ec += offset;
             }
             break;
-          default :
+          case GRN_TABLE_NO_KEY :
+          case GRN_TABLE_HASH_KEY :
+          case GRN_TABLE_PAT_KEY :
+          case GRN_TABLE_DAT_KEY :
             {
               char name[GRN_TABLE_MAX_KEY_SIZE];
               int name_size;

  Modified: lib/mrb/scripts/scan_info_data.rb (+1 -1)
===================================================================
--- lib/mrb/scripts/scan_info_data.rb    2015-01-03 14:38:17 +0900 (cfc1dfc)
+++ lib/mrb/scripts/scan_info_data.rb    2015-01-03 14:59:13 +0900 (76220c8)
@@ -127,7 +127,7 @@ module Groonga
             i += 2
           end
           put_index(value, section_id, code.weight)
-        else
+        when Table
           raise ErrorMessage, "invalid match target: <#{value.name}>"
         end
         i += 1
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index