Skip to content

Commit

Permalink
refactor: remove driver-go dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@huskar-t
huskar-t committed Dec 2, 2024
1 parent ddba0c7 commit 7b550ca
Show file tree
Hide file tree
Showing 134 changed files with 27,933 additions and 399 deletions.
4 changes: 2 additions & 2 deletions controller/rest/configcontroller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
taoserrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/db/commonpool"
"github.com/taosdata/taosadapter/v3/db/tool"
taoserrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools/iptool"
)
Expand Down
8 changes: 4 additions & 4 deletions controller/rest/restful.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common"
"github.com/taosdata/driver-go/v3/common/parser"
tErrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/db/async"
"github.com/taosdata/taosadapter/v3/db/commonpool"
"github.com/taosdata/taosadapter/v3/driver/common"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
tErrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/httperror"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/monitor"
Expand Down
4 changes: 2 additions & 2 deletions controller/rest/table_vgid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
tErrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/db/commonpool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
tErrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools/connectpool"
"github.com/taosdata/taosadapter/v3/tools/iptool"
Expand Down
6 changes: 3 additions & 3 deletions controller/ws/query/ws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common/parser"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/async"
"github.com/taosdata/taosadapter/v3/db/tool"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/httperror"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/monitor"
Expand Down
6 changes: 3 additions & 3 deletions controller/ws/schemaless/schemaless.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
tErrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/db/tool"
tErrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools/generator"
"github.com/taosdata/taosadapter/v3/tools/iptool"
Expand Down
10 changes: 5 additions & 5 deletions controller/ws/schemaless/schemaless_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/gorilla/websocket"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"github.com/taosdata/driver-go/v3/ws/schemaless"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
_ "github.com/taosdata/taosadapter/v3/controller/rest"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/log"
)

