Skip to content

Commit 3d5bde7

Browse files
joshua-adams-1joshua-adams-1
committed
Addresses nit comments
1 parent 7e17962 commit 3d5bde7

File tree

2 files changed

+32
-48
lines changed

2 files changed

+32
-48
lines changed

‎server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/MetricStatsTests.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,17 @@ protected ClusterBalanceStats.MetricStats mutateInstance(ClusterBalanceStats.Met
4444
}
4545

4646
public void testToXContent() throws IOException {
47-
double total = randomDouble();
48-
double min = randomDouble();
49-
double max = randomDouble();
50-
double average = randomDouble();
51-
double stdDev = randomDouble();
52-
ClusterBalanceStats.MetricStats stats = new ClusterBalanceStats.MetricStats(total, min, max, average, stdDev);
47+
ClusterBalanceStats.MetricStats stats = createRandomMetricStats();
5348

5449
XContentBuilder builder = XContentFactory.jsonBuilder();
5550
builder = stats.toXContent(builder, ToXContent.EMPTY_PARAMS);
5651
// Convert to map for easy assertions
5752
Map<String, Object> map = XContentHelper.convertToMap(BytesReference.bytes(builder), false, builder.contentType()).v2();
5853

59-
assertThat(map.get("total"), equalTo(total));
60-
assertThat(map.get("min"), equalTo(min));
61-
assertThat(map.get("max"), equalTo(max));
62-
assertThat(map.get("average"), equalTo(average));
63-
assertThat(map.get("std_dev"), equalTo(stdDev));
54+
assertThat(map.get("total"), equalTo(stats.total()));
55+
assertThat(map.get("min"), equalTo(stats.min()));
56+
assertThat(map.get("max"), equalTo(stats.max()));
57+
assertThat(map.get("average"), equalTo(stats.average()));
58+
assertThat(map.get("std_dev"), equalTo(stats.stdDev()));
6459
}
6560
}

