diff --git a/go.mod b/go.mod index 00fb58580d2b5..cb272a6141a9d 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/go-playground/validator/v10 v10.14.0 github.com/gofrs/flock v0.8.1 - github.com/golang/protobuf v1.5.4 // indirect + github.com/golang/protobuf v1.5.4 github.com/google/btree v1.1.2 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/klauspost/compress v1.17.9 @@ -97,9 +97,9 @@ require ( github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect github.com/alibabacloud-go/tea v1.1.8 // indirect - github.com/andybalholm/brotli v1.0.4 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 // indirect - github.com/apache/thrift v0.18.1 // indirect + github.com/apache/thrift v0.19.0 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -143,7 +143,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/flatbuffers v2.0.8+incompatible // indirect + github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.5 // indirect @@ -190,7 +190,7 @@ require ( github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pierrec/lz4 v2.5.2+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 // indirect github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect @@ -245,13 +245,13 @@ require ( go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/automaxprocs v1.5.3 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.18.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/term v0.27.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.11.0 // indirect + golang.org/x/tools v0.22.0 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect diff --git a/go.sum b/go.sum index fc960fb1a7152..7aa48e29614df 100644 --- a/go.sum +++ b/go.sum @@ -104,14 +104,14 @@ github.com/alibabacloud-go/tea v1.1.8 h1:vFF0707fqjGiQTxrtMnIXRjOCvQXf49CuDVRtTo github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= github.com/aliyun/credentials-go v1.2.7 h1:gLtFylxLZ1TWi1pStIt1O6a53GFU1zkNwjtJir2B4ow= github.com/aliyun/credentials-go v1.2.7/go.mod h1:/KowD1cfGSLrLsH28Jr8W+xwoId0ywIy5lNzDz6O1vw= -github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= -github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg= -github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I= +github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= +github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I= github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= @@ -397,8 +397,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= -github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= +github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -712,8 +712,8 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c h1:xpW9bvK+HuuTmyFqUwr+jcCvpVkK7sumiz+ko5H9eq4= @@ -1092,8 +1092,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1337,19 +1337,19 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= -gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= -gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= diff --git a/internal/core/src/CMakeLists.txt b/internal/core/src/CMakeLists.txt index e127952cc7ed7..1b1baa28b235b 100644 --- a/internal/core/src/CMakeLists.txt +++ b/internal/core/src/CMakeLists.txt @@ -34,8 +34,6 @@ include_directories( ${CONAN_INCLUDE_DIRS} ${MILVUS_STORAGE_INCLUDE_DIR} ) -message("!!! knowhere include dir: ${KNOWHERE_INCLUDE_DIR}") -message("!!! milvus storage include dir: ${MILVUS_STORAGE_INCLUDE_DIR}") add_subdirectory( pb ) add_subdirectory( log ) diff --git a/internal/core/thirdparty/milvus-storage/CMakeLists.txt b/internal/core/thirdparty/milvus-storage/CMakeLists.txt index 7a56c86868ae4..10500c68e5d5e 100644 --- a/internal/core/thirdparty/milvus-storage/CMakeLists.txt +++ b/internal/core/thirdparty/milvus-storage/CMakeLists.txt @@ -48,5 +48,4 @@ if ( NOT milvus-storage_POPULATED ) ${milvus-storage_BINARY_DIR} ) endif() -set( MILVUS_STORAGE_INCLUDE_DIR ${milvus-storage_SOURCE_DIR}/cpp/include CACHE INTERNAL "Path to milvus-storage include directory" ) -message ("!!!!!! milvus storage include dir: ${MILVUS_STORAGE_INCLUDE_DIR}") \ No newline at end of file +set( MILVUS_STORAGE_INCLUDE_DIR ${milvus-storage_SOURCE_DIR}/cpp/include CACHE INTERNAL "Path to milvus-storage include directory" ) \ No newline at end of file diff --git a/internal/storagev2/OWNERS b/internal/storagev2/OWNERS index ea3d8a900b853..43bbbe7016716 100644 --- a/internal/storagev2/OWNERS +++ b/internal/storagev2/OWNERS @@ -1,6 +1,6 @@ reviewers: - tedxu - - st-huang + - shaoting-huang - sunby approvers: diff --git a/internal/storagev2/common/arrow_util/arrow_util.go b/internal/storagev2/common/arrow_util/arrow_util.go index 032ed5a310721..fa0b49d015c0e 100644 --- a/internal/storagev2/common/arrow_util/arrow_util.go +++ b/internal/storagev2/common/arrow_util/arrow_util.go @@ -21,9 +21,9 @@ import ( "github.com/apache/arrow/go/v12/arrow/memory" "github.com/apache/arrow/go/v12/parquet/file" "github.com/apache/arrow/go/v12/parquet/pqarrow" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) func MakeArrowFileReader(fs fs.Fs, filePath string) (*pqarrow.FileReader, error) { diff --git a/internal/storagev2/common/utils/utils.go b/internal/storagev2/common/utils/utils.go index dd7d9b1745e51..5b774835abff2 100644 --- a/internal/storagev2/common/utils/utils.go +++ b/internal/storagev2/common/utils/utils.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,14 +24,12 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/endian" "github.com/google/uuid" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/proto/schema_proto" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/proto/schema_proto" ) -var ( - ErrInvalidArgument = errors.New("invalid argument") -) +var ErrInvalidArgument = errors.New("invalid argument") func ToProtobufType(dataType arrow.Type) (schema_proto.LogicType, error) { typeId := int(dataType) @@ -316,7 +314,7 @@ func FromProtobufDataType(dataType *schema_proto.DataType) (arrow.DataType, erro if err != nil { return nil, err } - //TODO FIX ME + // TODO FIX ME return arrow.MapOf(fieldType.Type, fieldType.Type), nil case schema_proto.LogicType_FIXED_SIZE_BINARY: diff --git a/internal/storagev2/file/blob/blob.go b/internal/storagev2/file/blob/blob.go index ef02e2efa7431..d99147aeec539 100644 --- a/internal/storagev2/file/blob/blob.go +++ b/internal/storagev2/file/blob/blob.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,7 @@ package blob -import "github.com/milvus-io/milvus-storage/go/proto/manifest_proto" +import "github.com/milvus-io/milvus/internal/storagev2/proto/manifest_proto" type Blob struct { Name string diff --git a/internal/storagev2/file/fragment/deletefragment.go b/internal/storagev2/file/fragment/deletefragment.go index ec73e7f98fe26..2d7329adf5a8b 100644 --- a/internal/storagev2/file/fragment/deletefragment.go +++ b/internal/storagev2/file/fragment/deletefragment.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,18 +15,20 @@ package fragment import ( - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) -type pkType any -type DeleteFragmentVector []DeleteFragment -type DeleteFragment struct { - id int64 - schema *schema.Schema - fs fs.Fs - data map[pkType][]int64 -} +type ( + pkType any + DeleteFragmentVector []DeleteFragment + DeleteFragment struct { + id int64 + schema *schema.Schema + fs fs.Fs + data map[pkType][]int64 + } +) func NewDeleteFragment(id int64, schema *schema.Schema, fs fs.Fs) *DeleteFragment { return &DeleteFragment{ diff --git a/internal/storagev2/file/fragment/fragment.go b/internal/storagev2/file/fragment/fragment.go index f24fa17d96b39..a69b1030e8d4f 100644 --- a/internal/storagev2/file/fragment/fragment.go +++ b/internal/storagev2/file/fragment/fragment.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,7 @@ package fragment -import "github.com/milvus-io/milvus-storage/go/proto/manifest_proto" +import "github.com/milvus-io/milvus/internal/storagev2/proto/manifest_proto" type FragmentType int32 diff --git a/internal/storagev2/io/format/parquet/file_reader.go b/internal/storagev2/io/format/parquet/file_reader.go index d30510219b4bc..fc305a11a22af 100644 --- a/internal/storagev2/io/format/parquet/file_reader.go +++ b/internal/storagev2/io/format/parquet/file_reader.go @@ -24,10 +24,10 @@ import ( "github.com/apache/arrow/go/v12/parquet/metadata" "github.com/apache/arrow/go/v12/parquet/pqarrow" "github.com/bits-and-blooms/bitset" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/filter" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/filter" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) type FileReader struct { diff --git a/internal/storagev2/io/format/parquet/file_writer.go b/internal/storagev2/io/format/parquet/file_writer.go index 82ec35f6b1366..9875cbe180695 100644 --- a/internal/storagev2/io/format/parquet/file_writer.go +++ b/internal/storagev2/io/format/parquet/file_writer.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,8 +18,8 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/parquet" "github.com/apache/arrow/go/v12/parquet/pqarrow" - "github.com/milvus-io/milvus-storage/go/io/format" - "github.com/milvus-io/milvus-storage/go/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/io/format" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" ) var _ format.Writer = (*FileWriter)(nil) diff --git a/internal/storagev2/io/fs/factory.go b/internal/storagev2/io/fs/factory.go index 7e07db24903ea..7271115ec7167 100644 --- a/internal/storagev2/io/fs/factory.go +++ b/internal/storagev2/io/fs/factory.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,11 +17,10 @@ package fs import ( "net/url" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) -type Factory struct { -} +type Factory struct{} func (f *Factory) Create(fsType options.FsType, uri *url.URL) (Fs, error) { switch fsType { diff --git a/internal/storagev2/io/fs/fs.go b/internal/storagev2/io/fs/fs.go index 6a9b2544eea4b..ef605de4da3d0 100644 --- a/internal/storagev2/io/fs/fs.go +++ b/internal/storagev2/io/fs/fs.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ package fs import ( - "github.com/milvus-io/milvus-storage/go/io/fs/file" + "github.com/milvus-io/milvus/internal/storagev2/io/fs/file" ) type Fs interface { diff --git a/internal/storagev2/io/fs/fs_util.go b/internal/storagev2/io/fs/fs_util.go index b7c374c0ab49d..1025418a30c08 100644 --- a/internal/storagev2/io/fs/fs_util.go +++ b/internal/storagev2/io/fs/fs_util.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,12 +19,10 @@ import ( "fmt" "net/url" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) -var ( - ErrInvalidFsType = errors.New("invalid fs type") -) +var ErrInvalidFsType = errors.New("invalid fs type") func BuildFileSystem(uri string) (Fs, error) { parsedUri, err := url.Parse(uri) diff --git a/internal/storagev2/io/fs/local_fs.go b/internal/storagev2/io/fs/local_fs.go index 67d6dda27eca9..a08a82f610d3a 100644 --- a/internal/storagev2/io/fs/local_fs.go +++ b/internal/storagev2/io/fs/local_fs.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/io/fs/file" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/io/fs/file" ) type LocalFS struct { @@ -39,7 +39,7 @@ func (l *LocalFS) OpenFile(path string) (file.File, error) { if err != nil { return nil, err } - open, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0666) + open, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0o666) if err != nil { return nil, err } diff --git a/internal/storagev2/io/fs/memory_fs.go b/internal/storagev2/io/fs/memory_fs.go index 55f1a0c50124e..5bebc3c40f13d 100644 --- a/internal/storagev2/io/fs/memory_fs.go +++ b/internal/storagev2/io/fs/memory_fs.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ package fs import ( - "github.com/milvus-io/milvus-storage/go/io/fs/file" + "github.com/milvus-io/milvus/internal/storagev2/io/fs/file" ) type MemoryFs struct { @@ -23,12 +23,12 @@ type MemoryFs struct { } func (m *MemoryFs) MkdirAll(dir string, i int) error { - //TODO implement me + // TODO implement me panic("implement me") } func (m *MemoryFs) List(path string) ([]FileEntry, error) { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/io/fs/minio_fs.go b/internal/storagev2/io/fs/minio_fs.go index b6dadfa5c5902..805d6ff356e6b 100644 --- a/internal/storagev2/io/fs/minio_fs.go +++ b/internal/storagev2/io/fs/minio_fs.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,10 +22,10 @@ import ( "path" "strings" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/common/errors" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/io/fs/file" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/common/errors" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/io/fs/file" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "go.uber.org/zap" @@ -38,7 +38,7 @@ type MinioFs struct { } func (fs *MinioFs) MkdirAll(dir string, i int) error { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/io/fs/minio_fs_test.go b/internal/storagev2/io/fs/minio_fs_test.go index 674ddce9ab021..b34cd0ce2cac3 100644 --- a/internal/storagev2/io/fs/minio_fs_test.go +++ b/internal/storagev2/io/fs/minio_fs_test.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ import ( "io" "testing" - "github.com/milvus-io/milvus-storage/go/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" "github.com/minio/minio-go/v7" "github.com/stretchr/testify/suite" ) @@ -88,7 +88,6 @@ func (suite *MinioFsTestSuite) TestMinioFsDeleteFile() { exist, err := suite.fs.Exist("default/a") suite.NoError(err) suite.False(exist) - } func (suite *MinioFsTestSuite) TestMinioFsList() { diff --git a/internal/storagev2/proto/manifest.proto b/internal/storagev2/proto/manifest.proto index d9ce34c270df3..68b186368be3e 100644 --- a/internal/storagev2/proto/manifest.proto +++ b/internal/storagev2/proto/manifest.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "storage_schema.proto"; package manifest_proto; -option go_package = "github.com/milvus-io/milvus-storage/go/proto/manifest_proto"; +option go_package = "github.com/milvus-io/milvus/internal/storagev2/proto/manifest_proto"; message Options { string uri = 1; } diff --git a/internal/storagev2/proto/manifest_proto/manifest.pb.go b/internal/storagev2/proto/manifest_proto/manifest.pb.go index e337c6f3ec815..a6dda69ba4f52 100644 --- a/internal/storagev2/proto/manifest_proto/manifest.pb.go +++ b/internal/storagev2/proto/manifest_proto/manifest.pb.go @@ -6,7 +6,7 @@ package manifest_proto import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - schema_proto "github.com/milvus-io/milvus-storage/go/proto/schema_proto" + schema_proto "github.com/milvus-io/milvus/internal/storagev2/proto/schema_proto" math "math" ) diff --git a/internal/storagev2/proto/storage_schema.proto b/internal/storagev2/proto/storage_schema.proto index 725a71c8a6605..4f81350918c2b 100644 --- a/internal/storagev2/proto/storage_schema.proto +++ b/internal/storagev2/proto/storage_schema.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package schema_proto; -option go_package = "github.com/milvus-io/milvus-storage/go/proto/schema_proto"; +option go_package = "github.com/milvus-io/milvus/internal/storagev2/proto/schema_proto"; enum LogicType { NA = 0; diff --git a/internal/storagev2/reader/common_reader/delete_reader.go b/internal/storagev2/reader/common_reader/delete_reader.go index d25f5836edf46..b41f76d6a9a27 100644 --- a/internal/storagev2/reader/common_reader/delete_reader.go +++ b/internal/storagev2/reader/common_reader/delete_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,9 +17,9 @@ package common_reader import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) type DeleteReader struct { @@ -30,32 +30,32 @@ type DeleteReader struct { } func (d DeleteReader) Retain() { - //TODO implement me + // TODO implement me panic("implement me") } func (d DeleteReader) Release() { - //TODO implement me + // TODO implement me panic("implement me") } func (d DeleteReader) Schema() *arrow.Schema { - //TODO implement me + // TODO implement me panic("implement me") } func (d DeleteReader) Next() bool { - //TODO implement me + // TODO implement me panic("implement me") } func (d DeleteReader) Record() arrow.Record { - //TODO implement me + // TODO implement me panic("implement me") } func (d DeleteReader) Err() error { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/reader/common_reader/filter_reader.go b/internal/storagev2/reader/common_reader/filter_reader.go index 61b7c1bd2abe7..a11d3b0d895e0 100644 --- a/internal/storagev2/reader/common_reader/filter_reader.go +++ b/internal/storagev2/reader/common_reader/filter_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ package common_reader import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) type FilterReader struct { @@ -27,27 +27,27 @@ type FilterReader struct { } func (r *FilterReader) Retain() { - //TODO implement me + // TODO implement me panic("implement me") } func (r *FilterReader) Release() { - //TODO implement me + // TODO implement me panic("implement me") } func (r *FilterReader) Schema() *arrow.Schema { - //TODO implement me + // TODO implement me panic("implement me") } func (r *FilterReader) Record() arrow.Record { - //TODO implement me + // TODO implement me panic("implement me") } func (r *FilterReader) Err() error { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/reader/common_reader/projection_reader.go b/internal/storagev2/reader/common_reader/projection_reader.go index 2f93c1b041e80..900c9e8f1e865 100644 --- a/internal/storagev2/reader/common_reader/projection_reader.go +++ b/internal/storagev2/reader/common_reader/projection_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,8 +17,8 @@ package common_reader import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) type ProjectionReader struct { diff --git a/internal/storagev2/reader/record_reader/filter_query_record.go b/internal/storagev2/reader/record_reader/filter_query_record.go index b400fa0b3fb4e..35d006c5028be 100644 --- a/internal/storagev2/reader/record_reader/filter_query_record.go +++ b/internal/storagev2/reader/record_reader/filter_query_record.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,14 +17,14 @@ package record_reader import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) type FilterQueryRecordReader struct { - //TODO implement me + // TODO implement me ref int64 schema *schema.Schema options *options.ReadOptions @@ -41,7 +41,8 @@ func NewFilterQueryReader( f fs.Fs, scalarFragment fragment.FragmentVector, vectorFragment fragment.FragmentVector, - deleteFragments fragment.DeleteFragmentVector) array.RecordReader { - //TODO implement me + deleteFragments fragment.DeleteFragmentVector, +) array.RecordReader { + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/reader/record_reader/merge_record_reader.go b/internal/storagev2/reader/record_reader/merge_record_reader.go index 1ddf99f6c9945..b5f8299aa9178 100644 --- a/internal/storagev2/reader/record_reader/merge_record_reader.go +++ b/internal/storagev2/reader/record_reader/merge_record_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,10 +16,10 @@ package record_reader import ( "github.com/apache/arrow/go/v12/arrow" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) type MergeRecordReader struct { @@ -34,32 +34,32 @@ type MergeRecordReader struct { } func (m MergeRecordReader) Retain() { - //TODO implement me + // TODO implement me panic("implement me") } func (m MergeRecordReader) Release() { - //TODO implement me + // TODO implement me panic("implement me") } func (m MergeRecordReader) Schema() *arrow.Schema { - //TODO implement me + // TODO implement me panic("implement me") } func (m MergeRecordReader) Next() bool { - //TODO implement me + // TODO implement me panic("implement me") } func (m MergeRecordReader) Record() arrow.Record { - //TODO implement me + // TODO implement me panic("implement me") } func (m MergeRecordReader) Err() error { - //TODO implement me + // TODO implement me panic("implement me") } @@ -69,7 +69,8 @@ func NewMergeRecordReader( f fs.Fs, scalarFragment fragment.FragmentVector, vectorFragment fragment.FragmentVector, - deleteFragments fragment.DeleteFragmentVector) *MergeRecordReader { - //TODO implement me + deleteFragments fragment.DeleteFragmentVector, +) *MergeRecordReader { + // TODO implement me panic("implement me") } diff --git a/internal/storagev2/reader/record_reader/multi_files_sequential_reader.go b/internal/storagev2/reader/record_reader/multi_files_sequential_reader.go index 4e00be8e96945..4ebafac592abc 100644 --- a/internal/storagev2/reader/record_reader/multi_files_sequential_reader.go +++ b/internal/storagev2/reader/record_reader/multi_files_sequential_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,10 +20,10 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" "github.com/apache/arrow/go/v12/parquet/pqarrow" - "github.com/milvus-io/milvus-storage/go/common/arrow_util" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/common/arrow_util" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) type MultiFilesSequentialReader struct { diff --git a/internal/storagev2/reader/record_reader/record_reader.go b/internal/storagev2/reader/record_reader/record_reader.go index 5556cd5840fdb..d720498e5edd5 100644 --- a/internal/storagev2/reader/record_reader/record_reader.go +++ b/internal/storagev2/reader/record_reader/record_reader.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,12 +16,12 @@ package record_reader import ( "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/filter" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/manifest" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/filter" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/manifest" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) func MakeRecordReader( diff --git a/internal/storagev2/reader/record_reader/scan_record.go b/internal/storagev2/reader/record_reader/scan_record.go index 800567916dd7f..0b8d3b868c714 100644 --- a/internal/storagev2/reader/record_reader/scan_record.go +++ b/internal/storagev2/reader/record_reader/scan_record.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,15 +20,15 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/format" - "github.com/milvus-io/milvus-storage/go/io/format/parquet" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/reader/common_reader" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/format" + "github.com/milvus-io/milvus/internal/storagev2/io/format/parquet" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/reader/common_reader" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" "go.uber.org/zap" ) @@ -138,7 +138,7 @@ func (r *ScanRecordReader) Err() error { } func (r *ScanRecordReader) MakeInnerReader() array.RecordReader { - //TODO implement me + // TODO implement me reader := NewMultiFilesSequentialReader(r.fs, r.dataFragments, r.Schema(), r.options) filterReader := common_reader.MakeFilterReader(reader, r.options) diff --git a/internal/storagev2/storage/lock/lock_manager.go b/internal/storagev2/storage/lock/lock_manager.go index 21f7282d878e7..f514903dc5e66 100644 --- a/internal/storagev2/storage/lock/lock_manager.go +++ b/internal/storagev2/storage/lock/lock_manager.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,12 @@ package lock import ( - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/common/log" + "sync" + + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/common/log" "github.com/pkg/errors" "go.uber.org/zap" - "sync" ) type LockManager interface { diff --git a/internal/storagev2/storage/manifest/commit.go b/internal/storagev2/storage/manifest/commit.go index 63e107409b5c4..33267de859493 100644 --- a/internal/storagev2/storage/manifest/commit.go +++ b/internal/storagev2/storage/manifest/commit.go @@ -15,8 +15,8 @@ package manifest import ( - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" ) type ManifestCommit struct { diff --git a/internal/storagev2/storage/manifest/commit_op.go b/internal/storagev2/storage/manifest/commit_op.go index b8fb577aa6761..e5117460199f8 100644 --- a/internal/storagev2/storage/manifest/commit_op.go +++ b/internal/storagev2/storage/manifest/commit_op.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,9 +15,9 @@ package manifest import ( - "github.com/milvus-io/milvus-storage/go/common/errors" - "github.com/milvus-io/milvus-storage/go/file/blob" - "github.com/milvus-io/milvus-storage/go/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/common/errors" + "github.com/milvus-io/milvus/internal/storagev2/file/blob" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" ) type ManifestCommitOp interface { diff --git a/internal/storagev2/storage/manifest/manifest.go b/internal/storagev2/storage/manifest/manifest.go index f2adc02e25368..1ef556fb4b850 100644 --- a/internal/storagev2/storage/manifest/manifest.go +++ b/internal/storagev2/storage/manifest/manifest.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,13 +19,13 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/file/blob" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/io/fs/file" - "github.com/milvus-io/milvus-storage/go/proto/manifest_proto" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/file/blob" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/io/fs/file" + "github.com/milvus-io/milvus/internal/storagev2/proto/manifest_proto" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) type Manifest struct { diff --git a/internal/storagev2/storage/manifest/manifest_test.go b/internal/storagev2/storage/manifest/manifest_test.go index ffbdef18087cc..8d01ad78206b2 100644 --- a/internal/storagev2/storage/manifest/manifest_test.go +++ b/internal/storagev2/storage/manifest/manifest_test.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,11 +19,11 @@ import ( "testing" "github.com/apache/arrow/go/v12/arrow" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/lock" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -89,7 +89,7 @@ func TestManifestCommitOp(t *testing.T) { f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) // create manifest file @@ -118,7 +118,7 @@ func TestManifestReaderWriter_Read(t *testing.T) { f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) // create manifest file @@ -139,7 +139,7 @@ func TestManifestReaderWriter_MaxVersion(t *testing.T) { f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) // create manifest file @@ -160,7 +160,7 @@ func TestManifestReaderWriter_Write(t *testing.T) { f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) // create manifest file @@ -176,7 +176,7 @@ func TestManifestReaderWriter_concurrency(t *testing.T) { f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) // create manifest file @@ -223,12 +223,11 @@ func TestManifestReaderWriter_concurrency(t *testing.T) { // Test Manifest commit concurrency func TestManifestCommit_concurrency(t *testing.T) { - tmpDir := t.TempDir() f, err := fs.BuildFileSystem("file:///" + tmpDir) // create manifest path - err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0755) + err = f.MkdirAll(utils.GetManifestDir(tmpDir), 0o755) assert.NoError(t, err) sc := createNewSchema() @@ -259,7 +258,6 @@ func TestManifestCommit_concurrency(t *testing.T) { }() } wg.Wait() - } func createNewSchema() *schema.Schema { diff --git a/internal/storagev2/storage/manifest/reader_writer.go b/internal/storagev2/storage/manifest/reader_writer.go index a095a95a2bd2d..da489558ab148 100644 --- a/internal/storagev2/storage/manifest/reader_writer.go +++ b/internal/storagev2/storage/manifest/reader_writer.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,10 +19,10 @@ import ( "fmt" "path/filepath" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" ) var ErrManifestNotFound = errors.New("manifest not found") @@ -40,6 +40,7 @@ func findAllManifest(fs fs.Fs, path string) ([]fs.FileEntry, error) { } return files, nil } + func (rw ManifestReaderWriter) Read(version int64) (*Manifest, error) { manifests, err := findAllManifest(rw.fs, utils.GetManifestDir(rw.root)) if err != nil { diff --git a/internal/storagev2/storage/options/options.go b/internal/storagev2/storage/options/options.go index 5c85d00dbcf44..f7fa2de9f5b5e 100644 --- a/internal/storagev2/storage/options/options.go +++ b/internal/storagev2/storage/options/options.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,10 +17,10 @@ package options import ( "math" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/filter" - "github.com/milvus-io/milvus-storage/go/storage/lock" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/filter" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" ) type Options struct { @@ -100,7 +100,7 @@ type FilterSet []filter.Filter var version int64 = math.MaxInt64 type ReadOptions struct { - //Filters map[string]filter.Filter + // Filters map[string]filter.Filter Filters map[string]filter.Filter FiltersV2 FilterSet Columns []string diff --git a/internal/storagev2/storage/schema/schema.go b/internal/storagev2/storage/schema/schema.go index 1e41ef890d6fa..c312ae9ef8015 100644 --- a/internal/storagev2/storage/schema/schema.go +++ b/internal/storagev2/storage/schema/schema.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,9 +16,9 @@ package schema import ( "github.com/apache/arrow/go/v12/arrow" - "github.com/milvus-io/milvus-storage/go/common/constant" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/proto/schema_proto" + "github.com/milvus-io/milvus/internal/storagev2/common/constant" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/proto/schema_proto" ) // Schema is a wrapper of arrow schema diff --git a/internal/storagev2/storage/schema/schema_option.go b/internal/storagev2/storage/schema/schema_option.go index e667bf63cbb0d..37f8f67181c3e 100644 --- a/internal/storagev2/storage/schema/schema_option.go +++ b/internal/storagev2/storage/schema/schema_option.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ import ( "errors" "github.com/apache/arrow/go/v12/arrow" - "github.com/milvus-io/milvus-storage/go/proto/schema_proto" + "github.com/milvus-io/milvus/internal/storagev2/proto/schema_proto" ) var ( @@ -84,7 +84,7 @@ func (o *SchemaOptions) Validate(schema *arrow.Schema) error { if !b { return ErrVectorColumnNotFound } else if vectorField[0].Type.ID() != arrow.FIXED_SIZE_BINARY && vectorField[0].Type.ID() != arrow.FIXED_SIZE_LIST { - return ErrVectorColumnType + return ErrVectorColumnType } } else { return ErrVectorColumnEmpty diff --git a/internal/storagev2/storage/space.go b/internal/storagev2/storage/space.go index dd9467504e07d..2893276c09977 100644 --- a/internal/storagev2/storage/space.go +++ b/internal/storagev2/storage/space.go @@ -18,18 +18,18 @@ import ( "math" "github.com/apache/arrow/go/v12/arrow/array" - "github.com/milvus-io/milvus-storage/go/common/errors" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/file/blob" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/filter" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/reader/record_reader" - "github.com/milvus-io/milvus-storage/go/storage/lock" - "github.com/milvus-io/milvus-storage/go/storage/manifest" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/transaction" + "github.com/milvus-io/milvus/internal/storagev2/common/errors" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/file/blob" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/filter" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/reader/record_reader" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/storage/manifest" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/transaction" ) type Space struct { @@ -107,7 +107,6 @@ func Open(uri string, opt options.Options) (*Space, error) { rw := manifest.NewManifestReaderWriter(f, path) m, err = rw.Read(opt.Version) - if err != nil { // create the first manifest file if err == manifest.ErrManifestNotFound { diff --git a/internal/storagev2/storage/space_test.go b/internal/storagev2/storage/space_test.go index 14e4f5e9edbb8..28413e38940b2 100644 --- a/internal/storagev2/storage/space_test.go +++ b/internal/storagev2/storage/space_test.go @@ -1,11 +1,11 @@ // Copyright 2023 Zilliz -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,15 +18,15 @@ import ( "sync" "testing" - "github.com/milvus-io/milvus-storage/go/storage/options" - "github.com/milvus-io/milvus-storage/go/storage/schema" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/storage/schema" "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" "github.com/apache/arrow/go/v12/arrow/memory" - "github.com/milvus-io/milvus-storage/go/filter" - "github.com/milvus-io/milvus-storage/go/storage" - "github.com/milvus-io/milvus-storage/go/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/filter" + "github.com/milvus-io/milvus/internal/storagev2/storage" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" "github.com/stretchr/testify/suite" ) diff --git a/internal/storagev2/storage/transaction/transaction.go b/internal/storagev2/storage/transaction/transaction.go index aace9d735ec96..4df7e9343af10 100644 --- a/internal/storagev2/storage/transaction/transaction.go +++ b/internal/storagev2/storage/transaction/transaction.go @@ -20,17 +20,17 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/apache/arrow/go/v12/arrow/array" "github.com/apache/arrow/go/v12/arrow/memory" - "github.com/milvus-io/milvus-storage/go/common/errors" - "github.com/milvus-io/milvus-storage/go/common/log" - "github.com/milvus-io/milvus-storage/go/common/utils" - "github.com/milvus-io/milvus-storage/go/file/blob" - "github.com/milvus-io/milvus-storage/go/file/fragment" - "github.com/milvus-io/milvus-storage/go/io/format" - "github.com/milvus-io/milvus-storage/go/io/format/parquet" - "github.com/milvus-io/milvus-storage/go/io/fs" - "github.com/milvus-io/milvus-storage/go/storage/lock" - "github.com/milvus-io/milvus-storage/go/storage/manifest" - "github.com/milvus-io/milvus-storage/go/storage/options" + "github.com/milvus-io/milvus/internal/storagev2/common/errors" + "github.com/milvus-io/milvus/internal/storagev2/common/log" + "github.com/milvus-io/milvus/internal/storagev2/common/utils" + "github.com/milvus-io/milvus/internal/storagev2/file/blob" + "github.com/milvus-io/milvus/internal/storagev2/file/fragment" + "github.com/milvus-io/milvus/internal/storagev2/io/format" + "github.com/milvus-io/milvus/internal/storagev2/io/format/parquet" + "github.com/milvus-io/milvus/internal/storagev2/io/fs" + "github.com/milvus-io/milvus/internal/storagev2/storage/lock" + "github.com/milvus-io/milvus/internal/storagev2/storage/manifest" + "github.com/milvus-io/milvus/internal/storagev2/storage/options" ) type SpaceMeta interface {