xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix runtime error

This commit is contained in:
Ping Xiao 2021-07-20 10:40:33 +08:00
parent 524641123a
commit a8ced0f493
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/perftest-scripts/perftest-query.sh
View File

@ -10,10 +10,9 @@ else
fi fi
jemalloc= jemalloc=
if [ x$2 != x ];then if [ x$2 != x ];then
jemalloc=1 jemalloc=jemalloc
echo "Building TDengine using jemalloc" echo "Building TDengine using jemalloc"
else else
jemalloc=0
echo "Building TDengine using glibc" echo "Building TDengine using glibc"
fi fi
@ -70,14 +69,16 @@ function buildTDengine {
git pull > /dev/null 2>&1 git pull > /dev/null 2>&1
LOCAL_COMMIT=`git rev-parse --short @` LOCAL_COMMIT=`git rev-parse --short @`
if [ $jemalloc = "1" ];then if [ $jemalloc = "jemalloc" ];then
echo "git submodule update --init --recursive"
git submodule update --init --recursive git submodule update --init --recursive
fi fi
cd debug cd debug
rm -rf * rm -rf *
if [ $jemalloc = "1" ];then if [ $jemalloc = "jemalloc" ];then
echo "cmake .. -DJEMALLOC_ENABLED=true > /dev/null"
cmake .. -DJEMALLOC_ENABLED=true > /dev/null cmake .. -DJEMALLOC_ENABLED=true > /dev/null
else else
cmake .. > /dev/null cmake .. > /dev/null
@ -121,7 +122,8 @@ function sendReport {
sed -i 's/\x1b\[[0-9;]*m//g' $PERFORMANCE_TEST_REPORT sed -i 's/\x1b\[[0-9;]*m//g' $PERFORMANCE_TEST_REPORT
BODY_CONTENT=`cat $PERFORMANCE_TEST_REPORT` BODY_CONTENT=`cat $PERFORMANCE_TEST_REPORT`
echo -e "From: <support@taosdata.com>\nto: ${receiver}\nsubject: Query Performace Report ${branch} ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
echo -e "From: <support@taosdata.com>\nto: ${receiver}\nsubject: Query Performace Report ${branch} ${jemalloc} ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
(cat - && uuencode $PERFORMANCE_TEST_REPORT performance-test-report-$today.log) | \ (cat - && uuencode $PERFORMANCE_TEST_REPORT performance-test-report-$today.log) | \
/usr/sbin/ssmtp "${receiver}" && echo "Report Sent!" /usr/sbin/ssmtp "${receiver}" && echo "Report Sent!"
} }

1
tests/pytest/tools/taosdemoPerformance.py
View File

@ -122,7 +122,6 @@ class taosdemoPerformace:
return buildPath return buildPath
def insertData(self): def insertData(self):
tdSql.prepare()
buildPath = self.getBuildPath() buildPath = self.getBuildPath()
if (buildPath == ""): if (buildPath == ""):