From 7dae8ff7384a9f0b8630e0920525d4a8e5fe496b Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Sat, 2 Aug 2025 12:18:06 -0400 Subject: [PATCH 1/3] dependancy: update go to 1.24 --- go.mod | 2 +- lz4/go.mod | 2 +- tests/bench/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe4be26ef..61841935e 100644 --- a/go.mod +++ b/go.mod @@ -41,4 +41,4 @@ retract ( v1.8.0 // tag from kiwicom/gocql added by mistake to scylladb/gocql ) -go 1.13 +go 1.24 \ No newline at end of file diff --git a/lz4/go.mod b/lz4/go.mod index 38dd62023..f0af638e0 100644 --- a/lz4/go.mod +++ b/lz4/go.mod @@ -17,7 +17,7 @@ // module github.com/gocql/gocql/lz4 -go 1.16 +go 1.24 require ( github.com/pierrec/lz4/v4 v4.1.21 diff --git a/tests/bench/go.mod b/tests/bench/go.mod index f63f7779c..3f0728467 100644 --- a/tests/bench/go.mod +++ b/tests/bench/go.mod @@ -1,6 +1,6 @@ module github.com/gocql/gocql/bench_test -go 1.22 +go 1.24 require ( github.com/brianvoe/gofakeit/v6 v6.28.0 From f55f0d05492aabfdb076b29d5be32aca02c168b3 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Sat, 2 Aug 2025 12:34:15 -0400 Subject: [PATCH 2/3] Release v2.0.0 Update module name to `github.com/scylladb/gocql/v2`. `replace` directive is not required anymore. --- README.md | 53 +++++++++-------- address_translators_test.go | 2 +- cassandra_test.go | 2 +- cloud_cluster_test.go | 4 +- cluster_test.go | 2 +- compressor_test.go | 2 +- conn.go | 6 +- conn_test.go | 2 +- connectionpool.go | 4 +- dialer/recorder/recorder.go | 4 +- dialer/replayer/replayer.go | 4 +- dialer/utils.go | 2 +- doc.go | 2 +- example_batch_test.go | 2 +- example_dynamic_columns_test.go | 2 +- example_lwt_batch_test.go | 2 +- example_lwt_test.go | 2 +- example_marshaler_test.go | 2 +- example_nulls_test.go | 2 +- example_paging_test.go | 2 +- example_set_test.go | 2 +- example_test.go | 2 +- example_udt_map_test.go | 2 +- example_udt_marshaler_test.go | 2 +- example_udt_struct_test.go | 2 +- example_udt_unmarshaler_test.go | 2 +- go.mod | 31 +++++----- go.sum | 59 ++++++++----------- hostpolicy/hostpool.go | 2 +- hostpolicy/hostpool_test.go | 2 +- integration_serialization_scylla_test.go | 2 +- integration_test.go | 2 +- internal/tests/serialization/utils_equal.go | 2 +- .../tests/serialization/valcases/simple.go | 2 +- keyspace_table_test.go | 2 +- lz4/go.mod | 2 +- marshal.go | 42 ++++++------- metadata_scylla.go | 2 +- policies_test.go | 2 +- prepared_cache.go | 2 +- ring_describer_test.go | 4 +- schema_queries_test.go | 2 +- scylla_test.go | 2 +- scyllacloud/cluster.go | 2 +- scyllacloud/config_test.go | 2 +- scyllacloud/hostdialer.go | 2 +- scyllacloud/hostdialer_test.go | 2 +- serialization/decimal/marshal_utils.go | 2 +- serialization/decimal/unmarshal_utils.go | 2 +- session.go | 6 +- tablets/tabets_utils_test.go | 2 +- tablets/tablet_utils.go | 2 +- tablets/tablets_bench_test.go | 2 +- tablets/tablets_test.go | 2 +- tests/bench/bench_marshal_test.go | 2 +- tests/bench/bench_single_conn_test.go | 6 +- tests/bench/go.mod | 6 +- tests/serialization/marshal_0_unset_test.go | 2 +- .../marshal_10_decimal_corrupt_test.go | 8 +-- .../serialization/marshal_10_decimal_test.go | 8 +-- tests/serialization/marshal_11_texts_test.go | 12 ++-- .../marshal_12_ascii_corrupt_test.go | 8 +-- tests/serialization/marshal_12_ascii_test.go | 8 +-- .../marshal_13_uuids_corrupt_test.go | 10 ++-- tests/serialization/marshal_13_uuids_test.go | 10 ++-- .../marshal_14_inet_corrupt_test.go | 8 +-- tests/serialization/marshal_14_inet_test.go | 8 +-- .../marshal_15_time_corrupt_test.go | 8 +-- tests/serialization/marshal_15_time_test.go | 8 +-- .../marshal_16_timestamp_corrupt_test.go | 8 +-- .../marshal_16_timestamp_test.go | 8 +-- .../marshal_17_date_corrupt_test.go | 8 +-- tests/serialization/marshal_17_date_test.go | 8 +-- .../marshal_18_duration_corrupt_test.go | 6 +- .../serialization/marshal_18_duration_test.go | 6 +- .../marshal_19_list_set_v3_corrupt_test.go | 6 +- .../marshal_19_list_set_v3_test.go | 6 +- .../marshal_1_boolean_corrupt_test.go | 8 +-- tests/serialization/marshal_1_boolean_test.go | 8 +-- .../marshal_20_map_v3_corrupt_test.go | 6 +- tests/serialization/marshal_20_map_v3_test.go | 6 +- .../marshal_2_tinyint_corrupt_test.go | 8 +-- tests/serialization/marshal_2_tinyint_test.go | 8 +-- .../marshal_3_smallint_corrupt_test.go | 8 +-- .../serialization/marshal_3_smallint_test.go | 8 +-- .../marshal_4_int_corrupt_test.go | 8 +-- tests/serialization/marshal_4_int_test.go | 8 +-- .../marshal_5_bigint_corrupt_test.go | 8 +-- tests/serialization/marshal_5_bigint_test.go | 8 +-- .../marshal_6_counter_corrupt_test.go | 8 +-- tests/serialization/marshal_6_counter_test.go | 8 +-- .../marshal_7_varint_corrupt_test.go | 8 +-- tests/serialization/marshal_7_varint_test.go | 8 +-- .../marshal_8_float_corrupt_test.go | 8 +-- tests/serialization/marshal_8_float_test.go | 8 +-- .../marshal_9_double_corrupt_test.go | 8 +-- tests/serialization/marshal_9_duble_test.go | 8 +-- token.go | 2 +- version.go | 2 +- 99 files changed, 314 insertions(+), 317 deletions(-) diff --git a/README.md b/README.md index ac2853243..7a7feff89 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ This eliminates passing data between shards and significantly reduces latency. There are open pull requests to merge the functionality to the upstream project: -* [gocql/gocql#1210](https://github.com/gocql/gocql/pull/1210) -* [gocql/gocql#1211](https://github.com/gocql/gocql/pull/1211). +* [gocql/gocql#1210](https://github.com/scylladb/gocql/v2/pull/1210) +* [gocql/gocql#1211](https://github.com/scylladb/gocql/v2/pull/1211). It also provides support for shard aware ports, a faster way to connect to all shards, details available in [blogpost](https://www.scylladb.com/2021/04/27/connect-faster-to-scylla-with-a-shard-aware-port/). @@ -40,32 +40,39 @@ It also provides support for shard aware ports, a faster way to connect to all s - [5.2 Iterator](#52-iterator) - [6. Contributing](#6-contributing) -## 1. Sunsetting Model +## Sunsetting Model > [!WARNING] > In general, the gocql team will focus on supporting the current and previous versions of Go. gocql may still work with older versions of Go, but official support for these versions will have been sunset. -## 2. Installation +## Installation -This is a drop-in replacement to gocql, it reuses the `github.com/gocql/gocql` import path. +Import package: +```sh +go get github.com/scylladb-solutions/gocql/v2 +``` -Add the following line to your project `go.mod` file. +And you ready to go. -```mod -replace github.com/gocql/gocql => github.com/scylladb/gocql latest -``` +## Migrate from v1 -and run +To migrate from v1 follow steps: +1. Upgrade go to at least `1.24` +2. In `go.mod` replace `github.com/gocql/gocql` with `github.com/scylladb-solutions/gocql/v2` with proper version. +3. In `go.mod` remove `replace` directive for `github.com/gocql/gocql`. +4. Run `go mod tidy` +5. Resolve conflicts -```sh -go mod tidy -``` +## Migrate from [gocql/gocql](https://github.com/gocql/gocql) or [apache/cassandra-gocql-driver](https://github.com/apache/cassandra-gocql-driver) -to evaluate `latest` to a concrete tag. +To switch from other driver forks following steps: +1. Replace any references from `github.com/gocql/gocql` to `github.com/scylladb-solutions/gocql/v2` in the code and `go.mod` +2. Run `go mod tidy` +3. Resolve conflicts -Your project now uses the Scylla driver fork, make sure you are using the `TokenAwareHostPolicy` to enable the shard-awareness, continue reading for details. +APIs of all forks are similar, but there could be some differences, resolve conflicts manually. -## 3. Quick Start +## Quick Start Spawn a ScyllaDB Instance using Docker Run command: @@ -82,7 +89,7 @@ package main import ( "fmt" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) func main() { @@ -107,9 +114,9 @@ func main() { } ``` -## 4. Data Types +## Data Types -Here's an list of all CQL Types reflected in the GoCQL environment: +Here's a list of all CQL Types reflected in the GoCQL environment: | ScyllaDB Type | Go Type | | ---------------- | ------------------ | @@ -137,7 +144,7 @@ Here's an list of all CQL Types reflected in the GoCQL environment: | `varchar` | `string` | | `varint` | `int64` | -## 5. Configuration +## Configuration In order to make shard-awareness work, token aware host selection policy has to be enabled. Please make sure that the gocql configuration has `PoolConfig.HostSelectionPolicy` properly set like in the example below. @@ -163,7 +170,7 @@ if localDC != "" { // c.NumConns = 4 ``` -### 5.1 Shard-aware port +### Shard-aware port This version of gocql supports a more robust method of establishing connection for each shard by using _shard aware port_ for native transport. It greatly reduces time and the number of connections needed to establish a connection per shard in some cases - ex. when many clients connect at once, or when there are non-shard-aware clients connected to the same cluster. @@ -210,7 +217,7 @@ Issues with shard-aware port not being reachable are not reported in non-debug m If you suspect that this feature is causing you problems, you can completely disable it by setting the `ClusterConfig.DisableShardAwarePort` flag to true. -### 5.2 Iterator +### Iterator Paging is a way to parse large result sets in smaller chunks. The driver provides an iterator to simplify this process. @@ -237,6 +244,6 @@ In case of range and `ALLOW FILTERING` queries server can send empty responses f That is why you should never consider empty response as the end of the result set. Always check `iter.Scan()` result to know if there are more results, or `Iter.LastPage()` to know if the last page was reached. -## 6. Contributing +## Contributing If you have any interest to be contributing in this GoCQL Fork, please read the [CONTRIBUTING.md](CONTRIBUTING.md) before initialize any Issue or Pull Request. diff --git a/address_translators_test.go b/address_translators_test.go index 50cd805e7..48db23c1f 100644 --- a/address_translators_test.go +++ b/address_translators_test.go @@ -28,7 +28,7 @@ package gocql import ( - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "net" "testing" ) diff --git a/cassandra_test.go b/cassandra_test.go index 17d10df1f..752cb4664 100644 --- a/cassandra_test.go +++ b/cassandra_test.go @@ -32,7 +32,7 @@ import ( "context" "errors" "fmt" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "math" "math/big" "net" diff --git a/cloud_cluster_test.go b/cloud_cluster_test.go index e0cb23922..4662d37f2 100644 --- a/cloud_cluster_test.go +++ b/cloud_cluster_test.go @@ -16,8 +16,8 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/scyllacloud" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/scyllacloud" "sigs.k8s.io/yaml" ) diff --git a/cluster_test.go b/cluster_test.go index 742df38ce..2a08f0eb8 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -28,7 +28,7 @@ package gocql import ( - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "net" "reflect" "testing" diff --git a/compressor_test.go b/compressor_test.go index 34fd6f8aa..a0663b0d5 100644 --- a/compressor_test.go +++ b/compressor_test.go @@ -34,7 +34,7 @@ import ( "github.com/klauspost/compress/s2" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) type frameExample struct { diff --git a/conn.go b/conn.go index 5852f798f..9f78c2fcd 100644 --- a/conn.go +++ b/conn.go @@ -30,7 +30,7 @@ import ( "crypto/tls" "errors" "fmt" - "github.com/gocql/gocql/tablets" + "github.com/scylladb/gocql/v2/tablets" "io" "io/ioutil" "net" @@ -40,8 +40,8 @@ import ( "sync/atomic" "time" - "github.com/gocql/gocql/internal/lru" - "github.com/gocql/gocql/internal/streams" + "github.com/scylladb/gocql/v2/internal/lru" + "github.com/scylladb/gocql/v2/internal/streams" ) // approve the authenticator with the list of allowed authenticators. If the provided list is empty, diff --git a/conn_test.go b/conn_test.go index a617f364f..3296e7685 100644 --- a/conn_test.go +++ b/conn_test.go @@ -50,7 +50,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/gocql/gocql/internal/streams" + "github.com/scylladb/gocql/v2/internal/streams" ) const ( diff --git a/connectionpool.go b/connectionpool.go index d957a248a..2e9c6a663 100644 --- a/connectionpool.go +++ b/connectionpool.go @@ -26,13 +26,13 @@ package gocql import ( "fmt" - "github.com/gocql/gocql/tablets" + "github.com/scylladb/gocql/v2/tablets" "math/rand" "net" "sync" "time" - "github.com/gocql/gocql/debounce" + "github.com/scylladb/gocql/v2/debounce" ) // interface to implement to receive the host information diff --git a/dialer/recorder/recorder.go b/dialer/recorder/recorder.go index 010565c46..fd02319f6 100644 --- a/dialer/recorder/recorder.go +++ b/dialer/recorder/recorder.go @@ -10,8 +10,8 @@ import ( "path" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/dialer" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/dialer" ) func NewRecordDialer(dir string) *RecordDialer { diff --git a/dialer/replayer/replayer.go b/dialer/replayer/replayer.go index 5856d26a9..4fbbf501d 100644 --- a/dialer/replayer/replayer.go +++ b/dialer/replayer/replayer.go @@ -11,8 +11,8 @@ import ( "path" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/dialer" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/dialer" ) func NewReplayDialer(dir string) *ReplayDialer { diff --git a/dialer/utils.go b/dialer/utils.go index 93e8600ba..6ef257b9e 100644 --- a/dialer/utils.go +++ b/dialer/utils.go @@ -1,7 +1,7 @@ package dialer import ( - "github.com/gocql/gocql/internal/murmur" + "github.com/scylladb/gocql/v2/internal/murmur" ) type Record struct { diff --git a/doc.go b/doc.go index 73fbfc85f..c849f0c27 100644 --- a/doc.go +++ b/doc.go @@ -392,4 +392,4 @@ // There is also a new implementation of Tracer - TracerEnhanced, that is intended to be more reliable and convinient to use. // It has a funcionality to check if trace is ready to be extracted and only actually gets it if requested which makes // the impact on a performance smaller. -package gocql // import "github.com/gocql/gocql" +package gocql // import "github.com/scylladb/gocql/v2" diff --git a/example_batch_test.go b/example_batch_test.go index b27085ccc..02ef28908 100644 --- a/example_batch_test.go +++ b/example_batch_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) // Example_batch demonstrates how to execute a batch of statements. diff --git a/example_dynamic_columns_test.go b/example_dynamic_columns_test.go index eab17528e..016217be8 100644 --- a/example_dynamic_columns_test.go +++ b/example_dynamic_columns_test.go @@ -32,7 +32,7 @@ import ( "reflect" "text/tabwriter" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // Example_dynamicColumns demonstrates how to handle dynamic column list. diff --git a/example_lwt_batch_test.go b/example_lwt_batch_test.go index c3cc8383d..6ce6b7a29 100644 --- a/example_lwt_batch_test.go +++ b/example_lwt_batch_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) // ExampleSession_MapExecuteBatchCAS demonstrates how to execute a batch lightweight transaction. diff --git a/example_lwt_test.go b/example_lwt_test.go index 7ca0fb8ba..d4d131a0b 100644 --- a/example_lwt_test.go +++ b/example_lwt_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // ExampleQuery_MapScanCAS demonstrates how to execute a single-statement lightweight transaction. diff --git a/example_marshaler_test.go b/example_marshaler_test.go index 323ebd241..58c9cc511 100644 --- a/example_marshaler_test.go +++ b/example_marshaler_test.go @@ -31,7 +31,7 @@ import ( "strconv" "strings" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // MyMarshaler implements Marshaler and Unmarshaler. diff --git a/example_nulls_test.go b/example_nulls_test.go index e288c99d3..b832d4ba7 100644 --- a/example_nulls_test.go +++ b/example_nulls_test.go @@ -28,7 +28,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // Example_nulls demonstrates how to distinguish between null and zero value when needed. diff --git a/example_paging_test.go b/example_paging_test.go index 1ddc4ceef..96b20fea7 100644 --- a/example_paging_test.go +++ b/example_paging_test.go @@ -28,7 +28,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // Example_paging demonstrates how to manually fetch pages and use page state. diff --git a/example_set_test.go b/example_set_test.go index 76a97f8b1..4b1780e65 100644 --- a/example_set_test.go +++ b/example_set_test.go @@ -29,7 +29,7 @@ import ( "log" "sort" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // Example_set demonstrates how to use sets. diff --git a/example_test.go b/example_test.go index 35ea051a0..3c6e318cb 100644 --- a/example_test.go +++ b/example_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) func Example() { diff --git a/example_udt_map_test.go b/example_udt_map_test.go index 03b98cc7a..f270f2127 100644 --- a/example_udt_map_test.go +++ b/example_udt_map_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // Example_userDefinedTypesMap demonstrates how to work with user-defined types as maps. diff --git a/example_udt_marshaler_test.go b/example_udt_marshaler_test.go index 1b24f2a85..c60f6c1c7 100644 --- a/example_udt_marshaler_test.go +++ b/example_udt_marshaler_test.go @@ -28,7 +28,7 @@ import ( "context" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // MyUDTMarshaler implements UDTMarshaler. diff --git a/example_udt_struct_test.go b/example_udt_struct_test.go index d5045d6a9..85bf056a1 100644 --- a/example_udt_struct_test.go +++ b/example_udt_struct_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) type MyUDT struct { diff --git a/example_udt_unmarshaler_test.go b/example_udt_unmarshaler_test.go index 9d4d2932a..94ac33676 100644 --- a/example_udt_unmarshaler_test.go +++ b/example_udt_unmarshaler_test.go @@ -29,7 +29,7 @@ import ( "fmt" "log" - gocql "github.com/gocql/gocql" + gocql "github.com/scylladb/gocql/v2" ) // MyUDTUnmarshaler implements UDTUnmarshaler. diff --git a/go.mod b/go.mod index 61841935e..44564d6c1 100644 --- a/go.mod +++ b/go.mod @@ -15,30 +15,27 @@ // See the License for the specific language governing permissions and // limitations under the License. // -module github.com/gocql/gocql +module github.com/scylladb/gocql/v2 require ( - github.com/google/go-cmp v0.4.0 + github.com/google/go-cmp v0.7.0 + github.com/google/uuid v1.6.0 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed - github.com/klauspost/compress v1.17.9 - golang.org/x/net v0.0.0-20220526153639-5463443f8c37 + github.com/klauspost/compress v1.18.0 + github.com/stretchr/testify v1.10.0 + golang.org/x/net v0.42.0 gopkg.in/inf.v0 v0.9.1 - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/yaml v1.6.0 ) require ( - github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect + github.com/bitly/go-hostpool v0.1.0 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect - github.com/google/uuid v1.6.0 - github.com/kr/pretty v0.1.0 // indirect - github.com/stretchr/testify v1.9.0 -) - -retract ( - v1.10.0 // tag from kiwicom/gocql added by mistake to scylladb/gocql - v1.9.0 // tag from kiwicom/gocql added by mistake to scylladb/gocql - v1.8.1 // tag from kiwicom/gocql added by mistake to scylladb/gocql - v1.8.0 // tag from kiwicom/gocql added by mistake to scylladb/gocql + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.yaml.in/yaml/v2 v2.4.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.24 \ No newline at end of file +go 1.24 diff --git a/go.sum b/go.sum index ebee6e10a..0d1aaa935 100644 --- a/go.sum +++ b/go.sum @@ -1,51 +1,44 @@ -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= +github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0= +github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7fnbG1MEliIzwu886fn8= -golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE= +go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI= +golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= +golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/hostpolicy/hostpool.go b/hostpolicy/hostpool.go index 7b965eb05..93d84759b 100644 --- a/hostpolicy/hostpool.go +++ b/hostpolicy/hostpool.go @@ -5,7 +5,7 @@ import ( "github.com/hailocab/go-hostpool" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) // HostPool is a host policy which uses the bitly/go-hostpool library diff --git a/hostpolicy/hostpool_test.go b/hostpolicy/hostpool_test.go index b2f818956..1ce8bd2a0 100644 --- a/hostpolicy/hostpool_test.go +++ b/hostpolicy/hostpool_test.go @@ -7,7 +7,7 @@ import ( "github.com/hailocab/go-hostpool" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) // Tests of the host pool host selection policy implementation diff --git a/integration_serialization_scylla_test.go b/integration_serialization_scylla_test.go index 73a4e828a..fed6b26bc 100644 --- a/integration_serialization_scylla_test.go +++ b/integration_serialization_scylla_test.go @@ -12,7 +12,7 @@ import ( "testing" "unsafe" - "github.com/gocql/gocql/internal/tests/serialization/valcases" + "github.com/scylladb/gocql/v2/internal/tests/serialization/valcases" ) func TestSerializationSimpleTypesCassandra(t *testing.T) { diff --git a/integration_test.go b/integration_test.go index 18bf0962b..cdf816727 100644 --- a/integration_test.go +++ b/integration_test.go @@ -31,7 +31,7 @@ package gocql import ( "context" "errors" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "reflect" "testing" "time" diff --git a/internal/tests/serialization/utils_equal.go b/internal/tests/serialization/utils_equal.go index 2561b3598..d4471a277 100644 --- a/internal/tests/serialization/utils_equal.go +++ b/internal/tests/serialization/utils_equal.go @@ -3,7 +3,7 @@ package serialization import ( "bytes" "fmt" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" "gopkg.in/inf.v0" "math/big" "reflect" diff --git a/internal/tests/serialization/valcases/simple.go b/internal/tests/serialization/valcases/simple.go index 79b9d18d8..f010fa4c0 100644 --- a/internal/tests/serialization/valcases/simple.go +++ b/internal/tests/serialization/valcases/simple.go @@ -7,7 +7,7 @@ import ( "net" "time" - "github.com/gocql/gocql/serialization/duration" + "github.com/scylladb/gocql/v2/serialization/duration" ) var simpleTypesCases = SimpleTypes{ diff --git a/keyspace_table_test.go b/keyspace_table_test.go index d21ef2b95..e9d308088 100644 --- a/keyspace_table_test.go +++ b/keyspace_table_test.go @@ -30,7 +30,7 @@ package gocql import ( "context" "fmt" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "testing" ) diff --git a/lz4/go.mod b/lz4/go.mod index f0af638e0..cf1d1a3b1 100644 --- a/lz4/go.mod +++ b/lz4/go.mod @@ -15,7 +15,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -module github.com/gocql/gocql/lz4 +module github.com/scylladb/gocql/lz4 go 1.24 diff --git a/marshal.go b/marshal.go index 4aad0fde7..3b5e7190f 100644 --- a/marshal.go +++ b/marshal.go @@ -32,27 +32,27 @@ import ( "reflect" "unsafe" - "github.com/gocql/gocql/serialization/ascii" - "github.com/gocql/gocql/serialization/bigint" - "github.com/gocql/gocql/serialization/blob" - "github.com/gocql/gocql/serialization/boolean" - "github.com/gocql/gocql/serialization/counter" - "github.com/gocql/gocql/serialization/cqlint" - "github.com/gocql/gocql/serialization/cqltime" - "github.com/gocql/gocql/serialization/date" - "github.com/gocql/gocql/serialization/decimal" - "github.com/gocql/gocql/serialization/double" - "github.com/gocql/gocql/serialization/duration" - "github.com/gocql/gocql/serialization/float" - "github.com/gocql/gocql/serialization/inet" - "github.com/gocql/gocql/serialization/smallint" - "github.com/gocql/gocql/serialization/text" - "github.com/gocql/gocql/serialization/timestamp" - "github.com/gocql/gocql/serialization/timeuuid" - "github.com/gocql/gocql/serialization/tinyint" - "github.com/gocql/gocql/serialization/uuid" - "github.com/gocql/gocql/serialization/varchar" - "github.com/gocql/gocql/serialization/varint" + "github.com/scylladb/gocql/v2/serialization/ascii" + "github.com/scylladb/gocql/v2/serialization/bigint" + "github.com/scylladb/gocql/v2/serialization/blob" + "github.com/scylladb/gocql/v2/serialization/boolean" + "github.com/scylladb/gocql/v2/serialization/counter" + "github.com/scylladb/gocql/v2/serialization/cqlint" + "github.com/scylladb/gocql/v2/serialization/cqltime" + "github.com/scylladb/gocql/v2/serialization/date" + "github.com/scylladb/gocql/v2/serialization/decimal" + "github.com/scylladb/gocql/v2/serialization/double" + "github.com/scylladb/gocql/v2/serialization/duration" + "github.com/scylladb/gocql/v2/serialization/float" + "github.com/scylladb/gocql/v2/serialization/inet" + "github.com/scylladb/gocql/v2/serialization/smallint" + "github.com/scylladb/gocql/v2/serialization/text" + "github.com/scylladb/gocql/v2/serialization/timestamp" + "github.com/scylladb/gocql/v2/serialization/timeuuid" + "github.com/scylladb/gocql/v2/serialization/tinyint" + "github.com/scylladb/gocql/v2/serialization/uuid" + "github.com/scylladb/gocql/v2/serialization/varchar" + "github.com/scylladb/gocql/v2/serialization/varint" ) var ( diff --git a/metadata_scylla.go b/metadata_scylla.go index 5769eeb0b..a34977d8c 100644 --- a/metadata_scylla.go +++ b/metadata_scylla.go @@ -12,7 +12,7 @@ import ( "sync" "sync/atomic" - "github.com/gocql/gocql/tablets" + "github.com/scylladb/gocql/v2/tablets" ) // schema metadata for a keyspace diff --git a/policies_test.go b/policies_test.go index b2a152a98..9940787f5 100644 --- a/policies_test.go +++ b/policies_test.go @@ -34,7 +34,7 @@ package gocql import ( "errors" "fmt" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "net" "sort" "strings" diff --git a/prepared_cache.go b/prepared_cache.go index 3fd256d33..af2577487 100644 --- a/prepared_cache.go +++ b/prepared_cache.go @@ -28,7 +28,7 @@ import ( "bytes" "sync" - "github.com/gocql/gocql/internal/lru" + "github.com/scylladb/gocql/v2/internal/lru" ) const defaultMaxPreparedStmts = 1000 diff --git a/ring_describer_test.go b/ring_describer_test.go index 5260b418a..d59477fb6 100644 --- a/ring_describer_test.go +++ b/ring_describer_test.go @@ -6,11 +6,11 @@ package gocql import ( "context" "fmt" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "net" "testing" - "github.com/gocql/gocql/internal/tests/mock" + "github.com/scylladb/gocql/v2/internal/tests/mock" ) func TestGetClusterPeerInfoZeroToken(t *testing.T) { diff --git a/schema_queries_test.go b/schema_queries_test.go index a8f7cdce0..4cc4dc0e0 100644 --- a/schema_queries_test.go +++ b/schema_queries_test.go @@ -4,7 +4,7 @@ package gocql import ( - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "testing" ) diff --git a/scylla_test.go b/scylla_test.go index 07baed4e7..949b94dd1 100644 --- a/scylla_test.go +++ b/scylla_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/gocql/gocql/internal/streams" + "github.com/scylladb/gocql/v2/internal/streams" ) func TestScyllaConnPickerPickNilToken(t *testing.T) { diff --git a/scyllacloud/cluster.go b/scyllacloud/cluster.go index 7ccb52a77..c44220272 100644 --- a/scyllacloud/cluster.go +++ b/scyllacloud/cluster.go @@ -8,7 +8,7 @@ import ( "net" "os" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" "sigs.k8s.io/yaml" ) diff --git a/scyllacloud/config_test.go b/scyllacloud/config_test.go index 48542e51d..18abe989d 100644 --- a/scyllacloud/config_test.go +++ b/scyllacloud/config_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" "sigs.k8s.io/yaml" ) diff --git a/scyllacloud/hostdialer.go b/scyllacloud/hostdialer.go index b362a1daf..710f1c4d6 100644 --- a/scyllacloud/hostdialer.go +++ b/scyllacloud/hostdialer.go @@ -9,7 +9,7 @@ import ( "net" "net/url" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" "golang.org/x/net/proxy" ) diff --git a/scyllacloud/hostdialer_test.go b/scyllacloud/hostdialer_test.go index f4dabc058..5441b0b5c 100644 --- a/scyllacloud/hostdialer_test.go +++ b/scyllacloud/hostdialer_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) const ( diff --git a/serialization/decimal/marshal_utils.go b/serialization/decimal/marshal_utils.go index 63748120a..7982a5ce3 100644 --- a/serialization/decimal/marshal_utils.go +++ b/serialization/decimal/marshal_utils.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/gocql/gocql/serialization/varint" + "github.com/scylladb/gocql/v2/serialization/varint" ) func EncInfDec(v inf.Dec) ([]byte, error) { diff --git a/serialization/decimal/unmarshal_utils.go b/serialization/decimal/unmarshal_utils.go index 760c575fa..d823e5e5e 100644 --- a/serialization/decimal/unmarshal_utils.go +++ b/serialization/decimal/unmarshal_utils.go @@ -6,7 +6,7 @@ import ( "reflect" "strconv" - "github.com/gocql/gocql/serialization/varint" + "github.com/scylladb/gocql/v2/serialization/varint" ) var errWrongDataLen = fmt.Errorf("failed to unmarshal decimal: the length of the data should be 0 or more than 5") diff --git a/session.go b/session.go index 6743f345b..4d95725da 100644 --- a/session.go +++ b/session.go @@ -38,9 +38,9 @@ import ( "time" "unicode" - "github.com/gocql/gocql/debounce" - "github.com/gocql/gocql/internal/lru" - "github.com/gocql/gocql/tablets" + "github.com/scylladb/gocql/v2/debounce" + "github.com/scylladb/gocql/v2/internal/lru" + "github.com/scylladb/gocql/v2/tablets" ) // Session is the interface used by users to interact with the database. diff --git a/tablets/tabets_utils_test.go b/tablets/tabets_utils_test.go index 8cb63590a..118ace385 100644 --- a/tablets/tabets_utils_test.go +++ b/tablets/tabets_utils_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" ) func TestCreateTablets(t *testing.T) { diff --git a/tablets/tablet_utils.go b/tablets/tablet_utils.go index 40ee27e1a..741a1f2f4 100644 --- a/tablets/tablet_utils.go +++ b/tablets/tablet_utils.go @@ -1,7 +1,7 @@ package tablets import ( - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "math" "math/rand" "sync/atomic" diff --git a/tablets/tablets_bench_test.go b/tablets/tablets_bench_test.go index 3d7d3af40..bade47374 100644 --- a/tablets/tablets_bench_test.go +++ b/tablets/tablets_bench_test.go @@ -2,7 +2,7 @@ package tablets import ( "fmt" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" "math" "runtime" "sync/atomic" diff --git a/tablets/tablets_test.go b/tablets/tablets_test.go index aad422bbf..ef9ad6178 100644 --- a/tablets/tablets_test.go +++ b/tablets/tablets_test.go @@ -6,7 +6,7 @@ package tablets import ( "testing" - "github.com/gocql/gocql/internal/tests" + "github.com/scylladb/gocql/v2/internal/tests" ) var tablets = TabletInfoList{ diff --git a/tests/bench/bench_marshal_test.go b/tests/bench/bench_marshal_test.go index a5c92ae06..53174ab52 100644 --- a/tests/bench/bench_marshal_test.go +++ b/tests/bench/bench_marshal_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/brianvoe/gofakeit/v6" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) func generateRandomBinaryData(size int) []byte { diff --git a/tests/bench/bench_single_conn_test.go b/tests/bench/bench_single_conn_test.go index 6bbdd643b..54f2e5b14 100644 --- a/tests/bench/bench_single_conn_test.go +++ b/tests/bench/bench_single_conn_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/dialer/recorder" - "github.com/gocql/gocql/dialer/replayer" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/dialer/recorder" + "github.com/scylladb/gocql/v2/dialer/replayer" ) func InitializeCluster() error { diff --git a/tests/bench/go.mod b/tests/bench/go.mod index 3f0728467..7092b5185 100644 --- a/tests/bench/go.mod +++ b/tests/bench/go.mod @@ -1,10 +1,10 @@ -module github.com/gocql/gocql/bench_test +module github.com/scylladb/gocql/bench_test go 1.24 require ( github.com/brianvoe/gofakeit/v6 v6.28.0 - github.com/gocql/gocql v1.7.0 + github.com/scylladb/gocql/v2 v2.0.0 ) require ( @@ -13,4 +13,4 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect ) -replace github.com/gocql/gocql => ../.. +replace github.com/scylladb/gocql/v2 => ../.. diff --git a/tests/serialization/marshal_0_unset_test.go b/tests/serialization/marshal_0_unset_test.go index 4cdb33472..0ebac71f4 100644 --- a/tests/serialization/marshal_0_unset_test.go +++ b/tests/serialization/marshal_0_unset_test.go @@ -6,7 +6,7 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" + "github.com/scylladb/gocql/v2" ) func TestMarshalUnsetColumn(t *testing.T) { diff --git a/tests/serialization/marshal_10_decimal_corrupt_test.go b/tests/serialization/marshal_10_decimal_corrupt_test.go index e8747b45d..edb63a23d 100644 --- a/tests/serialization/marshal_10_decimal_corrupt_test.go +++ b/tests/serialization/marshal_10_decimal_corrupt_test.go @@ -4,10 +4,10 @@ import ( "gopkg.in/inf.v0" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/decimal" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/decimal" ) func TestMarshalDecimalCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_10_decimal_test.go b/tests/serialization/marshal_10_decimal_test.go index 3a4e3027c..f7066234b 100644 --- a/tests/serialization/marshal_10_decimal_test.go +++ b/tests/serialization/marshal_10_decimal_test.go @@ -11,10 +11,10 @@ import ( "gopkg.in/inf.v0" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/decimal" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/decimal" ) func TestMarshalDecimal(t *testing.T) { diff --git a/tests/serialization/marshal_11_texts_test.go b/tests/serialization/marshal_11_texts_test.go index 527ef2175..18059f4b1 100644 --- a/tests/serialization/marshal_11_texts_test.go +++ b/tests/serialization/marshal_11_texts_test.go @@ -6,12 +6,12 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/blob" - "github.com/gocql/gocql/serialization/text" - "github.com/gocql/gocql/serialization/varchar" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/blob" + "github.com/scylladb/gocql/v2/serialization/text" + "github.com/scylladb/gocql/v2/serialization/varchar" ) func TestMarshalTexts(t *testing.T) { diff --git a/tests/serialization/marshal_12_ascii_corrupt_test.go b/tests/serialization/marshal_12_ascii_corrupt_test.go index dbda677ab..18542259a 100644 --- a/tests/serialization/marshal_12_ascii_corrupt_test.go +++ b/tests/serialization/marshal_12_ascii_corrupt_test.go @@ -6,10 +6,10 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/ascii" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/ascii" ) func TestMarshalAsciiMustFail(t *testing.T) { diff --git a/tests/serialization/marshal_12_ascii_test.go b/tests/serialization/marshal_12_ascii_test.go index d4e593f7e..136cde9cf 100644 --- a/tests/serialization/marshal_12_ascii_test.go +++ b/tests/serialization/marshal_12_ascii_test.go @@ -6,10 +6,10 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/ascii" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/ascii" ) func TestMarshalAscii(t *testing.T) { diff --git a/tests/serialization/marshal_13_uuids_corrupt_test.go b/tests/serialization/marshal_13_uuids_corrupt_test.go index d57d0f6d3..fdbbd4251 100644 --- a/tests/serialization/marshal_13_uuids_corrupt_test.go +++ b/tests/serialization/marshal_13_uuids_corrupt_test.go @@ -6,11 +6,11 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/timeuuid" - "github.com/gocql/gocql/serialization/uuid" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/timeuuid" + "github.com/scylladb/gocql/v2/serialization/uuid" ) func TestMarshalUUIDsMustFail(t *testing.T) { diff --git a/tests/serialization/marshal_13_uuids_test.go b/tests/serialization/marshal_13_uuids_test.go index 06cd9bac5..8293cb298 100644 --- a/tests/serialization/marshal_13_uuids_test.go +++ b/tests/serialization/marshal_13_uuids_test.go @@ -6,11 +6,11 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/timeuuid" - "github.com/gocql/gocql/serialization/uuid" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/timeuuid" + "github.com/scylladb/gocql/v2/serialization/uuid" ) func TestMarshalUUIDs(t *testing.T) { diff --git a/tests/serialization/marshal_14_inet_corrupt_test.go b/tests/serialization/marshal_14_inet_corrupt_test.go index 2a418cfb5..e463a2602 100644 --- a/tests/serialization/marshal_14_inet_corrupt_test.go +++ b/tests/serialization/marshal_14_inet_corrupt_test.go @@ -7,10 +7,10 @@ import ( "net" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/inet" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/inet" ) func TestMarshalsInetMustFail(t *testing.T) { diff --git a/tests/serialization/marshal_14_inet_test.go b/tests/serialization/marshal_14_inet_test.go index 5ad15b462..cebb1b601 100644 --- a/tests/serialization/marshal_14_inet_test.go +++ b/tests/serialization/marshal_14_inet_test.go @@ -7,10 +7,10 @@ import ( "net" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/inet" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/inet" ) func TestMarshalsInet(t *testing.T) { diff --git a/tests/serialization/marshal_15_time_corrupt_test.go b/tests/serialization/marshal_15_time_corrupt_test.go index 57dba214f..0052f3ff6 100644 --- a/tests/serialization/marshal_15_time_corrupt_test.go +++ b/tests/serialization/marshal_15_time_corrupt_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/cqltime" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/cqltime" ) func TestMarshalTimeCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_15_time_test.go b/tests/serialization/marshal_15_time_test.go index 79c233035..cefb4e502 100644 --- a/tests/serialization/marshal_15_time_test.go +++ b/tests/serialization/marshal_15_time_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/cqltime" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/cqltime" ) func TestMarshalsTime(t *testing.T) { diff --git a/tests/serialization/marshal_16_timestamp_corrupt_test.go b/tests/serialization/marshal_16_timestamp_corrupt_test.go index 0b5458bcc..c44529047 100644 --- a/tests/serialization/marshal_16_timestamp_corrupt_test.go +++ b/tests/serialization/marshal_16_timestamp_corrupt_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/timestamp" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/timestamp" ) func TestMarshalTimestampCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_16_timestamp_test.go b/tests/serialization/marshal_16_timestamp_test.go index 804862cce..51df1b3fc 100644 --- a/tests/serialization/marshal_16_timestamp_test.go +++ b/tests/serialization/marshal_16_timestamp_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/timestamp" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/timestamp" ) func TestMarshalsTimestamp(t *testing.T) { diff --git a/tests/serialization/marshal_17_date_corrupt_test.go b/tests/serialization/marshal_17_date_corrupt_test.go index 614d67814..bf14105e6 100644 --- a/tests/serialization/marshal_17_date_corrupt_test.go +++ b/tests/serialization/marshal_17_date_corrupt_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/date" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/date" ) func TestMarshalDateCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_17_date_test.go b/tests/serialization/marshal_17_date_test.go index cb5b800a8..02880e019 100644 --- a/tests/serialization/marshal_17_date_test.go +++ b/tests/serialization/marshal_17_date_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/date" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/date" ) func TestMarshalsDate(t *testing.T) { diff --git a/tests/serialization/marshal_18_duration_corrupt_test.go b/tests/serialization/marshal_18_duration_corrupt_test.go index 5c0bd3b1f..29eb36277 100644 --- a/tests/serialization/marshal_18_duration_corrupt_test.go +++ b/tests/serialization/marshal_18_duration_corrupt_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalDurationCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_18_duration_test.go b/tests/serialization/marshal_18_duration_test.go index e3a29df6f..5f873ae48 100644 --- a/tests/serialization/marshal_18_duration_test.go +++ b/tests/serialization/marshal_18_duration_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalsDuration(t *testing.T) { diff --git a/tests/serialization/marshal_19_list_set_v3_corrupt_test.go b/tests/serialization/marshal_19_list_set_v3_corrupt_test.go index 9d1c12bf8..19c649c23 100644 --- a/tests/serialization/marshal_19_list_set_v3_corrupt_test.go +++ b/tests/serialization/marshal_19_list_set_v3_corrupt_test.go @@ -7,9 +7,9 @@ import ( "math" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalSetListV3Corrupt(t *testing.T) { diff --git a/tests/serialization/marshal_19_list_set_v3_test.go b/tests/serialization/marshal_19_list_set_v3_test.go index 4ef7b4f60..b1c9c0692 100644 --- a/tests/serialization/marshal_19_list_set_v3_test.go +++ b/tests/serialization/marshal_19_list_set_v3_test.go @@ -6,9 +6,9 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalSetListV3(t *testing.T) { diff --git a/tests/serialization/marshal_1_boolean_corrupt_test.go b/tests/serialization/marshal_1_boolean_corrupt_test.go index 8d9472cfc..2fdf9f553 100644 --- a/tests/serialization/marshal_1_boolean_corrupt_test.go +++ b/tests/serialization/marshal_1_boolean_corrupt_test.go @@ -6,11 +6,11 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql/serialization/boolean" + "github.com/scylladb/gocql/v2/serialization/boolean" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalBooleanCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_1_boolean_test.go b/tests/serialization/marshal_1_boolean_test.go index 3fa3c83cb..ac3a66561 100644 --- a/tests/serialization/marshal_1_boolean_test.go +++ b/tests/serialization/marshal_1_boolean_test.go @@ -6,10 +6,10 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/boolean" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/boolean" ) func TestMarshalBoolean(t *testing.T) { diff --git a/tests/serialization/marshal_20_map_v3_corrupt_test.go b/tests/serialization/marshal_20_map_v3_corrupt_test.go index cefc76daf..d8549a227 100644 --- a/tests/serialization/marshal_20_map_v3_corrupt_test.go +++ b/tests/serialization/marshal_20_map_v3_corrupt_test.go @@ -7,9 +7,9 @@ import ( "math" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalMapV3Corrupt(t *testing.T) { diff --git a/tests/serialization/marshal_20_map_v3_test.go b/tests/serialization/marshal_20_map_v3_test.go index b726a1305..5df58f58d 100644 --- a/tests/serialization/marshal_20_map_v3_test.go +++ b/tests/serialization/marshal_20_map_v3_test.go @@ -6,9 +6,9 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" ) func TestMarshalMapV3(t *testing.T) { diff --git a/tests/serialization/marshal_2_tinyint_corrupt_test.go b/tests/serialization/marshal_2_tinyint_corrupt_test.go index fb8271294..7bac685d3 100644 --- a/tests/serialization/marshal_2_tinyint_corrupt_test.go +++ b/tests/serialization/marshal_2_tinyint_corrupt_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/tinyint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/tinyint" ) func TestMarshalTinyintCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_2_tinyint_test.go b/tests/serialization/marshal_2_tinyint_test.go index 22e13e761..a4b936b81 100644 --- a/tests/serialization/marshal_2_tinyint_test.go +++ b/tests/serialization/marshal_2_tinyint_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/tinyint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/tinyint" ) func TestMarshalTinyint(t *testing.T) { diff --git a/tests/serialization/marshal_3_smallint_corrupt_test.go b/tests/serialization/marshal_3_smallint_corrupt_test.go index 00fba89c3..8f8cc29fb 100644 --- a/tests/serialization/marshal_3_smallint_corrupt_test.go +++ b/tests/serialization/marshal_3_smallint_corrupt_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/smallint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/smallint" ) func TestMarshalSmallintCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_3_smallint_test.go b/tests/serialization/marshal_3_smallint_test.go index a24e2896c..8efeb1ca5 100644 --- a/tests/serialization/marshal_3_smallint_test.go +++ b/tests/serialization/marshal_3_smallint_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/smallint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/smallint" ) func TestMarshalSmallint(t *testing.T) { diff --git a/tests/serialization/marshal_4_int_corrupt_test.go b/tests/serialization/marshal_4_int_corrupt_test.go index 3b177cca9..60fafca1a 100644 --- a/tests/serialization/marshal_4_int_corrupt_test.go +++ b/tests/serialization/marshal_4_int_corrupt_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/cqlint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/cqlint" ) func TestMarshalIntCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_4_int_test.go b/tests/serialization/marshal_4_int_test.go index e860752ca..b38125be4 100644 --- a/tests/serialization/marshal_4_int_test.go +++ b/tests/serialization/marshal_4_int_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/cqlint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/cqlint" ) func TestMarshalInt(t *testing.T) { diff --git a/tests/serialization/marshal_5_bigint_corrupt_test.go b/tests/serialization/marshal_5_bigint_corrupt_test.go index 3b0c77587..21763f9cb 100644 --- a/tests/serialization/marshal_5_bigint_corrupt_test.go +++ b/tests/serialization/marshal_5_bigint_corrupt_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/bigint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/bigint" ) func TestMarshalBigIntCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_5_bigint_test.go b/tests/serialization/marshal_5_bigint_test.go index a864630a0..fbe265540 100644 --- a/tests/serialization/marshal_5_bigint_test.go +++ b/tests/serialization/marshal_5_bigint_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/bigint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/bigint" ) func TestMarshalBigInt(t *testing.T) { diff --git a/tests/serialization/marshal_6_counter_corrupt_test.go b/tests/serialization/marshal_6_counter_corrupt_test.go index b82ca891b..200cb1ace 100644 --- a/tests/serialization/marshal_6_counter_corrupt_test.go +++ b/tests/serialization/marshal_6_counter_corrupt_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/counter" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/counter" ) func TestMarshalCounterCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_6_counter_test.go b/tests/serialization/marshal_6_counter_test.go index ee9c7d498..6c0b6455f 100644 --- a/tests/serialization/marshal_6_counter_test.go +++ b/tests/serialization/marshal_6_counter_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/counter" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/counter" ) func TestMarshalCounter(t *testing.T) { diff --git a/tests/serialization/marshal_7_varint_corrupt_test.go b/tests/serialization/marshal_7_varint_corrupt_test.go index 721d60c7a..5f44bedd9 100644 --- a/tests/serialization/marshal_7_varint_corrupt_test.go +++ b/tests/serialization/marshal_7_varint_corrupt_test.go @@ -4,10 +4,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/varint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/varint" ) func TestMarshalVarIntCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_7_varint_test.go b/tests/serialization/marshal_7_varint_test.go index 460a8e85e..7e1ac4c95 100644 --- a/tests/serialization/marshal_7_varint_test.go +++ b/tests/serialization/marshal_7_varint_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/varint" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/varint" ) func TestMarshalVarIntNew(t *testing.T) { diff --git a/tests/serialization/marshal_8_float_corrupt_test.go b/tests/serialization/marshal_8_float_corrupt_test.go index 5a19bfe43..df45722f2 100644 --- a/tests/serialization/marshal_8_float_corrupt_test.go +++ b/tests/serialization/marshal_8_float_corrupt_test.go @@ -6,10 +6,10 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/float" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/float" ) func TestMarshalFloatCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_8_float_test.go b/tests/serialization/marshal_8_float_test.go index 3560ac1e0..02988bba0 100644 --- a/tests/serialization/marshal_8_float_test.go +++ b/tests/serialization/marshal_8_float_test.go @@ -7,10 +7,10 @@ import ( "math" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/float" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/float" ) func TestMarshalFloat(t *testing.T) { diff --git a/tests/serialization/marshal_9_double_corrupt_test.go b/tests/serialization/marshal_9_double_corrupt_test.go index 35599ebc9..461c36b72 100644 --- a/tests/serialization/marshal_9_double_corrupt_test.go +++ b/tests/serialization/marshal_9_double_corrupt_test.go @@ -6,10 +6,10 @@ package serialization_test import ( "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/double" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/double" ) func TestMarshalDoubleCorrupt(t *testing.T) { diff --git a/tests/serialization/marshal_9_duble_test.go b/tests/serialization/marshal_9_duble_test.go index 94f4f6fde..58fd2acfc 100644 --- a/tests/serialization/marshal_9_duble_test.go +++ b/tests/serialization/marshal_9_duble_test.go @@ -7,10 +7,10 @@ import ( "math" "testing" - "github.com/gocql/gocql" - "github.com/gocql/gocql/internal/tests/serialization" - "github.com/gocql/gocql/internal/tests/serialization/mod" - "github.com/gocql/gocql/serialization/double" + "github.com/scylladb/gocql/v2" + "github.com/scylladb/gocql/v2/internal/tests/serialization" + "github.com/scylladb/gocql/v2/internal/tests/serialization/mod" + "github.com/scylladb/gocql/v2/serialization/double" ) func TestMarshalDouble(t *testing.T) { diff --git a/token.go b/token.go index 8a3141fc7..c7f02bb56 100644 --- a/token.go +++ b/token.go @@ -37,7 +37,7 @@ import ( "strconv" "strings" - "github.com/gocql/gocql/internal/murmur" + "github.com/scylladb/gocql/v2/internal/murmur" ) // a token partitioner diff --git a/version.go b/version.go index daaa2553b..c4522d0a5 100644 --- a/version.go +++ b/version.go @@ -27,7 +27,7 @@ package gocql import "runtime/debug" const ( - mainPackage = "github.com/gocql/gocql" + mainPackage = "github.com/scylladb/gocql/v2" ) var defaultDriverVersion string From cd6c904ba7194583d5804396ceeb1b05f478a161 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Sat, 2 Aug 2025 12:40:16 -0400 Subject: [PATCH 3/3] tests: don't use t.Errorf on regular strings Linter start complining, switch to `t.Error` --- cassandra_test.go | 4 ++-- compressor_test.go | 4 ++-- debounce/refresh_debouncer_test.go | 4 ++-- integration_test.go | 6 +++--- policies_integration_test.go | 13 ++++++------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cassandra_test.go b/cassandra_test.go index 752cb4664..99f412771 100644 --- a/cassandra_test.go +++ b/cassandra_test.go @@ -100,7 +100,7 @@ func TestUseStatementError(t *testing.T) { if err := session.Query("USE gocql_test").Exec(); err != nil { if err != ErrUseStmt { - t.Fatalf("expected ErrUseStmt, got " + err.Error()) + t.Fatalf("expected ErrUseStmt, got %v", err) } } else { t.Fatal("expected err, got nil.") @@ -561,7 +561,7 @@ func TestCAS(t *testing.T) { if _, err := session.Query(`DELETE FROM cas_table WHERE title = ? and revid = ? IF last_modified = ?`, title, revid, tenSecondsLater).ScanCAS(); !strings.HasPrefix(err.Error(), "gocql: not enough columns to scan into") { - t.Fatalf("delete: was expecting count mismatch error but got: %q", err.Error()) + t.Fatalf("delete: was expecting count mismatch error but got: %v", err) } if applied, err := session.Query(`DELETE FROM cas_table WHERE title = ? and revid = ? IF last_modified = ?`, diff --git a/compressor_test.go b/compressor_test.go index a0663b0d5..8e6daf693 100644 --- a/compressor_test.go +++ b/compressor_test.go @@ -137,7 +137,7 @@ func TestSnappyCompressor(t *testing.T) { } if bytes.Compare(decoded, frame.Frame) != 0 { - t.Fatalf("failed to match the decoded value with the original value") + t.Fatal("failed to match the decoded value with the original value") } t.Logf("Compression rate %f", float64(len(encoded))/float64(len(frame.Frame))) }) @@ -156,7 +156,7 @@ func TestSnappyCompressor(t *testing.T) { } if len(decoded) == 0 { - t.Fatalf("frame was decoded to empty slice") + t.Fatal("frame was decoded to empty slice") } }) } diff --git a/debounce/refresh_debouncer_test.go b/debounce/refresh_debouncer_test.go index 8184415f0..ac38427e8 100644 --- a/debounce/refresh_debouncer_test.go +++ b/debounce/refresh_debouncer_test.go @@ -214,7 +214,7 @@ func TestErrorBroadcaster_MultipleListeners(t *testing.T) { }() wg.Wait() if loadedVal := result.Load(); loadedVal != nil { - t.Errorf(loadedVal.(error).Error()) + t.Error(loadedVal.(error).Error()) } } @@ -249,6 +249,6 @@ func TestErrorBroadcaster_StopWithoutBroadcast(t *testing.T) { }() wg.Wait() if loadedVal := result.Load(); loadedVal != nil { - t.Errorf(loadedVal.(error).Error()) + t.Error(loadedVal.(error).Error()) } } diff --git a/integration_test.go b/integration_test.go index cdf816727..a02259f14 100644 --- a/integration_test.go +++ b/integration_test.go @@ -54,7 +54,7 @@ func TestAuthentication(t *testing.T) { session, err := cluster.CreateSession() if err != nil { - t.Fatalf("Authentication error: %s", err) + t.Fatalf("Authentication error: %v", err) } session.Close() @@ -241,10 +241,10 @@ func TestApplicationInformation(t *testing.T) { break } if iter.Close() != nil { - t.Fatalf("failed to execute query: %s", iter.Close().Error()) + t.Fatalf("failed to execute query: %v", iter.Close()) } if !found { - t.Fatalf("failed to find the application info row") + t.Fatal("failed to find the application info row") } }) } diff --git a/policies_integration_test.go b/policies_integration_test.go index c352b9b28..aa199d933 100644 --- a/policies_integration_test.go +++ b/policies_integration_test.go @@ -5,7 +5,6 @@ package gocql import ( "context" - "fmt" "testing" "time" ) @@ -68,24 +67,24 @@ func TestTokenAwareHostPolicy(t *testing.T) { func testIfPolicyInitializedProperly(t *testing.T, cluster *ClusterConfig, policy *tokenAwareHostPolicy) { _, err := cluster.CreateSession() if err != nil { - t.Fatalf(fmt.Errorf("faled to create session: %v", err).Error()) + t.Fatalf("faled to create session: %s", err.Error()) } md := policy.getMetadataReadOnly() if md == nil { - t.Fatalf("tokenAwareHostPolicy has no metadata") + t.Fatal("tokenAwareHostPolicy has no metadata") } if len(md.tokenRing.tokens) == 0 { - t.Fatalf("tokenAwareHostPolicy metadata has no tokens") + t.Fatal("tokenAwareHostPolicy metadata has no tokens") } if len(md.tokenRing.hosts) == 0 { - t.Fatalf("tokenAwareHostPolicy metadata has no hosts") + t.Fatal("tokenAwareHostPolicy metadata has no hosts") } if md.tokenRing.partitioner == nil { - t.Fatalf("tokenAwareHostPolicy metadata has no partitioner") + t.Fatal("tokenAwareHostPolicy metadata has no partitioner") } if cluster.Keyspace != "" { if len(md.replicas[cluster.Keyspace]) == 0 { - t.Fatalf("tokenAwareHostPolicy metadata has no replicas in target keyspace") + t.Fatal("tokenAwareHostPolicy metadata has no replicas in target keyspace") } } }