diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c2fe6b8e..53fcc1d1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: name: Build runs-on: ubuntu-latest env: - SCYLLA_IMAGE: scylladb/scylla:5.4.6 + SCYLLA_IMAGE: scylladb/scylla:6.0.0 steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 diff --git a/docker-compose.yml b/docker-compose.yml index e23a1e15d..77ad6b8b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,10 +33,8 @@ services: timeout: 5s retries: 18 node_2: - image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7 + image: ${SCYLLA_IMAGE} command: | - --experimental-features consistent-topology-changes - --experimental-features tablets --smp 2 --memory 1G --seeds 192.168.100.12 @@ -49,10 +47,8 @@ services: timeout: 5s retries: 18 node_3: - image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7 + image: ${SCYLLA_IMAGE} command: | - --experimental-features consistent-topology-changes - --experimental-features tablets --smp 2 --memory 1G --seeds 192.168.100.12 @@ -68,10 +64,8 @@ services: node_2: condition: service_healthy node_4: - image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7 + image: ${SCYLLA_IMAGE} command: | - --experimental-features consistent-topology-changes - --experimental-features tablets --smp 2 --memory 1G --seeds 192.168.100.12 diff --git a/metadata_cassandra.go b/metadata_cassandra.go index 08723ddb4..4886fdab5 100644 --- a/metadata_cassandra.go +++ b/metadata_cassandra.go @@ -994,7 +994,6 @@ func getMaterializedViewsMetadata(session *Session, keyspaceName string) ([]Mate compaction, compression, crc_check_chance, - dclocal_read_repair_chance, default_time_to_live, extensions, gc_grace_seconds, @@ -1003,7 +1002,6 @@ func getMaterializedViewsMetadata(session *Session, keyspaceName string) ([]Mate max_index_interval, memtable_flush_period_in_ms, min_index_interval, - read_repair_chance, speculative_retry FROM %s WHERE keyspace_name = ?`, tableName) diff --git a/metadata_scylla.go b/metadata_scylla.go index b675b6c8c..7996a254e 100644 --- a/metadata_scylla.go +++ b/metadata_scylla.go @@ -553,13 +553,11 @@ func getTableMetadata(session *Session, keyspaceName string) ([]TableMetadata, e "compaction": &table.Options.Compaction, "compression": &table.Options.Compression, "crc_check_chance": &table.Options.CrcCheckChance, - "dclocal_read_repair_chance": &table.Options.DcLocalReadRepairChance, "default_time_to_live": &table.Options.DefaultTimeToLive, "gc_grace_seconds": &table.Options.GcGraceSeconds, "max_index_interval": &table.Options.MaxIndexInterval, "memtable_flush_period_in_ms": &table.Options.MemtableFlushPeriodInMs, "min_index_interval": &table.Options.MinIndexInterval, - "read_repair_chance": &table.Options.ReadRepairChance, "speculative_retry": &table.Options.SpeculativeRetry, "flags": &table.Flags, "extensions": &table.Extensions, @@ -772,13 +770,11 @@ func getViewMetadata(session *Session, keyspaceName string) ([]ViewMetadata, err "compaction": &view.Options.Compaction, "compression": &view.Options.Compression, "crc_check_chance": &view.Options.CrcCheckChance, - "dclocal_read_repair_chance": &view.Options.DcLocalReadRepairChance, "default_time_to_live": &view.Options.DefaultTimeToLive, "gc_grace_seconds": &view.Options.GcGraceSeconds, "max_index_interval": &view.Options.MaxIndexInterval, "memtable_flush_period_in_ms": &view.Options.MemtableFlushPeriodInMs, "min_index_interval": &view.Options.MinIndexInterval, - "read_repair_chance": &view.Options.ReadRepairChance, "speculative_retry": &view.Options.SpeculativeRetry, "extensions": &view.Extensions, }) { diff --git a/recreate.go b/recreate.go index 045fd3a0f..738d898a1 100644 --- a/recreate.go +++ b/recreate.go @@ -319,13 +319,11 @@ func (h toCQLHelpers) tableOptionsToCQL(ops TableMetadataOptions) ([]string, err "bloom_filter_fp_chance": ops.BloomFilterFpChance, "comment": ops.Comment, "crc_check_chance": ops.CrcCheckChance, - "dclocal_read_repair_chance": ops.DcLocalReadRepairChance, "default_time_to_live": ops.DefaultTimeToLive, "gc_grace_seconds": ops.GcGraceSeconds, "max_index_interval": ops.MaxIndexInterval, "memtable_flush_period_in_ms": ops.MemtableFlushPeriodInMs, "min_index_interval": ops.MinIndexInterval, - "read_repair_chance": ops.ReadRepairChance, "speculative_retry": ops.SpeculativeRetry, } diff --git a/testdata/config/scylla.yaml b/testdata/config/scylla.yaml index 945d184bd..68ee54a9e 100644 --- a/testdata/config/scylla.yaml +++ b/testdata/config/scylla.yaml @@ -8,5 +8,3 @@ client_encryption_options: keyfile: /etc/scylla/db.key truststore: /etc/scylla/ca.crt require_client_auth: true -# when using 5.4.x we have to specify force_schema_commit_log option -force_schema_commit_log: true diff --git a/testdata/recreate/index_golden.cql b/testdata/recreate/index_golden.cql index b902acbdb..25cdbe50e 100644 --- a/testdata/recreate/index_golden.cql +++ b/testdata/recreate/index_golden.cql @@ -16,13 +16,11 @@ CREATE TABLE gocqlx_idx.menus ( AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE INDEX menus_name_idx ON gocqlx_idx.menus (name); diff --git a/testdata/recreate/materialized_views_golden.cql b/testdata/recreate/materialized_views_golden.cql index 9e1e9408d..4ade3e5f8 100644 --- a/testdata/recreate/materialized_views_golden.cql +++ b/testdata/recreate/materialized_views_golden.cql @@ -14,13 +14,11 @@ CREATE TABLE gocqlx_mv.mv_buildings ( AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city AS @@ -35,13 +33,11 @@ CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city AS AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city2 AS @@ -59,11 +55,9 @@ CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city2 AS AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; diff --git a/testdata/recreate/secondary_index_golden.cql b/testdata/recreate/secondary_index_golden.cql index 274395432..579963bcf 100644 --- a/testdata/recreate/secondary_index_golden.cql +++ b/testdata/recreate/secondary_index_golden.cql @@ -16,13 +16,11 @@ CREATE TABLE gocqlx_sec_idx.menus ( AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE INDEX menus_name_idx ON gocqlx_sec_idx.menus ((location), name); diff --git a/testdata/recreate/table.cql b/testdata/recreate/table.cql index bd4bc26c3..9a649f8fb 100644 --- a/testdata/recreate/table.cql +++ b/testdata/recreate/table.cql @@ -8,8 +8,7 @@ CREATE TABLE gocqlx_table.monkeySpecies ( common_name text, population varint, average_size int -) WITH comment='Important biological records' - AND read_repair_chance = 1.0; +) WITH comment='Important biological records'; CREATE TABLE gocqlx_table.timeline ( userid uuid, diff --git a/testdata/recreate/table_golden.cql b/testdata/recreate/table_golden.cql index a70e8e81c..93df4eca3 100644 --- a/testdata/recreate/table_golden.cql +++ b/testdata/recreate/table_golden.cql @@ -16,13 +16,11 @@ CREATE TABLE gocqlx_table.loads ( AND compaction = {'class':'TimeWindowCompactionStrategy','compaction_window_size':'14','compaction_window_unit':'DAYS'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE TABLE gocqlx_table.monkeyspecies ( @@ -36,13 +34,11 @@ CREATE TABLE gocqlx_table.monkeyspecies ( AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 1 AND speculative_retry = '99.0PERCENTILE'; CREATE TABLE gocqlx_table.timeline ( @@ -59,13 +55,11 @@ CREATE TABLE gocqlx_table.timeline ( AND compaction = {'class':'LeveledCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE TABLE gocqlx_table.users_picture ( @@ -81,11 +75,9 @@ CREATE TABLE gocqlx_table.users_picture ( AND compaction = {'class':'SizeTieredCompactionStrategy'} AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'} AND crc_check_chance = 1 - AND dclocal_read_repair_chance = 0 AND default_time_to_live = 0 AND gc_grace_seconds = 864000 AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE';