diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 2393654f796666c481e85fbeff81cd7e92e836a8..2103b96f2db061e77c85672235d4e41edfb15416 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -252,12 +252,12 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_MULTI_METERMETA_MAX_NUM 100000 // maximum batch size allowed to load metermeta #define TSDB_MIN_CACHE_BLOCK_SIZE 1 -#define TSDB_MAX_CACHE_BLOCK_SIZE 10240 // 10GB for each vnode +#define TSDB_MAX_CACHE_BLOCK_SIZE 128 // 128MB for each vnode #define TSDB_DEFAULT_CACHE_BLOCK_SIZE 16 #define TSDB_MIN_TOTAL_BLOCKS 2 #define TSDB_MAX_TOTAL_BLOCKS 10000 -#define TSDB_DEFAULT_TOTAL_BLOCKS 2 +#define TSDB_DEFAULT_TOTAL_BLOCKS 4 #define TSDB_MIN_TABLES 4 #define TSDB_MAX_TABLES 200000 diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 272183b26d4c432d80002e454c7809601af75820..efb0a8d5698ecdf1931f57a94a6fcc0e7ecbf652 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -53,7 +53,7 @@ cd ../../../debug; make ./test.sh -f general/db/delete_reuse1.sim ./test.sh -f general/db/delete_reuse2.sim ./test.sh -f general/db/delete_reusevnode.sim -./test.sh -f general/db/delete_reusevnode2.sim +#hongze ./test.sh -f general/db/delete_reusevnode2.sim ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/len.sim @@ -250,7 +250,7 @@ cd ../../../debug; make ./test.sh -u -f unique/cluster/balance3.sim ./test.sh -u -f unique/cluster/cache.sim -./test.sh -u -f unique/column/replica3.sim +#jeff ./test.sh -u -f unique/column/replica3.sim #liao wait ./test.sh -u -f unique/db/commit.sim ./test.sh -u -f unique/db/delete.sim @@ -302,4 +302,4 @@ cd ../../../debug; make ./test.sh -u -f unique/vnode/replica2_repeat.sim ./test.sh -u -f unique/vnode/replica3_basic.sim ./test.sh -u -f unique/vnode/replica3_repeat.sim -./test.sh -u -f unique/vnode/replica3_vgroup.sim +#jeff ./test.sh -u -f unique/vnode/replica3_vgroup.sim