Skip to content

Commit d31c2e8

Browse files
committed
Remove ramBytesUsed reference in test
1 parent 41dec6d commit d31c2e8

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,14 @@ public void testIndexingPressure() throws Exception {
616616

617617
IndexingPressure.Coordinating coordinatingIndexingPressure = indexingPressure.getCoordinating();
618618
assertThat(coordinatingIndexingPressure, notNullValue());
619-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc0Source));
620-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc1Source));
621-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc2Source));
622-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc3Source));
623-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc4Source));
624-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc0UpdateSource));
619+
verify(coordinatingIndexingPressure).increment(1, length(doc0Source));
620+
verify(coordinatingIndexingPressure).increment(1, length(doc1Source));
621+
verify(coordinatingIndexingPressure).increment(1, length(doc2Source));
622+
verify(coordinatingIndexingPressure).increment(1, length(doc3Source));
623+
verify(coordinatingIndexingPressure).increment(1, length(doc4Source));
624+
verify(coordinatingIndexingPressure).increment(1, length(doc0UpdateSource));
625625
if (useLegacyFormat == false) {
626-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc1UpdateSource));
626+
verify(coordinatingIndexingPressure).increment(1, length(doc1UpdateSource));
627627
}
628628

629629
verify(coordinatingIndexingPressure, times(useLegacyFormat ? 6 : 7)).increment(eq(0), longThat(l -> l > 0));
@@ -720,7 +720,7 @@ public void testIndexingPressureTripsOnInferenceRequestGeneration() throws Excep
720720

721721
IndexingPressure.Coordinating coordinatingIndexingPressure = indexingPressure.getCoordinating();
722722
assertThat(coordinatingIndexingPressure, notNullValue());
723-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc1Source));
723+
verify(coordinatingIndexingPressure).increment(1, length(doc1Source));
724724
verify(coordinatingIndexingPressure, times(1)).increment(anyInt(), anyLong());
725725

726726
// Verify that the coordinating indexing pressure is maintained through downstream action filters
@@ -759,7 +759,7 @@ public void testIndexingPressureTripsOnInferenceRequestGeneration() throws Excep
759759
public void testIndexingPressureTripsOnInferenceResponseHandling() throws Exception {
760760
final XContentBuilder doc1Source = IndexRequest.getXContentBuilder(XContentType.JSON, "sparse_field", "bar");
761761
final InstrumentedIndexingPressure indexingPressure = new InstrumentedIndexingPressure(
762-
Settings.builder().put(MAX_COORDINATING_BYTES.getKey(), (bytesUsed(doc1Source) + 1) + "b").build()
762+
Settings.builder().put(MAX_COORDINATING_BYTES.getKey(), (length(doc1Source) + 1) + "b").build()
763763
);
764764

765765
final InferenceStats inferenceStats = new InferenceStats(mock(), mock());
@@ -802,7 +802,7 @@ public void testIndexingPressureTripsOnInferenceResponseHandling() throws Except
802802

803803
IndexingPressure.Coordinating coordinatingIndexingPressure = indexingPressure.getCoordinating();
804804
assertThat(coordinatingIndexingPressure, notNullValue());
805-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc1Source));
805+
verify(coordinatingIndexingPressure).increment(1, length(doc1Source));
806806
verify(coordinatingIndexingPressure).increment(eq(0), longThat(l -> l > 0));
807807
verify(coordinatingIndexingPressure, times(2)).increment(anyInt(), anyLong());
808808

@@ -862,14 +862,14 @@ public void testIndexingPressurePartialFailure() throws Exception {
862862
);
863863
XContentBuilder builder = XContentFactory.jsonBuilder();
864864
semanticTextField.toXContent(builder, EMPTY_PARAMS);
865-
return bytesUsed(builder);
865+
return length(builder);
866866
};
867867

868868
final InstrumentedIndexingPressure indexingPressure = new InstrumentedIndexingPressure(
869869
Settings.builder()
870870
.put(
871871
MAX_COORDINATING_BYTES.getKey(),
872-
(bytesUsed(doc1Source) + bytesUsed(doc2Source) + estimateInferenceResultsBytes.apply(List.of("bar"), barEmbedding)
872+
(length(doc1Source) + length(doc2Source) + estimateInferenceResultsBytes.apply(List.of("bar"), barEmbedding)
873873
+ (estimateInferenceResultsBytes.apply(List.of("bazzz"), bazzzEmbedding) / 2)) + "b"
874874
)
875875
.build()
@@ -913,8 +913,8 @@ public void testIndexingPressurePartialFailure() throws Exception {
913913

914914
IndexingPressure.Coordinating coordinatingIndexingPressure = indexingPressure.getCoordinating();
915915
assertThat(coordinatingIndexingPressure, notNullValue());
916-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc1Source));
917-
verify(coordinatingIndexingPressure).increment(1, bytesUsed(doc2Source));
916+
verify(coordinatingIndexingPressure).increment(1, length(doc1Source));
917+
verify(coordinatingIndexingPressure).increment(1, length(doc2Source));
918918
verify(coordinatingIndexingPressure, times(2)).increment(eq(0), longThat(l -> l > 0));
919919
verify(coordinatingIndexingPressure, times(4)).increment(anyInt(), anyLong());
920920

@@ -1124,8 +1124,8 @@ private static BulkItemRequest[] randomBulkItemRequest(
11241124
new BulkItemRequest(requestId, new IndexRequest("index").source(expectedDocMap, requestContentType)) };
11251125
}
11261126

1127-
private static long bytesUsed(XContentBuilder builder) {
1128-
return BytesReference.bytes(builder).ramBytesUsed();
1127+
private static long length(XContentBuilder builder) {
1128+
return BytesReference.bytes(builder).length();
11291129
}
11301130

11311131
@SuppressWarnings({ "unchecked" })

0 commit comments

Comments
 (0)