提交 95129921 编写于 作者: C Cary Xu

<TD-6636><hotfix>: row convert fix and schema version fetch optimize

上级 0d423152
......@@ -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));
......
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册