Kouhei Sutou
null+****@clear*****
Tue Apr 25 15:00:21 JST 2017
Kouhei Sutou 2017-04-25 15:00:21 +0900 (Tue, 25 Apr 2017) New Revision: e5e73616a827256630c52123d5b9fe745c971a46 https://github.com/mroonga/mroonga/commit/e5e73616a827256630c52123d5b9fe745c971a46 Message: Revert "Support Groonga 7.0.2" This reverts commit 90975383ac4276cd1f2944c459924a48c0b1c8c5. Groonga reverted OP_CALL nargs incompatibility. Modified files: lib/mrn_condition_converter.cpp Modified: lib/mrn_condition_converter.cpp (+1 -8) =================================================================== --- lib/mrn_condition_converter.cpp 2017-04-25 14:46:45 +0900 (2a9c250) +++ lib/mrn_condition_converter.cpp 2017-04-25 15:00:21 +0900 (b325b1a) @@ -542,14 +542,7 @@ namespace mrn { append_const_item(field_item, max_item, expression); grn_expr_append_const(ctx_, expression, &include, GRN_OP_PUSH, 1); - int call_n_args = 5; - // TODO: Remove this condition when we drop Groonga 7.0.1 or - // earlier support or Groonga 10 is released. - if (strcmp(grn_get_version(), "7.0.2") >= 0 || - strcmp(grn_get_version(), "7.0.1-105-") >= 0) { - call_n_args++; - } - grn_expr_append_op(ctx_, expression, GRN_OP_CALL, call_n_args); + grn_expr_append_op(ctx_, expression, GRN_OP_CALL, 5); grn_expr_append_op(ctx_, expression, GRN_OP_AND, 2); -------------- next part -------------- HTML����������������������������...Download