Repository: orc Updated Branches: refs/heads/master 297b149a9 -> 812c27145
ORC-407: Lowerbound and upperbound support in JsonFileDump. A minor touchup that simplifies the code. Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/812c2714 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/812c2714 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/812c2714 Branch: refs/heads/master Commit: 812c27145fe38e1971df1ddfa86aceef949ac53f Parents: 297b149 Author: Owen O'Malley <[email protected]> Authored: Tue Oct 2 09:58:20 2018 -0700 Committer: Owen O'Malley <[email protected]> Committed: Tue Oct 2 09:58:20 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/orc/tools/JsonFileDump.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/812c2714/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java ---------------------------------------------------------------------- diff --git a/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java b/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java index 878cbc8..8813bde 100644 --- a/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java +++ b/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java @@ -319,17 +319,17 @@ public class JsonFileDump { writer.key("sum").value(((DoubleColumnStatistics) cs).getSum()); writer.key("type").value(OrcProto.Type.Kind.DOUBLE); } else if (cs instanceof StringColumnStatistics) { - if(((StringColumnStatistics) cs).getMinimum() == null && - ((StringColumnStatistics) cs).getLowerBound() != null) { - writer.key("lowerBound").value(((StringColumnStatistics) cs).getLowerBound()); - } else { - writer.key("min").value(((StringColumnStatistics) cs).getMinimum()); + String lower = ((StringColumnStatistics) cs).getLowerBound(); + if (((StringColumnStatistics) cs).getMinimum() != null) { + writer.key("min").value(lower); + } else if (lower != null) { + writer.key("lowerBound").value(lower); } - if(((StringColumnStatistics) cs).getMaximum() == null && - ((StringColumnStatistics) cs).getUpperBound() != null) { - writer.key("upperBound").value(((StringColumnStatistics) cs).getUpperBound()); - } else { - writer.key("max").value(((StringColumnStatistics) cs).getMaximum()); + String upper = ((StringColumnStatistics) cs).getUpperBound(); + if (((StringColumnStatistics) cs).getMaximum() != null) { + writer.key("max").value(upper); + } else if (upper != null) { + writer.key("upperBound").value(upper); } writer.key("totalLength").value(((StringColumnStatistics) cs).getSum()); writer.key("type").value(OrcProto.Type.Kind.STRING);
