From 951299218e7198823093504d626da6e41049763d Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Wed, 15 Sep 2021 23:29:02 +0800 Subject: [PATCH] : row convert fix and schema version fetch optimize --- src/client/inc/tsclient.h | 2 +- src/tsdb/inc/tsdbMeta.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index ff796cdcbf..dd4ff7eb57 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -567,7 +567,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 8ce5e7ade8..5bf36aad80 100644 --- a/src/tsdb/inc/tsdbMeta.h +++ b/src/tsdb/inc/tsdbMeta.h @@ -110,10 +110,12 @@ static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, } 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; + } else { + pTSchema = *(STSchema**)ptr; } - pTSchema = *(STSchema**)ptr; } ASSERT(pTSchema != NULL); @@ -124,7 +126,7 @@ static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, pSchema = pTSchema; } -_exit: + // _exit: if (lock) TSDB_RUNLOCK_TABLE(pDTable); return pSchema; } -- GitLab