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

update fst core struct

This commit is contained in:
yihaoDeng 2021-11-29 10:54:49 +08:00
parent 53680b76bb
commit 32ac2d02c8
4 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,4 +255,8 @@ 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);
//refactor this function
bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr);
#endif #endif

2
source/libs/index/inc/index_fst_node.h
View File

@ -41,7 +41,7 @@ FstBuilderNode *fstBuilderNodeClone(FstBuilderNode *src);
void fstBuilderNodeCloneFrom(FstBuilderNode *dst, FstBuilderNode *src); void fstBuilderNodeCloneFrom(FstBuilderNode *dst, FstBuilderNode *src);
bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr); //bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr);
void fstBuilderNodeDestroy(FstBuilderNode *node); void fstBuilderNodeDestroy(FstBuilderNode *node);

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

@ -733,6 +733,11 @@ bool fstNodeCompile(FstNode *node, void *w, CompiledAddr lastAddr, CompiledAddr
return true; return true;
} }
bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr) {
return fstNodeCompile(NULL, wrt, lastAddr, startAddr, b);
}
FstBuilder *fstBuilderCreate(void *w, FstType ty) { FstBuilder *fstBuilderCreate(void *w, FstType ty) {
FstBuilder *b = malloc(sizeof(FstBuilder)); FstBuilder *b = malloc(sizeof(FstBuilder));

43
source/libs/index/src/index_fst_node.c
View File

@ -59,26 +59,27 @@ void fstBuilderNodeCloneFrom(FstBuilderNode *dst, FstBuilderNode *src) {
src->trans = NULL; src->trans = NULL;
} }
bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr) { //bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr) {
size_t sz = taosArrayGetSize(b->trans);
assert(sz < 256); //size_t sz = taosArrayGetSize(b->trans);
if (FST_BUILDER_NODE_IS_FINAL(b) //assert(sz < 256);
&& FST_BUILDER_NODE_TRANS_ISEMPTY(b) //if (FST_BUILDER_NODE_IS_FINAL(b)
&& FST_BUILDER_NODE_FINALOUTPUT_ISZERO(b)) { // && FST_BUILDER_NODE_TRANS_ISEMPTY(b)
return true; // && FST_BUILDER_NODE_FINALOUTPUT_ISZERO(b)) {
} else if (sz != 1 || b->isFinal) { // return true;
// AnyTrans->Compile(w, addr, node); //} else if (sz != 1 || b->isFinal) {
} else { // // AnyTrans->Compile(w, addr, node);
FstTransition *tran = taosArrayGet(b->trans, 0); //} else {
if (tran->addr == lastAddr && tran->out == 0) { // FstTransition *tran = taosArrayGet(b->trans, 0);
//OneTransNext::compile(w, lastAddr, tran->inp); // if (tran->addr == lastAddr && tran->out == 0) {
return true; // //OneTransNext::compile(w, lastAddr, tran->inp);
} else { // return true;
//OneTrans::Compile(w, lastAddr, *tran); // } else {
return true; // //OneTrans::Compile(w, lastAddr, *tran);
} // return true;
} // }
return true; //}
} //return true;
//}