From d674fcc8babb404eb3f97f9a666f669b937d9e18 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 24 Nov 2021 20:03:20 +0800
Subject: [PATCH] update fst struct

---
 source/libs/index/inc/index_fst.h |  8 ++++----
 source/libs/index/src/index_fst.c | 31 ++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/source/libs/index/inc/index_fst.h b/source/libs/index/inc/index_fst.h
index 2fa8b2ebba..b137690a05 100644
--- a/source/libs/index/inc/index_fst.h
+++ b/source/libs/index/inc/index_fst.h
@@ -99,15 +99,15 @@ FstState fstStateCreateFrom(FstSlice* data, CompiledAddr addr);
 FstState fstStateCreate(State state);
 
 //compile
-void fstStateCompileForOneTransNext(FstState* state, FstCountingWriter *w, CompiledAddr addr, uint8_t inp);
-void fstStateCompileForOneTrans(FstState* state, FstCountingWriter *w, CompiledAddr addr, FstTransition trn);
-void fstStateCompileForAnyTrans(FstState* state, FstCountingWriter *w, CompiledAddr addr, FstBuilderNode *node);
+void fstStateCompileForOneTransNext(FstCountingWriter *w, CompiledAddr addr, uint8_t inp);
+void fstStateCompileForOneTrans(FstCountingWriter *w, CompiledAddr addr, FstTransition trn);
+void fstStateCompileForAnyTrans(FstCountingWriter *w, CompiledAddr addr, FstBuilderNode *node);
 
 // set_comm_input
 void fstStateSetCommInput(FstState* state, uint8_t inp);
 
 // comm_input
-uint8_t fstStateCommInput(FstState* state);
+uint8_t fstStateCommInput(FstState* state, bool *null);
 
 // input_len
 
diff --git a/source/libs/index/src/index_fst.c b/source/libs/index/src/index_fst.c
index 8d3e1a0551..31b7668156 100644
--- a/source/libs/index/src/index_fst.c
+++ b/source/libs/index/src/index_fst.c
@@ -187,14 +187,24 @@ FstState fstStateCreate(State state){
   return stateDict[idx];
 }
 //compile
-void fstStateCompileForOneTransNext(FstState* state, FstCountingWriter *w, CompiledAddr addr, uint8_t inp) {
+void fstStateCompileForOneTransNext(FstCountingWriter *w, CompiledAddr addr, uint8_t inp) {
+  FstState s = fstStateCreate(OneTransNext);  
+  fstStateSetCommInput(&s, inp);
+
+  bool null = false;
+  uint8_t v = fstStateCommInput(&s, &null);
+  if (null) {
+    // w->write_all(&[inp])
+  }  
+  // w->write_all(&[s.val])
   return ;
 }
-void fstStateCompileForOneTrans(FstState* state, FstCountingWriter *w, CompiledAddr addr, FstTransition trn) {
+void fstStateCompileForOneTrans(FstCountingWriter *w, CompiledAddr addr, FstTransition trn) {
+  
   return ;
 
 }
-void fstStateCompileForAnyTrans(FstState* state, FstCountingWriter *w, CompiledAddr addr, FstBuilderNode *node) {
+void fstStateCompileForAnyTrans(FstCountingWriter *w, CompiledAddr addr, FstBuilderNode *node) {
   return;
 }
 
@@ -208,9 +218,13 @@ void fstStateSetCommInput(FstState* s, uint8_t inp) {
 }
 
 // comm_input
-uint8_t fstStateCommInput(FstState* s) {
+uint8_t fstStateCommInput(FstState* s, bool *null) {
   assert(s->state == OneTransNext || s->state == OneTrans);
   uint8_t v = s->val & 0b00111111;
+  if (v == 0) { 
+    *null = true; 
+    return v;
+  } 
   //v = 0 indicate that common_input is None
   return v == 0 ? 0 : COMMON_INPUT(v);  
 }
@@ -219,7 +233,9 @@ uint8_t fstStateCommInput(FstState* s) {
 
 uint64_t fstStateInputLen(FstState* s) {
   assert(s->state == OneTransNext || s->state == OneTrans);
-  return fstStateCommInput(s) == 0 ? 1 : 0;
+  bool null = false;
+  fstStateCommInput(s, &null); 
+  return null ? 1 : 0 ;
 } 
   
 
@@ -250,8 +266,9 @@ uint64_t fstStateEndAddrForAnyTrans(FstState *state, uint64_t version, FstSlice
 uint8_t  fstStateInput(FstState *s, FstNode *node) {
   assert(s->state == OneTransNext || s->state == OneTrans);
   FstSlice *slice = &node->data;
-  uint8_t inp = fstStateCommInput(s);
-  return inp != 0 ? inp : slice->data[slice->start - 1];
+  bool null = false;
+  uint8_t inp = fstStateCommInput(s, &null);
+  return null == false ? inp : slice->data[slice->start - 1];
 }
 uint8_t  fstStateInputForAnyTrans(FstState *s, FstNode *node, uint64_t i) {
   assert(s->state == AnyTrans);