asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ti...@apache.org
Subject asterixdb git commit: 2 small fixes for the transition to jackson
Date Sat, 07 Jan 2017 02:17:15 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master c49405aaf -> 69ab91aae


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>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/69ab91aa
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/69ab91aa
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/69ab91aa

Branch: refs/heads/master
Commit: 69ab91aae0e73e3cc9c4cd387a12529898860eef
Parents: c49405a
Author: Till Westmann <tillw@apache.org>
Authored: Fri Jan 6 16:56:07 2017 -0800
Committer: Till Westmann <tillw@apache.org>
Committed: Fri Jan 6 18:16:46 2017 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/asterix/app/result/ResultPrinter.java | 2 +-
 hyracks-fullstack/hyracks/hyracks-api/pom.xml                      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/69ab91aa/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
----------------------------------------------------------------------
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 @@ public class ResultPrinter {
         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);
             }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/69ab91aa/hyracks-fullstack/hyracks/hyracks-api/pom.xml
----------------------------------------------------------------------
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>


Mime
View raw message