Merge branch 'develop' of https://github.com/taosdata/TDengine into develop

tests/script/fullGeneralSuite.sim

+#unsupport run general/alter/cached_schema_after_alter.sim
+#unsupport run general/alter/count.sim
+#unsupport run general/alter/import.sim
+#unsupport run general/alter/insert1.sim
+#unsupport run general/alter/insert2.sim
+#unsupport run general/alter/metrics.sim
+#unsupport run general/alter/table.sim
+run general/cache/new_metrics.sim
+run general/cache/restart_metrics.sim
+run general/cache/restart_table.sim
+run general/connection/connection.sim  
+run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
+run general/compress/commitlog.sim
+run general/compress/compress.sim
+run general/compress/compress2.sim
+run general/compress/uncompress.sim
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
+run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
+run general/compute/null.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
+run general/db/alter_option.sim
+run general/db/alter_tables_d2.sim
+run general/db/alter_tables_v1.sim
+run general/db/alter_tables_v4.sim
+run general/db/alter_vgroups.sim
+run general/db/basic.sim
+run general/db/basic1.sim
+run general/db/basic2.sim
+run general/db/basic3.sim
+run general/db/basic4.sim
+run general/db/basic5.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/delete.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
+run general/db/vnodes.sim
+run general/field/2.sim
+run general/field/3.sim
+run general/field/4.sim
+run general/field/5.sim
+run general/field/6.sim
+run general/field/bigint.sim
+run general/field/binary.sim
+run general/field/bool.sim
+run general/field/single.sim
+run general/field/smallint.sim
+run general/field/tinyint.sim
+run general/http/restful.sim
+run general/http/restful_insert.sim
+run general/http/restful_limit.sim
+run general/http/restful_full.sim
+run general/http/prepare.sim
+run general/http/telegraf.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
+run general/import/basic.sim
+run general/import/commit.sim
+run general/import/large.sim
+run general/import/replica1.sim
+run general/insert/basic.sim
+run general/insert/insert_drop.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
+#unsupport run general/parser/alter.sim
+#unsupport run general/parser/alter1.sim
+#unsupport run general/parser/alter_stable.sim
+run general/parser/auto_create_tb.sim
+run general/parser/auto_create_tb_drop_tb.sim
+run general/parser/col_arithmetic_operation.sim
+run general/parser/columnValue.sim
+run general/parser/commit.sim
+run general/parser/create_db.sim
+run general/parser/create_mt.sim
+run general/parser/create_tb.sim
+run general/parser/dbtbnameValidate.sim
+run general/parser/import_commit1.sim
+run general/parser/import_commit2.sim
+run general/parser/import_commit3.sim
+run general/parser/insert_tb.sim
+run general/parser/first_last.sim
+#unsupport run general/parser/import_file.sim
+run general/parser/lastrow.sim
+run general/parser/nchar.sim
+#unsupport run general/parser/null_char.sim
+run general/parser/single_row_in_tb.sim
+run general/parser/select_from_cache_disk.sim
+run general/parser/limit.sim
+run general/parser/limit1.sim
+run general/parser/limit1_tblocks100.sim
+run general/parser/mixed_blocks.sim
+run general/parser/selectResNum.sim
+run general/parser/select_across_vnodes.sim
+run general/parser/slimit1.sim
+run general/parser/tbnameIn.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/projection_limit_offset.sim
+run general/parser/limit2.sim
+run general/parser/slimit.sim
+run general/parser/fill.sim
+run general/parser/fill_stb.sim
+run general/parser/interp.sim
+run general/parser/where.sim
+#unsupport run general/parser/join.sim
+#unsupport run general/parser/join_multivnode.sim
+run general/parser/select_with_tags.sim
+#unsupport run general/parser/groupby.sim
+#unsupport run general/parser/bug.sim
+#unsupport run general/parser/tags_dynamically_specifiy.sim
+#unsupport run general/parser/set_tag_vals.sim
+#unsupport run general/parser/repeatAlter.sim
+#unsupport run general/parser/slimit_alter_tags.sim
+#unsupport run general/parser/stream_on_sys.sim
+#unsupport run general/parser/stream.sim
+#unsupport run general/parser/repeatStream.sim
+run general/stable/disk.sim
+run general/stable/dnode3.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
+run general/table/autocreate.sim
+run general/table/basic1.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
+run general/table/bigint.sim
+run general/table/binary.sim
+run general/table/bool.sim
+run general/table/column_name.sim
+run general/table/column_num.sim
+run general/table/column_value.sim
+run general/table/column2.sim
+run general/table/date.sim
+run general/table/db.table.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
+run general/table/double.sim
+run general/table/fill.sim
+run general/table/float.sim
+run general/table/int.sim
+run general/table/limit.sim
+run general/table/smallint.sim
+run general/table/table_len.sim
+run general/table/table.sim
+run general/table/tinyint.sim
+run general/table/vgroup.sim
+run general/tag/3.sim
+run general/tag/4.sim
+run general/tag/5.sim
+run general/tag/6.sim
+#unsupport run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+#unsupport run general/tag/change.sim
+run general/tag/column.sim
+#unsupport run general/tag/commit.sim
+run general/tag/create.sim
+#unsupport run general/tag/delete.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
+#unsupport run general/tag/set.sim
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
+run general/user/authority.sim
+run general/user/monitor.sim
+run general/user/pass_alter.sim
+run general/user/pass_len.sim
+run general/user/user_create.sim
+run general/user/user_len.sim
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
+run general/vector/metrics_query.sim
+run general/vector/metrics_tag.sim
+run general/vector/metrics_time.sim
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim

tests/script/sh/cfg.sh

@@ -41,10 +41,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 

tests/script/sh/clear.sh

@@ -44,10 +44,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/$NODE_NAME

tests/script/sh/deploy.sh

@@ -39,10 +39,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 

tests/script/sh/exec.sh

@@ -50,10 +50,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/$NODE_NAME

tests/script/sh/exec_tarbitrator.sh

@@ -47,10 +47,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/arbitrator

tests/script/test.sh

@@ -49,10 +49,15 @@ else
 fi
 
 TOP_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TOP_DIR/$BIN_DIR
+BUILD_DIR=$TOP_DIR/$BIN_DIR/build
 
 SIM_DIR=$TOP_DIR/sim
 

tests/test-all.sh

@@ -9,7 +9,11 @@ NC='\033[0m'
 
 echo "### run TSIM script ###"
 cd script
-./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+if [ "$1" == "cron" ]; then
+  ./test.sh -f fullGeneralSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+else
+  ./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+fi
 
 totalSuccess=`grep 'success' out.log | wc -l`
 totalBasic=`grep success out.log | grep Suite | wc -l`