xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more code format

This commit is contained in:
Hongze Cheng 2022-10-13 13:59:18 +08:00
parent d5255f1eb7
commit 63d9b85631
8 changed files with 115 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/parser/inc/parInsertData.h
View File

@ -18,9 +18,9 @@
#include "catalog.h" #include "catalog.h"
#include "os.h" #include "os.h"
#include "query.h"
#include "tname.h" #include "tname.h"
#include "ttypes.h" #include "ttypes.h"
#include "query.h"
#define IS_DATA_COL_ORDERED(spd) ((spd->orderStatus) == (int8_t)ORDER_STATUS_ORDERED) #define IS_DATA_COL_ORDERED(spd) ((spd->orderStatus) == (int8_t)ORDER_STATUS_ORDERED)

13
source/libs/stream/src/streamUpdate.c
View File

@ -174,13 +174,14 @@ bool updateInfoIsUpdated(SUpdateInfo *pInfo, uint64_t tableId, TSKEY ts) {
if (res == TSDB_CODE_SUCCESS) { if (res == TSDB_CODE_SUCCESS) {
return false; return false;
} else { } else {
qDebug("===stream===Update close window sbf. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64 ", ts:%" PRIu64, tableId, qDebug("===stream===Update close window sbf. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64
maxTs, *pMapMaxTs, ts); ", ts:%" PRIu64,
tableId, maxTs, *pMapMaxTs, ts);
return true; return true;
} }
} }
qDebug("===stream===Update close window. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64 ", ts:%" PRIu64, tableId, qDebug("===stream===Update close window. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64 ", ts:%" PRIu64,
maxTs, *pMapMaxTs, ts); tableId, maxTs, *pMapMaxTs, ts);
return true; return true;
} }
@ -202,8 +203,8 @@ bool updateInfoIsUpdated(SUpdateInfo *pInfo, uint64_t tableId, TSKEY ts) {
} }
if (ts < pInfo->minTS) { if (ts < pInfo->minTS) {
qDebug("===stream===Update min ts. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64 ", ts:%" PRIu64, tableId, qDebug("===stream===Update min ts. tableId:%" PRIu64 ", maxTs:%" PRIu64 ", mapMaxTs:%" PRIu64 ", ts:%" PRIu64,
maxTs, *pMapMaxTs, ts); tableId, maxTs, *pMapMaxTs, ts);
return true; return true;
} else if (res == TSDB_CODE_SUCCESS) { } else if (res == TSDB_CODE_SUCCESS) {
return false; return false;

1
source/libs/stream/test/tstreamUpdateTest.cpp
View File

@ -190,7 +190,6 @@ TEST(TD_STREAM_UPDATE_TEST, update) {
updateInfoDestroy(pSU5); updateInfoDestroy(pSU5);
updateInfoDestroy(pSU6); updateInfoDestroy(pSU6);
updateInfoDestroy(pSU7); updateInfoDestroy(pSU7);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {

59
tools/scripts/codeFormat.sh
View File

@ -8,35 +8,42 @@ ORIGIN_DIR=$(pwd)
cd ${PRJ_ROOT_DIR} cd ${PRJ_ROOT_DIR}
FORMAT_DIR_LIST=( FORMAT_DIR_LIST=(
"include" "${PRJ_ROOT_DIR}/include"
"source/os" "${PRJ_ROOT_DIR}/source/os"
"source/util" "${PRJ_ROOT_DIR}/source/util"
"source/common" "${PRJ_ROOT_DIR}/source/common"
"source/libs/cache" "${PRJ_ROOT_DIR}/source/libs/cache"
"source/libs/catalog" "${PRJ_ROOT_DIR}/source/libs/catalog"
"source/libs/command" "${PRJ_ROOT_DIR}/source/libs/command"
"source/libs/executor" "${PRJ_ROOT_DIR}/source/libs/executor"
# "source/libs/function" # "${PRJ_ROOT_DIR}/source/libs/function"
# "source/libs/index" "${PRJ_ROOT_DIR}/source/libs/index"
# "source/libs/monitor" "${PRJ_ROOT_DIR}/source/libs/monitor"
# "source/libs/nodes" "${PRJ_ROOT_DIR}/source/libs/nodes"
# "source/libs/parser" # "${PRJ_ROOT_DIR}/source/libs/parser"
# "source/libs/planner" "${PRJ_ROOT_DIR}/source/libs/planner"
# "source/libs/qcom" # "${PRJ_ROOT_DIR}/source/libs/qcom"
# "source/libs/qworker" # "${PRJ_ROOT_DIR}/source/libs/qworker"
# "source/libs/scalar" # "${PRJ_ROOT_DIR}/source/libs/scalar"
# "source/libs/stream" "${PRJ_ROOT_DIR}/source/libs/stream"
# "source/libs/sync" # "${PRJ_ROOT_DIR}/source/libs/sync"
"source/libs/tdb" "${PRJ_ROOT_DIR}/source/libs/tdb"
"source/libs/tfs" "${PRJ_ROOT_DIR}/source/libs/tfs"
# "source/libs/transport" "${PRJ_ROOT_DIR}/source/libs/transport"
"source/libs/wal" "${PRJ_ROOT_DIR}/source/libs/wal"
# "source/client" # "${PRJ_ROOT_DIR}/source/client"
"source/dnode" "${PRJ_ROOT_DIR}/source/dnode"
)
EXCLUDE_DIR_LIST=(
)
EXCLUDE_FILE_LIST=(
"source/libs/parser/sql.c"
) )
for d in ${FORMAT_DIR_LIST[@]}; do for d in ${FORMAT_DIR_LIST[@]}; do
for f in $(find ${PRJ_ROOT_DIR}/$d/ -regex '.*\.\(cpp\|hpp\|c\|h\)'); do for f in $(find $d -regex '.*\.\(cpp\|hpp\|c\|h\)'); do
${FORMAT_BIN} -i $f ${FORMAT_BIN} -i $f
done done
done done