Kouhei Sutou 2018-10-30 15:30:22 +0900 (Tue, 30 Oct 2018) Revision: 858dbdb37b25b5f0a6440e0de73beac09763194f https://github.com/groonga/groonga/commit/858dbdb37b25b5f0a6440e0de73beac09763194f Message: truncate: support token filter options Added files: test/command/suite/truncate/table/token_filters_dat.expected test/command/suite/truncate/table/token_filters_dat.test test/command/suite/truncate/table/token_filters_hash.expected test/command/suite/truncate/table/token_filters_hash.test test/command/suite/truncate/table/token_filters_pat.expected test/command/suite/truncate/table/token_filters_pat.test Modified files: lib/db.c Modified: lib/db.c (+5 -3) =================================================================== --- lib/db.c 2018-10-30 15:26:08 +0900 (6b4d723de) +++ lib/db.c 2018-10-30 15:30:22 +0900 (3b6a7a60e) @@ -2357,8 +2357,8 @@ grn_table_truncate(grn_ctx *ctx, grn_obj *table) grn_table_get_default_tokenizer_string(ctx, table, &tokenizer); GRN_TEXT_INIT(&normalizer, 0); grn_table_get_normalizer_string(ctx, table, &normalizer); - GRN_PTR_INIT(&token_filters, GRN_OBJ_VECTOR, GRN_ID_NIL); - grn_obj_get_info(ctx, table, GRN_INFO_TOKEN_FILTERS, &token_filters); + GRN_TEXT_INIT(&token_filters, 0); + grn_table_get_token_filters_string(ctx, table, &token_filters); } switch (table->header.type) { case GRN_TABLE_PAT_KEY : @@ -2401,7 +2401,9 @@ grn_table_truncate(grn_ctx *ctx, grn_obj *table) grn_obj_set_info(ctx, table, GRN_INFO_NORMALIZER, &normalizer); } GRN_OBJ_FIN(ctx, &normalizer); - grn_obj_set_info(ctx, table, GRN_INFO_TOKEN_FILTERS, &token_filters); + if (GRN_TEXT_LEN(&token_filters) > 0) { + grn_obj_set_info(ctx, table, GRN_INFO_TOKEN_FILTERS, &token_filters); + } GRN_OBJ_FIN(ctx, &token_filters); } if (rc == GRN_SUCCESS) { Added: test/command/suite/truncate/table/token_filters_dat.expected (+14 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_dat.expected 2018-10-30 15:30:22 +0900 (952d1feb2) @@ -0,0 +1,14 @@ +plugin_register token_filters/stop_word +[[0,0.0,0.0],true] +table_create Tags TABLE_DAT_KEY ShortText --default_tokenizer 'TokenNgram("n", 3)' --token_filters 'TokenFilterStopWord("column", "ignore")' +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_DAT_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" +truncate Tags +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_DAT_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" Added: test/command/suite/truncate/table/token_filters_dat.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_dat.test 2018-10-30 15:30:22 +0900 (2c73c7769) @@ -0,0 +1,9 @@ +plugin_register token_filters/stop_word + +table_create Tags TABLE_DAT_KEY ShortText \ + --default_tokenizer 'TokenNgram("n", 3)' \ + --token_filters 'TokenFilterStopWord("column", "ignore")' +dump + +truncate Tags +dump Added: test/command/suite/truncate/table/token_filters_hash.expected (+14 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_hash.expected 2018-10-30 15:30:22 +0900 (c235f40b7) @@ -0,0 +1,14 @@ +plugin_register token_filters/stop_word +[[0,0.0,0.0],true] +table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer 'TokenNgram("n", 3)' --token_filters 'TokenFilterStopWord("column", "ignore")' +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" +truncate Tags +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" Added: test/command/suite/truncate/table/token_filters_hash.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_hash.test 2018-10-30 15:30:22 +0900 (649de3c36) @@ -0,0 +1,9 @@ +plugin_register token_filters/stop_word + +table_create Tags TABLE_HASH_KEY ShortText \ + --default_tokenizer 'TokenNgram("n", 3)' \ + --token_filters 'TokenFilterStopWord("column", "ignore")' +dump + +truncate Tags +dump Added: test/command/suite/truncate/table/token_filters_pat.expected (+14 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_pat.expected 2018-10-30 15:30:22 +0900 (0bdb4408f) @@ -0,0 +1,14 @@ +plugin_register token_filters/stop_word +[[0,0.0,0.0],true] +table_create Tags TABLE_PAT_KEY ShortText --default_tokenizer 'TokenNgram("n", 3)' --token_filters 'TokenFilterStopWord("column", "ignore")' +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_PAT_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" +truncate Tags +[[0,0.0,0.0],true] +dump +plugin_register token_filters/stop_word + +table_create Tags TABLE_PAT_KEY ShortText --default_tokenizer "TokenNgram(\"n\", 3)" --token_filters "TokenFilterStopWord(\"column\", \"ignore\")" Added: test/command/suite/truncate/table/token_filters_pat.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/truncate/table/token_filters_pat.test 2018-10-30 15:30:22 +0900 (9f943c0a6) @@ -0,0 +1,9 @@ +plugin_register token_filters/stop_word + +table_create Tags TABLE_PAT_KEY ShortText \ + --default_tokenizer 'TokenNgram("n", 3)' \ + --token_filters 'TokenFilterStopWord("column", "ignore")' +dump + +truncate Tags +dump -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181030/0dced8c2/attachment-0001.html>
