Skip to content

Commit 638dea9

Browse files
authored
Fix MemoryTracking...ArraysTests bulkSet errors (#113934) (#113936)
Backports the following commits to 8.x: - Fix MemoryTracking...ArraysTests bulkSet errors (#113934)
1 parent b6432e9 commit 638dea9

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

server/src/test/java/org/elasticsearch/search/aggregations/metrics/MemoryTrackingTDigestArraysTests.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,29 @@ public void testIntResize() {
8484
}
8585

8686
public void testIntBulkSet() {
87-
int initialSize = randomIntBetween(10, 1000);
88-
int sourceArraySize = randomIntBetween(0, initialSize);
87+
int targetArraySize = randomIntBetween(10, 1000);
88+
int sourceArraySize = randomIntBetween(0, 1000);
8989

90-
try (TDigestIntArray array = intArray(initialSize); TDigestIntArray source = intArray(sourceArraySize)) {
91-
assertThat(array.size(), equalTo(initialSize));
90+
try (TDigestIntArray target = intArray(targetArraySize); TDigestIntArray source = intArray(sourceArraySize)) {
91+
assertThat(target.size(), equalTo(targetArraySize));
9292
assertThat(source.size(), equalTo(sourceArraySize));
9393

9494
int value = randomInt();
9595
for (int i = 0; i < sourceArraySize; i++) {
9696
source.set(i, value);
9797
}
9898

99-
int initialOffset = randomIntBetween(0, initialSize - sourceArraySize);
100-
int sourceOffset = randomIntBetween(0, sourceArraySize - 1);
101-
int elementsToCopy = randomIntBetween(1, sourceArraySize - sourceOffset);
99+
int targetOffset = randomIntBetween(0, targetArraySize);
100+
int sourceOffset = randomIntBetween(0, sourceArraySize);
101+
int elementsToCopy = randomIntBetween(0, Math.min(sourceArraySize - sourceOffset, targetArraySize - targetOffset));
102102

103-
array.set(initialOffset, source, sourceOffset, elementsToCopy);
103+
target.set(targetOffset, source, sourceOffset, elementsToCopy);
104104

105-
for (int i = 0; i < initialSize; i++) {
106-
if (i < initialOffset || i >= initialOffset + elementsToCopy) {
107-
assertThat(array.get(i), equalTo(0));
105+
for (int i = 0; i < targetArraySize; i++) {
106+
if (i < targetOffset || i >= targetOffset + elementsToCopy) {
107+
assertThat(target.get(i), equalTo(0));
108108
} else {
109-
assertThat(array.get(i), equalTo(value));
109+
assertThat(target.get(i), equalTo(value));
110110
}
111111
}
112112
}
@@ -289,29 +289,29 @@ public void testDoubleAdd() {
289289
}
290290

291291
public void testDoubleBulkSet() {
292-
int initialSize = randomIntBetween(10, 1000);
293-
int sourceArraySize = randomIntBetween(0, initialSize);
292+
int targetArraySize = randomIntBetween(10, 1000);
293+
int sourceArraySize = randomIntBetween(0, 1000);
294294

295-
try (TDigestDoubleArray array = doubleArray(initialSize); TDigestDoubleArray source = doubleArray(sourceArraySize)) {
296-
assertThat(array.size(), equalTo(initialSize));
295+
try (TDigestDoubleArray target = doubleArray(targetArraySize); TDigestDoubleArray source = doubleArray(sourceArraySize)) {
296+
assertThat(target.size(), equalTo(targetArraySize));
297297
assertThat(source.size(), equalTo(sourceArraySize));
298298

299299
double value = randomDoubleBetween(-Double.MAX_VALUE, Double.MAX_VALUE, true);
300300
for (int i = 0; i < sourceArraySize; i++) {
301301
source.set(i, value);
302302
}
303303

304-
int initialOffset = randomIntBetween(0, initialSize - sourceArraySize);
305-
int sourceOffset = randomIntBetween(0, sourceArraySize - 1);
306-
int elementsToCopy = randomIntBetween(1, sourceArraySize - sourceOffset);
304+
int targetOffset = randomIntBetween(0, targetArraySize);
305+
int sourceOffset = randomIntBetween(0, sourceArraySize);
306+
int elementsToCopy = randomIntBetween(0, Math.min(sourceArraySize - sourceOffset, targetArraySize - targetOffset));
307307

308-
array.set(initialOffset, source, sourceOffset, elementsToCopy);
308+
target.set(targetOffset, source, sourceOffset, elementsToCopy);
309309

310-
for (int i = 0; i < initialSize; i++) {
311-
if (i < initialOffset || i >= initialOffset + elementsToCopy) {
312-
assertThat(array.get(i), equalTo(0.0));
310+
for (int i = 0; i < targetArraySize; i++) {
311+
if (i < targetOffset || i >= targetOffset + elementsToCopy) {
312+
assertThat(target.get(i), equalTo(0.0));
313313
} else {
314-
assertThat(array.get(i), equalTo(value));
314+
assertThat(target.get(i), equalTo(value));
315315
}
316316
}
317317
}

0 commit comments

Comments
 (0)