From 5b887c7017a59a40dc7bf45e0fa55a7d9e6225f8 Mon Sep 17 00:00:00 2001
From: t_max <1172915550@qq.com>
Date: Thu, 29 Aug 2024 13:59:34 +0800
Subject: [PATCH] chore: merge 3.1 to 3.0

---
 .github/workflows/compatibility.yml | 140 +++++++++++++++++++++++++
 .github/workflows/go.yml            |   1 +
 .github/workflows/push.yml          |   1 +
 README-CN.md                        |  27 +++--
 README.md                           |  29 ++++--
 taosRestful/connection.go           |  29 ++++--
 taosRestful/connector_test.go       | 153 ++++++++++++++++++++++++++++
 taosRestful/dsn.go                  |   6 ++
 taosRestful/dsn_test.go             |  24 +++--
 wrapper/stmt_test.go                |   2 -
 10 files changed, 367 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/compatibility.yml

diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
new file mode 100644
index 0000000..956433b
--- /dev/null
+++ b/.github/workflows/compatibility.yml
@@ -0,0 +1,140 @@
+name: compatibility
+
+on:
+  pull_request:
+    branches:
+      - '3.1'
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        td_version: [ 'main', '3.0' ]
+    name: Build ${{ matrix.td_version }}
+    outputs:
+      commit_id: ${{ steps.get_commit_id.outputs.commit_id }}
+    steps:
+      - name: checkout TDengine by pr
+        if: github.event_name == 'pull_request'
+        uses: actions/checkout@v3
+        with:
+          repository: 'taosdata/TDengine'
+          path: 'TDengine'
+          ref: ${{ matrix.td_version }}
+
+      - name: get_commit_id
+        id: get_commit_id
+        run: |
+          cd TDengine
+          echo "commit_id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+
+      - name: Cache server by pr
+        if: github.event_name == 'pull_request'
+        id: cache-server-pr
+        uses: actions/cache@v3
+        with:
+          path: server.tar.gz
+          key: ${{ runner.os }}-build-${{ matrix.td_version }}-${{ steps.get_commit_id.outputs.commit_id }}
+
+      - name: prepare install
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: sudo apt install -y libgeos-dev
+
+      - name: install TDengine
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: |
+          cd TDengine
+          mkdir debug
+          cd debug
+          cmake .. -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9 
+          make -j 4
+
+      - name: package
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: |
+          mkdir -p ./release
+          cp ./TDengine/debug/build/bin/taos ./release/
+          cp ./TDengine/debug/build/bin/taosd ./release/
+          cp ./TDengine/tools/taosadapter/taosadapter ./release/
+          cp ./TDengine/debug/build/lib/libtaos.so.3.9.9.9 ./release/
+          cp ./TDengine/debug/build/lib/librocksdb.so.8.1.1 ./release/ ||:
+          cp ./TDengine/include/client/taos.h ./release/
+          cat >./release/install.sh<<EOF 
+          chmod +x ./taos
+          chmod +x ./taosd
+          chmod +x ./taosadapter
+          cp ./taos /bin/
+          cp ./taosd /bin/
+          cp ./taosadapter /bin/
+          cp ./libtaos.so.3.9.9.9 /usr/lib
+          cp ./librocksdb.so.8.1.1 /usr/lib ||:
+          ln -sf /usr/lib/libtaos.so.3.9.9.9 /usr/lib/libtaos.so.1
+          ln -sf /usr/lib/libtaos.so.1 /usr/lib/libtaos.so
+          ln -sf /usr/lib/librocksdb.so.8.1.1 /usr/lib/librocksdb.so.8 ||:
+          ln -sf /usr/lib/librocksdb.so.8 /usr/lib/librocksdb.so ||:
+          cp ./taos.h /usr/include
+          EOF
+          tar -zcvf server.tar.gz ./release
+
+  test:
+    runs-on: ubuntu-22.04
+    needs: build
+    strategy:
+      matrix:
+        go: [ '1.14', 'stable' ]
+        td_version: [ 'main', '3.0' ]
+    name: Go ${{ matrix.td_version }} ${{ matrix.go }}
+    steps:
+      - name: get cache server by pr
+        if: github.event_name == 'pull_request'
+        id: get-cache-server-pr
+        uses: actions/cache@v3
+        with:
+          path: server.tar.gz
+          key: ${{ runner.os }}-build-${{ matrix.td_version }}-${{ needs.build.outputs.commit_id }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ matrix.td_version }}-
+
+
+      - name: prepare install
+        run: sudo apt install -y libgeos-dev
+
+      - name: install
+        run: |
+          tar -zxvf server.tar.gz
+          cd release && sudo sh install.sh
+
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: copy taos cfg
+        run: |
+          sudo mkdir -p /etc/taos
+          sudo cp ./.github/workflows/taos.cfg /etc/taos/taos.cfg
+          sudo cp ./.github/workflows/taosadapter.toml /etc/taos/taosadapter.toml
+
+      - name: shell
+        run: |
+          cat >start.sh<<EOF 
+          ulimit -n 65535 && TAOS_SUPPORT_VNODES=256 taosd
+          EOF
+
+      - name: taosd
+        run: nohup sudo sh ./start.sh &
+
+      - name: start taosadapter
+        run: sudo taosadapter &
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go }}
+          cache-dependency-path: go.sum
+
+      - name: Test
+        run: sudo go test -v --count=1 -coverprofile=coverage.txt -covermode=atomic ./...
\ No newline at end of file
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 03dc0dc..2891a2d 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - 'main'
       - '3.0'
