Kouhei Sutou
null+****@clear*****
Thu Dec 29 23:40:07 JST 2016
Kouhei Sutou 2016-12-29 23:40:07 +0900 (Thu, 29 Dec 2016) New Revision: 0aa5e6f167f7a7cb214b3ef35e5695fcd745145c https://github.com/pgroonga/pgroonga/commit/0aa5e6f167f7a7cb214b3ef35e5695fcd745145c Message: Require Groonga 6.1.1 or later Modified files: Makefile appveyor.yml src/pgrn_create.c src/pgrn_groonga.c src/pgrn_jsonb.c src/pgrn_variables.c src/pgroonga.c Modified: Makefile (+1 -1) =================================================================== --- Makefile 2016-12-29 23:34:45 +0900 (4fdc9e0) +++ Makefile 2016-12-29 23:40:07 +0900 (ef0c8bf) @@ -1,4 +1,4 @@ -REQUIRED_GROONGA_VERSION = 6.0.7 +REQUIRED_GROONGA_VERSION = 6.1.1 GROONGA_PKG = "groonga >= $(REQUIRED_GROONGA_VERSION)" PACKAGES = $(GROONGA_PKG) ifdef HAVE_MSGPACK Modified: appveyor.yml (+1 -1) =================================================================== --- appveyor.yml 2016-12-29 23:34:45 +0900 (e558f6a) +++ appveyor.yml 2016-12-29 23:40:07 +0900 (9c18f8a) @@ -2,7 +2,7 @@ version: "{build}" clone_depth: 10 environment: POSTGRESQL_VERSION: 9.6.1-1 - GROONGA_VERSION: 6.0.9 + GROONGA_VERSION: 6.1.1 install: - set PATH=C:\msys64\usr\bin;%PATH% build_script: Modified: src/pgrn_create.c (+0 -2) =================================================================== --- src/pgrn_create.c 2016-12-29 23:34:45 +0900 (2b28029) +++ src/pgrn_create.c 2016-12-29 23:40:07 +0900 (2e03cf5) @@ -75,9 +75,7 @@ PGrnCreateDataColumn(PGrnCreateData *data) case GRN_DB_LONG_TEXT: if (PGrnIsZstdAvailable) { -#ifdef GRN_OBJ_COMPRESS_ZSTD flags |= GRN_OBJ_COMPRESS_ZSTD; -#endif } else if (PGrnIsLZ4Available) { Modified: src/pgrn_groonga.c (+0 -4) =================================================================== --- src/pgrn_groonga.c 2016-12-29 23:34:45 +0900 (bd23731) +++ src/pgrn_groonga.c 2016-12-29 23:40:07 +0900 (39015b1) @@ -30,13 +30,9 @@ PGrnInitializeGroongaInformation(void) grn_obj_get_info(ctx, NULL, GRN_INFO_SUPPORT_ZLIB, &grnIsSupported); PGrnIsZlibAvailable = (GRN_BOOL_VALUE(&grnIsSupported)); -#ifdef GRN_OBJ_COMPRESS_ZSTD GRN_BULK_REWIND(&grnIsSupported); grn_obj_get_info(ctx, NULL, GRN_INFO_SUPPORT_ZSTD, &grnIsSupported); PGrnIsZstdAvailable = (GRN_BOOL_VALUE(&grnIsSupported)); -#else - PGrnIsZstdAvailable = false; -#endif GRN_OBJ_FIN(ctx, &grnIsSupported); } Modified: src/pgrn_jsonb.c (+0 -2) =================================================================== --- src/pgrn_jsonb.c 2016-12-29 23:34:45 +0900 (7067428) +++ src/pgrn_jsonb.c 2016-12-29 23:40:07 +0900 (345cbc1) @@ -220,9 +220,7 @@ PGrnJSONBCreateDataColumns(Relation index, grn_column_flags flags = 0; if (PGrnIsZstdAvailable) { -#ifdef GRN_OBJ_COMPRESS_ZSTD flags |= GRN_OBJ_COMPRESS_ZSTD; -#endif } else if (PGrnIsLZ4Available) { Modified: src/pgrn_variables.c (+0 -3) =================================================================== --- src/pgrn_variables.c 2016-12-29 23:34:45 +0900 (1ad9df7) +++ src/pgrn_variables.c 2016-12-29 23:40:07 +0900 (70f95c7) @@ -76,9 +76,6 @@ PGrnPostgreSQLLoggerLog(grn_ctx *ctx, grn_log_level level, } } -#ifndef GRN_LOG_PID -# define GRN_LOG_PID (0) -#endif static grn_logger PGrnPostgreSQLLogger = { GRN_LOG_DEFAULT_LEVEL, GRN_LOG_TIME | GRN_LOG_MESSAGE | GRN_LOG_PID, Modified: src/pgroonga.c (+0 -2) =================================================================== --- src/pgroonga.c 2016-12-29 23:34:45 +0900 (be8333f) +++ src/pgroonga.c 2016-12-29 23:40:07 +0900 (e9211f6) @@ -389,9 +389,7 @@ _PG_init(void) grn_thread_set_get_limit_func(PGrnGetThreadLimit, NULL); -#ifdef GRN_LOG_PID grn_default_logger_set_flags(grn_default_logger_get_flags() | GRN_LOG_PID); -#endif if (grn_init() != GRN_SUCCESS) ereport(ERROR, -------------- next part -------------- HTML����������������������������...Download