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

Merge pull request #9045 from taosdata/feature/fst 

update fst search frame
This commit is contained in:
Yihao Deng 2021-12-11 16:52:15 +08:00 committed by GitHub
parent 559af5e5a8 a9a068410b
commit f45083c6aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/index/inc/index_fst.h
View File

@ -275,6 +275,7 @@ FstNode* fstGetRoot(Fst *fst);
FstType fstGetType(Fst *fst); FstType fstGetType(Fst *fst);
CompiledAddr fstGetRootAddr(Fst *fst); CompiledAddr fstGetRootAddr(Fst *fst);
Output fstEmptyFinalOutput(Fst *fst, bool *null); Output fstEmptyFinalOutput(Fst *fst, bool *null);
bool fstVerify(Fst *fst); bool fstVerify(Fst *fst);

1
source/libs/index/inc/index_fst_automation.h
View File

@ -50,6 +50,7 @@ typedef struct AutomationFunc {
} AutomationFunc; } AutomationFunc;
AutomationCtx *automCtxCreate(void *data, AutomationType type); AutomationCtx *automCtxCreate(void *data, AutomationType type);
void autoCtxDestroy(AutomationCtx *ctx);
extern AutomationFunc automFuncs[]; extern AutomationFunc automFuncs[];
#ifdef __cplusplus #ifdef __cplusplus

1
source/libs/index/src/index_fst.c
View File

@ -1072,7 +1072,6 @@ bool fstGet(Fst *fst, FstSlice *b, Output *out) {
tOut += trn.out; tOut += trn.out;
root = fstGetNode(fst, trn.addr); root = fstGetNode(fst, trn.addr);
taosArrayPush(nodes, &root); taosArrayPush(nodes, &root);
//fstNodeDestroy(root);
} }
if (!FST_NODE_IS_FINAL(root)) { if (!FST_NODE_IS_FINAL(root)) {
return false; return false;

14
source/libs/index/src/index_fst_automation.c
View File

@ -75,6 +75,7 @@ AutomationFunc automFuncs[] = {{
patternAccept, patternAccept,
patternAcceptEof patternAcceptEof
} }
// add more search type
}; };
AutomationCtx* automCtxCreate(void *data, AutomationType type) { AutomationCtx* automCtxCreate(void *data, AutomationType type) {
@ -82,8 +83,15 @@ AutomationCtx* automCtxCreate(void *data, AutomationType type) {
if (ctx == NULL) { return NULL; } if (ctx == NULL) { return NULL; }
ctx->type = type; ctx->type = type;
if (type == AUTOMATION_PREFIX) { if (ctx->type == AUTOMATION_PREFIX) {
} } else if (ctx->type == AUTMMATION_MATCH) {
}
} else {
// add more search type
}
return ctx;
}
void autoCtxDestroy(AutomationCtx *ctx) {
free(ctx);
}