@@ -8,7 +8,7 @@ use super::blueprint_display::{
8
8
BpClickhouseServersTableSchema , BpDatasetsTableSchema , BpDiffState ,
9
9
BpGeneration , BpOmicronZonesTableSchema , BpPendingMgsUpdates ,
10
10
BpPhysicalDisksTableSchema , BpTable , BpTableColumn , BpTableData ,
11
- BpTableRow , KvListWithHeading , KvPair , constants:: * , linear_table_modified,
11
+ BpTableRow , KvList , KvPair , constants:: * , linear_table_modified,
12
12
linear_table_unchanged,
13
13
} ;
14
14
use super :: {
@@ -1186,7 +1186,7 @@ impl BpDiffDatasets {
1186
1186
/// there is only a single known blueprint with no before or after collection or
1187
1187
/// bluerpint to compare to.
1188
1188
pub struct ClickhouseClusterConfigDiffTablesForSingleBlueprint {
1189
- pub metadata : KvListWithHeading ,
1189
+ pub metadata : KvList ,
1190
1190
pub keepers : BpTable ,
1191
1191
pub servers : BpTable ,
1192
1192
}
@@ -1220,7 +1220,7 @@ impl ClickhouseClusterConfigDiffTablesForSingleBlueprint {
1220
1220
. collect ( ) ;
1221
1221
1222
1222
let metadata =
1223
- KvListWithHeading :: new ( CLICKHOUSE_CLUSTER_CONFIG_HEADING , rows) ;
1223
+ KvList :: new ( Some ( CLICKHOUSE_CLUSTER_CONFIG_HEADING ) , rows) ;
1224
1224
1225
1225
let keepers = BpTable :: new (
1226
1226
BpClickhouseKeepersTableSchema { } ,
@@ -1259,7 +1259,7 @@ impl From<ClickhouseClusterConfigDiffTablesForSingleBlueprint>
1259
1259
/// `ClickhouseClusterConfig` tables or a `ClickhouseClusterConfig` table and
1260
1260
/// its inventory representation.
1261
1261
pub struct ClickhouseClusterConfigDiffTables {
1262
- pub metadata : KvListWithHeading ,
1262
+ pub metadata : KvList ,
1263
1263
pub keepers : BpTable ,
1264
1264
pub servers : Option < BpTable > ,
1265
1265
}
@@ -1289,8 +1289,8 @@ impl ClickhouseClusterConfigDiffTables {
1289
1289
) ,
1290
1290
)
1291
1291
} ;
1292
- let metadata = KvListWithHeading :: new (
1293
- CLICKHOUSE_CLUSTER_CONFIG_HEADING ,
1292
+ let metadata = KvList :: new (
1293
+ Some ( CLICKHOUSE_CLUSTER_CONFIG_HEADING ) ,
1294
1294
vec ! [
1295
1295
KvPair :: new(
1296
1296
BpDiffState :: Added ,
@@ -1434,8 +1434,8 @@ impl ClickhouseClusterConfigDiffTables {
1434
1434
} ;
1435
1435
}
1436
1436
1437
- let metadata = KvListWithHeading :: new (
1438
- CLICKHOUSE_CLUSTER_CONFIG_HEADING ,
1437
+ let metadata = KvList :: new (
1438
+ Some ( CLICKHOUSE_CLUSTER_CONFIG_HEADING ) ,
1439
1439
vec ! [
1440
1440
diff_row!( generation, GENERATION ) ,
1441
1441
diff_row!( max_used_server_id, CLICKHOUSE_MAX_USED_SERVER_ID ) ,
@@ -1523,8 +1523,8 @@ impl ClickhouseClusterConfigDiffTables {
1523
1523
before : & clickhouse_admin_types:: ClickhouseKeeperClusterMembership ,
1524
1524
) -> Self {
1525
1525
// There's only so much information in a collection. Show what we can.
1526
- let metadata = KvListWithHeading :: new (
1527
- CLICKHOUSE_CLUSTER_CONFIG_HEADING ,
1526
+ let metadata = KvList :: new (
1527
+ Some ( CLICKHOUSE_CLUSTER_CONFIG_HEADING ) ,
1528
1528
vec ! [ KvPair :: new(
1529
1529
BpDiffState :: Removed ,
1530
1530
CLICKHOUSE_HIGHEST_SEEN_KEEPER_LEADER_COMMITTED_LOG_INDEX ,
@@ -1713,7 +1713,7 @@ impl<'diff> BlueprintDiffDisplay<'diff> {
1713
1713
1714
1714
pub fn make_metadata_diff_tables (
1715
1715
& self ,
1716
- ) -> impl IntoIterator < Item = KvListWithHeading > {
1716
+ ) -> impl IntoIterator < Item = KvList > {
1717
1717
macro_rules! diff_row {
1718
1718
( $member: ident, $label: expr) => {
1719
1719
diff_row!( $member, $label, std:: convert:: identity)
@@ -1742,8 +1742,8 @@ impl<'diff> BlueprintDiffDisplay<'diff> {
1742
1742
}
1743
1743
1744
1744
[
1745
- KvListWithHeading :: new (
1746
- COCKROACHDB_HEADING ,
1745
+ KvList :: new (
1746
+ Some ( COCKROACHDB_HEADING ) ,
1747
1747
vec ! [
1748
1748
diff_row!(
1749
1749
cockroachdb_fingerprint,
@@ -1757,8 +1757,8 @@ impl<'diff> BlueprintDiffDisplay<'diff> {
1757
1757
) ,
1758
1758
] ,
1759
1759
) ,
1760
- KvListWithHeading :: new (
1761
- METADATA_HEADING ,
1760
+ KvList :: new (
1761
+ Some ( METADATA_HEADING ) ,
1762
1762
vec ! [
1763
1763
diff_row!( internal_dns_version, INTERNAL_DNS_VERSION ) ,
1764
1764
diff_row!( external_dns_version, EXTERNAL_DNS_VERSION ) ,
@@ -1769,7 +1769,7 @@ impl<'diff> BlueprintDiffDisplay<'diff> {
1769
1769
1770
1770
pub fn make_oximeter_read_diff_tables (
1771
1771
& self ,
1772
- ) -> impl IntoIterator < Item = KvListWithHeading > {
1772
+ ) -> impl IntoIterator < Item = KvList > {
1773
1773
macro_rules! diff_row {
1774
1774
( $member: ident, $label: expr) => {
1775
1775
diff_row!( $member, $label, std:: convert:: identity)
@@ -1799,8 +1799,8 @@ impl<'diff> BlueprintDiffDisplay<'diff> {
1799
1799
} ;
1800
1800
}
1801
1801
1802
- [ KvListWithHeading :: new (
1803
- OXIMETER_HEADING ,
1802
+ [ KvList :: new (
1803
+ Some ( OXIMETER_HEADING ) ,
1804
1804
vec ! [
1805
1805
diff_row!( oximeter_read_version, GENERATION ) ,
1806
1806
diff_row!( oximeter_read_mode, OXIMETER_READ_FROM ) ,
0 commit comments