‎server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/TierBalanceStatsTests.java‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,7 @@ protected ClusterBalanceStats.TierBalanceStats mutateInstance(ClusterBalanceStat
5252

5353
@SuppressWarnings("unchecked")
5454
public void testToXContent() throws IOException {
55-
ClusterBalanceStats.MetricStats shardCount = createRandomMetricStats();
56-
ClusterBalanceStats.MetricStats undesiredShardAllocations = createRandomMetricStats();
57-
ClusterBalanceStats.MetricStats forecastWriteLoad = createRandomMetricStats();
58-
ClusterBalanceStats.MetricStats forecastDiskUsage = createRandomMetricStats();
59-
ClusterBalanceStats.MetricStats actualDiskUsage = createRandomMetricStats();
60-
ClusterBalanceStats.TierBalanceStats tierBalanceStats = new ClusterBalanceStats.TierBalanceStats(
61-
shardCount,
62-
undesiredShardAllocations,
63-
forecastWriteLoad,
64-
forecastDiskUsage,
65-
actualDiskUsage
66-
);
55+
ClusterBalanceStats.TierBalanceStats tierBalanceStats = createRandomTierBalanceStats();
6756

6857
XContentBuilder builder = XContentFactory.jsonBuilder();
6958
builder = tierBalanceStats.toXContent(builder, ToXContent.EMPTY_PARAMS);
@@ -83,42 +72,42 @@ public void testToXContent() throws IOException {
8372

8473
Map<String, Object> shardCountStats = (Map<String, Object>) map.get("shard_count");
8574
assertThat(shardCountStats.keySet(), containsInAnyOrder("total", "average", "min", "max", "std_dev"));
86-
assertEquals(shardCountStats.get("total"), shardCount.total());
87-
assertEquals(shardCountStats.get("average"), shardCount.average());
88-
assertEquals(shardCountStats.get("min"), shardCount.min());
89-
assertEquals(shardCountStats.get("max"), shardCount.max());
90-
assertEquals(shardCountStats.get("std_dev"), shardCount.stdDev());
75+
assertEquals(shardCountStats.get("total"), tierBalanceStats.shardCount().total());
76+
assertEquals(shardCountStats.get("average"), tierBalanceStats.shardCount().average());
77+
assertEquals(shardCountStats.get("min"), tierBalanceStats.shardCount().min());
78+
assertEquals(shardCountStats.get("max"), tierBalanceStats.shardCount().max());
79+
assertEquals(shardCountStats.get("std_dev"), tierBalanceStats.shardCount().stdDev());
9180

9281
Map<String, Object> undesiredShardAllocationCountStats = (Map<String, Object>) map.get("undesired_shard_allocation_count");
9382
assertThat(undesiredShardAllocationCountStats.keySet(), containsInAnyOrder("total", "average", "min", "max", "std_dev"));
94-
assertEquals(undesiredShardAllocationCountStats.get("total"), undesiredShardAllocations.total());
95-
assertEquals(undesiredShardAllocationCountStats.get("average"), undesiredShardAllocations.average());
96-
assertEquals(undesiredShardAllocationCountStats.get("min"), undesiredShardAllocations.min());
97-
assertEquals(undesiredShardAllocationCountStats.get("max"), undesiredShardAllocations.max());
98-
assertEquals(undesiredShardAllocationCountStats.get("std_dev"), undesiredShardAllocations.stdDev());
83+
assertEquals(undesiredShardAllocationCountStats.get("total"), tierBalanceStats.undesiredShardAllocations().total());
84+
assertEquals(undesiredShardAllocationCountStats.get("average"), tierBalanceStats.undesiredShardAllocations().average());
85+
assertEquals(undesiredShardAllocationCountStats.get("min"), tierBalanceStats.undesiredShardAllocations().min());
86+
assertEquals(undesiredShardAllocationCountStats.get("max"), tierBalanceStats.undesiredShardAllocations().max());
87+
assertEquals(undesiredShardAllocationCountStats.get("std_dev"), tierBalanceStats.undesiredShardAllocations().stdDev());
9988

10089
Map<String, Object> forecastWriteLoadStats = (Map<String, Object>) map.get("forecast_write_load");
10190
assertThat(forecastWriteLoadStats.keySet(), containsInAnyOrder("total", "average", "min", "max", "std_dev"));
102-
assertEquals(forecastWriteLoadStats.get("total"), forecastWriteLoad.total());
103-
assertEquals(forecastWriteLoadStats.get("average"), forecastWriteLoad.average());
104-
assertEquals(forecastWriteLoadStats.get("min"), forecastWriteLoad.min());
105-
assertEquals(forecastWriteLoadStats.get("max"), forecastWriteLoad.max());
106-
assertEquals(forecastWriteLoadStats.get("std_dev"), forecastWriteLoad.stdDev());
91+
assertEquals(forecastWriteLoadStats.get("total"), tierBalanceStats.forecastWriteLoad().total());
92+
assertEquals(forecastWriteLoadStats.get("average"), tierBalanceStats.forecastWriteLoad().average());
93+
assertEquals(forecastWriteLoadStats.get("min"), tierBalanceStats.forecastWriteLoad().min());
94+
assertEquals(forecastWriteLoadStats.get("max"), tierBalanceStats.forecastWriteLoad().max());
95+
assertEquals(forecastWriteLoadStats.get("std_dev"), tierBalanceStats.forecastWriteLoad().stdDev());
10796

10897
Map<String, Object> forecastDiskUsageStats = (Map<String, Object>) map.get("forecast_disk_usage");
10998
assertThat(forecastDiskUsageStats.keySet(), containsInAnyOrder("total", "average", "min", "max", "std_dev"));
110-
assertEquals(forecastDiskUsageStats.get("total"), forecastDiskUsage.total());
111-
assertEquals(forecastDiskUsageStats.get("average"), forecastDiskUsage.average());
112-
assertEquals(forecastDiskUsageStats.get("min"), forecastDiskUsage.min());
113-
assertEquals(forecastDiskUsageStats.get("max"), forecastDiskUsage.max());
114-
assertEquals(forecastDiskUsageStats.get("std_dev"), forecastDiskUsage.stdDev());
99+
assertEquals(forecastDiskUsageStats.get("total"), tierBalanceStats.forecastShardSize().total());
100+
assertEquals(forecastDiskUsageStats.get("average"), tierBalanceStats.forecastShardSize().average());
101+
assertEquals(forecastDiskUsageStats.get("min"), tierBalanceStats.forecastShardSize().min());
102+
assertEquals(forecastDiskUsageStats.get("max"), tierBalanceStats.forecastShardSize().max());
103+
assertEquals(forecastDiskUsageStats.get("std_dev"), tierBalanceStats.forecastShardSize().stdDev());
115104

116105
Map<String, Object> actualDiskUsageStats = (Map<String, Object>) map.get("actual_disk_usage");
117106
assertThat(actualDiskUsageStats.keySet(), containsInAnyOrder("total", "average", "min", "max", "std_dev"));
118-
assertEquals(actualDiskUsageStats.get("total"), actualDiskUsage.total());
119-
assertEquals(actualDiskUsageStats.get("average"), actualDiskUsage.average());
120-
assertEquals(actualDiskUsageStats.get("min"), actualDiskUsage.min());
121-
assertEquals(actualDiskUsageStats.get("max"), actualDiskUsage.max());
122-
assertEquals(actualDiskUsageStats.get("std_dev"), actualDiskUsage.stdDev());
107+
assertEquals(actualDiskUsageStats.get("total"), tierBalanceStats.actualShardSize().total());
108+
assertEquals(actualDiskUsageStats.get("average"), tierBalanceStats.actualShardSize().average());
109+
assertEquals(actualDiskUsageStats.get("min"), tierBalanceStats.actualShardSize().min());
110+
assertEquals(actualDiskUsageStats.get("max"), tierBalanceStats.actualShardSize().max());
111+
assertEquals(actualDiskUsageStats.get("std_dev"), tierBalanceStats.actualShardSize().stdDev());
123112
}
124113
}

0 commit comments

Comments
 (0)