From 90ffa91b2e0ff9c66f38b2c8d3cb5cef683c0cfb Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 6 Aug 2021 13:45:34 +0800
Subject: [PATCH 1/3] [TD-5773]<CI>add some arm env in Drone

---
 .drone.yml | 114 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 80 insertions(+), 34 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 3f6c622598..b520f308ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,18 +23,16 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
-name: test_arm64
+name: test_arm64_bionic
 
 platform:
   os: linux
   arch: arm64
-
 steps:
 - name: build
-  image: gcc
+  image: arm64v8/ubuntu:bionic
   commands:
   - apt-get update
   - apt-get install -y cmake build-essential
@@ -52,7 +50,84 @@ steps:
     - 2.0
 ---
 kind: pipeline
-name: test_arm
+name: test_arm64_focal
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: arm64v8/ubuntu:focal
+  commands:
+  - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+  - apt-get update 
+  - apt-get install -y -qq cmake build-essential
+  - mkdir debug
+  - cd debug
+  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - make 
+  trigger:
+    event:
+      - pull_request
+  when:
+    branch:
+    - develop
+    - master
+    - 2.0
+---
+kind: pipeline
+name: test_arm64_centos7
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: arm64v8/centos:7
+  commands:
+  - yum install -y gcc gcc-c++ make cmake git
+  - mkdir debug
+  - cd debug
+  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - make 
+  trigger:
+    event:
+      - pull_request
+  when:
+    branch:
+    - develop
+    - master
+    - 2.0
+---
+kind: pipeline
+name: test_arm64_centos8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: arm64v8/centos:8
+  commands:
+  - dnf install -y gcc gcc-c++ make cmake epel-release git libarchive
+  - mkdir debug
+  - cd debug
+  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - make 
+  trigger:
+    event:
+      - pull_request
+  when:
+    branch:
+    - develop
+    - master
+    - 2.0
+---
+kind: pipeline
+name: test_arm_bionic
 
 platform:
   os: linux
@@ -75,8 +150,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
-
 ---
 kind: pipeline
 name: build_trusty
@@ -103,7 +176,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -129,7 +201,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 
 ---
 kind: pipeline
@@ -155,7 +226,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -179,28 +249,4 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 
----
-kind: pipeline
-name: goodbye
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: 64-bit
-  image: alpine
-  commands:
-  - echo 64-bit is good.
-  when:
-    branch:
-    - develop
-    - master
-    - 2.0
-
-
-depends_on:
-- test_arm64
-- test_amd64
\ No newline at end of file

From 14ab3747e6b31ca03e86cb72ad6d75748a76d8ef Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Fri, 6 Aug 2021 14:57:38 +0800
Subject: [PATCH 2/3] [TD-5860]<fix>: fix grafanaplugin error in grafana
 6.x(6.2+) (#7224)

---
 src/connector/grafanaplugin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
index 4a4d79099b..a44ec1ca49 160000
--- a/src/connector/grafanaplugin
+++ b/src/connector/grafanaplugin
@@ -1 +1 @@
-Subproject commit 4a4d79099b076b8ff12d5b4fdbcba54049a6866d
+Subproject commit a44ec1ca493ad01b2bf825b6418f69e11f548206

From a93326c9799def7472e07ec6bcdcb3db40055697 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 7 Aug 2021 14:05:57 +0800
Subject: [PATCH 3/3] [TD-5872]<fix>: taosdemo stmt performance. (#7236)

---
 src/kit/taosdemo/taosdemo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index dec26ae92d..c895545b81 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -5982,7 +5982,7 @@ static int32_t prepareStbStmtBind(
         int64_t startTime, int32_t recSeq,
         bool isColumn)
 {
-    char *bindBuffer = calloc(1, g_args.len_of_binary);
+    char *bindBuffer = calloc(1, DOUBLE_BUFF_LEN); // g_args.len_of_binary);
     if (bindBuffer == NULL) {
         errorPrint("%s() LN%d, Failed to allocate %d bind buffer\n",
                 __func__, __LINE__, g_args.len_of_binary);