Kouhei Sutou
null+****@clear*****
Tue Oct 20 14:29:29 JST 2015
Kouhei Sutou 2015-10-20 14:29:29 +0900 (Tue, 20 Oct 2015) New Revision: 77da933d20ce76dddfc9a57a3da50ede19a24eba https://github.com/groonga/groonga/commit/77da933d20ce76dddfc9a57a3da50ede19a24eba Message: schema: support column compress Added files: test/command/suite/schema/tables/columns/compress/lz4.test test/command/suite/schema/tables/columns/compress/zlib.test Copied files: test/command/suite/schema/tables/columns/compress/lz4.expected (from test/command/suite/schema/tables/columns/type/scalar.expected) test/command/suite/schema/tables/columns/compress/zlib.expected (from test/command/suite/schema/tables/columns/type/scalar.expected) Modified files: lib/proc.c test/command/suite/schema/tables/columns/type/scalar.expected test/command/suite/schema/tables/columns/type/vector.expected Modified: lib/proc.c (+24 -1) =================================================================== --- lib/proc.c 2015-10-20 14:20:57 +0900 (80ac314) +++ lib/proc.c 2015-10-20 14:29:29 +0900 (37c4efb) @@ -7866,6 +7866,26 @@ proc_schema_column_output_value_type(grn_ctx *ctx, grn_obj *column) } static void +proc_schema_column_output_compress(grn_ctx *ctx, grn_obj *column) +{ + const char *compress = NULL; + + if (column->header.type != GRN_COLUMN_INDEX) { + if (column->header.flags & GRN_OBJ_COMPRESS_ZLIB) { + compress = "zlib"; + } else if (column->header.flags & GRN_OBJ_COMPRESS_LZ4) { + compress = "lz4"; + } + } + + if (compress) { + GRN_OUTPUT_CSTR(compress); + } else { + GRN_OUTPUT_NULL(); + } +} + +static void proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column) { if (!column) { @@ -7874,7 +7894,7 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column) proc_schema_output_column_name(ctx, column); - GRN_OUTPUT_MAP_OPEN("column", 6); + GRN_OUTPUT_MAP_OPEN("column", 7); GRN_OUTPUT_CSTR("name"); proc_schema_output_column_name(ctx, column); @@ -7891,6 +7911,9 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column) GRN_OUTPUT_CSTR("value_type"); proc_schema_column_output_value_type(ctx, column); + GRN_OUTPUT_CSTR("compress"); + proc_schema_column_output_compress(ctx, column); + GRN_OUTPUT_MAP_CLOSE(); } Copied: test/command/suite/schema/tables/columns/compress/lz4.expected (+3 -2) 97% =================================================================== --- test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:20:57 +0900 (ffd294e) +++ test/command/suite/schema/tables/columns/compress/lz4.expected 2015-10-20 14:29:29 +0900 (ac9bcd7) @@ -1,6 +1,6 @@ table_create Logs TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Logs message COLUMN_SCALAR Text +column_create Logs message COLUMN_SCALAR|COMPRESS_LZ4 Text [[0,0.0,0.0],true] schema [ @@ -198,7 +198,8 @@ schema "value_type": { "name": "Text", "type": "type" - } + }, + "compress": "lz4" } } } Added: test/command/suite/schema/tables/columns/compress/lz4.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/schema/tables/columns/compress/lz4.test 2015-10-20 14:29:29 +0900 (defccb7) @@ -0,0 +1,4 @@ +table_create Logs TABLE_NO_KEY +column_create Logs message COLUMN_SCALAR|COMPRESS_LZ4 Text + +schema Copied: test/command/suite/schema/tables/columns/compress/zlib.expected (+3 -2) 97% =================================================================== --- test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:20:57 +0900 (ffd294e) +++ test/command/suite/schema/tables/columns/compress/zlib.expected 2015-10-20 14:29:29 +0900 (eb77b4c) @@ -1,6 +1,6 @@ table_create Logs TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Logs message COLUMN_SCALAR Text +column_create Logs message COLUMN_SCALAR|COMPRESS_ZLIB Text [[0,0.0,0.0],true] schema [ @@ -198,7 +198,8 @@ schema "value_type": { "name": "Text", "type": "type" - } + }, + "compress": "zlib" } } } Added: test/command/suite/schema/tables/columns/compress/zlib.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/schema/tables/columns/compress/zlib.test 2015-10-20 14:29:29 +0900 (d087132) @@ -0,0 +1,4 @@ +table_create Logs TABLE_NO_KEY +column_create Logs message COLUMN_SCALAR|COMPRESS_ZLIB Text + +schema Modified: test/command/suite/schema/tables/columns/type/scalar.expected (+2 -1) =================================================================== --- test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:20:57 +0900 (ffd294e) +++ test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:29:29 +0900 (45e288f) @@ -198,7 +198,8 @@ schema "value_type": { "name": "Text", "type": "type" - } + }, + "compress": null } } } Modified: test/command/suite/schema/tables/columns/type/vector.expected (+2 -1) =================================================================== --- test/command/suite/schema/tables/columns/type/vector.expected 2015-10-20 14:20:57 +0900 (5836cde) +++ test/command/suite/schema/tables/columns/type/vector.expected 2015-10-20 14:29:29 +0900 (973bc88) @@ -204,7 +204,8 @@ schema "value_type": { "name": "Tags", "type": "reference" - } + }, + "compress": null } } }, -------------- next part -------------- HTML����������������������������...Download