Skip to content
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

fix: get error message before free #240

Merged
merged 3 commits into from
Nov 29, 2023
Merged

fix: get error message before free #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ec7c28
fix: get error message before free
huskar-t Nov 29, 2023
3b1f105
fix: node exporter test
huskar-t Nov 29, 2023
18d2f05
fix: ws query test
huskar-t Nov 29, 2023
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
8 changes: 5 additions & 3 deletions controller/ws/ws/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,9 @@ func (h *messageHandler) handleQuery(_ context.Context, request Request, logger
code := wrapper.TaosError(result.Res)
if code != httperror.SUCCESS {
monitor.WSRecordResult(sqlType, false)
errStr := wrapper.TaosErrorStr(result.Res)
freeCPointer(result.Res)
return &BaseResponse{Code: code, Message: wrapper.TaosErrorStr(result.Res)}
return &BaseResponse{Code: code, Message: errStr}
}
monitor.WSRecordResult(sqlType, true)
isUpdate := wrapper.TaosIsUpdateQuery(result.Res)
Expand Down Expand Up @@ -435,8 +436,9 @@ func (h *messageHandler) handleFetch(_ context.Context, request Request, logger
return &FetchResponse{ID: req.ID, Completed: true}
}
if result.N < 0 {
errStr := wrapper.TaosErrorStr(result.Res)
h.queryResults.FreeResultByID(req.ID)
return &BaseResponse{Code: 0xffff, Message: wrapper.TaosErrorStr(result.Res)}
return &BaseResponse{Code: 0xffff, Message: errStr}
}
length := wrapper.FetchLengths(item.TaosResult, item.FieldsCount)
logger.Debugln("fetch_lengths cost:", log.GetLogDuration(isDebug, s))
Expand Down Expand Up @@ -889,8 +891,8 @@ func (h *messageHandler) handleBindMessage(_ context.Context, req dealBinaryRequ
logger.Debugln("stmt_bind_param_batch cost:", log.GetLogDuration(isDebug, s))
thread.Unlock()
if code != 0 {
logger.Errorf("## stmt bind param error: %s", wrapper.TaosStmtErrStr(stmtItem.stmt))
errStr := wrapper.TaosStmtErrStr(stmtItem.stmt)
logger.Errorf("## stmt bind param error: %s", errStr)
return &StmtBindResponse{
BaseResponse: BaseResponse{Code: code, Message: errStr},
StmtID: req.id,
Expand Down
3 changes: 1 addition & 2 deletions controller/ws/ws/ws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ func TestWsQuery(t *testing.T) {
code, message = doRestful("create table t3 using stb1 tags('{\"table\":\"t3\"}')", "test_ws_query")
assert.Equal(t, 0, code, message)

defer doRestful("drop database if exists test_ws_query", "")

s := httptest.NewServer(router)
defer s.Close()
defer doRestful("drop database if exists test_ws_query", "")
ws, _, err := websocket.DefaultDialer.Dial("ws"+strings.TrimPrefix(s.URL, "http")+"/ws", nil)
if err != nil {
t.Error(err)
Expand Down
12 changes: 6 additions & 6 deletions plugin/nodeexporter/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ func TestNodeExporter_Gather(t *testing.T) {
viper.Set("node_exporter.urls", []string{api})
viper.Set("node_exporter.gatherDuration", time.Second)
viper.Set("node_exporter.ttl", 1000)
n := NodeExporter{}
err := n.Init(nil)
assert.NoError(t, err)
err = n.Start()
assert.NoError(t, err)
conn, err := af.Open("", "", "", "", 0)
assert.NoError(t, err)
defer conn.Close()
_, err = conn.Exec("create database if not exists node_exporter precision 'ns'")
assert.NoError(t, err)
err = conn.SelectDB("node_exporter")
assert.NoError(t, err)
time.Sleep(time.Second)
n := NodeExporter{}
err = n.Init(nil)
assert.NoError(t, err)
err = n.Start()
assert.NoError(t, err)
time.Sleep(time.Second * 2)
rows, err := conn.Query("select last(`value`) as `value` from node_exporter.test_metric;")
assert.NoError(t, err)
defer rows.Close()
Expand Down