From aec7bef25b05afb69696533bafe00e7b53210c0c Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 3 Mar 2022 12:29:54 +0800
Subject: [PATCH] add UT

---
 source/libs/index/src/index_tfile.c |  3 +++
 source/libs/index/test/fstTest.cc   | 23 +++++++++++++----------
 source/libs/index/test/jsonUT.cc    | 22 ++++++++++++++++++----
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/source/libs/index/src/index_tfile.c b/source/libs/index/src/index_tfile.c
index a2089e8eee..0947c796b2 100644
--- a/source/libs/index/src/index_tfile.c
+++ b/source/libs/index/src/index_tfile.c
@@ -275,6 +275,7 @@ int tfileWriterPut(TFileWriter* tw, void* data, bool order) {
     __compar_fn_t fn;
 
     int8_t colType = tw->header.colType;
+    colType = INDEX_TYPE_GET_TYPE(colType);
     if (colType == TSDB_DATA_TYPE_BINARY || colType == TSDB_DATA_TYPE_NCHAR) {
       fn = tfileStrCompare;
     } else {
@@ -572,6 +573,8 @@ static int tfileWriteHeader(TFileWriter* writer) {
 static int tfileWriteData(TFileWriter* write, TFileValue* tval) {
   TFileHeader* header = &write->header;
   uint8_t      colType = header->colType;
+
+  colType = INDEX_TYPE_GET_TYPE(colType);
   if (colType == TSDB_DATA_TYPE_BINARY || colType == TSDB_DATA_TYPE_NCHAR) {
     FstSlice key = fstSliceCreate((uint8_t*)(tval->colVal), (size_t)strlen(tval->colVal));
     if (fstBuilderInsert(write->fb, key, tval->offset)) {
diff --git a/source/libs/index/test/fstTest.cc b/source/libs/index/test/fstTest.cc
index 65118a2bce..74dcec4490 100644
--- a/source/libs/index/test/fstTest.cc
+++ b/source/libs/index/test/fstTest.cc
@@ -312,15 +312,18 @@ void validateTFile(char* arg) {
   tfCleanup();
 }
 
-void iterTFileReader(char* path, char* ver) {
+void iterTFileReader(char* path, char* uid, char* colName, char* ver) {
   tfInit();
 
-  int          version = atoi(ver);
-  TFileReader* reader = tfileReaderOpen(path, 0, version, "tag1");
-  Iterate*     iter = tfileIteratorCreate(reader);
-  bool         tn = iter ? iter->next(iter) : false;
-  int          count = 0;
-  int          termCount = 0;
+  uint64_t suid = atoi(uid);
+  int      version = atoi(ver);
+
+  TFileReader* reader = tfileReaderOpen(path, suid, version, colName);
+
+  Iterate* iter = tfileIteratorCreate(reader);
+  bool     tn = iter ? iter->next(iter) : false;
+  int      count = 0;
+  int      termCount = 0;
   while (tn == true) {
     count++;
     IterateValue* cv = iter->getValue(iter);
@@ -337,9 +340,9 @@ void iterTFileReader(char* path, char* ver) {
 int main(int argc, char* argv[]) {
   // tool to check all kind of fst test
   // if (argc > 1) { validateTFile(argv[1]); }
-  if (argc > 2) {
-    // opt
-    iterTFileReader(argv[1], argv[2]);
+  if (argc > 4) {
+    // path suid colName ver
+    iterTFileReader(argv[1], argv[2], argv[3], argv[4]);
   }
   // checkFstCheckIterator();
   // checkFstLongTerm();
diff --git a/source/libs/index/test/jsonUT.cc b/source/libs/index/test/jsonUT.cc
index e184bc49ae..e5c79d137f 100644
--- a/source/libs/index/test/jsonUT.cc
+++ b/source/libs/index/test/jsonUT.cc
@@ -22,7 +22,7 @@ class JsonEnv : public ::testing::Test {
   virtual void SetUp() {
     taosRemoveDir(dir.c_str());
     taosMkDir(dir.c_str());
-
+    printf("set up\n");
     opts = indexOptsCreate();
     int ret = tIndexJsonOpen(opts, dir.c_str(), &index);
     assert(ret == 0);
@@ -30,6 +30,7 @@ class JsonEnv : public ::testing::Test {
   virtual void TearDown() {
     tIndexJsonClose(index);
     indexOptsDestroy(opts);
+    printf("destory\n");
   }
   SIndexJsonOpts* opts;
   SIndexJson*     index;
@@ -37,7 +38,7 @@ class JsonEnv : public ::testing::Test {
 
 TEST_F(JsonEnv, testWrite) {
   {
-    std::string colName("voltage");
+    std::string colName("test");
     std::string colVal("ab");
     SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
                                        colVal.c_str(), colVal.size());
@@ -76,7 +77,7 @@ TEST_F(JsonEnv, testWrite) {
     indexMultiTermDestroy(terms);
   }
   {
-    std::string colName("voltage");
+    std::string colName("test");
     std::string colVal("ab");
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
@@ -91,6 +92,19 @@ TEST_F(JsonEnv, testWrite) {
   }
 }
 TEST_F(JsonEnv, testWriteMillonData) {
+  {
+    std::string colName("test");
+    std::string colVal("ab");
+    SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
+                                       colVal.c_str(), colVal.size());
+
+    SIndexMultiTerm* terms = indexMultiTermCreate();
+    indexMultiTermAdd(terms, term);
+    for (size_t i = 0; i < 100; i++) {
+      tIndexJsonPut(index, terms, i);
+    }
+    indexMultiTermDestroy(terms);
+  }
   {
     std::string colName("voltagefdadfa");
     std::string colVal("abxxxxxxxxxxxx");
@@ -105,7 +119,7 @@ TEST_F(JsonEnv, testWriteMillonData) {
     indexMultiTermDestroy(terms);
   }
   {
-    std::string colName("voltage");
+    std::string colName("test");
     std::string colVal("ab");
 
     SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);