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

fix compile

This commit is contained in:
Liu Jicong 2022-08-23 20:33:26 +08:00
parent de041f45b5
commit c296dd0a63
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libs/executor/executor.h
View File

@ -23,7 +23,6 @@ extern "C" {
#include "query.h"
#include "tcommon.h"
#include "tmsgcb.h"
#include "tstream.h"
typedef void* qTaskInfo_t;
typedef void* DataSinkHandle;
@ -42,7 +41,7 @@ typedef struct {
bool initTableReader;
bool initTqReader;
int32_t numOfVgroups;
SStreamState* pState;
void* pStateBackend;
} SReadHandle;
// in queue mode, data streams are seperated by msg

3
source/libs/executor/CMakeLists.txt
View File

@ -8,8 +8,7 @@ add_library(executor STATIC ${EXECUTOR_SRC})
# )
target_link_libraries(executor
PUBLIC stream
PRIVATE os util common function parser planner qcom vnode scalar nodes index
PRIVATE os util common function parser planner qcom vnode scalar nodes index stream
)
target_include_directories(

4
source/libs/executor/src/executorimpl.c
View File

@ -4616,8 +4616,8 @@ int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SRead
goto _complete;
}
if (pHandle && pHandle->pState) {
(*pTaskInfo)->streamInfo.pState = pHandle->pState;
if (pHandle && pHandle->pStateBackend) {
(*pTaskInfo)->streamInfo.pState = pHandle->pStateBackend;
}
(*pTaskInfo)->sql = sql;

1
source/libs/stream/src/streamExec.c
View File

@ -140,7 +140,6 @@ int32_t streamPipelineExec(SStreamTask* pTask, int32_t batchNum, bool dispatch)
return 0;
}
// TODO: handle version
int32_t streamExecForAll(SStreamTask* pTask) {
while (1) {
int32_t batchCnt = 1;

9
source/libs/stream/src/streamMeta.c
View File

@ -23,16 +23,17 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
terrno = TSDB_CODE_OUT_OF_MEMORY;
return NULL;
}
char streamPath[200];
int32_t len = strlen(path) + 20;
char* streamPath = taosMemoryCalloc(1, len);
sprintf(streamPath, "%s/%s", path, "stream");
pMeta->path = strdup(streamPath);
if (tdbOpen(pMeta->path, 16 * 1024, 1, &pMeta->db) < 0) {
goto _err;
}
char checkpointPath[200];
sprintf(checkpointPath, "%s/%s", streamPath, "checkpoints");
mkdir(checkpointPath, 0755);
sprintf(streamPath, "%s/%s", pMeta->path, "checkpoints");
mkdir(streamPath, 0755);
taosMemoryFree(streamPath);
if (tdbTbOpen("task.db", sizeof(int32_t), -1, NULL, pMeta->db, &pMeta->pTaskDb) < 0) {
goto _err;