Kouhei Sutou
null+****@clear*****
Mon Oct 26 12:32:58 JST 2015
Kouhei Sutou 2015-10-26 12:32:58 +0900 (Mon, 26 Oct 2015) New Revision: 2e7ad2bd09570d649123ef35c3ba621f3105dac7 https://github.com/groonga/groonga/commit/2e7ad2bd09570d649123ef35c3ba621f3105dac7 Message: Enable grn_ts by default Modified files: lib/grn_ts.h lib/proc.c lib/ts.c Modified: lib/grn_ts.h (+0 -4) =================================================================== --- lib/grn_ts.h 2015-10-25 23:39:32 +0900 (5e2766b) +++ lib/grn_ts.h 2015-10-26 12:32:58 +0900 (c815433) @@ -19,8 +19,6 @@ #ifndef GRN_TS_H #define GRN_TS_H -#ifdef GRN_WITH_TS - #include <stddef.h> #include <stdint.h> @@ -393,6 +391,4 @@ grn_rc grn_ts_select(grn_ctx *ctx, grn_obj *table, } #endif -#endif /* GRN_WITH_TS */ - #endif /* GRN_TS_H */ Modified: lib/proc.c (+1 -5) =================================================================== --- lib/proc.c 2015-10-25 23:39:32 +0900 (553d908) +++ lib/proc.c 2015-10-26 12:32:58 +0900 (da0542a) @@ -26,9 +26,7 @@ #include "grn_token_cursor.h" #include "grn_expr.h" -#ifdef GRN_WITH_TS -# include "grn_ts.h" -#endif /* GRN_WITH_TS */ +#include "grn_ts.h" #include <string.h> #include <stdlib.h> @@ -1013,7 +1011,6 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, } if ((table_ = grn_ctx_get(ctx, table, table_len))) { // match_columns_ = grn_obj_column(ctx, table_, match_columns, match_columns_len); -#ifdef GRN_WITH_TS if (filter_len && (filter[0] == '?') && (ctx->impl->output_type == GRN_CONTENT_JSON)) { ctx->rc = grn_ts_select(ctx, table_, filter + 1, filter_len - 1, @@ -1025,7 +1022,6 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, } goto exit; } -#endif /* GRN_WITH_TS */ if (query_len || filter_len) { grn_obj *v; GRN_EXPR_CREATE_FOR_QUERY(ctx, table_, cond, v); Modified: lib/ts.c (+0 -4) =================================================================== --- lib/ts.c 2015-10-25 23:39:32 +0900 (72d3175) +++ lib/ts.c 2015-10-26 12:32:58 +0900 (17852ed) @@ -18,8 +18,6 @@ /* TS is an acronym for "Turbo Selector". */ -#ifdef GRN_WITH_TS - #include "grn_ts.h" #include <ctype.h> @@ -7983,5 +7981,3 @@ grn_ts_select(grn_ctx *ctx, grn_obj *table, } return rc; } - -#endif /* GRN_WITH_TS */ -------------- next part -------------- HTML����������������������������...Download