more code format

source/libs/scalar/inc/sclInt.h

@@ -18,9 +18,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#include "query.h"
 #include "tcommon.h"
 #include "thash.h"
-#include "query.h"
 
 typedef struct SOperatorValueType {
   int32_t opResType;
@@ -29,46 +29,72 @@ typedef struct SOperatorValueType {
 } SOperatorValueType;
 
 typedef struct SScalarCtx {
-  int32_t      code;
-  bool         dual;
-  SArray      *pBlockList;  /* element is SSDataBlock* */
-  SHashObj    *pRes;  /* element is SScalarParam */
-  void        *param;      // additional parameter (meta actually) for acquire value such as tbname/tags values
+  int32_t            code;
+  bool               dual;
+  SArray*            pBlockList; /* element is SSDataBlock* */
+  SHashObj*          pRes;       /* element is SScalarParam */
+  void*              param;      // additional parameter (meta actually) for acquire value such as tbname/tags values
   SOperatorValueType type;
 } SScalarCtx;
 
-
 #define SCL_DATA_TYPE_DUMMY_HASH 9000
-#define SCL_DEFAULT_OP_NUM 10
+#define SCL_DEFAULT_OP_NUM       10
 
-#define SCL_IS_CONST_NODE(_node) ((NULL == (_node)) || (QUERY_NODE_VALUE == (_node)->type) || (QUERY_NODE_NODE_LIST == (_node)->type))
+#define SCL_IS_CONST_NODE(_node) \
+  ((NULL == (_node)) || (QUERY_NODE_VALUE == (_node)->type) || (QUERY_NODE_NODE_LIST == (_node)->type))
 #define SCL_IS_CONST_CALC(_ctx) (NULL == (_ctx)->pBlockList)
-//#define SCL_IS_NULL_VALUE_NODE(_node) ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode *)_node)->node.resType.type) && (((SValueNode *)_node)->placeholderNo <= 0))
-#define SCL_IS_NULL_VALUE_NODE(_node) ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode *)_node)->node.resType.type))
+//#define SCL_IS_NULL_VALUE_NODE(_node) ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode
+//*)_node)->node.resType.type) && (((SValueNode *)_node)->placeholderNo <= 0))
+#define SCL_IS_NULL_VALUE_NODE(_node) \
+  ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode*)_node)->node.resType.type))
 #define SCL_IS_COMPARISON_OPERATOR(_opType) ((_opType) >= OP_TYPE_GREATER_THAN && (_opType) < OP_TYPE_IS_NOT_UNKNOWN)
-#define SCL_DOWNGRADE_DATETYPE(_type) ((_type) == TSDB_DATA_TYPE_BIGINT || TSDB_DATA_TYPE_DOUBLE == (_type) || (_type) == TSDB_DATA_TYPE_UBIGINT)
-#define SCL_NO_NEED_CONVERT_COMPARISION(_ltype, _rtype, _optr) (IS_NUMERIC_TYPE(_ltype) && IS_NUMERIC_TYPE(_rtype) && ((_optr) >= OP_TYPE_GREATER_THAN && (_optr) <= OP_TYPE_NOT_EQUAL))
+#define SCL_DOWNGRADE_DATETYPE(_type) \
+  ((_type) == TSDB_DATA_TYPE_BIGINT || TSDB_DATA_TYPE_DOUBLE == (_type) || (_type) == TSDB_DATA_TYPE_UBIGINT)
+#define SCL_NO_NEED_CONVERT_COMPARISION(_ltype, _rtype, _optr) \
+  (IS_NUMERIC_TYPE(_ltype) && IS_NUMERIC_TYPE(_rtype) &&       \
+   ((_optr) >= OP_TYPE_GREATER_THAN && (_optr) <= OP_TYPE_NOT_EQUAL))
 
