Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/stream_compression

This commit is contained in:
Hongze Cheng 2022-09-29 13:23:20 +08:00
commit cb554920aa
8 changed files with 23 additions and 21 deletions

View File

@ -22,5 +22,4 @@ An example is as follows.
username = "root" username = "root"
password = "taosdata" password = "taosdata"
data_format = "influx" data_format = "influx"
influx_max_line_bytes = 250
``` ```

View File

@ -60,7 +60,6 @@ For the configuration method, add the following text to `/etc/telegraf/telegraf.
username = "<TDengine's username>" username = "<TDengine's username>"
password = "<TDengine's password>" password = "<TDengine's password>"
data_format = "influx" data_format = "influx"
influx_max_line_bytes = 250
``` ```
Then restart telegraf: Then restart telegraf:

View File

@ -22,6 +22,5 @@
username = "root" username = "root"
password = "taosdata" password = "taosdata"
data_format = "influx" data_format = "influx"
influx_max_line_bytes = 250
``` ```

View File

@ -61,7 +61,6 @@ IT 运维监测数据通常都是对时间特性比较敏感的数据,例如
username = "<TDengine's username>" username = "<TDengine's username>"
password = "<TDengine's password>" password = "<TDengine's password>"
data_format = "influx" data_format = "influx"
influx_max_line_bytes = 250
``` ```
然后重启 Telegraf 然后重启 Telegraf

View File

@ -486,7 +486,7 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
pReader->pTsdb = getTsdbByRetentions(pVnode, pCond->twindows.skey, pVnode->config.tsdbCfg.retentions, idstr, &level); pReader->pTsdb = getTsdbByRetentions(pVnode, pCond->twindows.skey, pVnode->config.tsdbCfg.retentions, idstr, &level);
pReader->suid = pCond->suid; pReader->suid = pCond->suid;
pReader->order = pCond->order; pReader->order = pCond->order;
pReader->capacity = 4096; pReader->capacity = capacity;
pReader->idStr = (idstr != NULL) ? strdup(idstr) : NULL; pReader->idStr = (idstr != NULL) ? strdup(idstr) : NULL;
pReader->verRange = getQueryVerRange(pVnode, pCond, level); pReader->verRange = getQueryVerRange(pVnode, pCond, level);
pReader->type = pCond->type; pReader->type = pCond->type;
@ -841,14 +841,18 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
bool asc = ASCENDING_TRAVERSE(pReader->order); bool asc = ASCENDING_TRAVERSE(pReader->order);
int32_t step = asc ? 1 : -1; int32_t step = asc ? 1 : -1;
if (asc && pReader->window.skey <= pBlock->minKey.ts) {
pDumpInfo->rowIndex = 0; if ((pDumpInfo->rowIndex == 0 && asc) || (pDumpInfo->rowIndex == pBlock->nRow - 1 && (!asc))) {
} else if (!asc && pReader->window.ekey >= pBlock->maxKey.ts) { if (asc && pReader->window.skey <= pBlock->minKey.ts) {
pDumpInfo->rowIndex = pBlock->nRow - 1; //pDumpInfo->rowIndex = 0;
} else { } else
int32_t pos = asc ? pBlock->nRow - 1 : 0; if (!asc && pReader->window.ekey >= pBlock->maxKey.ts) {
int32_t order = (pReader->order == TSDB_ORDER_ASC) ? TSDB_ORDER_DESC : TSDB_ORDER_ASC; //pDumpInfo->rowIndex = pBlock->nRow - 1;
pDumpInfo->rowIndex = doBinarySearchKey(pBlockData->aTSKEY, pBlock->nRow, pos, pReader->window.skey, order); } else {
int32_t pos = asc ? pBlock->nRow - 1 : 0;
int32_t order = (pReader->order == TSDB_ORDER_ASC) ? TSDB_ORDER_DESC : TSDB_ORDER_ASC;
pDumpInfo->rowIndex = doBinarySearchKey(pBlockData->aTSKEY, pBlock->nRow, pos, pReader->window.skey, order);
}
} }
// time window check // time window check
@ -932,8 +936,8 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
pDumpInfo->rowIndex += step * remain; pDumpInfo->rowIndex += step * remain;
if (pDumpInfo->rowIndex >= 0 && pDumpInfo->rowIndex < pBlock->nRow) { if (pDumpInfo->rowIndex >= 0 && pDumpInfo->rowIndex < pBlock->nRow) {
int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex]; // int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
setBlockAllDumped(pDumpInfo, ts, pReader->order); // setBlockAllDumped(pDumpInfo, ts, pReader->order);
} else { } else {
int64_t k = asc ? pBlock->maxKey.ts : pBlock->minKey.ts; int64_t k = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
setBlockAllDumped(pDumpInfo, k, pReader->order); setBlockAllDumped(pDumpInfo, k, pReader->order);

View File

@ -1656,6 +1656,8 @@ int32_t doSetupUdf(char udfName[], UdfcFuncHandle *funcHandle) {
int32_t errCode = udfcRunUdfUvTask(task, UV_TASK_CONNECT); int32_t errCode = udfcRunUdfUvTask(task, UV_TASK_CONNECT);
if (errCode != 0) { if (errCode != 0) {
fnError("failed to connect to pipe. udfName: %s, pipe: %s", udfName, (&gUdfdProxy)->udfdPipeName); fnError("failed to connect to pipe. udfName: %s, pipe: %s", udfName, (&gUdfdProxy)->udfdPipeName);
taosMemoryFree(task->session);
taosMemoryFree(task);
return TSDB_CODE_UDF_PIPE_CONNECT_ERR; return TSDB_CODE_UDF_PIPE_CONNECT_ERR;
} }

View File

@ -960,7 +960,7 @@ int32_t udfdInitResidentFuncs() {
char* token; char* token;
while ((token = strtok_r(pSave, ",", &pSave)) != NULL) { while ((token = strtok_r(pSave, ",", &pSave)) != NULL) {
char func[TSDB_FUNC_NAME_LEN] = {0}; char func[TSDB_FUNC_NAME_LEN] = {0};
strncpy(func, token, strlen(token)); strncpy(func, token, sizeof(func));
taosArrayPush(global.residentFuncs, func); taosArrayPush(global.residentFuncs, func);
} }

View File

@ -879,7 +879,7 @@ int sml_16960_Test() {
"{" "{"
"\"timestamp\":" "\"timestamp\":"
"" ""
"{ \"value\": 1349020800000, \"type\": \"ms\" }" "{ \"value\": 1664418955000, \"type\": \"ms\" }"
"," ","
"\"value\":" "\"value\":"
"" ""
@ -916,7 +916,7 @@ int sml_16960_Test() {
"{" "{"
"\"timestamp\":" "\"timestamp\":"
"" ""
"{ \"value\": 1349020800001, \"type\": \"ms\" }" "{ \"value\": 1664418955001, \"type\": \"ms\" }"
"," ","
"\"value\":" "\"value\":"
"" ""
@ -953,7 +953,7 @@ int sml_16960_Test() {
"{" "{"
"\"timestamp\":" "\"timestamp\":"
"" ""
"{ \"value\": 1349020800002, \"type\": \"ms\" }" "{ \"value\": 1664418955002, \"type\": \"ms\" }"
"," ","
"\"value\":" "\"value\":"
"" ""
@ -990,7 +990,7 @@ int sml_16960_Test() {
"{" "{"
"\"timestamp\":" "\"timestamp\":"
"" ""
"{ \"value\": 1349020800003, \"type\": \"ms\" }" "{ \"value\": 1664418955003, \"type\": \"ms\" }"
"," ","
"\"value\":" "\"value\":"
"" ""
@ -1027,7 +1027,7 @@ int sml_16960_Test() {
"{" "{"
"\"timestamp\":" "\"timestamp\":"
"" ""
"{ \"value\": 1349020800004, \"type\": \"ms\" }" "{ \"value\": 1664418955004, \"type\": \"ms\" }"
"," ","
"\"value\":" "\"value\":"
"" ""