From 32ac2d02c87d7f5ba46db2204fa4f78289b199ae Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 29 Nov 2021 10:54:49 +0800
Subject: [PATCH] update fst core struct

---
 source/libs/index/inc/index_fst.h      |  4 +++
 source/libs/index/inc/index_fst_node.h |  2 +-
 source/libs/index/src/index_fst.c      |  5 +++
 source/libs/index/src/index_fst_node.c | 43 +++++++++++++-------------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/source/libs/index/inc/index_fst.h b/source/libs/index/inc/index_fst.h
index 37feb79ac8..01be2f8b2b 100644
--- a/source/libs/index/inc/index_fst.h
+++ b/source/libs/index/inc/index_fst.h
@@ -255,4 +255,8 @@ FstType      fstGetType(Fst *fst);
 CompiledAddr fstGetRootAddr(Fst *fst);
 Output fstEmptyFinalOutput(Fst *fst, bool *null);
 bool fstVerify(Fst *fst);
+
+
+//refactor this function 
+bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr); 
 #endif
diff --git a/source/libs/index/inc/index_fst_node.h b/source/libs/index/inc/index_fst_node.h
index ddd7e1f450..0645aa1158 100644
--- a/source/libs/index/inc/index_fst_node.h
+++ b/source/libs/index/inc/index_fst_node.h
@@ -41,7 +41,7 @@ FstBuilderNode *fstBuilderNodeClone(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);
 
diff --git a/source/libs/index/src/index_fst.c b/source/libs/index/src/index_fst.c
index 6c1ea8cfeb..f9cb68baa9 100644
--- a/source/libs/index/src/index_fst.c
+++ b/source/libs/index/src/index_fst.c
@@ -733,6 +733,11 @@ bool fstNodeCompile(FstNode *node, void *w, CompiledAddr lastAddr, CompiledAddr
   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 *b = malloc(sizeof(FstBuilder));  
diff --git a/source/libs/index/src/index_fst_node.c b/source/libs/index/src/index_fst_node.c
index 5452f9cb89..b33b8e4428 100644
--- a/source/libs/index/src/index_fst_node.c
+++ b/source/libs/index/src/index_fst_node.c
@@ -59,26 +59,27 @@ void fstBuilderNodeCloneFrom(FstBuilderNode *dst, FstBuilderNode *src) {
   src->trans = NULL;
 }
 
-bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr) {
-  size_t sz = taosArrayGetSize(b->trans);  
-  assert(sz < 256);
-  if (FST_BUILDER_NODE_IS_FINAL(b) 
-      && FST_BUILDER_NODE_TRANS_ISEMPTY(b) 
-      && FST_BUILDER_NODE_FINALOUTPUT_ISZERO(b)) {
-    return true; 
-  } else if (sz != 1 || b->isFinal) {
-    // AnyTrans->Compile(w, addr, node);
-  } else {
-    FstTransition *tran = taosArrayGet(b->trans, 0);   
-    if (tran->addr == lastAddr && tran->out == 0) {
-       //OneTransNext::compile(w, lastAddr, tran->inp);
-       return true;
-    } else {
-      //OneTrans::Compile(w, lastAddr, *tran);
-       return true;
-    } 
-  } 
-  return true; 
-} 
+//bool fstBuilderNodeCompileTo(FstBuilderNode *b, FstCountingWriter *wrt, CompiledAddr lastAddr, CompiledAddr startAddr) {
+  
+  //size_t sz = taosArrayGetSize(b->trans);  
+  //assert(sz < 256);
+  //if (FST_BUILDER_NODE_IS_FINAL(b) 
+  //    && FST_BUILDER_NODE_TRANS_ISEMPTY(b) 
+  //    && FST_BUILDER_NODE_FINALOUTPUT_ISZERO(b)) {
+  //  return true; 
+  //} else if (sz != 1 || b->isFinal) {
+  //  // AnyTrans->Compile(w, addr, node);
+  //} else {
+  //  FstTransition *tran = taosArrayGet(b->trans, 0);   
+  //  if (tran->addr == lastAddr && tran->out == 0) {
+  //     //OneTransNext::compile(w, lastAddr, tran->inp);
+  //     return true;
+  //  } else {
+  //    //OneTrans::Compile(w, lastAddr, *tran);
+  //     return true;
+  //  } 
+  //} 
+  //return true; 
+//}