[asterixdb] 02/02: Merge commit '111dc14' from 'stabilization-f69489' into 'master'

[mblow]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 1d19aff4ae10744faa0f05c742b71f0bd0153d58
Merge: 845615a 111dc14
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Feb 8 10:26:07 2019 -0500

    Merge commit '111dc14' from 'stabilization-f69489' into 'master'
    
    Change-Id: I5963cc6bc2f821d438ff54f836df831dd7c1a6c5

 .../asterix/test/common/ResultExtractor.java       |   7 +-
 .../test/common/SingleLinePrettyPrinter.java       | 405 ---------------------
 .../results/json/int01-cleanjson/int01.1.json      |   3 +-
 .../results/json/int01-losslessjson/int01.1.json   |   9 +-
 .../json/issue-ASTERIXDB-1165/nullablefield.1.json |   3 +-
 .../results/numeric/non-finite/non-finite.1.json   |   7 +-
 6 files changed, 17 insertions(+), 417 deletions(-)

diff --cc 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
index 8b61508,37e1213..705624a
--- 
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,8 -108,7 +107,7 @@@ public class ResultExtractor 
      }
  
      private static InputStream extract(InputStream resultStream, 
EnumSet<ResultField> resultFields) throws Exception {
 -        final String resultStr = IOUtils.toString(resultStream, 
Charset.defaultCharset());
 +        final String resultStr = IOUtils.toString(resultStream, 
StandardCharsets.UTF_8);
-         final PrettyPrinter singleLine = new SingleLinePrettyPrinter();
          final ObjectNode result = OBJECT_MAPPER.readValue(resultStr, 
ObjectNode.class);
  
          LOGGER.debug("+++++++\n" + result + "\n+++++++\n");