xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-4034]add timestamp in last NULL column

This commit is contained in:
lichuang 2021-05-17 13:37:59 +08:00
parent 9fac24bc7a
commit 9d3d129fef
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/inc/tdataformat.h
View File

@ -234,6 +234,7 @@ typedef struct SDataCol {
int len; // column data length int len; // column data length
VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column
void * pData; // Actual data pointer void * pData; // Actual data pointer
TSKEY ts; // only used in last NULL column
} SDataCol; } SDataCol;
static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; } static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; }

3
src/tsdb/src/tsdbMemTable.c
View File

@ -985,7 +985,7 @@ static void updateTableLatestColumn(STsdbRepo *pRepo, STable *pTable, SDataRow r
for (int j = 0; j < schemaNCols(pSchema); j++) { for (int j = 0; j < schemaNCols(pSchema); j++) {
if (j >= pTable->lastColNum) { if (j >= pTable->lastColNum) {
pTable->lastCols = realloc(pTable->lastCols, pTable->lastColNum + 10); pTable->lastCols = realloc(pTable->lastCols, pTable->lastColNum + 10);
for (int i = 0; i < 10; ++i) { for (i = 0; i < 10; ++i) {
pTable->lastCols[i + pTable->lastColNum].bytes = 0; pTable->lastCols[i + pTable->lastColNum].bytes = 0;
pTable->lastCols[i + pTable->lastColNum].pData = NULL; pTable->lastCols[i + pTable->lastColNum].pData = NULL;
} }
@ -1009,6 +1009,7 @@ static void updateTableLatestColumn(STsdbRepo *pRepo, STable *pTable, SDataRow r
//tsdbDebug("vgId:%d cache column %d for %d,%p", REPO_ID(pRepo), j, pDataCol->bytes, pDataCol->pData); //tsdbDebug("vgId:%d cache column %d for %d,%p", REPO_ID(pRepo), j, pDataCol->bytes, pDataCol->pData);
memcpy(pDataCol->pData, value, pDataCol->bytes); memcpy(pDataCol->pData, value, pDataCol->bytes);
pDataCol->ts = dataRowTKey(row);
} }
} }