Skip to content

Commit bb8ace1

Browse files
nielsbaumannielsbauman
authored
Merge branch 'main' into fix-rollover-not-found
2 parents 08d520f + 50437e7 commit bb8ace1

File tree

128 files changed

+1763
-1117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1763
-1117
lines changed

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.elasticsearch.compute.data.DoubleVector;
2525
import org.elasticsearch.compute.data.LongBlock;
2626
import org.elasticsearch.compute.data.LongVector;
27+
import org.elasticsearch.compute.data.OrdinalBytesRefVector;
2728
import org.elasticsearch.compute.data.Page;
2829
import org.elasticsearch.compute.operator.DriverContext;
2930
import org.elasticsearch.compute.operator.EvalOperator;
@@ -127,7 +128,9 @@ static void selfTest() {
127128
"mv_min_ascending",
128129
"rlike",
129130
"to_lower",
130-
"to_upper" }
131+
"to_lower_ords",
132+
"to_upper",
133+
"to_upper_ords" }
131134
)
132135
public String operation;
133136

@@ -235,12 +238,12 @@ private static EvalOperator.ExpressionEvaluator evaluator(String operation) {
235238
RLike rlike = new RLike(Source.EMPTY, keywordField, new RLikePattern(".ar"));
236239
yield EvalMapper.toEvaluator(FOLD_CONTEXT, rlike, layout(keywordField)).get(driverContext);
237240
}
238-
case "to_lower" -> {
241+
case "to_lower", "to_lower_ords" -> {
239242
FieldAttribute keywordField = keywordField();
240243
ToLower toLower = new ToLower(Source.EMPTY, keywordField, configuration());
241244
yield EvalMapper.toEvaluator(FOLD_CONTEXT, toLower, layout(keywordField)).get(driverContext);
242245
}
243-
case "to_upper" -> {
246+
case "to_upper", "to_upper_ords" -> {
244247
FieldAttribute keywordField = keywordField();
245248
ToUpper toUpper = new ToUpper(Source.EMPTY, keywordField, configuration());
246249
yield EvalMapper.toEvaluator(FOLD_CONTEXT, toUpper, layout(keywordField)).get(driverContext);
@@ -414,13 +417,15 @@ private static void checkExpected(String operation, Page actual) {
414417
}
415418
}
416419
}
417-
case "to_lower" -> checkBytes(operation, actual, new BytesRef[] { new BytesRef("foo"), new BytesRef("bar") });
418-
case "to_upper" -> checkBytes(operation, actual, new BytesRef[] { new BytesRef("FOO"), new BytesRef("BAR") });
420+
case "to_lower" -> checkBytes(operation, actual, false, new BytesRef[] { new BytesRef("foo"), new BytesRef("bar") });
421+
case "to_lower_ords" -> checkBytes(operation, actual, true, new BytesRef[] { new BytesRef("foo"), new BytesRef("bar") });
422+
case "to_upper" -> checkBytes(operation, actual, false, new BytesRef[] { new BytesRef("FOO"), new BytesRef("BAR") });
423+
case "to_upper_ords" -> checkBytes(operation, actual, true, new BytesRef[] { new BytesRef("FOO"), new BytesRef("BAR") });
419424
default -> throw new UnsupportedOperationException(operation);
420425
}
421426
}
422427

