From 4b791d67bae9567bc592db66943046af5062d154 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Tue, 12 Mar 2024 09:48:28 +0800 Subject: [PATCH] more fix --- include/util/tbuffer.inc | 3 ++- source/libs/parser/src/parTranslater.c | 4 ++-- source/util/test/bufferTest.cpp | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/util/tbuffer.inc b/include/util/tbuffer.inc index 6390d5007f..f0137ee978 100644 --- a/include/util/tbuffer.inc +++ b/include/util/tbuffer.inc @@ -171,7 +171,8 @@ static FORCE_INLINE int32_t tBufferPutF64(SBuffer *buffer, double value) { // reader // SBufferReader static int32_t tBufferReaderInit(SBufferReader *reader, uint32_t offset, SBuffer *buffer) { - (*reader) = BUFFER_READER_INITIALIZER(offset, buffer); + reader->offset = offset; + reader->buffer = buffer; return 0; } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 8c32498476..ac9f2b3b09 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -5776,7 +5776,7 @@ static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray) { field.flags |= COL_SMA_ON; } if (pCol->is_pk) { - field.flags != COL_IS_KEY; + field.flags |= COL_IS_KEY; } taosArrayPush(*pArray, &field); } @@ -6158,7 +6158,7 @@ static void toSchema(const SColumnDefNode* pCol, col_id_t colId, SSchema* pSchem flags |= COL_SMA_ON; } if (pCol->is_pk) { - flags != COL_IS_KEY; + flags |= COL_IS_KEY; } pSchema->colId = colId; pSchema->type = pCol->dataType.type; diff --git a/source/util/test/bufferTest.cpp b/source/util/test/bufferTest.cpp index 400c6b3d4b..4e152b783b 100644 --- a/source/util/test/bufferTest.cpp +++ b/source/util/test/bufferTest.cpp @@ -250,7 +250,8 @@ TEST(BufferTest, forwardWriteAndRead) { } // read - SBufferReader reader = BUFFER_READER_INITIALIZER(0, &buffer); + SBufferReader reader; + tBufferReaderInit(&reader, 0, &buffer); /* fix-len struct */ STestStruct testStruct2 = {1, 2};