From d8991f19137d7f78f1d5b25ccbceae32caafc96f Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 30 Sep 2020 11:02:52 +0800 Subject: [PATCH 1/3] fix TD-1640 --- src/util/inc/tscompression.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h index 37d1e7b590..cca6d6e250 100644 --- a/src/util/inc/tscompression.h +++ b/src/util/inc/tscompression.h @@ -26,7 +26,7 @@ extern "C" { #define COMP_OVERFLOW_BYTES 2 #define BITS_PER_BYTE 8 // Masks -#define INT64MASK(_x) ((1ul << _x) - 1) +#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 From c9152cb35f25b5a282164acb4bc76cd9c0a1d7d0 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 30 Sep 2020 04:08:11 +0000 Subject: [PATCH 2/3] minor changes --- src/inc/taosdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 115630d1a5..2896e91d93 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -73,7 +73,7 @@ extern const int32_t TYPE_BYTES[11]; #define TSDB_DATA_BOOL_NULL 0x02 #define TSDB_DATA_TINYINT_NULL 0x80 #define TSDB_DATA_SMALLINT_NULL 0x8000 -#define TSDB_DATA_INT_NULL 0x80000000 +#define TSDB_DATA_INT_NULL 0x80000000L #define TSDB_DATA_BIGINT_NULL 0x8000000000000000L #define TSDB_DATA_FLOAT_NULL 0x7FF00000 // it is an NAN @@ -304,7 +304,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf #define TSDB_MIN_VNODES 64 #define TSDB_MAX_VNODES 2048 #define TSDB_MIN_VNODES_PER_DB 2 -#define TSDB_MAX_VNODES_PER_DB 16 +#define TSDB_MAX_VNODES_PER_DB 32 #define TSDB_DNODE_ROLE_ANY 0 #define TSDB_DNODE_ROLE_MGMT 1 From 4b9a1813a5226f1097c53e6a7ab1e2a1a3fd5452 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 30 Sep 2020 04:12:13 +0000 Subject: [PATCH 3/3] minor changs --- src/inc/taosdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 2896e91d93..1667bb5de5 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -304,7 +304,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf #define TSDB_MIN_VNODES 64 #define TSDB_MAX_VNODES 2048 #define TSDB_MIN_VNODES_PER_DB 2 -#define TSDB_MAX_VNODES_PER_DB 32 +#define TSDB_MAX_VNODES_PER_DB 64 #define TSDB_DNODE_ROLE_ANY 0 #define TSDB_DNODE_ROLE_MGMT 1