From 0fd9c69d1cf2f2f21baecc64bf73002adaa55d03 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Wed, 15 Sep 2021 21:00:40 +0800 Subject: [PATCH] : row convert fix and schema version fetch optimize --- src/client/inc/tsclient.h | 2 +- src/tsdb/inc/tsdbMeta.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index b9aaea8469..3ab9e2f66f 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -580,7 +580,7 @@ static FORCE_INLINE void convertToSKVRow(SMemRow dest, SMemRow src, SSchema *pSc SKVRow kvRow = memRowKvBody(dest); memRowSetType(dest, SMEM_ROW_KV); - memRowSetKvVersion(kvRow, dataRowVersion(dataRow)); + memRowSetKvVersion(dest, dataRowVersion(dataRow)); kvRowSetNCols(kvRow, nBoundCols); kvRowSetLen(kvRow, (TDRowLenT)(TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * nBoundCols)); diff --git a/src/tsdb/inc/tsdbMeta.h b/src/tsdb/inc/tsdbMeta.h index 51801c843c..f65d49c9b0 100644 --- a/src/tsdb/inc/tsdbMeta.h +++ b/src/tsdb/inc/tsdbMeta.h @@ -106,12 +106,13 @@ static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, if (lock) TSDB_RLOCK_TABLE(pDTable); if (_version < 0) { // get the latest version of schema - pTSchema = *(STSchema **)taosArrayGetLast(pDTable->schema); + pTSchema = *(STSchema**)taosArrayGetLast(pDTable->schema); } else { // get the schema with version void* ptr = taosArraySearch(pDTable->schema, &_version, tsdbCompareSchemaVersion, TD_EQ); if (ptr == NULL) { - terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION; - goto _exit; + pTSchema = *(STSchema**)taosArrayGetLast(pDTable->schema); + // terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION; + // goto _exit; } pTSchema = *(STSchema**)ptr; } @@ -124,7 +125,7 @@ static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, pSchema = pTSchema; } -_exit: + // _exit: if (lock) TSDB_RUNLOCK_TABLE(pDTable); return pSchema; } -- GitLab