From 7691a0e1af6424736344cf300dcac58bce9b833c Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 28 Apr 2022 17:31:31 +0800 Subject: [PATCH 1/3] print running cases --- tests/system-test/fulltest.sh | 1 + tests/test-all.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 83f185ae97..94ac666272 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e +set -x python3 ./test.py -f 0-others/taosShell.py diff --git a/tests/test-all.sh b/tests/test-all.sh index ff9905e209..67bf66ee40 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -93,6 +93,7 @@ function runSimCaseOneByOnefq { if [[ $line =~ ^./test.sh* ]] || [[ $line =~ ^run* ]]; then #case=`echo $line | grep sim$ |awk '{print $NF}'` case=`echo $line | grep -o ".*\.sim" |awk '{print $NF}'` + echo "$line running ..." start_time=`date +%s` date +%F\ %T | tee -a out.log From 555caef50ea2b521b3ab0e8b6bdcadd19e1fec78 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Thu, 28 Apr 2022 18:14:12 +0800 Subject: [PATCH 2/3] feat: add tdSRowSetTpInfo method --- include/common/trow.h | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/include/common/trow.h b/include/common/trow.h index 464e0dd69f..5068d6f883 100644 --- a/include/common/trow.h +++ b/include/common/trow.h @@ -181,7 +181,7 @@ typedef struct { // N.B. If without STSchema, getExtendedRowSize() is used to get the rowMaxBytes and // (int32_t)ceil((double)nCols/TD_VTYPE_PARTS) should be added if TD_SUPPORT_BITMAP defined. -#define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_ROW_HEAD_LEN) +#define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_BITMAP_BYTES((s)->numOfCols) + TD_ROW_HEAD_LEN) #define TD_ROW_SET_INFO(r, i) (TD_ROW_INFO(r) = (i)) #define TD_ROW_SET_TYPE(r, t) (TD_ROW_TYPE(r) = (t)) @@ -593,6 +593,34 @@ static FORCE_INLINE int32_t tdSRowSetInfo(SRowBuilder *pBuilder, int32_t nCols, return TSDB_CODE_SUCCESS; } +/** + * @brief + * + * @param pBuilder + * @param nCols + * @param nBoundCols use -1 if not available + * @param flen + * @return FORCE_INLINE + */ +static FORCE_INLINE int32_t tdSRowSetTpInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t flen) { + pBuilder->flen = flen; + pBuilder->nCols = nCols; + if (pBuilder->flen <= 0 || pBuilder->nCols <= 0) { + TASSERT(0); + terrno = TSDB_CODE_INVALID_PARA; + return terrno; + } +#ifdef TD_SUPPORT_BITMAP + // the primary TS key is stored separatedly + pBuilder->nBitmaps = (int16_t)TD_BITMAP_BYTES(pBuilder->nCols - 1); +#else + pBuilder->nBitmaps = 0; + pBuilder->nBoundBitmaps = 0; +#endif + return TSDB_CODE_SUCCESS; +} + + /** * @brief To judge row type: STpRow/SKvRow * @@ -1383,7 +1411,6 @@ static void tdSRowPrint(STSRow *row, STSchema *pSchema) { } printf("\n"); } - #ifdef TROW_ORIGIN_HZ typedef struct { uint32_t nRows; From ff123fb6ec657dba4c4de365ed62c2f0b5f1c7f9 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Thu, 28 Apr 2022 18:17:02 +0800 Subject: [PATCH 3/3] refactor --- include/common/trow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/common/trow.h b/include/common/trow.h index 262e19f1c3..ace59b2a91 100644 --- a/include/common/trow.h +++ b/include/common/trow.h @@ -181,7 +181,7 @@ typedef struct { // N.B. If without STSchema, getExtendedRowSize() is used to get the rowMaxBytes and // (int32_t)ceil((double)nCols/TD_VTYPE_PARTS) should be added if TD_SUPPORT_BITMAP defined. -#define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_BITMAP_BYTES((s)->numOfCols) + TD_ROW_HEAD_LEN) +#define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_ROW_HEAD_LEN) #define TD_ROW_SET_INFO(r, i) (TD_ROW_INFO(r) = (i)) #define TD_ROW_SET_TYPE(r, t) (TD_ROW_TYPE(r) = (t))