[Groonga-commit] groonga/groonga at 59d0620 [master] Rename "all_records" to "_all"

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Apr 20 22:22:29 JST 2016


Kouhei Sutou	2016-04-20 22:22:29 +0900 (Wed, 20 Apr 2016)

  New Revision: 59d0620b84cc5f594882a222272418b8282f11ca
  https://github.com/groonga/groonga/commit/59d0620b84cc5f594882a222272418b8282f11ca

  Message:
    Rename "all_records" to "_all"
    
    Because we use leading "_" for reserved name.

  Modified files:
    lib/db.c
    test/command/suite/select/drilldown/labeled/keys/empty.expected
  Renamed files:
    test/command/suite/select/drilldown/labeled/no_keys/no_calc_target.expected
      (from test/command/suite/select/drilldown/labeled/all_records/no_calc_target.expected)
    test/command/suite/select/drilldown/labeled/no_keys/no_calc_target.test
      (from test/command/suite/select/drilldown/labeled/all_records/no_calc_target.test)
    test/command/suite/select/drilldown/labeled/no_keys/no_table.expected
      (from test/command/suite/select/drilldown/labeled/all_records/no_table.expected)
    test/command/suite/select/drilldown/labeled/no_keys/no_table.test
      (from test/command/suite/select/drilldown/labeled/all_records/no_table.test)
    test/command/suite/select/drilldown/labeled/no_keys/sum.expected
      (from test/command/suite/select/drilldown/labeled/all_records/sum.expected)
    test/command/suite/select/drilldown/labeled/no_keys/sum.test
      (from test/command/suite/select/drilldown/labeled/all_records/sum.test)

  Modified: lib/db.c (+4 -4)
===================================================================
--- lib/db.c    2016-04-19 21:44:47 +0900 (7591ea9)
+++ lib/db.c    2016-04-20 22:22:29 +0900 (3868599)
@@ -3765,8 +3765,8 @@ grn_table_group_single_key_records(grn_ctx *ctx, grn_obj *table,
   GRN_OBJ_FIN(ctx, &bulk);
 }
 
-#define GRN_TABLE_GROUP_ALL_RECORDS_NAME     "all_records"
-#define GRN_TABLE_GROUP_ALL_RECORDS_NAME_LEN (sizeof(GRN_TABLE_GROUP_ALL_RECORDS_NAME) - 1)
+#define GRN_TABLE_GROUP_ALL_NAME     "_all"
+#define GRN_TABLE_GROUP_ALL_NAME_LEN (sizeof(GRN_TABLE_GROUP_ALL_NAME) - 1)
 
 static void
 grn_table_group_all_records(grn_ctx *ctx, grn_obj *table,
@@ -3782,8 +3782,8 @@ grn_table_group_all_records(grn_ctx *ctx, grn_obj *table,
     grn_id id;
     void *value;
     if (grn_table_add_v_inline(ctx, res,
-                               GRN_TABLE_GROUP_ALL_RECORDS_NAME,
-                               GRN_TABLE_GROUP_ALL_RECORDS_NAME_LEN,
+                               GRN_TABLE_GROUP_ALL_NAME,
+                               GRN_TABLE_GROUP_ALL_NAME_LEN,
                                &value, NULL)) {
       while ((id = grn_table_cursor_next_inline(ctx, tc))) {
         grn_rset_recinfo *ri = NULL;

  Modified: test/command/suite/select/drilldown/labeled/keys/empty.expected (+1 -1)
===================================================================
--- test/command/suite/select/drilldown/labeled/keys/empty.expected    2016-04-19 21:44:47 +0900 (e88cca8)
+++ test/command/suite/select/drilldown/labeled/keys/empty.expected    2016-04-20 22:22:29 +0900 (d98a0e5)
@@ -55,7 +55,7 @@ select Memos --limit 0 --drilldown[tag].keys ''
           ]
         ],
         [
-          "all_records",
+          "_all",
           4
         ]
       ]

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/no_calc_target.expected (+1 -1) 97%
===================================================================
--- test/command/suite/select/drilldown/labeled/all_records/no_calc_target.expected    2016-04-19 21:44:47 +0900 (7296242)
+++ test/command/suite/select/drilldown/labeled/no_keys/no_calc_target.expected    2016-04-20 22:22:29 +0900 (e71a5a4)
@@ -63,7 +63,7 @@ select Memos   --drilldown[n_records].output_columns _key,_nsubrecs
           ]
         ],
         [
-          "all_records",
+          "_all",
           4
         ]
       ]

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/no_calc_target.test (+0 -0) 100%
===================================================================

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/no_table.expected (+1 -1) 98%
===================================================================
--- test/command/suite/select/drilldown/labeled/all_records/no_table.expected    2016-04-19 21:44:47 +0900 (317062e)
+++ test/command/suite/select/drilldown/labeled/no_keys/no_table.expected    2016-04-20 22:22:29 +0900 (8b0bac8)
@@ -73,7 +73,7 @@ select Memos   --drilldown[sum].calc_types SUM   --drilldown[sum].calc_target va
           ]
         ],
         [
-          "all_records",
+          "_all",
           19
         ]
       ]

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/no_table.test (+0 -0) 100%
===================================================================

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/sum.expected (+1 -1) 98%
===================================================================
--- test/command/suite/select/drilldown/labeled/all_records/sum.expected    2016-04-19 21:44:47 +0900 (e072db5)
+++ test/command/suite/select/drilldown/labeled/no_keys/sum.expected    2016-04-20 22:22:29 +0900 (3e4dcab)
@@ -102,7 +102,7 @@ select Memos   --drilldown[tag].keys tag   --drilldown[tag_sum].table tag   --dr
           ]
         ],
         [
-          "all_records",
+          "_all",
           4
         ]
       ]

  Renamed: test/command/suite/select/drilldown/labeled/no_keys/sum.test (+0 -0) 100%
===================================================================
-------------- next part --------------
HTML����������������������������...
Download 



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