+      - '3.1'
   workflow_dispatch:
     inputs:
       tbBranch:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index efcb135..2e4cc75 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - 'main'
       - '3.0'
+      - '3.1'
 
 
 jobs:
diff --git a/README-CN.md b/README-CN.md
index 3394433..9ebdaf6 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -10,17 +10,21 @@
 
 v2 与 v3 版本不兼容，与 TDengine 版本对应如下：
 
-| **driver-go 版本** | **TDengine 版本**      | **主要功能**                       |
-|------------------|----------------------|--------------------------------|
-| v3.5.1           | 3.2.1.0+ / 3.1.1.13+ | 原生 stmt 查询和 geometry 类型支持      |
-| v3.5.0           | 3.0.5.0+             | 获取消费进度及按照指定进度开始消费              |
-| v3.3.1           | 3.0.4.1+             | 基于 websocket 的 schemaless 协议写入 |
-| v3.1.0           | 3.0.2.2+             | 提供贴近 kafka 的订阅 api             |
-| v3.0.4           | 3.0.2.2+             | 新增 request id 相关接口             |
-| v3.0.3           | 3.0.1.5+             | 基于 websocket 的 statement 写入    |
-| v3.0.2           | 3.0.1.5+             | 基于 websocket 的数据查询和写入          |
-| v3.0.1           | 3.0.0.0+             | 基于 websocket 的消息订阅             |
-| v3.0.0           | 3.0.0.0+             | 适配 TDengine 3.0 查询和写入          |
+| **driver-go 版本** | **TDengine 版本**      | **主要功能**                         |
+|------------------|----------------------|----------------------------------|
+| v3.5.5           | 3.2.3.0+ / 3.1.1.27+ | restful 支持跳过 ssl 证书检查            |
+| v3.5.4           | 3.2.3.0+ / 3.1.1.27+ | 兼容 TDengine 3.3.0.0 tmq raw data |
+| v3.5.3           | 3.2.3.0+ / 3.1.1.27+ | 重构 taosWS                        |
+| v3.5.2           | 3.2.3.0+ / 3.1.1.27+ | websocket 压缩和优化消息订阅性能            |
+| v3.5.1           | 3.2.1.0+ / 3.1.1.13+ | 原生 stmt 查询和 geometry 类型支持        |
+| v3.5.0           | 3.0.5.0+             | 获取消费进度及按照指定进度开始消费                |
+| v3.3.1           | 3.0.4.1+             | 基于 websocket 的 schemaless 协议写入   |
+| v3.1.0           | 3.0.2.2+             | 提供贴近 kafka 的订阅 api               |
+| v3.0.4           | 3.0.2.2+             | 新增 request id 相关接口               |
+| v3.0.3           | 3.0.1.5+             | 基于 websocket 的 statement 写入      |
+| v3.0.2           | 3.0.1.5+             | 基于 websocket 的数据查询和写入            |
+| v3.0.1           | 3.0.0.0+             | 基于 websocket 的消息订阅               |
+| v3.0.0           | 3.0.0.0+             | 适配 TDengine 3.0 查询和写入            |
 
 ## 安装
 
