Skip to content

Commit

Permalink
Revert "bootstrap: create an explicit zoneconfig for timeseries data"
Browse files Browse the repository at this point in the history 
This reverts commit 59f5cb9.

Epic: none

Release note: None
  • Loading branch information
@arulajmani
arulajmani committed Jul 29, 2024
1 parent d6381b7 commit f9d47ce
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 60 deletions.
8 changes: 0 additions & 8 deletions pkg/ccl/logictestccl/testdata/logic_test/crdb_internal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1
0 RANGE default
16 RANGE meta
17 RANGE system
18 RANGE timeseries
22 RANGE liveness
111 TABLE test.public.t4
111 INDEX test.public.t4@myt4index
Expand Down Expand Up @@ -110,13 +109,6 @@ RANGE system ALTER RANGE system CONFIGURE ZONE USING
num_replicas = 5,
constraints = '[]',
lease_preferences = '[]'
RANGE timeseries ALTER RANGE timeseries CONFIGURE ZONE USING
range_min_bytes = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 14400,
num_replicas = 3,
constraints = '[]',
lease_preferences = '[]'
TABLE test.public.t4 ALTER TABLE test.public.t4 CONFIGURE ZONE USING
num_replicas = 7

Expand Down
55 changes: 27 additions & 28 deletions pkg/ccl/logictestccl/testdata/logic_test/zone
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,34 +616,33 @@ SELECT target, range_name, database_name, table_name, index_name, partition_name
FROM crdb_internal.zones
ORDER BY target
----
DATABASE "my database" NULL my database NULL NULL NULL
DATABASE system NULL system NULL NULL NULL
INDEX "my database".public."my table"@"my index" NULL my database my table my index NULL
INDEX test.public.t36642@secondary NULL test t36642 secondary NULL
INDEX test.public.t36642@tertiary NULL test t36642 tertiary NULL
INDEX test.public.t36644@secondary NULL test t36644 secondary NULL
INDEX test.public.t36644@tertiary NULL test t36644 tertiary NULL
INDEX test.public.t@secondary NULL test t secondary NULL
INDEX test.public.t@tertiary NULL test t tertiary NULL
PARTITION "my partition" OF INDEX "my database".public."my table"@"my index" NULL my database my table my index my partition
PARTITION "my partition" OF INDEX "my database".public."my table"@"my table_pkey" NULL my database my table my table_pkey my partition
PARTITION x1_idx OF INDEX test.public.t38391@foo NULL test t38391 foo x1_idx
RANGE default default NULL NULL NULL NULL
RANGE liveness liveness NULL NULL NULL NULL
RANGE meta meta NULL NULL NULL NULL
RANGE system system NULL NULL NULL NULL
RANGE timeseries timeseries NULL NULL NULL NULL
TABLE "my database".public."my table" NULL my database my table NULL NULL
TABLE system.public.lease NULL system lease NULL NULL
TABLE system.public.replication_constraint_stats NULL system replication_constraint_stats NULL NULL
TABLE system.public.replication_stats NULL system replication_stats NULL NULL
TABLE system.public.span_stats_tenant_boundaries NULL system span_stats_tenant_boundaries NULL NULL
TABLE system.public.statement_activity NULL system statement_activity NULL NULL
TABLE system.public.statement_statistics NULL system statement_statistics NULL NULL
TABLE system.public.tenant_usage NULL system tenant_usage NULL NULL
TABLE system.public.transaction_activity NULL system transaction_activity NULL NULL
TABLE system.public.transaction_statistics NULL system transaction_statistics NULL NULL
TABLE test.public.t NULL test t NULL NULL
DATABASE "my database" NULL my database NULL NULL NULL
DATABASE system NULL system NULL NULL NULL
INDEX "my database".public."my table"@"my index" NULL my database my table my index NULL
INDEX test.public.t36642@secondary NULL test t36642 secondary NULL
INDEX test.public.t36642@tertiary NULL test t36642 tertiary NULL
INDEX test.public.t36644@secondary NULL test t36644 secondary NULL
INDEX test.public.t36644@tertiary NULL test t36644 tertiary NULL
INDEX test.public.t@secondary NULL test t secondary NULL
INDEX test.public.t@tertiary NULL test t tertiary NULL
PARTITION "my partition" OF INDEX "my database".public."my table"@"my index" NULL my database my table my index my partition
PARTITION "my partition" OF INDEX "my database".public."my table"@"my table_pkey" NULL my database my table my table_pkey my partition
PARTITION x1_idx OF INDEX test.public.t38391@foo NULL test t38391 foo x1_idx
RANGE default default NULL NULL NULL NULL
RANGE liveness liveness NULL NULL NULL NULL
RANGE meta meta NULL NULL NULL NULL
RANGE system system NULL NULL NULL NULL
TABLE "my database".public."my table" NULL my database my table NULL NULL
TABLE system.public.lease NULL system lease NULL NULL
TABLE system.public.replication_constraint_stats NULL system replication_constraint_stats NULL NULL
TABLE system.public.replication_stats NULL system replication_stats NULL NULL
TABLE system.public.span_stats_tenant_boundaries NULL system span_stats_tenant_boundaries NULL NULL
TABLE system.public.statement_activity NULL system statement_activity NULL NULL
TABLE system.public.statement_statistics NULL system statement_statistics NULL NULL
TABLE system.public.tenant_usage NULL system tenant_usage NULL NULL
TABLE system.public.transaction_activity NULL system transaction_activity NULL NULL
TABLE system.public.transaction_statistics NULL system transaction_statistics NULL NULL
TABLE test.public.t NULL test t NULL NULL

