diff --git a/packaging/release.sh b/packaging/release.sh index 6a00f0b79db7ef093be9d675fb4a17888daaf929..58f69589d831f51604a67d54942520cb41700bc2 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -123,11 +123,11 @@ cd ${compile_dir} # arm only support lite ver if [ -z "$armver" ]; then - cmake ${top_dir}/../ + cmake ../ elif [ "$armver" == "arm64" ]; then - cmake ${top_dir}/../ -DVERSION=lite -DARMVER=arm64 + cmake ../ -DARMVER=arm64 elif [ "$armver" == "arm32" ]; then - cmake ${top_dir}/../ -DVERSION=lite -DARMVER=arm32 + cmake ../ -DARMVER=arm32 else echo "input parameter error!!!" return diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 2911452fb43d7b484c55b66bcc80c39ba3c6c2ed..019e614e0b8333a55a8bdf8318aa5a865032cbd3 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -313,9 +313,9 @@ vercomp () { function is_version_compatible() { - curr_version=$(${bin_dir}/taosd -V | cut -d ' ' -f 2) + curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 2) - min_compatible_version=$(${script_dir}/bin/taosd -V | cut -d ' ' -f 4) + min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 4) vercomp $curr_version $min_compatible_version case $? in diff --git a/packaging/tools/release_note b/packaging/tools/release_note index 3a3cd81ca91bc274e8375d12d3e7de7890b016f6..4578a4523c50f3b0764ce05add5920cf0be72172 100644 --- a/packaging/tools/release_note +++ b/packaging/tools/release_note @@ -1,3 +1,14 @@ +taos-1.6.4.0 (Release on 2019-12-01) +Bug fixed: + 1.Look for possible causes of file corruption and fix them + 2.Encapsulate memory allocation functions to reduce the possibility of crashes + 3.Increase Arm64 compilation options + 4.Remove most of the warnings in the code + 5.Provide a variety of connector usage documents + 6.Network connection can be selected in udp and tcp + 7.Allow the maximum number of Tags to be 32 + 8.Bugs reported by the user + taos-1.5.2.6 (Release on 2019-05-13) Bug fixed: - Nchar strings sometimes were wrongly truncated on Window diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index ea356a257a31dea67ccf7b06dcb057d02adeba93..8b057654c68a4c8f39bf541e07f1e171ebed0091 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -147,7 +147,10 @@ extern "C" { #define TSDB_MAX_MGMT_IPS (TSDB_MAX_MPEERS+1) #define TSDB_REPLICA_MIN_NUM 1 -#define TSDB_REPLICA_MAX_NUM 3 +/* + * this is defined in CMakeList.txt + */ +//#define TSDB_REPLICA_MAX_NUM 3 #define TSDB_TBNAME_COLUMN_INDEX (-1) #define TSDB_MULTI_METERMETA_MAX_NUM 100000 // maximum batch size allowed to load metermeta diff --git a/src/util/src/version.c b/src/util/src/version.c index 35cd40a942b3f6f74f3d1dd565130201a8e7b0f6..87426123ec8d9b307c999b34d555ce8884357c3d 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,4 @@ char version[64] = "1.6.4.0"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "b6e308866e315483915f4c42a2717547ed0b9d36"; -char buildinfo[512] = "Built by ubuntu at 2019-11-26 21:56"; +char gitinfo[128] = "e86237890ee9daa8f6ab64ed225a027ae63ebdfc"; +char buildinfo[512] = "Built by ubuntu at 2019-11-30 23:16";