@@ -350,6 +354,7 @@ DSN 格式为：
 
 - `disableCompression` 是否接受压缩数据，默认为 `true` 不接受压缩数据，如果传输数据使用 gzip 压缩设置为 `false`。
 - `readBufferSize` 读取数据的缓存区大小默认为 4K (4096)，当查询结果数据量多时可以适当调大该值。
+- `skipVerify` 是否跳过 ssl 证书检查，默认为 `false` 不跳过，如果使用 https 连接可以设置为 `true`。
 
 ### 使用限制
 
diff --git a/README.md b/README.md
index a4125c5..d0e1ba7 100644
--- a/README.md
+++ b/README.md
@@ -10,17 +10,22 @@ English | [简体中文](README-CN.md)
 
 v2 is not compatible with v3 version and corresponds to the TDengine version as follows:
 
-| **driver-go version** | **TDengine version** | **major features**                     |
-|-----------------------|----------------------|----------------------------------------|
-| v3.5.1                | 3.2.1.0+ / 3.1.1.13+ | native stmt query and geometry support |
-| v3.5.0                | 3.0.5.0+             | tmq: get assignment and seek offset    |
-| v3.3.1                | 3.0.4.1+             | schemaless insert over websocket       |
-| v3.1.0                | 3.0.2.2+             | provide tmq apis close to kafka        |
-| v3.0.4                | 3.0.2.2+             | add request id                         |
-| v3.0.3                | 3.0.1.5+             | statement insert over websocket        |
-| v3.0.2                | 3.0.1.5+             | bulk pulling over websocket            |
-| v3.0.1                | 3.0.0.0+             | tmq over websocket                     |
-| v3.0.0                | 3.0.0.0+             | adapt to TDengine 3.0 query and insert |
+| **driver-go version** | **TDengine version** | **major features**                            |
+|-----------------------|----------------------|-----------------------------------------------|
+| v3.5.6                | 3.3.2.0+ / 3.1.2.0+  | WebSocket performance improvements            |
+| v3.5.5                | 3.2.3.0+ / 3.1.1.27+ | support skip http ssl check                   |
+| v3.5.4                | 3.2.3.0+ / 3.1.1.27+ | compatible with TDengine 3.3.0.0 tmq raw data |
+| v3.5.3                | 3.2.3.0+ / 3.1.1.27+ | refactor taosWS                               |
+| v3.5.2                | 3.2.3.0+ / 3.1.1.27+ | websocket compression and optimize tmq poll   |
+| v3.5.1                | 3.2.1.0+ / 3.1.1.13+ | native stmt query and geometry support        |
+| v3.5.0                | 3.0.5.0+             | tmq: get assignment and seek offset           |
+| v3.3.1                | 3.0.4.1+             | schemaless insert over websocket              |
+| v3.1.0                | 3.0.2.2+             | provide tmq apis close to kafka               |
+| v3.0.4                | 3.0.2.2+             | add request id                                |
+| v3.0.3                | 3.0.1.5+             | statement insert over websocket               |
+| v3.0.2                | 3.0.1.5+             | bulk pulling over websocket                   |
+| v3.0.1                | 3.0.0.0+             | tmq over websocket                            |
+| v3.0.0                | 3.0.0.0+             | adapt to TDengine 3.0 query and insert        |
 
 ## Install
 
