From e4115b94d9b27b747b845d7ca7074992b563b115 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Thu, 16 Sep 2021 19:12:10 +0800 Subject: [PATCH] revert --- src/tsdb/inc/tsdbMeta.h | 1 - src/tsdb/src/tsdbCommit.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tsdb/inc/tsdbMeta.h b/src/tsdb/inc/tsdbMeta.h index 353f6ab03c..8ce5e7ade8 100644 --- a/src/tsdb/inc/tsdbMeta.h +++ b/src/tsdb/inc/tsdbMeta.h @@ -99,7 +99,6 @@ static FORCE_INLINE int tsdbCompareSchemaVersion(const void *key1, const void *k } } -// set rowType to -1 at default if have no relationship with row static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, bool copy, int16_t _version) { STable* pDTable = (pTable->pSuper != NULL) ? pTable->pSuper : pTable; // for performance purpose STSchema* pSchema = NULL; diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c index 297df2587b..0311048780 100644 --- a/src/tsdb/src/tsdbCommit.c +++ b/src/tsdb/src/tsdbCommit.c @@ -1438,8 +1438,7 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt (*iter)++; } else if (key1 > key2) { if (pSchema == NULL || schemaVersion(pSchema) != memRowVersion(row)) { - pSchema = - tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, memRowVersion(row)); + pSchema = tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, memRowVersion(row)); ASSERT(pSchema != NULL); } @@ -1460,8 +1459,7 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt if (update != TD_ROW_DISCARD_UPDATE) { //copy mem data if (pSchema == NULL || schemaVersion(pSchema) != memRowVersion(row)) { - pSchema = - tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, memRowVersion(row)); + pSchema = tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, memRowVersion(row)); ASSERT(pSchema != NULL); } -- GitLab