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

fst query

This commit is contained in:
yihaoDeng 2022-03-29 15:06:28 +08:00
parent 6a4199d3ed
commit 0653513968
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,10 +645,6 @@ void fstNodeDestroy(FstNode* node) {
fstSliceDestroy(&node->data); fstSliceDestroy(&node->data);
taosMemoryFree(node); taosMemoryFree(node);
} }
void fstNodeDestroyP(void* node) {
FstNode* n = (FstNode*)(*(FstNode**)node);
fstNodeDestroy(n);
};
FstTransitions* fstNodeTransitions(FstNode* node) { FstTransitions* fstNodeTransitions(FstNode* node) {
FstTransitions* t = taosMemoryMalloc(sizeof(FstTransitions)); FstTransitions* t = taosMemoryMalloc(sizeof(FstTransitions));
if (NULL == t) { if (NULL == t) {
@ -1359,7 +1355,7 @@ StreamWithStateResult* streamWithStateNextWith(StreamWithState* sws, StreamCallb
sws->stack = (SArray*)taosArrayInit(256, sizeof(StreamState)); sws->stack = (SArray*)taosArrayInit(256, sizeof(StreamState));
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
fstSliceDestroy(&slice); fstSliceDestroy(&slice);
taosArrayDestroyEx(nodes, NULL); taosArrayDestroy(nodes);
return NULL; return NULL;
} }
if (FST_NODE_IS_FINAL(nextNode) && isMatch) { if (FST_NODE_IS_FINAL(nextNode) && isMatch) {
@ -1367,20 +1363,14 @@ StreamWithStateResult* streamWithStateNextWith(StreamWithState* sws, StreamCallb
StreamWithStateResult* result = swsResultCreate(&slice, fOutput, tState); StreamWithStateResult* result = swsResultCreate(&slice, fOutput, tState);
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
fstSliceDestroy(&slice); fstSliceDestroy(&slice);
taosArrayDestroyEx(nodes, NULL); taosArrayDestroy(nodes);
nodes = NULL; nodes = NULL;
return result; return result;
} }
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
fstSliceDestroy(&slice); fstSliceDestroy(&slice);
}; };
taosArrayDestroyEx(nodes, NULL); taosArrayDestroy(nodes);
// taosArrayDestroyEx(nodes, );
// for (size_t i = 0; i < taosArrayGetSize(nodes); i++) {
// FstNode** node = (FstNode**)taosArrayGet(nodes, i);
// fstNodeDestroy(*node);
//}
// taosArrayDestroy(nodes);
return NULL; return NULL;
} }