@@ -349,6 +354,8 @@ Parameters:
 
 - `disableCompression` Whether to accept compressed data, default is `true` Do not accept compressed data, set to `false` if the transferred data is compressed using gzip.
 - `readBufferSize` The default size of the buffer for reading data is 4K (4096), which can be adjusted upwards when there is a lot of data in the query result.
+- `skipVerify` Whether to skip the verification of the server certificate, the default is `false`, and the server
+  certificate is verified by default. If the server certificate is not verified, set to `true`.
 
 ### Usage restrictions
 
diff --git a/taosRestful/connection.go b/taosRestful/connection.go
index e7f21c5..4970184 100644
--- a/taosRestful/connection.go
+++ b/taosRestful/connection.go
@@ -3,6 +3,7 @@ package taosRestful
 import (
 	"compress/gzip"
 	"context"
+	"crypto/tls"
 	"database/sql/driver"
 	"encoding/base64"
 	"errors"
@@ -36,18 +37,24 @@ func newTaosConn(cfg *config) (*taosConn, error) {
 		readBufferSize = 4 << 10
 	}
 	tc := &taosConn{cfg: cfg, readBufferSize: readBufferSize}
+	transport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+		}).DialContext,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		DisableCompression:    cfg.disableCompression,
+	}
+	if cfg.skipVerify {
+		transport.TLSClientConfig = &tls.Config{
+			InsecureSkipVerify: true,
+		}
+	}
 	tc.client = &http.Client{
-		Transport: &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
-			DialContext: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-			}).DialContext,
-			IdleConnTimeout:       90 * time.Second,
-			TLSHandshakeTimeout:   10 * time.Second,
-			ExpectContinueTimeout: 1 * time.Second,
-			DisableCompression:    cfg.disableCompression,
-		},
+		Transport: transport,
 	}
 	path := "/rest/sql"
 	if len(cfg.dbName) != 0 {
diff --git a/taosRestful/connector_test.go b/taosRestful/connector_test.go
index f8bf6f7..eac38db 100644
--- a/taosRestful/connector_test.go
+++ b/taosRestful/connector_test.go
@@ -1,9 +1,22 @@
 package taosRestful
 
 import (
+	"context"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	crand "crypto/rand"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
 	"database/sql"
+	"encoding/pem"
 	"fmt"
+	"log"
+	"math/big"
 	"math/rand"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
 	"reflect"
 	"strings"
 	"testing"
@@ -377,3 +390,143 @@ func TestAllTypeQueryNullWithoutJson(t *testing.T) {
 		assert.Nil(t, *values[i].(*interface{}))
 	}
 }
+
+func generateSelfSignedCert() (tls.Certificate, error) {
+	priv, err := ecdsa.GenerateKey(elliptic.P384(), crand.Reader)
+	if err != nil {
+		return tls.Certificate{}, err
+	}
+
+	notBefore := time.Now()
+	notAfter := notBefore.Add(365 * 24 * time.Hour)
+
+	serialNumber, err := crand.Int(crand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return tls.Certificate{}, err
+	}
+
+	template := x509.Certificate{
+		SerialNumber: serialNumber,
+		Subject: pkix.Name{
+			Organization: []string{"Your Company"},
+		},
+		NotBefore:             notBefore,
+		NotAfter:              notAfter,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+	}
+
+	certDER, err := x509.CreateCertificate(crand.Reader, &template, &template, &priv.PublicKey, priv)
+	if err != nil {
+		return tls.Certificate{}, err
+	}
+
+	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER})
+	keyPEM, err := x509.MarshalECPrivateKey(priv)
+	if err != nil {
+		return tls.Certificate{}, err
+	}
+
+	keyPEMBlock := pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyPEM})
+
+	return tls.X509KeyPair(certPEM, keyPEMBlock)
+}
+
+func startProxy() *http.Server {
+	// Generate self-signed certificate
+	cert, err := generateSelfSignedCert()
+	if err != nil {
+		log.Fatalf("Failed to generate self-signed certificate: %v", err)
+	}
+
+	target := "http://127.0.0.1:6041"
+	proxyURL, err := url.Parse(target)
+	if err != nil {
+		log.Fatalf("Failed to parse target URL: %v", err)
+	}
+
+	proxy := httputil.NewSingleHostReverseProxy(proxyURL)
+	proxy.ErrorHandler = func(w http.ResponseWriter, r *http.Request, e error) {
+		http.Error(w, "Proxy error", http.StatusBadGateway)
+	}
+	mux := http.NewServeMux()
+	mux.Handle("/", proxy)
+
+	server := &http.Server{
+		Addr:      ":34443",
+		Handler:   mux,
+		TLSConfig: &tls.Config{Certificates: []tls.Certificate{cert}},
+		// Setup server timeouts for better handling of idle connections and slowloris attacks
+		WriteTimeout: 10 * time.Second,
+		ReadTimeout:  10 * time.Second,
+		IdleTimeout:  30 * time.Second,
+	}
+
+	log.Println("Starting server on :34443")
+	go func() {
+		err = server.ListenAndServeTLS("", "")
+		if err != nil && err != http.ErrServerClosed {
+			log.Fatalf("Failed to start HTTPS server: %v", err)
+		}
+	}()
+	return server
+}
+
+func TestSSL(t *testing.T) {
+	dataSourceNameWithSkipVerify := fmt.Sprintf("%s:%s@https(%s:%d)/?skipVerify=true", user, password, host, 34443)
+	server := startProxy()
+	defer server.Shutdown(context.Background())
+	time.Sleep(1 * time.Second)
+	database := "restful_test_ssl"
+	db, err := sql.Open("taosRestful", dataSourceNameWithSkipVerify)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+	err = db.Ping()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_, err = db.Exec(fmt.Sprintf("drop database if exists %s", database))
+		if err != nil {
+			t.Fatal(err)
+		}
+	}()
+	_, err = db.Exec(fmt.Sprintf("create database if not exists %s", database))
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = db.Exec(generateCreateTableSql(database, true))
+	if err != nil {
+		t.Fatal(err)
+	}
+	colValues, scanValues, insertSql := generateValues()
+	_, err = db.Exec(fmt.Sprintf(`insert into %s.t1 using %s.alltype tags('{"a":"b"}') %s`, database, database, insertSql))
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err := db.Query(fmt.Sprintf("select * from %s.alltype where ts = '%s'", database, colValues[0].(time.Time).Format(time.RFC3339Nano)))
+	assert.NoError(t, err)
+	columns, err := rows.Columns()
+	assert.NoError(t, err)
+	t.Log(columns)
+	cTypes, err := rows.ColumnTypes()
+	assert.NoError(t, err)
+	t.Log(cTypes)
+	var tt types.RawMessage
+	dest := make([]interface{}, len(scanValues)+1)
+	for i := range scanValues {
+		dest[i] = reflect.ValueOf(&scanValues[i]).Interface()
+	}
+	dest[len(scanValues)] = &tt
+	for rows.Next() {
+		err := rows.Scan(dest...)
+		assert.NoError(t, err)
+	}
+	for i, v := range colValues {
+		assert.Equal(t, v, scanValues[i])
+	}
+	assert.Equal(t, types.RawMessage(`{"a":"b"}`), tt)
+}
diff --git a/taosRestful/dsn.go b/taosRestful/dsn.go
index 3936231..612962a 100644
--- a/taosRestful/dsn.go
+++ b/taosRestful/dsn.go
@@ -30,6 +30,7 @@ type config struct {
 	disableCompression bool
 	readBufferSize     int
 	token              string // cloud platform token
+	skipVerify         bool
 }
 
 // NewConfig creates a new Config and sets default values.
