[Groonga-commit] groonga/groonga at 5c624e0 [master] query_expander tsv: reduce needless truncate

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Mar 11 20:50:20 JST 2015


Kouhei Sutou	2015-03-11 20:50:20 +0900 (Wed, 11 Mar 2015)

  New Revision: 5c624e0ba0e1cc57c76f2b0091c953437ea3dac9
  https://github.com/groonga/groonga/commit/5c624e0ba0e1cc57c76f2b0091c953437ea3dac9

  Message:
    query_expander tsv: reduce needless truncate

  Modified files:
    plugins/query_expanders/tsv.c

  Modified: plugins/query_expanders/tsv.c (+7 -4)
===================================================================
--- plugins/query_expanders/tsv.c    2015-03-11 18:14:16 +0900 (019ab33)
+++ plugins/query_expanders/tsv.c    2015-03-11 20:50:20 +0900 (79bd53f)
@@ -182,10 +182,13 @@ parse_synonyms_file_line(grn_ctx *ctx, const char *line, int line_length,
       return;
     }
 
-    GRN_TEXT_PUTC(ctx, value, '\0');
-    grn_bulk_truncate(ctx, value, MAX_SYNONYM_BYTES - 1);
-    GRN_TEXT_PUTC(ctx, value, '\0');
-    memcpy(value_location, GRN_TEXT_VALUE(value), MAX_SYNONYM_BYTES);
+    if (GRN_TEXT_LEN(value) <= MAX_SYNONYM_BYTES - 1) {
+      GRN_TEXT_PUTC(ctx, value, '\0');
+    } else {
+      grn_bulk_truncate(ctx, value, MAX_SYNONYM_BYTES - 1);
+      GRN_TEXT_PUTC(ctx, value, '\0');
+    }
+    memcpy(value_location, GRN_TEXT_VALUE(value), GRN_TEXT_LEN(value));
   }
 }
 
-------------- next part --------------
HTML����������������������������...
Download 



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