diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 3605db1e6..ec335ebfe 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -79,6 +79,10 @@

Reduce debug level for infoIni() to test.

+ +

Return IoFilterGroup * from ioFilterGroupAdd().

+
+

Add missing LOG_DEBUG() macro.

diff --git a/src/common/io/filter/group.c b/src/common/io/filter/group.c index 554ec1ba5..62b53d7c7 100644 --- a/src/common/io/filter/group.c +++ b/src/common/io/filter/group.c @@ -76,7 +76,7 @@ ioFilterGroupNew(void) /*********************************************************************************************************************************** Add a filter ***********************************************************************************************************************************/ -void +IoFilterGroup * ioFilterGroupAdd(IoFilterGroup *this, IoFilter *filter) { FUNCTION_DEBUG_BEGIN(logLevelDebug); @@ -95,7 +95,7 @@ ioFilterGroupAdd(IoFilterGroup *this, IoFilter *filter) IoFilterData filterData = {.filter = filter}; lstAdd(this->filterList, &filterData); - FUNCTION_DEBUG_RESULT_VOID(); + FUNCTION_DEBUG_RESULT(IO_FILTER_GROUP, this); } /*********************************************************************************************************************************** diff --git a/src/common/io/filter/group.h b/src/common/io/filter/group.h index 8e80aa0eb..1eeef8927 100644 --- a/src/common/io/filter/group.h +++ b/src/common/io/filter/group.h @@ -26,7 +26,7 @@ IoFilterGroup *ioFilterGroupNew(void); /*********************************************************************************************************************************** Functions ***********************************************************************************************************************************/ -void ioFilterGroupAdd(IoFilterGroup *this, IoFilter *filter); +IoFilterGroup *ioFilterGroupAdd(IoFilterGroup *this, IoFilter *filter); void ioFilterGroupOpen(IoFilterGroup *this); void ioFilterGroupProcess(IoFilterGroup *this, const Buffer *input, Buffer *output); void ioFilterGroupClose(IoFilterGroup *this); diff --git a/test/expect/mock-archive-001.log b/test/expect/mock-archive-001.log index ae2ae452f..b1a90f6f0 100644 --- a/test/expect/mock-archive-001.log +++ b/test/expect/mock-archive-001.log @@ -191,7 +191,7 @@ P00 DEBUG: storage/driver/posix/storage::storageDriverPosixNew: => {Storage P00 DEBUG: storage/storage::storageNewWrite: (this: {type: posix, path: {"/"}, write: true}, fileExp: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, param.modeFile: 0000, param.modePath: 0000, param.noCreatePath: true, param.noSyncFile: true, param.noSyncPath: true, param.noAtomic: true, param.filterGroup: null) P00 DEBUG: storage/storage::storageNewWrite: => {type: posix, name: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, modeFile: 0640, modePath: 0750, createPath: false, syncFile: false, syncPath: false, atomic: false} P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: (this: {inputSame: false, done: true}, filter: {IoFilter}) -P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: => void +P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: => {inputSame: false, done: true} P00 DEBUG: storage/storage::storageNewRead: (this: {type: posix, path: {"[TEST_PATH]/db-master/repo"}, write: false}, fileExp: {"/9.4-1/0000000100000001/000000010000000100000001-ceb021d9bb41f220511e413b095d2b0d89fec113.gz"}, param.ignoreMissing: false, param.filterGroup: null) P00 DEBUG: storage/storage::storageNewRead: => {type: posix, name: {"[TEST_PATH]/db-master/repo/archive/db/9.4-1/0000000100000001/000000010000000100000001-ceb021d9bb41f220511e413b095d2b0d89fec113.gz"}, ignoreMissing: false} P00 DEBUG: storage/storage::storageCopy: (source: {type: posix, name: {"[TEST_PATH]/db-master/repo/archive/db/9.4-1/0000000100000001/000000010000000100000001-ceb021d9bb41f220511e413b095d2b0d89fec113.gz"}, ignoreMissing: false}, destination: {type: posix, name: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, modeFile: 0640, modePath: 0750, createPath: false, syncFile: false, syncPath: false, atomic: false}) diff --git a/test/expect/mock-stanza-001.log b/test/expect/mock-stanza-001.log index 3a2ae028f..05c52a375 100644 --- a/test/expect/mock-stanza-001.log +++ b/test/expect/mock-stanza-001.log @@ -566,7 +566,7 @@ P00 DEBUG: storage/driver/posix/storage::storageDriverPosixNew: => {Storage P00 DEBUG: storage/storage::storageNewWrite: (this: {type: posix, path: {"/"}, write: true}, fileExp: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, param.modeFile: 0000, param.modePath: 0000, param.noCreatePath: true, param.noSyncFile: true, param.noSyncPath: true, param.noAtomic: true, param.filterGroup: null) P00 DEBUG: storage/storage::storageNewWrite: => {type: posix, name: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, modeFile: 0640, modePath: 0750, createPath: false, syncFile: false, syncPath: false, atomic: false} P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: (this: {inputSame: false, done: true}, filter: {IoFilter}) -P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: => void +P00 DEBUG: common/io/filter/group::ioFilterGroupAdd: => {inputSame: false, done: true} P00 DEBUG: storage/storage::storageNewRead: (this: {type: posix, path: {"[TEST_PATH]/db-master/repo"}, write: false}, fileExp: {"/9.3-1/0000000100000001/000000010000000100000002-488ba4b8b98acc510bce86b8f16e3c1ed9886a29.gz"}, param.ignoreMissing: false, param.filterGroup: null) P00 DEBUG: storage/storage::storageNewRead: => {type: posix, name: {"[TEST_PATH]/db-master/repo/archive/db/9.3-1/0000000100000001/000000010000000100000002-488ba4b8b98acc510bce86b8f16e3c1ed9886a29.gz"}, ignoreMissing: false} P00 DEBUG: storage/storage::storageCopy: (source: {type: posix, name: {"[TEST_PATH]/db-master/repo/archive/db/9.3-1/0000000100000001/000000010000000100000002-488ba4b8b98acc510bce86b8f16e3c1ed9886a29.gz"}, ignoreMissing: false}, destination: {type: posix, name: {"[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG"}, modeFile: 0640, modePath: 0750, createPath: false, syncFile: false, syncPath: false, atomic: false}) diff --git a/test/src/module/common/ioTest.c b/test/src/module/common/ioTest.c index cf032ffa3..b419dcf18 100644 --- a/test/src/module/common/ioTest.c +++ b/test/src/module/common/ioTest.c @@ -267,7 +267,7 @@ testRun(void) IoFilterGroup *filterGroup = NULL; TEST_ASSIGN(filterGroup, ioFilterGroupNew(), " create new filter group"); IoSize *sizeFilter = ioSizeNew(); - TEST_RESULT_VOID(ioFilterGroupAdd(filterGroup, ioSizeFilter(sizeFilter)), " add filter to filter group"); + TEST_RESULT_PTR(ioFilterGroupAdd(filterGroup, ioSizeFilter(sizeFilter)), filterGroup, " add filter to filter group"); TEST_RESULT_VOID( ioFilterGroupAdd(filterGroup, ioTestFilterDoubleNew("double", 1)->filter), " add filter to filter group"); TEST_RESULT_VOID(ioFilterGroupAdd(filterGroup, ioSizeFilter(ioSizeNew())), " add filter to filter group");