423-
private static void checkBytes(String operation, Page actual, BytesRef[] expectedVals) {
428+
private static void checkBytes(String operation, Page actual, boolean expectOrds, BytesRef[] expectedVals) {
424429
BytesRef scratch = new BytesRef();
425430
BytesRefVector v = actual.<BytesRefBlock>getBlock(1).asVector();
426431
for (int i = 0; i < BLOCK_LENGTH; i++) {
@@ -430,6 +435,15 @@ private static void checkBytes(String operation, Page actual, BytesRef[] expecte
430435
throw new AssertionError("[" + operation + "] expected [" + expected + "] but was [" + b + "]");
431436
}
432437
}
438+
if (expectOrds) {
439+
if (v.asOrdinals() == null) {
440+
throw new IllegalArgumentException("expected ords but got " + v);
441+
}
442+
} else {
443+
if (v.asOrdinals() != null) {
444+
throw new IllegalArgumentException("expected non-ords but got " + v);
445+
}
446+
}
433447
}
434448

435449
private static Page page(String operation) {
@@ -510,6 +524,16 @@ private static Page page(String operation) {
510524
}
511525
yield new Page(builder.build().asBlock());
512526
}
527+
case "to_lower_ords", "to_upper_ords" -> {
528+
var bytes = blockFactory.newBytesRefVectorBuilder(BLOCK_LENGTH);
529+
bytes.appendBytesRef(new BytesRef("foo"));
530+
bytes.appendBytesRef(new BytesRef("bar"));
531+
var ordinals = blockFactory.newIntVectorFixedBuilder(BLOCK_LENGTH);
532+
for (int i = 0; i < BLOCK_LENGTH; i++) {
533+
ordinals.appendInt(i % 2);
534+
}
535+
yield new Page(new OrdinalBytesRefVector(ordinals.build(), bytes.build()).asBlock());
536+
}
513537
default -> throw new UnsupportedOperationException();
514538
};
515539
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ConcatFilesTask.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*/
99
package org.elasticsearch.gradle.internal;
1010

11+
import com.google.common.collect.Iterables;
12+
1113
import org.gradle.api.DefaultTask;
1214
import org.gradle.api.file.FileCollection;
1315
import org.gradle.api.tasks.Input;
@@ -85,7 +87,7 @@ public void setAdditionalLines(List<String> additionalLines) {
8587
public void concatFiles() throws IOException {
8688
if (getHeaderLine() != null) {
8789
getTarget().getParentFile().mkdirs();
88-
Files.write(getTarget().toPath(), (getHeaderLine() + '\n').getBytes(StandardCharsets.UTF_8));
90+
Files.writeString(getTarget().toPath(), getHeaderLine() + '\n');
8991
}
9092

9193
// To remove duplicate lines
@@ -95,11 +97,12 @@ public void concatFiles() throws IOException {
9597
uniqueLines.addAll(Files.readAllLines(f.toPath(), StandardCharsets.UTF_8));
9698
}
9799
}
98-
Files.write(getTarget().toPath(), uniqueLines, StandardCharsets.UTF_8, StandardOpenOption.APPEND);
99-
100-
for (String additionalLine : additionalLines) {
101-
Files.write(getTarget().toPath(), (additionalLine + '\n').getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
102-
}
100+
Files.write(
101+
getTarget().toPath(),
102+
Iterables.concat(uniqueLines, additionalLines),
103+
StandardCharsets.UTF_8,
104+
StandardOpenOption.APPEND
105+
);
103106
}
104107

105108
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void generateDependenciesInfo() throws IOException {
155155
output.append(dep.getGroup() + ":" + dep.getName() + "," + dep.getVersion() + "," + url + "," + licenseType + "\n");
156156
}
157157

158-
Files.write(outputFile.toPath(), output.toString().getBytes("UTF-8"), StandardOpenOption.CREATE);
158+
Files.writeString(outputFile.toPath(), output.toString(), StandardOpenOption.CREATE);
159159
}
160160

