Skip to content

Commit 90e67e4

Browse files
nik9000nik9000
committed
More tests
1 parent 9872f90 commit 90e67e4

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValueSourceReaderTypeConversionTests.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118
import java.util.stream.IntStream;
119119
import java.util.stream.LongStream;
120120

121+
import static org.elasticsearch.compute.lucene.read.ValuesSourceReaderOperatorTests.StatusChecks.multiName;
122+
import static org.elasticsearch.compute.lucene.read.ValuesSourceReaderOperatorTests.StatusChecks.singleName;
121123
import static org.elasticsearch.test.MapMatcher.assertMap;
122124
import static org.elasticsearch.test.MapMatcher.matchesMap;
123125
import static org.elasticsearch.xpack.esql.core.type.DataType.IP;
@@ -1196,13 +1198,13 @@ private static void docValues(
11961198
assertMap(
11971199
"Expected segment count in " + readers + "\n",
11981200
readers,
1199-
matchesMap().entry(name + ":row_stride:BlockDocValuesReader.Singleton" + type, lessThanOrEqualTo(segmentCount))
1201+
matchesMap().entry(name + ":row_stride:" + singleName(type), lessThanOrEqualTo(segmentCount))
12001202
);
12011203
} else {
12021204
assertMap(
12031205
"Expected segment count in " + readers + "\n",
12041206
readers,
1205-
matchesMap().entry(name + ":column_at_a_time:BlockDocValuesReader.Singleton" + type, lessThanOrEqualTo(pageCount))
1207+
matchesMap().entry(name + ":column_at_a_time:" + singleName(type), lessThanOrEqualTo(pageCount))
12061208
);
12071209
}
12081210
}
@@ -1216,19 +1218,19 @@ private static void mvDocValues(
12161218
Map<?, ?> readers
12171219
) {
12181220
if (forcedRowByRow) {
1219-
Integer singletons = (Integer) readers.remove(name + ":row_stride:BlockDocValuesReader.Singleton" + type);
1221+
Integer singletons = (Integer) readers.remove(name + ":row_stride:" + singleName(type));
12201222
if (singletons != null) {
12211223
segmentCount -= singletons;
12221224
}
1223-
assertMap(readers, matchesMap().entry(name + ":row_stride:BlockDocValuesReader." + type, segmentCount));
1225+
assertMap(readers, matchesMap().entry(name + ":row_stride:" + multiName(type), segmentCount));
12241226
} else {
1225-
Integer singletons = (Integer) readers.remove(name + ":column_at_a_time:BlockDocValuesReader.Singleton" + type);
1227+
Integer singletons = (Integer) readers.remove(name + ":column_at_a_time:" + singleName(type));
12261228
if (singletons != null) {
12271229
pageCount -= singletons;
12281230
}
12291231
assertMap(
12301232
readers,
1231-
matchesMap().entry(name + ":column_at_a_time:BlockDocValuesReader." + type, lessThanOrEqualTo(pageCount))
1233+
matchesMap().entry(name + ":column_at_a_time:" + multiName(type), lessThanOrEqualTo(pageCount))
12321234
);
12331235
}
12341236
}

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,16 +1310,13 @@ static void textWithDelegate(boolean forcedRowByRow, int pageCount, int segmentC
13101310
if (forcedRowByRow) {
13111311
assertMap(
13121312
readers,
1313-
matchesMap().entry(
1314-
"text_with_delegate:row_stride:Delegating[to=kwd, impl=BlockDocValuesReader.SingletonOrdinals]",
1315-
segmentCount
1316-
)
1313+
matchesMap().entry("text_with_delegate:row_stride:Delegating[to=kwd, impl=BytesRefsFromOrds.Singleton]", segmentCount)
13171314
);
13181315
} else {
13191316
assertMap(
13201317
readers,
13211318
matchesMap().entry(
1322-
"text_with_delegate:column_at_a_time:Delegating[to=kwd, impl=BlockDocValuesReader.SingletonOrdinals]",
1319+
"text_with_delegate:column_at_a_time:Delegating[to=kwd, impl=BytesRefsFromOrds.Singleton]",
13231320
lessThanOrEqualTo(pageCount)
13241321
)
13251322
);
@@ -1331,15 +1328,15 @@ static void mvTextWithDelegate(boolean forcedRowByRow, int pageCount, int segmen
13311328
assertMap(
13321329
readers,
13331330
matchesMap().entry(
1334-
"mv_text_with_delegate:row_stride:Delegating[to=mv_kwd, impl=BlockDocValuesReader.Ordinals]",
1331+
"mv_text_with_delegate:row_stride:Delegating[to=mv_kwd, impl=BytesRefsFromOrds.SortedSet]",
13351332
equalTo(segmentCount)
13361333
)
13371334
);
13381335
} else {
13391336
assertMap(
13401337
readers,
13411338
matchesMap().entry(
1342-
"mv_text_with_delegate:column_at_a_time:Delegating[to=mv_kwd, impl=BlockDocValuesReader.Ordinals]",
1339+
"mv_text_with_delegate:column_at_a_time:Delegating[to=mv_kwd, impl=BytesRefsFromOrds.SortedSet]",
13431340
lessThanOrEqualTo(pageCount)
13441341
)
13451342
);
@@ -1377,12 +1374,12 @@ private static void docValues(
13771374
if (forcedRowByRow) {
13781375
assertMap(
13791376
readers,
1380-
matchesMap().entry(name + ":row_stride:BlockDocValuesReader.Singleton" + type, lessThanOrEqualTo(segmentCount))
1377+
matchesMap().entry(name + ":row_stride:" + singleName(type), lessThanOrEqualTo(segmentCount))
13811378
);
13821379
} else {
13831380
assertMap(
13841381
readers,
1385-
matchesMap().entry(name + ":column_at_a_time:BlockDocValuesReader.Singleton" + type, lessThanOrEqualTo(pageCount))
1382+
matchesMap().entry(name + ":column_at_a_time:" + singleName(type), lessThanOrEqualTo(pageCount))
13861383
);
13871384
}
13881385
}
@@ -1396,23 +1393,28 @@ private static void mvDocValues(
13961393
Map<?, ?> readers
13971394
) {
13981395
if (forcedRowByRow) {
1399-
Integer singletons = (Integer) readers.remove(name + ":row_stride:BlockDocValuesReader.Singleton" + type);
1396+
Integer singletons = (Integer) readers.remove(name + ":row_stride:" + singleName(type));
14001397
if (singletons != null) {
14011398
segmentCount -= singletons;
14021399
}
1403-
assertMap(readers, matchesMap().entry(name + ":row_stride:BlockDocValuesReader." + type, segmentCount));
1400+
assertMap(readers, matchesMap().entry(name + ":row_stride:" + multiName(type), segmentCount));
14041401
} else {
1405-
Integer singletons = (Integer) readers.remove(name + ":column_at_a_time:BlockDocValuesReader.Singleton" + type);
1402+
Integer singletons = (Integer) readers.remove(name + ":column_at_a_time:" + singleName(type));
14061403
if (singletons != null) {
14071404
pageCount -= singletons;
14081405
}
1409-
assertMap(
1410-
readers,
1411-
matchesMap().entry(name + ":column_at_a_time:BlockDocValuesReader." + type, lessThanOrEqualTo(pageCount))
1412-
);
1406+
assertMap(readers, matchesMap().entry(name + ":column_at_a_time:" + multiName(type), lessThanOrEqualTo(pageCount)));
14131407
}
14141408
}
14151409

1410+
static String singleName(String type) {
1411+
return type.equals("Ordinals") ? "BytesRefsFromOrds.Singleton" : "BlockDocValuesReader.Singleton" + type;
1412+
}
1413+
1414+
static String multiName(String type) {
1415+
return type.equals("Ordinals") ? "BytesRefsFromOrds.SortedSet" : "BlockDocValuesReader." + type;
1416+
}
1417+
14161418
static void id(boolean forcedRowByRow, int pageCount, int segmentCount, Map<?, ?> readers) {
14171419
stored("_id", "Id", forcedRowByRow, pageCount, segmentCount, readers);
14181420
}

0 commit comments

Comments
 (0)