Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3164
Change subject: Merge commit '111dc14' from 'stabilization-f69489' into 'master'
......................................................................
Merge commit '111dc14' from 'stabilization-f69489' into 'master'
Change-Id: I5963cc6bc2f821d438ff54f836df831dd7c1a6c5
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/64/3164/1
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
index 790494b..705624a 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
@@ -107,12 +107,7 @@
}
private static InputStream extract(InputStream resultStream,
EnumSet<ResultField> resultFields) throws Exception {
-<<<<<<< HEAD (845615 [ASTERIXDB-2514] Fix BigInt display in formatted JSON)
final String resultStr = IOUtils.toString(resultStream,
StandardCharsets.UTF_8);
- final PrettyPrinter singleLine = new SingleLinePrettyPrinter();
-=======
- final String resultStr = IOUtils.toString(resultStream,
Charset.defaultCharset());
->>>>>>> BRANCH (111dc1 [NO ISSUE] Remove un-neccessary Jackson printer)
final ObjectNode result = OBJECT_MAPPER.readValue(resultStr,
ObjectNode.class);
LOGGER.debug("+++++++\n" + result + "\n+++++++\n");
--
To view, visit https://asterix-gerrit.ics.uci.edu/3164
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5963cc6bc2f821d438ff54f836df831dd7c1a6c5
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
