diff --git a/internal/datacoord/compaction_task_meta.go b/internal/datacoord/compaction_task_meta.go index 779d1be048..72043f36b2 100644 --- a/internal/datacoord/compaction_task_meta.go +++ b/internal/datacoord/compaction_task_meta.go @@ -18,7 +18,6 @@ package datacoord import ( "context" - "encoding/json" "strconv" "sync" "time" @@ -28,6 +27,7 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/datacoord/compaction_task_meta_test.go b/internal/datacoord/compaction_task_meta_test.go index ce3cb85a7d..2809d61dc3 100644 --- a/internal/datacoord/compaction_task_meta_test.go +++ b/internal/datacoord/compaction_task_meta_test.go @@ -18,13 +18,13 @@ package datacoord import ( "context" - "encoding/json" "testing" "time" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/pkg/util/metricsinfo" diff --git a/internal/datacoord/import_meta.go b/internal/datacoord/import_meta.go index b81de5950a..bb662e8789 100644 --- a/internal/datacoord/import_meta.go +++ b/internal/datacoord/import_meta.go @@ -17,12 +17,12 @@ package datacoord import ( - "encoding/json" "time" "github.com/hashicorp/golang-lru/v2/expirable" "golang.org/x/exp/maps" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/pkg/util/lock" "github.com/milvus-io/milvus/pkg/util/timerecord" diff --git a/internal/datacoord/import_meta_test.go b/internal/datacoord/import_meta_test.go index a9ed20f5eb..5d79190699 100644 --- a/internal/datacoord/import_meta_test.go +++ b/internal/datacoord/import_meta_test.go @@ -17,7 +17,6 @@ package datacoord import ( - "encoding/json" "fmt" "math/rand" "testing" @@ -26,6 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/datacoord/import_task.go b/internal/datacoord/import_task.go index 719ad0035b..92021e2330 100644 --- a/internal/datacoord/import_task.go +++ b/internal/datacoord/import_task.go @@ -17,10 +17,9 @@ package datacoord import ( - "encoding/json" - "google.golang.org/protobuf/proto" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/milvus-io/milvus/pkg/util/metricsinfo" diff --git a/internal/datacoord/import_util_test.go b/internal/datacoord/import_util_test.go index 51ed9ddfcc..b819da710e 100644 --- a/internal/datacoord/import_util_test.go +++ b/internal/datacoord/import_util_test.go @@ -18,7 +18,6 @@ package datacoord import ( "context" - "encoding/json" "fmt" "math/rand" "path" @@ -33,6 +32,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/mocks" mocks2 "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" diff --git a/internal/datacoord/index_meta.go b/internal/datacoord/index_meta.go index a14392368f..d0f3ef22dc 100644 --- a/internal/datacoord/index_meta.go +++ b/internal/datacoord/index_meta.go @@ -19,7 +19,6 @@ package datacoord import ( "context" - "encoding/json" "fmt" "strconv" "sync" @@ -33,6 +32,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/indexpb" diff --git a/internal/datacoord/index_meta_test.go b/internal/datacoord/index_meta_test.go index 8290b1db5a..5fce622421 100644 --- a/internal/datacoord/index_meta_test.go +++ b/internal/datacoord/index_meta_test.go @@ -19,7 +19,6 @@ package datacoord import ( "context" - "encoding/json" "sync" "testing" "time" @@ -29,6 +28,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" mockkv "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" diff --git a/internal/datacoord/metrics_info.go b/internal/datacoord/metrics_info.go index 165a42bbee..31e090cdb8 100644 --- a/internal/datacoord/metrics_info.go +++ b/internal/datacoord/metrics_info.go @@ -18,7 +18,6 @@ package datacoord import ( "context" - "encoding/json" "sync" "github.com/cockroachdb/errors" @@ -28,6 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/datacoord/session" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/datacoord/metrics_info_test.go b/internal/datacoord/metrics_info_test.go index 7ad368c283..514a70b3e6 100644 --- a/internal/datacoord/metrics_info_test.go +++ b/internal/datacoord/metrics_info_test.go @@ -18,7 +18,6 @@ package datacoord import ( "context" - "encoding/json" "testing" "github.com/cockroachdb/errors" @@ -29,6 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/datacoord/session" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/datanode/importv2/scheduler_test.go b/internal/datanode/importv2/scheduler_test.go index 2b2b0bd712..62cff3f3dd 100644 --- a/internal/datanode/importv2/scheduler_test.go +++ b/internal/datanode/importv2/scheduler_test.go @@ -18,7 +18,6 @@ package importv2 import ( "context" - "encoding/json" "io" "strconv" "strings" @@ -33,6 +32,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/distributed/proxy/httpserver/handler_test.go b/internal/distributed/proxy/httpserver/handler_test.go index 4b69022229..ad5266b4f3 100644 --- a/internal/distributed/proxy/httpserver/handler_test.go +++ b/internal/distributed/proxy/httpserver/handler_test.go @@ -3,7 +3,6 @@ package httpserver import ( "bytes" "context" - "encoding/json" "fmt" "net/http" "net/http/httptest" @@ -17,6 +16,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/distributed/proxy/httpserver/handler_v1_test.go b/internal/distributed/proxy/httpserver/handler_v1_test.go index 96a6e65bdd..0fce30276c 100644 --- a/internal/distributed/proxy/httpserver/handler_v1_test.go +++ b/internal/distributed/proxy/httpserver/handler_v1_test.go @@ -3,7 +3,6 @@ package httpserver import ( "bytes" "context" - "encoding/json" "fmt" "net/http" "net/http/httptest" @@ -20,6 +19,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/distributed/proxy/httpserver/handler_v2.go b/internal/distributed/proxy/httpserver/handler_v2.go index 6b277762ff..ec050c0954 100644 --- a/internal/distributed/proxy/httpserver/handler_v2.go +++ b/internal/distributed/proxy/httpserver/handler_v2.go @@ -2,7 +2,6 @@ package httpserver import ( "context" - "encoding/json" "fmt" "io" "net/http" @@ -24,6 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/distributed/proxy/httpserver/handler_v2_test.go b/internal/distributed/proxy/httpserver/handler_v2_test.go index 0a1737080c..ee117b617e 100644 --- a/internal/distributed/proxy/httpserver/handler_v2_test.go +++ b/internal/distributed/proxy/httpserver/handler_v2_test.go @@ -3,7 +3,6 @@ package httpserver import ( "bytes" "context" - "encoding/json" "fmt" "net/http" "net/http/httptest" @@ -18,6 +17,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" mhttp "github.com/milvus-io/milvus/internal/http" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proxy" diff --git a/internal/distributed/proxy/httpserver/utils_test.go b/internal/distributed/proxy/httpserver/utils_test.go index 07d0740713..4105d85dd2 100644 --- a/internal/distributed/proxy/httpserver/utils_test.go +++ b/internal/distributed/proxy/httpserver/utils_test.go @@ -1,7 +1,6 @@ package httpserver import ( - "encoding/json" "math" "strconv" "strings" @@ -15,6 +14,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/typeutil" ) diff --git a/internal/distributed/proxy/httpserver/wrap_request.go b/internal/distributed/proxy/httpserver/wrap_request.go index 045dbf13d5..c1fd1194fd 100644 --- a/internal/distributed/proxy/httpserver/wrap_request.go +++ b/internal/distributed/proxy/httpserver/wrap_request.go @@ -2,7 +2,6 @@ package httpserver import ( "encoding/binary" - "encoding/json" "fmt" "math" @@ -12,6 +11,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/util/typeutil" ) diff --git a/internal/distributed/proxy/httpserver/wrap_request_test.go b/internal/distributed/proxy/httpserver/wrap_request_test.go index 4d673fb6bd..64706be35d 100644 --- a/internal/distributed/proxy/httpserver/wrap_request_test.go +++ b/internal/distributed/proxy/httpserver/wrap_request_test.go @@ -1,13 +1,13 @@ package httpserver import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" ) func TestFieldData_AsSchemapb(t *testing.T) { diff --git a/internal/distributed/proxy/service_test.go b/internal/distributed/proxy/service_test.go index bb73295921..9df8dc942c 100644 --- a/internal/distributed/proxy/service_test.go +++ b/internal/distributed/proxy/service_test.go @@ -20,7 +20,6 @@ import ( "context" "crypto/tls" "crypto/x509" - "encoding/json" "fmt" "net/http/httptest" "os" @@ -45,6 +44,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcproxyclient "github.com/milvus-io/milvus/internal/distributed/proxy/client" "github.com/milvus-io/milvus/internal/distributed/proxy/httpserver" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/util/hookutil" diff --git a/internal/flushcommon/pipeline/flow_graph_manager.go b/internal/flushcommon/pipeline/flow_graph_manager.go index 468a033c74..8527e65ee9 100644 --- a/internal/flushcommon/pipeline/flow_graph_manager.go +++ b/internal/flushcommon/pipeline/flow_graph_manager.go @@ -18,12 +18,12 @@ package pipeline import ( "context" - "encoding/json" "fmt" "go.uber.org/zap" "github.com/milvus-io/milvus/internal/flushcommon/util" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/metrics" "github.com/milvus-io/milvus/pkg/util/metricsinfo" diff --git a/internal/flushcommon/pipeline/flow_graph_manager_test.go b/internal/flushcommon/pipeline/flow_graph_manager_test.go index 3f69ccd540..c89163f592 100644 --- a/internal/flushcommon/pipeline/flow_graph_manager_test.go +++ b/internal/flushcommon/pipeline/flow_graph_manager_test.go @@ -18,7 +18,6 @@ package pipeline import ( "context" - "encoding/json" "fmt" "os" "testing" @@ -35,6 +34,7 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/metrics" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/flushcommon/syncmgr/sync_manager.go b/internal/flushcommon/syncmgr/sync_manager.go index bed92083b5..eb48de9244 100644 --- a/internal/flushcommon/syncmgr/sync_manager.go +++ b/internal/flushcommon/syncmgr/sync_manager.go @@ -2,7 +2,6 @@ package syncmgr import ( "context" - "encoding/json" "fmt" "strconv" "time" @@ -14,6 +13,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/pkg/config" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/flushcommon/syncmgr/sync_manager_test.go b/internal/flushcommon/syncmgr/sync_manager_test.go index d8c19c7a68..40f8c868ce 100644 --- a/internal/flushcommon/syncmgr/sync_manager_test.go +++ b/internal/flushcommon/syncmgr/sync_manager_test.go @@ -2,7 +2,6 @@ package syncmgr import ( "context" - "encoding/json" "math/rand" "strconv" "testing" @@ -22,6 +21,7 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" diff --git a/internal/flushcommon/syncmgr/task.go b/internal/flushcommon/syncmgr/task.go index b7463b04b9..e5c2f913cd 100644 --- a/internal/flushcommon/syncmgr/task.go +++ b/internal/flushcommon/syncmgr/task.go @@ -18,7 +18,6 @@ package syncmgr import ( "context" - "encoding/json" "fmt" "path" "time" @@ -31,6 +30,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/pkg/common" diff --git a/internal/http/healthz/healthz_handler.go b/internal/http/healthz/healthz_handler.go index 3567962311..62c98e1cd8 100644 --- a/internal/http/healthz/healthz_handler.go +++ b/internal/http/healthz/healthz_handler.go @@ -18,7 +18,6 @@ package healthz import ( "context" - "encoding/json" "fmt" "net/http" "sync" @@ -27,6 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" ) diff --git a/internal/http/server.go b/internal/http/server.go index c7aeed289c..f9932f72a7 100644 --- a/internal/http/server.go +++ b/internal/http/server.go @@ -18,7 +18,6 @@ package http import ( "embed" - "encoding/json" "fmt" "net/http" "os" @@ -30,6 +29,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/http/healthz" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/eventlog" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/expr" diff --git a/internal/http/server_test.go b/internal/http/server_test.go index 726a0adb6d..e2d1090c0d 100644 --- a/internal/http/server_test.go +++ b/internal/http/server_test.go @@ -19,7 +19,6 @@ package http import ( "bytes" "context" - "encoding/json" "fmt" "io" "net" @@ -36,6 +35,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/http/healthz" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/expr" "github.com/milvus-io/milvus/pkg/util/paramtable" diff --git a/internal/json/sonic.go b/internal/json/sonic.go index 816126b163..b636172fa6 100644 --- a/internal/json/sonic.go +++ b/internal/json/sonic.go @@ -36,4 +36,9 @@ var ( NewEncoder = json.NewEncoder ) -type Number = gojson.Number +type ( + Delim = gojson.Delim + Decoder = gojson.Decoder + Number = gojson.Number + RawMessage = gojson.RawMessage +) diff --git a/internal/metastore/kv/rootcoord/kv_catalog.go b/internal/metastore/kv/rootcoord/kv_catalog.go index 6e594d7fa2..104a8f61a4 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog.go +++ b/internal/metastore/kv/rootcoord/kv_catalog.go @@ -2,7 +2,6 @@ package rootcoord import ( "context" - "encoding/json" "fmt" "github.com/cockroachdb/errors" @@ -12,6 +11,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" diff --git a/internal/metastore/kv/rootcoord/kv_catalog_test.go b/internal/metastore/kv/rootcoord/kv_catalog_test.go index 1c899b683b..127a66cb36 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog_test.go +++ b/internal/metastore/kv/rootcoord/kv_catalog_test.go @@ -2,7 +2,6 @@ package rootcoord import ( "context" - "encoding/json" "fmt" "strings" "sync" @@ -21,6 +20,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" diff --git a/internal/parser/planparserv2/convert_field_data_to_generic_value.go b/internal/parser/planparserv2/convert_field_data_to_generic_value.go index c4479a4c11..d00f9dc6c9 100644 --- a/internal/parser/planparserv2/convert_field_data_to_generic_value.go +++ b/internal/parser/planparserv2/convert_field_data_to_generic_value.go @@ -2,10 +2,10 @@ package planparserv2 import ( "bytes" - "encoding/json" "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/planpb" ) diff --git a/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go b/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go index 673b820c60..89a50a7707 100644 --- a/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go +++ b/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go @@ -1,12 +1,12 @@ package planparserv2 import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/planpb" ) diff --git a/internal/parser/planparserv2/show_visitor.go b/internal/parser/planparserv2/show_visitor.go index 64cb854a28..436175ee93 100644 --- a/internal/parser/planparserv2/show_visitor.go +++ b/internal/parser/planparserv2/show_visitor.go @@ -1,10 +1,9 @@ package planparserv2 import ( - "encoding/json" - "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/pkg/log" ) diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go index 61eeca1b86..e6e49b07a6 100644 --- a/internal/parser/planparserv2/utils.go +++ b/internal/parser/planparserv2/utils.go @@ -1,12 +1,12 @@ package planparserv2 import ( - "encoding/json" "fmt" "strconv" "strings" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/pkg/util/typeutil" ) diff --git a/internal/proxy/dummyreq.go b/internal/proxy/dummyreq.go index 09ec1b83ed..d7e1f4eb29 100644 --- a/internal/proxy/dummyreq.go +++ b/internal/proxy/dummyreq.go @@ -17,7 +17,7 @@ package proxy import ( - "encoding/json" + "github.com/milvus-io/milvus/internal/json" ) type dummyRequestType struct { diff --git a/internal/proxy/dummyreq_test.go b/internal/proxy/dummyreq_test.go index a86ec6ad83..6e4ac7cf07 100644 --- a/internal/proxy/dummyreq_test.go +++ b/internal/proxy/dummyreq_test.go @@ -17,12 +17,12 @@ package proxy import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" ) diff --git a/internal/proxy/http_req_impl.go b/internal/proxy/http_req_impl.go index 135340eb9a..ea21a7464a 100644 --- a/internal/proxy/http_req_impl.go +++ b/internal/proxy/http_req_impl.go @@ -17,7 +17,6 @@ package proxy import ( - "encoding/json" "net/http" "strconv" "strings" @@ -28,6 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mhttp "github.com/milvus-io/milvus/internal/http" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proxy/connection" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/proxy/management.go b/internal/proxy/management.go index 31e7883267..635e516066 100644 --- a/internal/proxy/management.go +++ b/internal/proxy/management.go @@ -17,7 +17,6 @@ package proxy import ( - "encoding/json" "fmt" "net/http" "strconv" @@ -25,6 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" management "github.com/milvus-io/milvus/internal/http" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/pkg/util/commonpbutil" diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 9d01f42ba1..a3e066ba00 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -20,7 +20,6 @@ import ( "bytes" "context" "encoding/binary" - "encoding/json" "fmt" "math/rand" "net" @@ -53,6 +52,7 @@ import ( grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" grpcrootcoord "github.com/milvus-io/milvus/internal/distributed/rootcoord" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" diff --git a/internal/proxy/reScorer.go b/internal/proxy/reScorer.go index 1477b82347..fc6776f4bc 100644 --- a/internal/proxy/reScorer.go +++ b/internal/proxy/reScorer.go @@ -1,7 +1,6 @@ package proxy import ( - "encoding/json" "fmt" "math" "reflect" @@ -12,6 +11,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/proxy/reScorer_test.go b/internal/proxy/reScorer_test.go index c48d8f0d45..e824099aca 100644 --- a/internal/proxy/reScorer_test.go +++ b/internal/proxy/reScorer_test.go @@ -1,12 +1,12 @@ package proxy import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" ) func TestRescorer(t *testing.T) { diff --git a/internal/proxy/task_index_test.go b/internal/proxy/task_index_test.go index b5aebd59d5..554856e987 100644 --- a/internal/proxy/task_index_test.go +++ b/internal/proxy/task_index_test.go @@ -18,7 +18,6 @@ package proxy import ( "context" - "encoding/json" "os" "sort" "testing" @@ -32,6 +31,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index 242acffb90..c153c75e2c 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -20,7 +20,6 @@ import ( "bytes" "context" "encoding/binary" - "encoding/json" "math/rand" "strconv" "testing" @@ -37,6 +36,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/proxy/util.go b/internal/proxy/util.go index cb6671b9c0..9541d40895 100644 --- a/internal/proxy/util.go +++ b/internal/proxy/util.go @@ -18,7 +18,6 @@ package proxy import ( "context" - "encoding/json" "fmt" "strconv" "strings" @@ -34,6 +33,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/parser/planparserv2" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" diff --git a/internal/proxy/util_test.go b/internal/proxy/util_test.go index 64515ad06c..4766d85b79 100644 --- a/internal/proxy/util_test.go +++ b/internal/proxy/util_test.go @@ -18,7 +18,6 @@ package proxy import ( "context" - "encoding/json" "fmt" "strconv" "strings" @@ -36,6 +35,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/proxy/validate_util.go b/internal/proxy/validate_util.go index 33bc9c2b63..692d928a6b 100644 --- a/internal/proxy/validate_util.go +++ b/internal/proxy/validate_util.go @@ -1,7 +1,6 @@ package proxy import ( - "encoding/json" "fmt" "math" "reflect" @@ -9,6 +8,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/nullutil" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/proxy/validate_util_test.go b/internal/proxy/validate_util_test.go index d71faa8d4b..2e30d1c8cb 100644 --- a/internal/proxy/validate_util_test.go +++ b/internal/proxy/validate_util_test.go @@ -1,7 +1,6 @@ package proxy import ( - "encoding/json" "fmt" "math" "reflect" @@ -13,6 +12,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/paramtable" diff --git a/internal/querycoordv2/handlers.go b/internal/querycoordv2/handlers.go index 85aa9f85f2..b1d5aac1cf 100644 --- a/internal/querycoordv2/handlers.go +++ b/internal/querycoordv2/handlers.go @@ -18,7 +18,6 @@ package querycoordv2 import ( "context" - "encoding/json" "sync" "time" @@ -29,6 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" diff --git a/internal/querycoordv2/handlers_test.go b/internal/querycoordv2/handlers_test.go index d2b2595ac2..1ac7d65467 100644 --- a/internal/querycoordv2/handlers_test.go +++ b/internal/querycoordv2/handlers_test.go @@ -17,13 +17,13 @@ package querycoordv2 import ( "context" - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) diff --git a/internal/querycoordv2/meta/dist_manager.go b/internal/querycoordv2/meta/dist_manager.go index d5b54da49b..9c6239948b 100644 --- a/internal/querycoordv2/meta/dist_manager.go +++ b/internal/querycoordv2/meta/dist_manager.go @@ -17,10 +17,9 @@ package meta import ( - "encoding/json" - "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) diff --git a/internal/querycoordv2/meta/dist_manager_test.go b/internal/querycoordv2/meta/dist_manager_test.go index 5f6a46846c..4af530ea6f 100644 --- a/internal/querycoordv2/meta/dist_manager_test.go +++ b/internal/querycoordv2/meta/dist_manager_test.go @@ -1,12 +1,12 @@ package meta import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/pkg/util/metricsinfo" diff --git a/internal/querycoordv2/meta/leader_view_manager_test.go b/internal/querycoordv2/meta/leader_view_manager_test.go index 9ff3b18b53..61e441498b 100644 --- a/internal/querycoordv2/meta/leader_view_manager_test.go +++ b/internal/querycoordv2/meta/leader_view_manager_test.go @@ -17,7 +17,6 @@ package meta import ( - "encoding/json" "testing" "github.com/cockroachdb/errors" @@ -27,6 +26,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/querycoordv2/meta/replica_manager.go b/internal/querycoordv2/meta/replica_manager.go index 436f24b5f7..610095b06c 100644 --- a/internal/querycoordv2/meta/replica_manager.go +++ b/internal/querycoordv2/meta/replica_manager.go @@ -17,7 +17,6 @@ package meta import ( - "encoding/json" "fmt" "sync" @@ -25,6 +24,7 @@ import ( "github.com/samber/lo" "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/querycoordv2/meta/replica_manager_test.go b/internal/querycoordv2/meta/replica_manager_test.go index 17e6c58aa8..f81cc5dfe0 100644 --- a/internal/querycoordv2/meta/replica_manager_test.go +++ b/internal/querycoordv2/meta/replica_manager_test.go @@ -17,7 +17,6 @@ package meta import ( - "encoding/json" "testing" "github.com/samber/lo" @@ -27,6 +26,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" diff --git a/internal/querycoordv2/meta/resource_manager.go b/internal/querycoordv2/meta/resource_manager.go index 05b8102f5a..408e2da246 100644 --- a/internal/querycoordv2/meta/resource_manager.go +++ b/internal/querycoordv2/meta/resource_manager.go @@ -17,7 +17,6 @@ package meta import ( - "encoding/json" "fmt" "sync" @@ -27,6 +26,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/session" diff --git a/internal/querycoordv2/meta/resource_manager_test.go b/internal/querycoordv2/meta/resource_manager_test.go index cee8af425a..b7cb16da98 100644 --- a/internal/querycoordv2/meta/resource_manager_test.go +++ b/internal/querycoordv2/meta/resource_manager_test.go @@ -16,7 +16,6 @@ package meta import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" @@ -25,6 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" diff --git a/internal/querycoordv2/meta/target_manager.go b/internal/querycoordv2/meta/target_manager.go index df6f2b134e..2115297de4 100644 --- a/internal/querycoordv2/meta/target_manager.go +++ b/internal/querycoordv2/meta/target_manager.go @@ -18,7 +18,6 @@ package meta import ( "context" - "encoding/json" "fmt" "runtime" "sync" @@ -27,6 +26,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/querycoordv2/meta/target_manager_test.go b/internal/querycoordv2/meta/target_manager_test.go index 156b671dea..7eeb99e83e 100644 --- a/internal/querycoordv2/meta/target_manager_test.go +++ b/internal/querycoordv2/meta/target_manager_test.go @@ -17,7 +17,6 @@ package meta import ( - "encoding/json" "testing" "time" @@ -27,6 +26,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" diff --git a/internal/querycoordv2/services_test.go b/internal/querycoordv2/services_test.go index 9d02c99639..a573eea5c8 100644 --- a/internal/querycoordv2/services_test.go +++ b/internal/querycoordv2/services_test.go @@ -18,7 +18,6 @@ package querycoordv2 import ( "context" - "encoding/json" "sort" "testing" "time" @@ -31,6 +30,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" diff --git a/internal/querycoordv2/task/task.go b/internal/querycoordv2/task/task.go index 4c38a66ea5..0383be60af 100644 --- a/internal/querycoordv2/task/task.go +++ b/internal/querycoordv2/task/task.go @@ -18,7 +18,6 @@ package task import ( "context" - "encoding/json" "fmt" "time" @@ -28,6 +27,7 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/atomic" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/querycoordv2/task/task_test.go b/internal/querycoordv2/task/task_test.go index 73655c0b2e..7799d8cb4e 100644 --- a/internal/querycoordv2/task/task_test.go +++ b/internal/querycoordv2/task/task_test.go @@ -18,7 +18,6 @@ package task import ( "context" - "encoding/json" "math/rand" "strings" "testing" @@ -32,6 +31,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" diff --git a/internal/querynodev2/metrics_info.go b/internal/querynodev2/metrics_info.go index 21dce90ce9..04b514568a 100644 --- a/internal/querynodev2/metrics_info.go +++ b/internal/querynodev2/metrics_info.go @@ -18,13 +18,13 @@ package querynodev2 import ( "context" - "encoding/json" "fmt" "github.com/samber/lo" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/querynodev2/collector" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" diff --git a/internal/querynodev2/metrics_info_test.go b/internal/querynodev2/metrics_info_test.go index e13cb74def..447d548d34 100644 --- a/internal/querynodev2/metrics_info_test.go +++ b/internal/querynodev2/metrics_info_test.go @@ -18,12 +18,12 @@ package querynodev2 import ( "context" - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/pipeline" diff --git a/internal/querynodev2/services_test.go b/internal/querynodev2/services_test.go index 3c3b60f7c1..3f6364a217 100644 --- a/internal/querynodev2/services_test.go +++ b/internal/querynodev2/services_test.go @@ -17,7 +17,6 @@ package querynodev2 import ( "context" - "encoding/json" "io" "math/rand" "path" @@ -38,6 +37,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/rootcoord/quota_center_test.go b/internal/rootcoord/quota_center_test.go index 3ad5653769..15b306d582 100644 --- a/internal/rootcoord/quota_center_test.go +++ b/internal/rootcoord/quota_center_test.go @@ -18,7 +18,6 @@ package rootcoord import ( "context" - "encoding/json" "fmt" "math" "strconv" @@ -34,6 +33,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/rootcoord/util.go b/internal/rootcoord/util.go index 88a27e758d..7912f6bd0a 100644 --- a/internal/rootcoord/util.go +++ b/internal/rootcoord/util.go @@ -18,7 +18,6 @@ package rootcoord import ( "context" - "encoding/json" "fmt" "strconv" "time" @@ -27,6 +26,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/pkg/common" diff --git a/internal/storage/binlog_test.go b/internal/storage/binlog_test.go index 6a7876dd82..f7a2fbc957 100644 --- a/internal/storage/binlog_test.go +++ b/internal/storage/binlog_test.go @@ -19,7 +19,6 @@ package storage import ( "bytes" "encoding/binary" - "encoding/json" "fmt" "testing" "time" @@ -28,6 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/milvus-io/milvus/pkg/util/tsoutil" diff --git a/internal/storage/data_codec.go b/internal/storage/data_codec.go index 460e042458..b7086387e0 100644 --- a/internal/storage/data_codec.go +++ b/internal/storage/data_codec.go @@ -18,7 +18,6 @@ package storage import ( "encoding/binary" - "encoding/json" "fmt" "math" "sort" @@ -26,6 +25,7 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/storage/delta_data.go b/internal/storage/delta_data.go index 8bb7f7cdf7..5dc0b4f812 100644 --- a/internal/storage/delta_data.go +++ b/internal/storage/delta_data.go @@ -17,7 +17,6 @@ package storage import ( - "encoding/json" "fmt" "strconv" "strings" @@ -27,6 +26,7 @@ import ( "github.com/valyala/fastjson" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/util/merr" ) diff --git a/internal/storage/event_data.go b/internal/storage/event_data.go index 69afb58d27..9ee6622438 100644 --- a/internal/storage/event_data.go +++ b/internal/storage/event_data.go @@ -18,7 +18,6 @@ package storage import ( "encoding/binary" - "encoding/json" "fmt" "io" "strconv" @@ -26,6 +25,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/typeutil" diff --git a/internal/storage/field_stats.go b/internal/storage/field_stats.go index 32f4f2959c..df8dee82a2 100644 --- a/internal/storage/field_stats.go +++ b/internal/storage/field_stats.go @@ -17,12 +17,12 @@ package storage import ( - "encoding/json" "fmt" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/storage/field_stats_test.go b/internal/storage/field_stats_test.go index ba1b71c3ef..0a5f9cfdfd 100644 --- a/internal/storage/field_stats_test.go +++ b/internal/storage/field_stats_test.go @@ -17,12 +17,12 @@ package storage import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/storage/field_value.go b/internal/storage/field_value.go index 9c8e16fb34..f9d59d89dc 100644 --- a/internal/storage/field_value.go +++ b/internal/storage/field_value.go @@ -17,12 +17,12 @@ package storage import ( - "encoding/json" "fmt" "math" "strings" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/storage/field_value_test.go b/internal/storage/field_value_test.go index 0c24c70c2b..a3343c3f12 100644 --- a/internal/storage/field_value_test.go +++ b/internal/storage/field_value_test.go @@ -17,10 +17,11 @@ package storage import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/internal/json" ) func TestVarCharFieldValue(t *testing.T) { diff --git a/internal/storage/gcp_native_object_storage.go b/internal/storage/gcp_native_object_storage.go index 614a5cf74f..a1526d33cf 100644 --- a/internal/storage/gcp_native_object_storage.go +++ b/internal/storage/gcp_native_object_storage.go @@ -18,7 +18,6 @@ package storage import ( "context" - "encoding/json" "fmt" "io" @@ -30,6 +29,7 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/retry" diff --git a/internal/storage/index_data_codec.go b/internal/storage/index_data_codec.go index 5baf695283..be53f156e2 100644 --- a/internal/storage/index_data_codec.go +++ b/internal/storage/index_data_codec.go @@ -17,7 +17,6 @@ package storage import ( - "encoding/json" "fmt" "strconv" "time" @@ -26,6 +25,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/typeutil" ) diff --git a/internal/storage/partition_stats.go b/internal/storage/partition_stats.go index d7e3893e80..d1697fa9df 100644 --- a/internal/storage/partition_stats.go +++ b/internal/storage/partition_stats.go @@ -17,9 +17,10 @@ package storage import ( - "encoding/json" "path" "strconv" + + "github.com/milvus-io/milvus/internal/json" ) type SegmentStats struct { diff --git a/internal/storage/primary_key.go b/internal/storage/primary_key.go index ed39825c54..628edd2e6b 100644 --- a/internal/storage/primary_key.go +++ b/internal/storage/primary_key.go @@ -17,11 +17,11 @@ package storage import ( - "encoding/json" "fmt" "strings" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/merr" ) diff --git a/internal/storage/primary_key_test.go b/internal/storage/primary_key_test.go index 12b1f666d4..d36658701d 100644 --- a/internal/storage/primary_key_test.go +++ b/internal/storage/primary_key_test.go @@ -1,12 +1,12 @@ package storage import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" ) func TestVarCharPrimaryKey(t *testing.T) { diff --git a/internal/storage/print_binlog.go b/internal/storage/print_binlog.go index ab5d159304..9df9d31d60 100644 --- a/internal/storage/print_binlog.go +++ b/internal/storage/print_binlog.go @@ -17,7 +17,6 @@ package storage import ( - "encoding/json" "fmt" "os" @@ -27,6 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/util/tsoutil" ) diff --git a/internal/storage/serde_events.go b/internal/storage/serde_events.go index afad9c0fc7..80f22672c0 100644 --- a/internal/storage/serde_events.go +++ b/internal/storage/serde_events.go @@ -19,7 +19,6 @@ package storage import ( "bytes" "encoding/binary" - "encoding/json" "fmt" "io" "sort" @@ -30,6 +29,7 @@ import ( "github.com/apache/arrow/go/v12/arrow/memory" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/metautil" diff --git a/internal/storage/stats.go b/internal/storage/stats.go index 3ab2e026d4..61b808667f 100644 --- a/internal/storage/stats.go +++ b/internal/storage/stats.go @@ -19,7 +19,6 @@ package storage import ( "bytes" "encoding/binary" - "encoding/json" "fmt" "maps" "math" @@ -27,6 +26,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/storage/stats_test.go b/internal/storage/stats_test.go index cccd3d9f9e..578ffd99ea 100644 --- a/internal/storage/stats_test.go +++ b/internal/storage/stats_test.go @@ -17,12 +17,12 @@ package storage import ( - "encoding/json" "testing" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/storage/utils_test.go b/internal/storage/utils_test.go index 03d6847754..eec411da23 100644 --- a/internal/storage/utils_test.go +++ b/internal/storage/utils_test.go @@ -19,7 +19,6 @@ package storage import ( "bytes" "encoding/binary" - "encoding/json" "math/rand" "strconv" "testing" @@ -32,6 +31,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/mq/msgstream" "github.com/milvus-io/milvus/pkg/util/testutils" diff --git a/internal/streamingcoord/client/client.go b/internal/streamingcoord/client/client.go index 1fb3b2bae3..4b6186186b 100644 --- a/internal/streamingcoord/client/client.go +++ b/internal/streamingcoord/client/client.go @@ -2,7 +2,6 @@ package client import ( "context" - "encoding/json" "time" clientv3 "go.etcd.io/etcd/client/v3" @@ -10,6 +9,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/streamingcoord/client/assignment" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/balancer/picker" diff --git a/internal/streamingnode/client/handler/handler_client.go b/internal/streamingnode/client/handler/handler_client.go index 8377759c70..29f0f1c9c9 100644 --- a/internal/streamingnode/client/handler/handler_client.go +++ b/internal/streamingnode/client/handler/handler_client.go @@ -2,7 +2,6 @@ package handler import ( "context" - "encoding/json" "time" "github.com/cockroachdb/errors" @@ -10,6 +9,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/assignment" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/consumer" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/producer" diff --git a/internal/streamingnode/client/manager/manager_client.go b/internal/streamingnode/client/manager/manager_client.go index 7496d56ef7..3264945078 100644 --- a/internal/streamingnode/client/manager/manager_client.go +++ b/internal/streamingnode/client/manager/manager_client.go @@ -2,7 +2,6 @@ package manager import ( "context" - "encoding/json" "time" clientv3 "go.etcd.io/etcd/client/v3" @@ -10,6 +9,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/balancer/picker" streamingserviceinterceptor "github.com/milvus-io/milvus/internal/util/streamingutil/service/interceptor" diff --git a/internal/util/bloomfilter/bloom_filter.go b/internal/util/bloomfilter/bloom_filter.go index 2183f04ef4..0c4dff36a4 100644 --- a/internal/util/bloomfilter/bloom_filter.go +++ b/internal/util/bloomfilter/bloom_filter.go @@ -16,14 +16,14 @@ package bloomfilter import ( - "encoding/json" - "github.com/bits-and-blooms/bloom/v3" "github.com/cockroachdb/errors" "github.com/greatroar/blobloom" "github.com/pingcap/log" "github.com/zeebo/xxh3" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/json" ) type BFType int diff --git a/internal/util/importutilv2/csv/row_parser.go b/internal/util/importutilv2/csv/row_parser.go index 50f0f2089e..04ce55454c 100644 --- a/internal/util/importutilv2/csv/row_parser.go +++ b/internal/util/importutilv2/csv/row_parser.go @@ -17,7 +17,6 @@ package csv import ( - "encoding/json" "fmt" "strconv" "strings" @@ -25,6 +24,7 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/parameterutil" diff --git a/internal/util/importutilv2/csv/row_parser_test.go b/internal/util/importutilv2/csv/row_parser_test.go index 7621e1b1a6..ef6f0af552 100644 --- a/internal/util/importutilv2/csv/row_parser_test.go +++ b/internal/util/importutilv2/csv/row_parser_test.go @@ -17,7 +17,6 @@ package csv import ( - "encoding/json" "fmt" "strings" "testing" @@ -26,6 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" ) diff --git a/internal/util/importutilv2/json/row_parser.go b/internal/util/importutilv2/json/row_parser.go index 8c1f0b4895..391427efbd 100644 --- a/internal/util/importutilv2/json/row_parser.go +++ b/internal/util/importutilv2/json/row_parser.go @@ -17,13 +17,13 @@ package json import ( - "encoding/json" "fmt" "strconv" "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/internal/util/nullutil" "github.com/milvus-io/milvus/pkg/util/merr" diff --git a/internal/util/importutilv2/json/row_parser_test.go b/internal/util/importutilv2/json/row_parser_test.go index 77f79aee3e..96fa48becc 100644 --- a/internal/util/importutilv2/json/row_parser_test.go +++ b/internal/util/importutilv2/json/row_parser_test.go @@ -17,7 +17,6 @@ package json import ( - "encoding/json" "strings" "testing" @@ -25,6 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/pkg/common" ) diff --git a/internal/util/importutilv2/numpy/field_reader.go b/internal/util/importutilv2/numpy/field_reader.go index 89835b5707..eb1fe468a8 100644 --- a/internal/util/importutilv2/numpy/field_reader.go +++ b/internal/util/importutilv2/numpy/field_reader.go @@ -19,7 +19,6 @@ package numpy import ( "bytes" "encoding/binary" - "encoding/json" "fmt" "io" "unicode/utf8" @@ -29,6 +28,7 @@ import ( "github.com/sbinet/npyio/npy" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/parameterutil" diff --git a/internal/util/importutilv2/parquet/field_reader.go b/internal/util/importutilv2/parquet/field_reader.go index e291ba16d4..ca017e304a 100644 --- a/internal/util/importutilv2/parquet/field_reader.go +++ b/internal/util/importutilv2/parquet/field_reader.go @@ -18,7 +18,6 @@ package parquet import ( "context" - "encoding/json" "fmt" "github.com/apache/arrow/go/v12/arrow" @@ -28,6 +27,7 @@ import ( "golang.org/x/exp/constraints" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/internal/util/nullutil" diff --git a/internal/util/proxyutil/proxy_watcher.go b/internal/util/proxyutil/proxy_watcher.go index 5caf8c1add..decc1e6420 100644 --- a/internal/util/proxyutil/proxy_watcher.go +++ b/internal/util/proxyutil/proxy_watcher.go @@ -18,7 +18,6 @@ package proxyutil import ( "context" - "encoding/json" "fmt" "path" "sync" @@ -30,6 +29,7 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/pkg/log" "github.com/milvus-io/milvus/pkg/util/lifetime" diff --git a/internal/util/proxyutil/proxy_watcher_test.go b/internal/util/proxyutil/proxy_watcher_test.go index f1f4a684dd..f015a5433d 100644 --- a/internal/util/proxyutil/proxy_watcher_test.go +++ b/internal/util/proxyutil/proxy_watcher_test.go @@ -18,7 +18,6 @@ package proxyutil import ( "context" - "encoding/json" "path" "strconv" "testing" @@ -27,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/pkg/util/etcd" "github.com/milvus-io/milvus/pkg/util/paramtable" diff --git a/internal/util/sessionutil/session_util.go b/internal/util/sessionutil/session_util.go index f7326174fa..5358fc6955 100644 --- a/internal/util/sessionutil/session_util.go +++ b/internal/util/sessionutil/session_util.go @@ -18,7 +18,6 @@ package sessionutil import ( "context" - "encoding/json" "fmt" "os" "path" @@ -36,6 +35,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" "github.com/milvus-io/milvus/pkg/common" diff --git a/internal/util/sessionutil/session_util_test.go b/internal/util/sessionutil/session_util_test.go index e379c959fc..3589108c67 100644 --- a/internal/util/sessionutil/session_util_test.go +++ b/internal/util/sessionutil/session_util_test.go @@ -2,7 +2,6 @@ package sessionutil import ( "context" - "encoding/json" "fmt" "math/rand" "net/url" @@ -26,6 +25,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/util/streamingutil/service/discoverer/session_discoverer.go b/internal/util/streamingutil/service/discoverer/session_discoverer.go index 630d1c866e..d93c412348 100644 --- a/internal/util/streamingutil/service/discoverer/session_discoverer.go +++ b/internal/util/streamingutil/service/discoverer/session_discoverer.go @@ -2,7 +2,6 @@ package discoverer import ( "context" - "encoding/json" "github.com/blang/semver/v4" "github.com/cockroachdb/errors" @@ -10,6 +9,7 @@ import ( "go.uber.org/zap" "google.golang.org/grpc/resolver" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" "github.com/milvus-io/milvus/pkg/log" diff --git a/internal/util/streamingutil/service/discoverer/session_discoverer_test.go b/internal/util/streamingutil/service/discoverer/session_discoverer_test.go index 304f8c8245..723bcc29e9 100644 --- a/internal/util/streamingutil/service/discoverer/session_discoverer_test.go +++ b/internal/util/streamingutil/service/discoverer/session_discoverer_test.go @@ -2,7 +2,6 @@ package discoverer import ( "context" - "encoding/json" "fmt" "io" "testing" @@ -11,6 +10,7 @@ import ( "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" "github.com/milvus-io/milvus/pkg/util/etcd" diff --git a/internal/util/testutil/test_util.go b/internal/util/testutil/test_util.go index 5182a331dd..34a0910ac4 100644 --- a/internal/util/testutil/test_util.go +++ b/internal/util/testutil/test_util.go @@ -1,7 +1,6 @@ package testutil import ( - "encoding/json" "fmt" "math/rand" "strconv" @@ -13,6 +12,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus/pkg/util/merr"