Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3216
Change subject: Merge commit 'ee67a43' from 'stabilization-f69489' into 'master'
......................................................................
Merge commit 'ee67a43' from 'stabilization-f69489' into 'master'
Change-Id: I2895436bd8a0de9a467409895f5363a7e8109b80
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
1 file changed, 4 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/16/3216/1
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index f0dcb8b..2f158e7 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -187,8 +187,10 @@
public TestExecutor(List<InetSocketAddress> endpoints) {
this.endpoints = endpoints;
- this.allCharsets = Charset.availableCharsets().values().stream()
- .filter(c -> canEncodeDecode(c,
"\n\t\\[]{}'\"")).collect(Collectors.toList());
+ allCharsets = Stream
+ .of("UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE", "UTF-32",
"UTF-32BE", "UTF-32LE", "x-UTF-32BE-BOM",
+ "x-UTF-32LE-BOM", "x-UTF-16LE-BOM")
+
.filter(Charset::isSupported).map(Charset::forName).collect(Collectors.toList());
}
public void setLibrarian(IExternalUDFLibrarian librarian) {
@@ -664,13 +666,6 @@
return next;
}
}
-<<<<<<< HEAD (d8da7b Merge commit '5543132' from 'stabilization-f69489' into
'mas)
-=======
- List<Charset> allCharsets = Stream
- .of("UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE",
"UTF-32", "UTF-32BE", "UTF-32LE",
- "x-UTF-32BE-BOM", "x-UTF-32LE-BOM",
"x-UTF-16LE-BOM")
-
.filter(Charset::isSupported).map(Charset::forName).collect(Collectors.toList());
->>>>>>> BRANCH (ee67a4 [NO ISSUE][TEST] Only use UTF Accept-Charsets)
Collections.shuffle(allCharsets);
charsetsRemaining.addAll(allCharsets);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/3216
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2895436bd8a0de9a467409895f5363a7e8109b80
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
