Kouhei Sutou
null+****@clear*****
Mon Dec 4 23:56:47 JST 2017
Kouhei Sutou 2017-12-04 23:56:47 +0900 (Mon, 04 Dec 2017) New Revision: 5ac542428a24f14ae1c0d4c84d21ef8e24a04ace https://github.com/pgroonga/pgroonga/commit/5ac542428a24f14ae1c0d4c84d21ef8e24a04ace Message: Support PostgreSQL 9.3 and 9.4 again Modified files: src/pgrn-compatible.h src/pgrn-convert.c Modified: src/pgrn-compatible.h (+8 -0) =================================================================== --- src/pgrn-compatible.h 2017-12-04 23:41:38 +0900 (5a72d12) +++ src/pgrn-compatible.h 2017-12-04 23:56:47 +0900 (ba8e5c7) @@ -159,3 +159,11 @@ # define PGRN_INDEX_AM_ROUTINE_HAVE_AM_PARALLEL_RESCAN # define PGRN_SUPPORT_LOGICAL_REPLICATION #endif + +#if PG_VERSION_NUM >= 90500 +# define pgrn_array_create_iterator(array, slide_ndim) \ + array_create_iterator(array, slide_ndim, NULL) +#else +# define pgrn_array_create_iterator(array, slide_ndim) \ + array_create_iterator(array, slide_ndim) +#endif Modified: src/pgrn-convert.c (+5 -11) =================================================================== --- src/pgrn-convert.c 2017-12-04 23:41:38 +0900 (6c0a9b5) +++ src/pgrn-convert.c 2017-12-04 23:56:47 +0900 (188da84) @@ -1,3 +1,7 @@ +#include "pgroonga.h" + +#include "pgrn-compatible.h" + #include "pgrn-convert.h" #include "pgrn-global.h" @@ -12,7 +16,6 @@ static void PGrnConvertFromDataArrayType(Datum datum, Oid typeID, grn_obj *buffer) { ArrayType *value = DatumGetArrayTypeP(datum); - ArrayMetaState state; ArrayIterator iterator; Datum elementDatum; bool isNULL; @@ -20,16 +23,7 @@ PGrnConvertFromDataArrayType(Datum datum, Oid typeID, grn_obj *buffer) if (ARR_NDIM(value) == 0) return; - state.element_type = ARR_ELEMTYPE(value); - state.typlen = -1; - state.typbyval = false; - state.typalign = 'i'; - state.typdelim = '\0'; - state.typioparam = InvalidOid; - state.typiofunc = InvalidOid; - memset(&(state.proc), 0, sizeof(FmgrInfo)); - - iterator = array_create_iterator(value, 0, &state); + iterator = pgrn_array_create_iterator(value, 0); while (array_iterate(iterator, &elementDatum, &isNULL)) { int weight = 0; -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171204/8b6c57b1/attachment-0001.htm