Expand Down Expand Up @@ -68,7 +68,7 @@ func TestRestful_InitSchemaless(t *testing.T) {
}{
{
name: "influxdb",
protocol: schemaless.InfluxDBLineProtocol,
protocol: wrapper.InfluxDBLineProtocol,
precision: "ms",
data: "measurement,host=host1 field1=2i,field2=2.0 1577837300000\n" +
"measurement,host=host1 field1=2i,field2=2.0 1577837400000\n" +
Expand All @@ -81,7 +81,7 @@ func TestRestful_InitSchemaless(t *testing.T) {
},
{
name: "opentsdb_telnet",
protocol: schemaless.OpenTSDBTelnetLineProtocol,
protocol: wrapper.OpenTSDBTelnetLineProtocol,
precision: "ms",
data: "meters.current 1648432611249 10.3 location=California.SanFrancisco group=2\n" +
"meters.current 1648432611250 12.6 location=California.SanFrancisco group=2\n" +
Expand All @@ -98,7 +98,7 @@ func TestRestful_InitSchemaless(t *testing.T) {
},
{
name: "opentsdb_json",
protocol: schemaless.OpenTSDBJsonFormatProtocol,
protocol: wrapper.OpenTSDBJsonFormatProtocol,
precision: "ms",
data: `[
{
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestRestful_InitSchemaless(t *testing.T) {
assert.NoError(t, err, string(msg))
assert.Equal(t, reqID, schemalessResp.ReqID)
assert.Equal(t, 0, schemalessResp.Code, schemalessResp.Message)
if c.protocol != schemaless.OpenTSDBJsonFormatProtocol {
if c.protocol != wrapper.OpenTSDBJsonFormatProtocol {
assert.Equal(t, c.totalRows, schemalessResp.TotalRows)
}
assert.Equal(t, c.affectedRows, schemalessResp.AffectedRows)
Expand Down
8 changes: 4 additions & 4 deletions controller/ws/stmt/convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"unsafe"

jsoniter "github.com/json-iterator/go"
"github.com/taosdata/driver-go/v3/common"
"github.com/taosdata/driver-go/v3/common/parser"
stmtCommon "github.com/taosdata/driver-go/v3/common/stmt"
"github.com/taosdata/driver-go/v3/types"
"github.com/taosdata/taosadapter/v3/driver/common"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
stmtCommon "github.com/taosdata/taosadapter/v3/driver/common/stmt"
"github.com/taosdata/taosadapter/v3/driver/types"
"github.com/taosdata/taosadapter/v3/tools"
)

Expand Down
6 changes: 3 additions & 3 deletions controller/ws/stmt/convert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"unsafe"

"github.com/stretchr/testify/assert"
"github.com/taosdata/driver-go/v3/common"
stmtCommon "github.com/taosdata/driver-go/v3/common/stmt"
"github.com/taosdata/driver-go/v3/types"
"github.com/taosdata/taosadapter/v3/driver/common"
stmtCommon "github.com/taosdata/taosadapter/v3/driver/common/stmt"
"github.com/taosdata/taosadapter/v3/driver/types"
)

func Test_stmtParseColumn(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions controller/ws/stmt/stmt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common/parser"
stmtCommon "github.com/taosdata/driver-go/v3/common/stmt"
tErrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/types"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/db/tool"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
stmtCommon "github.com/taosdata/taosadapter/v3/driver/common/stmt"
tErrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/types"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/httperror"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools"
Expand Down
10 changes: 5 additions & 5 deletions controller/ws/tmq/tmq.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import (

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common"
"github.com/taosdata/driver-go/v3/common/parser"
taoserrors "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/asynctmq"
"github.com/taosdata/taosadapter/v3/db/asynctmq/tmqhandle"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/db/tool"
"github.com/taosdata/taosadapter/v3/driver/common"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
taoserrors "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/httperror"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/thread"
Expand Down
4 changes: 2 additions & 2 deletions controller/ws/tmq/tmq_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
jsoniter "github.com/json-iterator/go"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"github.com/taosdata/driver-go/v3/common/parser"
"github.com/taosdata/driver-go/v3/common/tmq"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller"
_ "github.com/taosdata/taosadapter/v3/controller/rest"
"github.com/taosdata/taosadapter/v3/controller/ws/query"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
"github.com/taosdata/taosadapter/v3/driver/common/tmq"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools/parseblock"
)
Expand Down
4 changes: 2 additions & 2 deletions controller/ws/ws/fetch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"encoding/binary"

"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common/parser"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/async"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools/bytesutil"
"github.com/taosdata/taosadapter/v3/tools/melody"
Expand Down
2 changes: 1 addition & 1 deletion controller/ws/ws/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

jsoniter "github.com/json-iterator/go"
"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/config"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/db/tool"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/tools"
"github.com/taosdata/taosadapter/v3/tools/iptool"
Expand Down
2 changes: 1 addition & 1 deletion controller/ws/ws/misc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"

"github.com/sirupsen/logrus"
errors2 "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
errors2 "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/tools/melody"
)

Expand Down
6 changes: 3 additions & 3 deletions controller/ws/ws/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"fmt"

"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common"
errors2 "github.com/taosdata/driver-go/v3/errors"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/async"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/db/tool"
"github.com/taosdata/taosadapter/v3/driver/common"
errors2 "github.com/taosdata/taosadapter/v3/driver/errors"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/log"
"github.com/taosdata/taosadapter/v3/monitor"
"github.com/taosdata/taosadapter/v3/tools/bytesutil"
Expand Down
4 changes: 2 additions & 2 deletions controller/ws/ws/query_result.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"unsafe"

"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/driver-go/v3/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/db/async"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/driver/wrapper/cgo"
"github.com/taosdata/taosadapter/v3/log"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/ws/ws/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/taosdata/driver-go/v3/common/parser"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
"github.com/taosdata/taosadapter/v3/tools/parseblock"
)

Expand Down
4 changes: 2 additions & 2 deletions controller/ws/ws/raw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"unsafe"

"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/common/parser"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/driver/common/parser"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/tools"
"github.com/taosdata/taosadapter/v3/tools/melody"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/ws/ws/schemaless.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"

"github.com/sirupsen/logrus"
"github.com/taosdata/driver-go/v3/wrapper"
"github.com/taosdata/taosadapter/v3/controller/ws/wstool"
"github.com/taosdata/taosadapter/v3/db/syncinterface"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
"github.com/taosdata/taosadapter/v3/tools/melody"
)

Expand Down
14 changes: 7 additions & 7 deletions controller/ws/ws/schemaless_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/taosdata/driver-go/v3/ws/schemaless"
"github.com/taosdata/taosadapter/v3/driver/wrapper"
)

func TestWsSchemaless(t *testing.T) {
Expand Down Expand Up @@ -43,7 +43,7 @@ func TestWsSchemaless(t *testing.T) {
}{
{
name: "influxdb",
protocol: schemaless.InfluxDBLineProtocol,
protocol: wrapper.InfluxDBLineProtocol,
precision: "ms",
data: "measurement,host=host1 field1=2i,field2=2.0 1577837300000\n" +
"measurement,host=host1 field1=2i,field2=2.0 1577837400000\n" +
Expand All @@ -55,7 +55,7 @@ func TestWsSchemaless(t *testing.T) {
},
{
name: "opentsdb_telnet",
protocol: schemaless.OpenTSDBTelnetLineProtocol,
protocol: wrapper.OpenTSDBTelnetLineProtocol,
precision: "ms",
data: "meters.current 1648432611249 10.3 location=California.SanFrancisco group=2\n" +
"meters.current 1648432611250 12.6 location=California.SanFrancisco group=2\n" +
Expand All @@ -71,7 +71,7 @@ func TestWsSchemaless(t *testing.T) {
},
{
name: "opentsdb_json",
protocol: schemaless.OpenTSDBJsonFormatProtocol,
protocol: wrapper.OpenTSDBJsonFormatProtocol,
precision: "ms",
data: `[
{
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestWsSchemaless(t *testing.T) {
},
{
name: "influxdb_tbnamekey",
protocol: schemaless.InfluxDBLineProtocol,
protocol: wrapper.InfluxDBLineProtocol,
precision: "ms",
data: "measurement,host=host1 field1=2i,field2=2.0 1577837300000\n" +
"measurement,host=host1 field1=2i,field2=2.0 1577837400000\n" +
Expand Down Expand Up @@ -158,7 +158,7 @@ func TestWsSchemaless(t *testing.T) {
assert.NoError(t, err, string(resp))
assert.Equal(t, reqID, schemalessResp.ReqID)
assert.Equal(t, 0, schemalessResp.Code, schemalessResp.Message)
if c.protocol != schemaless.OpenTSDBJsonFormatProtocol {
if c.protocol != wrapper.OpenTSDBJsonFormatProtocol {
assert.Equal(t, c.totalRows, schemalessResp.TotalRows)
}
assert.Equal(t, c.affectedRows, schemalessResp.AffectedRows)
Expand Down Expand Up @@ -203,7 +203,7 @@ func TestWsSchemalessError(t *testing.T) {
},
{
name: "wrong timestamp",
protocol: schemaless.InfluxDBLineProtocol,
protocol: wrapper.InfluxDBLineProtocol,
precision: "ms",
data: "measurement,host=host1 field1=2i,field2=2.0 10",
},
Expand Down
Loading

0 comments on commit 7b550ca

Please sign in to comment.