Kouhei Sutou
null+****@clear*****
Thu Jun 2 09:42:10 JST 2016
Kouhei Sutou 2016-06-02 09:42:10 +0900 (Thu, 02 Jun 2016) New Revision: 6d092bcc8285b48ded166c28318212a283921051 https://github.com/pgroonga/pgroonga/commit/6d092bcc8285b48ded166c28318212a283921051 Message: Add missing "V2" suffix Modified files: src/pgroonga.c src/pgroonga.h Modified: src/pgroonga.c (+5 -5) =================================================================== --- src/pgroonga.c 2016-06-02 09:41:59 +0900 (8b0ae4d) +++ src/pgroonga.c 2016-06-02 09:42:10 +0900 (908fb5d) @@ -678,7 +678,7 @@ PGrnIsQueryContainStrategyIndex(Relation index, int nthAttribute) strategyOID = get_opfamily_member(index->rd_opfamily[nthAttribute], leftType, rightType, - PGrnQueryContainStrategyNumber); + PGrnQueryContainStrategyV2Number); return OidIsValid(strategyOID); } @@ -2612,8 +2612,8 @@ PGrnSearchBuildCondition(IndexScanDesc scan, case PGrnRegexpStrategyNumber: operator = GRN_OP_REGEXP; break; - case PGrnQueryContainStrategyNumber: - case PGrnMatchContainStrategyNumber: + case PGrnQueryContainStrategyV2Number: + case PGrnMatchContainStrategyV2Number: switch (attribute->atttypid) { case TEXTOID: @@ -2671,7 +2671,7 @@ PGrnSearchBuildCondition(IndexScanDesc scan, GRN_TEXT_VALUE(&(buffers->general)), GRN_TEXT_LEN(&(buffers->general))); break; - case PGrnQueryContainStrategyNumber: + case PGrnQueryContainStrategyV2Number: { grn_obj *queries = &(buffers->general); unsigned int i, n; @@ -2694,7 +2694,7 @@ PGrnSearchBuildCondition(IndexScanDesc scan, } break; } - case PGrnMatchContainStrategyNumber: + case PGrnMatchContainStrategyV2Number: { grn_obj *keywords = &(buffers->general); grn_obj keywordBuffer; Modified: src/pgroonga.h (+2 -2) =================================================================== --- src/pgroonga.h 2016-06-02 09:41:59 +0900 (fcf755c) +++ src/pgroonga.h 2016-06-02 09:42:10 +0900 (143ece3) @@ -30,8 +30,8 @@ #define PGrnScriptStrategyV2Number 15 /* operator &` (script in Groonga) */ #define PGrnPrefixStrategyV2Number 16 /* operator &^ (prefix search) */ #define PGrnPrefixRKStrategyV2Number 17 /* operator &^~ (prefix RK search) */ -#define PGrnMatchContainStrategyNumber 18 /* operator &@> (@ in Groonga) */ -#define PGrnQueryContainStrategyNumber 19 /* operator &?> (query in Groonga) */ +#define PGrnMatchContainStrategyV2Number 18 /* operator &@> (@ in Groonga) */ +#define PGrnQueryContainStrategyV2Number 19 /* operator &?> (query in Groonga) */ #define PGrnPrefixContainStrategyV2Number 20 /* operator &^> (prefix search) */ #define PGrnPrefixRKContainStrategyV2Number 21 /* operator &^~> (prefix RK search) */ -------------- next part -------------- HTML����������������������������...Download