# Test the zone information being displayed in SHOW CREATE
statement ok
Expand Down
1 change: 0 additions & 1 deletion pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/testdata/full_translate_named_zones_deleted
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SELECT id FROM system.zones
11
16
17
18
22
25
27
Expand Down
7 changes: 4 additions & 3 deletions pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/testdata/named_zones
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
# RANGE DEFAULT is akin to a full reconciliation.


# ID 18 is for the time series range. At bootstrap, it has an explicit zone
# config which should inherit from RANGE DEFAULT.
# ID 18 is for the time series range which is the only named zone that doesn't
# have an entry in `system.zones` at bootstrap. It should inherit from RANGE
# DEFAULT.
query-sql
SELECT count(*) FROM system.zones WHERE id=18
----
1
0

translate named-zone=timeseries
----
Expand Down
1 change: 0 additions & 1 deletion pkg/cmd/roachtest/tests/gossip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ func runGossipRestartNodeOne(ctx context.Context, t test.Test, c cluster.Cluster
run(`ALTER DATABASE system %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
run(`ALTER RANGE meta %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
run(`ALTER RANGE liveness %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
run(`ALTER RANGE timeseries %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
if t.IsBuildVersion("v19.2.0") {
run(`ALTER TABLE system.replication_stats %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
run(`ALTER TABLE system.replication_constraint_stats %[1]s CONFIGURE ZONE %[2]s 'constraints: {"-rack=0"}'`)
Expand Down
1 change: 0 additions & 1 deletion pkg/kv/kvserver/replicate_queue_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,6 @@ func TestPromoteNonVoterInAddVoter(t *testing.T) {
setConstraintFn("RANGE system", 7, 7, "")
setConstraintFn("RANGE liveness", 7, 7, "")
setConstraintFn("RANGE meta", 7, 7, "")
setConstraintFn("RANGE timeseries", 7, 7, "")
setConstraintFn("RANGE default", 7, 7, "")
testutils.SucceedsSoon(t, func() error {
if err := forceScanOnAllReplicationQueues(tc); err != nil {
Expand Down
6 changes: 1 addition & 5 deletions pkg/kv/kvserver/reports/reporter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,9 @@ func TestCriticalLocalitiesReportIntegration(t *testing.T) {
}
require.Greater(t, len(systemZoneIDs), 0, "expected some system zones, got none")
// Remove the entries in systemZoneIDs that don't get critical locality reports.
// The default range (zoneID=0) does get reports, but since there is no system
// data in the default range that is not part of a more granular zone (e.g.,
// the meta, liveness, timeseries, or system range), there won't be a report
// for it.
i := 0
for j, zid := range systemZoneIDs {
if zoneChangesReplication(&systemZones[j]) && zid != keys.RootNamespaceID {
if zoneChangesReplication(&systemZones[j]) {
systemZoneIDs[i] = zid
i++
}
Expand Down
5 changes: 0 additions & 5 deletions pkg/sql/catalog/bootstrap/metadata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,6 @@ func InitialZoneConfigKVs(
metaRangeZoneConf := protoutil.Clone(defaultSystemZoneConfig).(*zonepb.ZoneConfig)
livenessZoneConf := protoutil.Clone(defaultSystemZoneConfig).(*zonepb.ZoneConfig)

// The timeseries zone is the same as the default zone, but we create it
// explicitly here so it's more clearly reported with SHOW ALL ZONE CONFIGURATIONS.
timeseriesZoneConf := protoutil.Clone(defaultZoneConfig).(*zonepb.ZoneConfig)

// .meta zone config entry with a shorter GC time.
metaRangeZoneConf.GC.TTLSeconds = 60 * 60 // 1h

Expand All @@ -538,7 +534,6 @@ func InitialZoneConfigKVs(
add(keys.MetaRangesID, metaRangeZoneConf)
add(keys.LivenessRangesID, livenessZoneConf)
add(keys.SystemRangesID, systemZoneConf)
add(keys.TimeseriesRangesID, timeseriesZoneConf)
add(keys.SystemDatabaseID, systemZoneConf)
add(keys.ReplicationConstraintStatsTableID, replicationConstraintStatsZoneConf)
add(keys.ReplicationStatsTableID, replicationStatsZoneConf)
Expand Down
3 changes: 1 addition & 2 deletions pkg/sql/catalog/bootstrap/testdata/testdata
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
system hash=4f192396c59085346e3e43f000323964a38c038f3e4b28bab0c09d92bb0ae6eb
system hash=ccfcf37e550c9bceebe02e444e7b9269f7565df315eccde68b1ff384e742c8b8
----
[{"key":"8b"}
,{"key":"8b89898a89","value":"0312450a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d8843d10011800200a"}
Expand Down Expand Up @@ -65,7 +65,6 @@ system hash=4f192396c59085346e3e43f000323964a38c038f3e4b28bab0c09d92bb0ae6eb
,{"key":"8d89938a89","value":"03220308d804500158017800"}
,{"key":"8d89988a89","value":"031080808040188080808002220308901c2805500058007801"}
,{"key":"8d89998a89","value":"031080808040188080808002220308c0702805500058007801"}
,{"key":"8d899a8a89","value":"031080808040188080808002220308c0702803500058007801"}
,{"key":"8d899e8a89","value":"031080808040188080808002220308d8042805500058007801"}
,{"key":"8d89a18a89","value":"03220308d804500158017800"}
,{"key":"8d89a38a89","value":"03220308d804500158017800"}
Expand Down
2 changes: 0 additions & 2 deletions pkg/sql/catalog/internal/catkv/testdata/testdata_system
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@ catalog:
zone: gc.ttlseconds=3600
"017":
zone: gc.ttlseconds=14400
"018":
zone: gc.ttlseconds=14400
"019":
descriptor: relation
namespace: (1, 29, "web_sessions")
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ SELECT 'schema.bar'::regclass::int

statement ok
INSERT INTO system.zones (id, config) VALUES
(18, (SELECT raw_config_protobuf FROM crdb_internal.zones WHERE zone_id = 0)),
($testdb_id, (SELECT raw_config_protobuf FROM crdb_internal.zones WHERE zone_id = 0)),
($testdb_foo_id, (SELECT raw_config_protobuf FROM crdb_internal.zones WHERE zone_id = 0)),
($schema_bar_id, (SELECT raw_config_protobuf FROM crdb_internal.zones WHERE zone_id = 0))
Expand Down
1 change: 0 additions & 1 deletion pkg/sql/logictest/testdata/logic_test/zone_config_system_tenant
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1
11 TABLE system.public.lease
16 RANGE meta
17 RANGE system
18 RANGE timeseries
22 RANGE liveness
25 TABLE system.public.replication_constraint_stats
27 TABLE system.public.replication_stats
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/tests/system_table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestInitialKeys(t *testing.T) {
var nonDescKeys int
if systemTenant {
codec = keys.SystemSQLCodec
nonDescKeys = 17
nonDescKeys = 16
} else {
codec = keys.MakeSQLCodec(roachpb.MustMakeTenantID(5))
nonDescKeys = 8
Expand Down
3 changes: 1 addition & 2 deletions pkg/sql/tests/testdata/initial_keys
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
initial-keys tenant=system
----
131 keys:
130 keys:
/Table/3/1/1/2/1
/Table/3/1/3/2/1
/Table/3/1/4/2/1
Expand Down Expand Up @@ -63,7 +63,6 @@ initial-keys tenant=system
/Table/5/1/11/2/1
/Table/5/1/16/2/1
/Table/5/1/17/2/1
/Table/5/1/18/2/1
/Table/5/1/22/2/1
/Table/5/1/25/2/1
/Table/5/1/27/2/1
Expand Down

0 comments on commit f9d47ce

Please sign in to comment.