[TD-10529]add new files.

include/common/common.h

@@ -16,6 +16,8 @@
 #ifndef TDENGINE_COMMON_H
 #define TDENGINE_COMMON_H
 
+#include "taosdef.h"
+
 typedef struct STimeWindow {
   TSKEY skey;
   TSKEY ekey;

include/common/tcompression.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_TCOMPRESSION_H
+#define TDENGINE_TCOMPRESSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taosdef.h"
+
+#define COMP_OVERFLOW_BYTES 2
+#define BITS_PER_BYTE       8
+
+// Masks
+#define INT64MASK(_x) ((((uint64_t)1) << _x) - 1)
+#define INT32MASK(_x) (((uint32_t)1 << _x) - 1)
+#define INT8MASK(_x) (((uint8_t)1 << _x) - 1)
+
+// Compression algorithm
+#define NO_COMPRESSION 0
+#define ONE_STAGE_COMP 1
+#define TWO_STAGE_COMP 2
+
+//
+// compressed data first byte foramt
+//   ------ 7 bit ---- | ---- 1 bit ----
+//        algorithm           mode
+//
+
+// compression data mode save first byte lower 1 bit
+#define MODE_NOCOMPRESS  0  // original data
+#define MODE_COMPRESS    1  // compatible old compress
+
+// compression algorithm save first byte higher 7 bit
+#define ALGO_SZ_LOSSY     1 // SZ compress 
+
+#define HEAD_MODE(x)  x%2
+#define HEAD_ALGO(x)  x/2
+
+extern int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type);
+extern int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type);
+extern int tsCompressBoolImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressBoolImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize);
+extern int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize);
+extern int tsCompressTimestampImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressDoubleImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressFloatImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressFloatImp(const char *const input, const int nelements, char *const output);
+// lossy
+extern int tsCompressFloatLossyImp(const char * input, const int nelements, char *const output);
+extern int tsDecompressFloatLossyImp(const char * input, int compressedSize, const int nelements, char *const output);
+extern int tsCompressDoubleLossyImp(const char * input, const int nelements, char *const output);
+extern int tsDecompressDoubleLossyImp(const char * input, int compressedSize, const int nelements, char *const output);
+
+#ifdef TD_TSZ
+extern bool lossyFloat;
+extern bool lossyDouble;
+// init call
+int tsCompressInit();
+// exit call
+void tsCompressExit();
+#endif
+
+static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                      char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output,
+                        int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                       char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output,
+                         int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                  char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output,
+                    int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, 
+                   char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressBoolImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressBoolImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output,
+                     int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressBoolImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressBoolImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+  return tsCompressStringImp(input, inputSize, output, outputSize);
+}
+
+static FORCE_INLINE int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  return tsDecompressStringImp(input, compressedSize, output, outputSize);
+}
+
+static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                    char algorithm, char *const buffer, int bufferSize) {
+#ifdef TD_TSZ
+  // lossy mode
+  if(lossyFloat) {
+    return tsCompressFloatLossyImp(input, nelements, output);
+  // lossless mode  
+  } else {
+#endif    
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsCompressFloatImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      int len = tsCompressFloatImp(input, nelements, buffer);
+      return tsCompressStringImp(buffer, len, output, outputSize);
+    } else {
+      assert(0);
+      return -1;
+    }    
+#ifdef TD_TSZ  
+  }
+#endif
+}
+
+static FORCE_INLINE int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output,
+                      int outputSize, char algorithm, char *const buffer, int bufferSize) {
+#ifdef TD_TSZ
+  if(HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY){
+    // decompress lossy
+    return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
+  } else {
+#endif    
+    // decompress lossless
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsDecompressFloatImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+      return tsDecompressFloatImp(buffer, nelements, output);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ  
+  }
+#endif
+}
+
+
+static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+#ifdef TD_TSZ  
+  if(lossyDouble){
+    // lossy mode
+    return tsCompressDoubleLossyImp(input, nelements, output);
+  } else {
+#endif    
+    // lossless mode
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsCompressDoubleImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      int len = tsCompressDoubleImp(input, nelements, buffer);
+      return tsCompressStringImp(buffer, len, output, outputSize);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ      
+  }
+#endif  
+}
+
+static FORCE_INLINE int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  #ifdef TD_TSZ  
+  if(HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY){
+    // decompress lossy
+    return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
+  } else {
+  #endif  
+    // decompress lossless
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsDecompressDoubleImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+      return tsDecompressDoubleImp(buffer, nelements, output);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ      
+  }
+#endif  
+}
+
+#ifdef TD_TSZ  
+//
+//  lossy float double
+//
+static FORCE_INLINE int tsCompressFloatLossy(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                    char algorithm, char *const buffer, int bufferSize) {
+  return tsCompressFloatLossyImp(input, nelements, output);
+}
+
+static FORCE_INLINE int tsDecompressFloatLossy(const char *const input, int compressedSize, const int nelements, char *const output,
+                      int outputSize, char algorithm, char *const buffer, int bufferSize){
+  return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
+}
+
+static FORCE_INLINE int tsCompressDoubleLossy(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize){
+  return tsCompressDoubleLossyImp(input, nelements, output);
+}
+
+static FORCE_INLINE int tsDecompressDoubleLossy(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize){
+  return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
+}
+
+#endif
+
+static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                        char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressTimestampImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressTimestampImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output,
+                          int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressTimestampImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressTimestampImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TCOMPRESSION_H
\ No newline at end of file

source/libs/parser/inc/tvariant.h

@@ -39,7 +39,7 @@ typedef struct SVariant {
 
 bool taosVariantIsValid(SVariant *pVar);
 
-void taosVariantCreate(SVariant *pVar, SStrToken *token);
+void taosVariantCreate(SVariant *pVar, SToken *token);
 
 void taosVariantCreateFromBinary(SVariant *pVar, const char *pz, size_t len, uint32_t type);
 

source/libs/planner/CMakeLists.txt

@@ -8,5 +8,5 @@ target_include_directories(
 
 target_link_libraries(
     planner
-    PRIVATE os util common catalog parser
+    PRIVATE os util common catalog parser transport
 )
\ No newline at end of file

source/libs/scheduler/inc/schedulerInt.h

@@ -25,14 +25,6 @@ extern "C" {
 #include "planner.h"
 #include "scheduler.h"
 
-typedef struct SSubquery {
-  int64_t   taskId; // the task id created by qnode
-  int32_t   type;
-  int32_t   level;
-  struct SQueryPhyNode *pNode;
-  SArray   *pUpstream;
-} SSubquery;
-
 typedef struct SQuery {
   SArray     **pSubquery;
   int32_t      numOfLevels;

src/client/src/tscServer.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <tscompression.h>
+#include <tcompression.h>
 #include "os.h"
 #include "qPlan.h"
 #include "qTableMeta.h"

src/common/src/ttypes.c

@@ -14,9 +14,9 @@
  */
 #include "os.h"
 
-#include "ttype.h"
+#include "tcompression.h"
 #include "ttokendef.h"
-#include "tscompression.h"
+#include "ttype.h"
 
 const int32_t TYPE_BYTES[15] = {
     -1,                      // TSDB_DATA_TYPE_NULL

src/dnode/src/dnodeMain.c

@@ -14,36 +14,36 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "os.h"
-#include "taos.h"
-#include "tnote.h"
-#include "ttimer.h"
-#include "tconfig.h"
-#include "tfile.h"
-#include "twal.h"
-#include "tfs.h"
-#include "tsync.h"
-#include "dnodeStep.h"
-#include "dnodePeer.h"
-#include "dnodeModule.h"
-#include "dnodeEps.h"
-#include "dnodeMInfos.h"
 #include "dnodeCfg.h"
 #include "dnodeCheck.h"
-#include "dnodeVRead.h"
-#include "dnodeVWrite.h"
-#include "dnodeVMgmt.h"
-#include "dnodeVnodes.h"
+#include "dnodeEps.h"
+#include "dnodeMInfos.h"
+#include "dnodeMPeer.h"
 #include "dnodeMRead.h"
 #include "dnodeMWrite.h"
-#include "dnodeMPeer.h"
+#include "dnodeModule.h"
+#include "dnodePeer.h"
 #include "dnodeShell.h"
+#include "dnodeStep.h"
 #include "dnodeTelemetry.h"
-#include "module.h"
+#include "dnodeVMgmt.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
+#include "dnodeVnodes.h"
 #include "mnode.h"
+#include "module.h"
+#include "os.h"
 #include "qScript.h"
+#include "taos.h"
 #include "tcache.h"
-#include "tscompression.h"
+#include "tcompression.h"
+#include "tconfig.h"
+#include "tfile.h"
+#include "tfs.h"
+#include "tnote.h"
+#include "tsync.h"
+#include "ttimer.h"
+#include "twal.h"
 
 #if !defined(_MODULE) || !defined(_TD_LINUX)
 int32_t moduleStart() { return 0; }

src/mnode/src/mnodeTable.c

@@ -14,35 +14,34 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "os.h"
-#include "taosmsg.h"
-#include "tutil.h"
-#include "taoserror.h"
-#include "taosmsg.h"
-#include "tscompression.h"
-#include "tname.h"
-#include "tidpool.h"
-#include "tglobal.h"
-#include "tcompare.h"
-#include "tdataformat.h"
-#include "tgrant.h"
-#include "tqueue.h"
+#include "mnodeTable.h"
+#include "dnode.h"
 #include "hash.h"
 #include "mnode.h"
-#include "dnode.h"
-#include "mnodeDef.h"
-#include "mnodeInt.h"
 #include "mnodeAcct.h"
 #include "mnodeDb.h"
+#include "mnodeDef.h"
 #include "mnodeDnode.h"
+#include "mnodeFunc.h"
+#include "mnodeInt.h"
+#include "mnodePeer.h"
+#include "mnodeRead.h"
 #include "mnodeSdb.h"
 #include "mnodeShow.h"
-#include "mnodeTable.h"
 #include "mnodeVgroup.h"
 #include "mnodeWrite.h"
-#include "mnodeRead.h"
-#include "mnodePeer.h"
-#include "mnodeFunc.h"
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tcompare.h"
+#include "tcompression.h"
+#include "tdataformat.h"
+#include "tglobal.h"
+#include "tgrant.h"
+#include "tidpool.h"
+#include "tname.h"
+#include "tqueue.h"
+#include "tutil.h"
 
 #define ALTER_CTABLE_RETRY_TIMES  3
 #define CREATE_CTABLE_RETRY_TIMES 10

src/query/src/qExecutor.c

@@ -19,17 +19,17 @@
 
 #include "exception.h"
 #include "hash.h"
-#include "texpr.h"
 #include "qExecutor.h"
 #include "qResultbuf.h"
+#include "qScript.h"
 #include "qUtil.h"
 #include "queryLog.h"
-#include "tlosertree.h"
-#include "ttype.h"
 #include "tcompare.h"
-#include "tscompression.h"
-#include "qScript.h"
+#include "tcompression.h"
+#include "texpr.h"
+#include "tlosertree.h"
 #include "tscLog.h"
+#include "ttype.h"
 
 #define IS_MASTER_SCAN(runtime)        ((runtime)->scanFlag == MASTER_SCAN)
 #define IS_REVERSE_SCAN(runtime)       ((runtime)->scanFlag == REVERSE_SCAN)

src/query/src/qResultbuf.c

 #include "qResultbuf.h"
-#include "stddef.h"
-#include "tscompression.h"
 #include "hash.h"
 #include "qExtbuffer.h"
 #include "queryLog.h"
+#include "stddef.h"
 #include "taoserror.h"
+#include "tcompression.h"
 
 #define GET_DATA_PAYLOAD(_p) ((char *)(_p)->pData + POINTER_BYTES)
 #define NO_IN_MEM_AVAILABLE_PAGES(_b) (listNEles((_b)->lruList) >= (_b)->inMemPages)

src/query/src/qTsbuf.c

 #include "qTsbuf.h"
+#include "queryLog.h"
 #include "taoserror.h"
-#include "tscompression.h"
+#include "tcompression.h"
 #include "tutil.h"
-#include "queryLog.h"
 
 static int32_t getDataStartOffset();
 static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t index, STSGroupBlockInfo* pBlockInfo);

src/query/src/qUtil.c

@@ -19,10 +19,10 @@
 
 #include "qExecutor.h"
 #include "qUtil.h"
+#include "queryLog.h"
 #include "tbuffer.h"
+#include "tcompression.h"
 #include "tlosertree.h"
-#include "queryLog.h"
-#include "tscompression.h"
 
 typedef struct SCompSupporter {
   STableQueryInfo **pTableQueryInfo;

src/tsdb/inc/tsdbint.h

@@ -26,20 +26,20 @@
 // #include <semaphore.h>
 // #include <dirent.h>
 
+#include "hash.h"
 #include "os.h"
-#include "tlog.h"
 #include "taosdef.h"
 #include "taoserror.h"
+#include "tarray.h"
 #include "tchecksum.h"
-#include "tskiplist.h"
-#include "tdataformat.h"
 #include "tcoding.h"
-#include "tscompression.h"
-#include "tlockfree.h"
-#include "tlist.h"
-#include "hash.h"
-#include "tarray.h"
+#include "tcompression.h"
+#include "tdataformat.h"
 #include "tfs.h"
+#include "tlist.h"
+#include "tlockfree.h"
+#include "tlog.h"
+#include "tskiplist.h"
 #include "tsocket.h"
 
 #include "tsdb.h"

src/util/src/tcompression.c

@@ -53,10 +53,9 @@
   #include "td_sz.h"
 #endif
 #include "taosdef.h"
-#include "tscompression.h"
-#include "tulog.h"
+#include "tcompression.h"
 #include "tglobal.h"
-
+#include "tulog.h"
 
 static const int TEST_NUMBER = 1;
 #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0)