asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Till Westmann (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in asterixdb[master]: 2 small fixes for the transition to jackson
Date Sat, 07 Jan 2017 02:16:51 GMT
Till Westmann has submitted this change and it was merged.

Change subject: 2 small fixes for the transition to jackson
......................................................................


2 small fixes for the transition to jackson

- fix support for atomic results
- remove one version in a POM

Change-Id: I39279a6a9bf8bffcf4c426b47610479030a53b42
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1423
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ceej@lambda.nu>
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
M hyracks-fullstack/hyracks/hyracks-api/pom.xml
2 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Chris Hillery: Looks good to me, approved
  Jenkins: Verified; No violations found



diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
index 5465fbd..9b1a3db 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
@@ -139,7 +139,7 @@
         if (indentJSON) {
             // TODO(tillw): this is inefficient - do this during record generation
             try {
-                record = om.writerWithDefaultPrettyPrinter().writeValueAsString(om.readValue(result,
ObjectNode.class));
+                record = om.writerWithDefaultPrettyPrinter().writeValueAsString(om.readValue(result,
Object.class));
             } catch (IOException e) {
                 throw new HyracksDataException(e);
             }
diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
index c872bea..2c00862 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
@@ -93,7 +93,6 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
   </dependencies>
 </project>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1423
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I39279a6a9bf8bffcf4c426b47610479030a53b42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <tillw@apache.org>
Gerrit-Reviewer: Chris Hillery <ceej@lambda.nu>
Gerrit-Reviewer: Christopher Hillery <ceejatec@gmail.com>
Gerrit-Reviewer: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <tillw@apache.org>

Mime
View raw message