Kouhei Sutou
null+****@clear*****
Sat Oct 29 01:16:40 JST 2016
Kouhei Sutou 2016-10-29 01:16:40 +0900 (Sat, 29 Oct 2016) New Revision: 7ae66d5074e141d99140c868cc14f829d9c28c22 https://github.com/pgroonga/pgroonga/commit/7ae66d5074e141d99140c868cc14f829d9c28c22 Message: wal: extract as a function Modified files: src/pgrn_wal.c Modified: src/pgrn_wal.c (+33 -17) =================================================================== --- src/pgrn_wal.c 2016-10-29 01:15:11 +0900 (b82de1d) +++ src/pgrn_wal.c 2016-10-29 01:16:40 +0900 (8bd28fc) @@ -439,28 +439,16 @@ PGrnWALInsertColumnFinish(PGrnWALData *data) { } -void -PGrnWALInsertColumn(PGrnWALData *data, - const char *name, - grn_obj *value) -{ #ifdef PGRN_SUPPORT_WAL +static void +PGrnWALInsertColumnValueBulk(PGrnWALData *data, + const char *name, + grn_obj *value) +{ msgpack_packer *packer; - if (!PGrnWALEnabled) - return; - packer = &(data->packer); - PGrnWALInsertColumnStart(data, name); - - if (value->header.type != GRN_BULK) { - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("pgroonga: WAL: array value isn't supported yet: <%s>", - grn_obj_type_to_string(value->header.type)))); - } - switch (value->header.domain) { case GRN_DB_BOOL: @@ -528,6 +516,34 @@ PGrnWALInsertColumn(PGrnWALData *data, } break; } +} +#endif + +void +PGrnWALInsertColumn(PGrnWALData *data, + const char *name, + grn_obj *value) +{ +#ifdef PGRN_SUPPORT_WAL + if (!PGrnWALEnabled) + return; + + PGrnWALInsertColumnStart(data, name); + + switch (value->header.type) + { + case GRN_BULK: + PGrnWALInsertColumnValueBulk(data, name, value); + break; + default: + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("pgroonga: WAL: not bulk value isn't supported yet: " + "<%s>: <%s>", + name, + grn_obj_type_to_string(value->header.type)))); + break; + } PGrnWALInsertColumnFinish(data); #endif -------------- next part -------------- HTML����������������������������...Download