161161
@Input

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/doc/RestTestsFromDocSnippetTask.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.File;
2525
import java.io.IOException;
2626
import java.io.PrintWriter;
27+
import java.nio.charset.StandardCharsets;
2728
import java.nio.file.Files;
2829
import java.nio.file.Path;
2930
import java.util.ArrayList;
@@ -440,7 +441,7 @@ private PrintWriter setupCurrent(Snippet test) {
440441
// Now setup the writer
441442
try {
442443
Files.createDirectories(dest.getParent());
443-
current = new PrintWriter(dest.toFile(), "UTF-8");
444+
current = new PrintWriter(dest.toFile(), StandardCharsets.UTF_8);
444445
return current;
445446
} catch (IOException e) {
446447
throw new RuntimeException(e);

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void checkInvalidPermissions() throws IOException {
106106
}
107107

108108
outputMarker.getParentFile().mkdirs();
109-
Files.write(outputMarker.toPath(), "done".getBytes("UTF-8"));
109+
Files.writeString(outputMarker.toPath(), "done");
110110
}
111111

112112
@OutputFile

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void checkInvalidPatterns() throws IOException {
135135

136136
File outputMarker = getOutputMarker();
137137
outputMarker.getParentFile().mkdirs();
138-
Files.write(outputMarker.toPath(), "done".getBytes(StandardCharsets.UTF_8));
138+
Files.writeString(outputMarker.toPath(), "done");
139139
}
140140

141141
@OutputFile

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private String runForbiddenAPIsCli() throws IOException {
364364
}
365365
final String forbiddenApisOutput;
366366
try (ByteArrayOutputStream outputStream = errorOut) {
367-
forbiddenApisOutput = outputStream.toString(StandardCharsets.UTF_8.name());
367+
forbiddenApisOutput = outputStream.toString(StandardCharsets.UTF_8);
368368
}
369369
if (EXPECTED_EXIT_CODES.contains(result.getExitValue()) == false) {
370370
throw new IllegalStateException("Forbidden APIs cli failed: " + forbiddenApisOutput);
@@ -397,7 +397,7 @@ private Set<String> runJdkJarHellCheck() throws IOException {
397397
}
398398
final String jdkJarHellCheckList;
399399
try (ByteArrayOutputStream outputStream = standardOut) {
400-
jdkJarHellCheckList = outputStream.toString(StandardCharsets.UTF_8.name());
400+
jdkJarHellCheckList = outputStream.toString(StandardCharsets.UTF_8);
401401
}
402402
return new TreeSet<>(Arrays.asList(jdkJarHellCheckList.split("\\r?\\n")));
403403
}

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void testConcatenationWithUnique() throws IOException {
6060
file2.getParentFile().mkdirs();
6161
file1.createNewFile();
6262
file2.createNewFile();
63-
Files.write(file1.toPath(), ("Hello" + System.lineSeparator() + "Hello").getBytes(StandardCharsets.UTF_8));
64-
Files.write(file2.toPath(), ("Hello" + System.lineSeparator() + "नमस्ते").getBytes(StandardCharsets.UTF_8));
63+
Files.writeString(file1.toPath(), "Hello" + System.lineSeparator() + "Hello");
64+
Files.writeString(file2.toPath(), "Hello" + System.lineSeparator() + "नमस्ते");
6565

6666
concatFilesTask.setFiles(project.fileTree(file1.getParentFile().getParentFile()));
6767

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private void createFileIn(File parent, String name, String content) throws IOExc
244244
Path file = parent.toPath().resolve(name);
245245
file.toFile().createNewFile();
246246

247-
Files.write(file, content.getBytes(StandardCharsets.UTF_8));
247+
Files.writeString(file, content);
248248
}
249249

250250
private TaskProvider<DependencyLicensesTask> createDependencyLicensesTask(Project project) {

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.Test;
1919

2020
import java.io.File;
21-
import java.nio.charset.Charset;
21+
import java.nio.charset.StandardCharsets;
2222
import java.nio.file.Files;
2323
import java.util.List;
2424
import java.util.stream.Collectors;
@@ -61,7 +61,7 @@ public void testCheckPermissionsWhenNoFileExists() throws Exception {
6161
filePermissionsTask.checkInvalidPermissions();
6262

6363
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions");
64-
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8"));
64+
List<String> result = Files.readAllLines(outputMarker.toPath(), StandardCharsets.UTF_8);
6565
assertEquals("done", result.get(0));
6666
}
6767

@@ -80,7 +80,7 @@ public void testCheckPermissionsWhenNoExecutableFileExists() throws Exception {
8080
filePermissionsTask.checkInvalidPermissions();
8181

8282
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions");
83-
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8"));
83+
List<String> result = Files.readAllLines(outputMarker.toPath(), StandardCharsets.UTF_8);
8484
assertEquals("done", result.get(0));
8585

8686
file.delete();

0 commit comments

Comments
 (0)