From 182328eba981ddea7051537505047c7dec520968 Mon Sep 17 00:00:00 2001
From: zyyang-taosdata <zyyang@taosdata.com>
Date: Thu, 19 Nov 2020 06:43:56 +0000
Subject: [PATCH] [TD-2156]<hotfix>: change packaging scripts for aarch32

---
 packaging/tools/install.sh        | 2 +-
 packaging/tools/install_client.sh | 2 +-
 src/client/src/tscSubquery.c      | 6 +++---
 src/connector/grafanaplugin       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index aedfb0a683..ddf7114f08 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -312,7 +312,7 @@ function install_data() {
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo} cp -rf ${script_dir}/connector/ ${install_main_dir}/
 }
 
 function install_examples() {
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 24586d3390..34a9bfaecb 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -163,7 +163,7 @@ function install_log() {
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo} cp -rf ${script_dir}/connector/ ${install_main_dir}/
 }
 
 function install_examples() {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 7066477aed..3f475f648d 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -594,7 +594,7 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
 
       if (taosArrayGetSize(result) > 0) {
         SVgroupTableInfo* prevGroup = taosArrayGet(result, taosArrayGetSize(result) - 1);
-        tscDebug("%p vgId:%d, tables:%"PRId64, pSql, prevGroup->vgInfo.vgId, taosArrayGetSize(prevGroup->itemList));
+        tscDebug("%p vgId:%d, tables:%u", pSql, prevGroup->vgInfo.vgId, taosArrayGetSize(prevGroup->itemList));
       }
 
       taosArrayPush(result, &info);
@@ -612,7 +612,7 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
 
   if (taosArrayGetSize(result) > 0) {
     SVgroupTableInfo* g = taosArrayGet(result, taosArrayGetSize(result) - 1);
-    tscDebug("%p vgId:%d, tables:%"PRId64, pSql, g->vgInfo.vgId, taosArrayGetSize(g->itemList));
+    tscDebug("%p vgId:%d, tables:%u", pSql, g->vgInfo.vgId, taosArrayGetSize(g->itemList));
   }
 }
 
@@ -753,7 +753,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
   }
 #endif
 
-  tscDebug("%p tags match complete, result: %"PRId64", %"PRId64, pParentSql, t1, t2);
+  tscDebug("%p tags match complete, result: %u, %u", pParentSql, t1, t2);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
index d598db167e..ec77d9049a 160000
--- a/src/connector/grafanaplugin
+++ b/src/connector/grafanaplugin
@@ -1 +1 @@
-Subproject commit d598db167eb256fe67409b7bb3d0eb7fffc3ff8c
+Subproject commit ec77d9049a719dabfd1a7c1122a209e201861944
-- 
GitLab