-#define sclFatal(...)  qFatal(__VA_ARGS__)
-#define sclError(...)  qError(__VA_ARGS__)
-#define sclWarn(...)   qWarn(__VA_ARGS__)
-#define sclInfo(...)   qInfo(__VA_ARGS__)
-#define sclDebug(...)  qDebug(__VA_ARGS__)
-#define sclTrace(...)  qTrace(__VA_ARGS__)
+#define sclFatal(...) qFatal(__VA_ARGS__)
+#define sclError(...) qError(__VA_ARGS__)
+#define sclWarn(...)  qWarn(__VA_ARGS__)
+#define sclInfo(...)  qInfo(__VA_ARGS__)
+#define sclDebug(...) qDebug(__VA_ARGS__)
+#define sclTrace(...) qTrace(__VA_ARGS__)
 
-#define SCL_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)
-#define SCL_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0)
-#define SCL_ERR_JRET(c) do { code = c; if (code != TSDB_CODE_SUCCESS) { terrno = code; goto _return; } } while (0)
+#define SCL_ERR_RET(c)                \
+  do {                                \
+    int32_t _code = c;                \
+    if (_code != TSDB_CODE_SUCCESS) { \
+      terrno = _code;                 \
+      return _code;                   \
+    }                                 \
+  } while (0)
+#define SCL_RET(c)                    \
+  do {                                \
+    int32_t _code = c;                \
+    if (_code != TSDB_CODE_SUCCESS) { \
+      terrno = _code;                 \
+    }                                 \
+    return _code;                     \
+  } while (0)
+#define SCL_ERR_JRET(c)              \
+  do {                               \
+    code = c;                        \
+    if (code != TSDB_CODE_SUCCESS) { \
+      terrno = code;                 \
+      goto _return;                  \
+    }                                \
+  } while (0)
 
 int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow);
 int32_t sclCreateColumnInfoData(SDataType* pType, int32_t numOfRows, SScalarParam* pParam);
 int32_t sclConvertToTsValueNode(int8_t precision, SValueNode* valueNode);
 
-#define GET_PARAM_TYPE(_c)      ((_c)->columnData ? (_c)->columnData->info.type : (_c)->hashValueType)
-#define GET_PARAM_BYTES(_c)     ((_c)->columnData->info.bytes)
-#define GET_PARAM_PRECISON(_c)  ((_c)->columnData->info.precision)
+#define GET_PARAM_TYPE(_c)     ((_c)->columnData ? (_c)->columnData->info.type : (_c)->hashValueType)
+#define GET_PARAM_BYTES(_c)    ((_c)->columnData->info.bytes)
+#define GET_PARAM_PRECISON(_c) ((_c)->columnData->info.precision)
 
-void sclFreeParam(SScalarParam *param);
+void sclFreeParam(SScalarParam* param);
 
 #ifdef __cplusplus
 }

source/libs/scalar/inc/sclvector.h

@@ -94,12 +94,12 @@ static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType)
   return p;
 }
 
-typedef void (*_bufConverteFunc)(char *buf, SScalarParam* pOut, int32_t outType, int32_t* overflow);
-typedef void (*_bin_scalar_fn_t)(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *output, int32_t order);
+typedef void (*_bufConverteFunc)(char *buf, SScalarParam *pOut, int32_t outType, int32_t *overflow);
+typedef void (*_bin_scalar_fn_t)(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *output, int32_t order);
 _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binOperator);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /*_TD_COMMON_BIN_SCALAR_OPERATOR_H_*/
+#endif /*_TD_COMMON_BIN_SCALAR_OPERATOR_H_*/

tools/scripts/codeFormat.sh

@@ -24,7 +24,7 @@ FORMAT_DIR_LIST=(
     "${PRJ_ROOT_DIR}/source/libs/planner"
     # "${PRJ_ROOT_DIR}/source/libs/qcom"
     # "${PRJ_ROOT_DIR}/source/libs/qworker"
-    # "${PRJ_ROOT_DIR}/source/libs/scalar"
+    "${PRJ_ROOT_DIR}/source/libs/scalar"
     "${PRJ_ROOT_DIR}/source/libs/stream"
     # "${PRJ_ROOT_DIR}/source/libs/sync"
     "${PRJ_ROOT_DIR}/source/libs/tdb"