@@ -154,6 +155,11 @@ func parseDSNParams(cfg *config, params string) (err error) {
 			}
 		case "token":
 			cfg.token = value
+		case "skipVerify":
+			cfg.skipVerify, err = strconv.ParseBool(value)
+			if err != nil {
+				return &errors.TaosError{Code: 0xffff, ErrStr: "invalid bool value: " + value}
+			}
 		default:
 			// lazy init
 			if cfg.params == nil {
diff --git a/taosRestful/dsn_test.go b/taosRestful/dsn_test.go
index e71b813..2ec3fbd 100644
--- a/taosRestful/dsn_test.go
+++ b/taosRestful/dsn_test.go
@@ -10,15 +10,16 @@ import (
 // @description: test parse dsn
 func TestParseDsn(t *testing.T) {
 	tcs := []struct {
-		dsn    string
-		errs   string
-		user   string
-		passwd string
-		net    string
-		addr   string
-		port   int
-		dbName string
-		token  string
+		dsn        string
+		errs       string
+		user       string
+		passwd     string
+		net        string
+		addr       string
+		port       int
+		dbName     string
+		token      string
+		skipVerify bool
 	}{{},
 		{dsn: "abcd", errs: "invalid DSN: missing the slash separating the database name"},
 		{dsn: "user:passwd@http(fqdn:6041)/dbname", user: "user", passwd: "passwd", net: "http", addr: "fqdn", port: 6041, dbName: "dbname"},
@@ -28,6 +29,7 @@ func TestParseDsn(t *testing.T) {
 		{dsn: "user:passwd@https(:0)/", user: "user", passwd: "passwd", net: "https"},
 		{dsn: "user:passwd@https(:0)/?interpolateParams=false&test=1", user: "user", passwd: "passwd", net: "https"},
 		{dsn: "user:passwd@https(:0)/?interpolateParams=false&token=token", user: "user", passwd: "passwd", net: "https", token: "token"},
+		{dsn: "user:passwd@https(:0)/?interpolateParams=false&token=token&skipVerify=true", user: "user", passwd: "passwd", net: "https", token: "token", skipVerify: true},
 	}
 	for i, tc := range tcs {
 		name := fmt.Sprintf("%d - %s", i, tc.dsn)
@@ -45,7 +47,9 @@ func TestParseDsn(t *testing.T) {
 				cfg.passwd != tc.passwd ||
 				cfg.net != tc.net ||
 				cfg.addr != tc.addr ||
-				cfg.port != tc.port {
+				cfg.port != tc.port ||
+				cfg.token != tc.token ||
+				cfg.skipVerify != tc.skipVerify {
 				t.Fatal(cfg)
 			}
 		})
diff --git a/wrapper/stmt_test.go b/wrapper/stmt_test.go
index d924645..339a6ec 100644
--- a/wrapper/stmt_test.go
+++ b/wrapper/stmt_test.go
@@ -702,7 +702,6 @@ func StmtQuery(t *testing.T, conn unsafe.Pointer, sql string, params *param.Para
 		if errCode != int(taosError.SUCCESS) {
 			errStr := TaosErrorStr(res)
 			err := taosError.NewError(code, errStr)
-			TaosFreeResult(res)
 			return nil, err
 		}
 		if blockSize == 0 {
@@ -711,7 +710,6 @@ func StmtQuery(t *testing.T, conn unsafe.Pointer, sql string, params *param.Para
 		d := parser.ReadBlock(block, blockSize, rowsHeader.ColTypes, precision)
 		data = append(data, d...)
 	}
-	TaosFreeResult(res)
 	return data, nil
 }