Skip to content

fix: there is no errors when sql is incorrectErr/check #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 1 commit into from
Apr 3, 2025
Merged

fix: there is no errors when sql is incorrectErr/check #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions client/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ import (
"encoding/binary"
"errors"
"fmt"
"github.com/apache/iotdb-client-go/common"
"log"
"net"
"reflect"
"sort"
"strings"
"time"

"github.com/apache/iotdb-client-go/common"

"github.com/apache/iotdb-client-go/rpc"
"github.com/apache/thrift/lib/go/thrift"
)
Expand Down Expand Up @@ -415,26 +416,34 @@ func (s *Session) SetTimeZone(timeZone string) (r *common.TSStatus, err error) {
return r, err
}

func (s *Session) ExecuteStatement(sql string) (*SessionDataSet, error) {
func (s *Session) ExecuteStatementWithContext(ctx context.Context, sql string) (*SessionDataSet, error) {
request := rpc.TSExecuteStatementReq{
SessionId: s.sessionId,
Statement: sql,
StatementId: s.requestStatementId,
FetchSize: &s.config.FetchSize,
}
resp, err := s.client.ExecuteStatement(context.Background(), &request)
resp, err := s.client.ExecuteStatement(ctx, &request)

if err != nil && resp == nil {
if s.reconnect() {
request.SessionId = s.sessionId
request.StatementId = s.requestStatementId
resp, err = s.client.ExecuteStatement(context.Background(), &request)
resp, err = s.client.ExecuteStatement(ctx, &request)
}
}

if statusErr := VerifySuccess(resp.Status); statusErr != nil {
return nil, statusErr
}

return s.genDataSet(sql, resp), err
}

func (s *Session) ExecuteStatement(sql string) (*SessionDataSet, error) {
return s.ExecuteStatementWithContext(context.Background(), sql)
}

func (s *Session) ExecuteNonQueryStatement(sql string) (r *common.TSStatus, err error) {
request := rpc.TSExecuteStatementReq{
SessionId: s.sessionId,
Expand Down
10 changes: 9 additions & 1 deletion test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
package e2e

import (
"context"
"fmt"
"github.com/apache/iotdb-client-go/common"
"log"
"math/rand"
"strings"
"testing"
"time"

"github.com/apache/iotdb-client-go/common"

"github.com/apache/iotdb-client-go/client"
"github.com/stretchr/testify/suite"
)
Expand Down Expand Up @@ -392,3 +394,9 @@ func (s *e2eTestSuite) Test_InsertAlignedTablets() {
assert.Equal(status, "8")
s.session.DeleteStorageGroup("root.ln.**")
}

func (s *e2eTestSuite) Test_InvalidSQL() {
_, err := s.session.ExecuteStatementWithContext(context.Background(), "select1 from device")
assert := s.Require()
assert.Error(err)
}