Merge branch '1.8'

Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/275e91b2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/275e91b2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/275e91b2

Branch: refs/heads/master
Commit: 275e91b2af96fbcb3a17ba78ef8abc1358cf98a8
Parents: 761b4eb e94cc38
Author: Michael Wall <[email protected]>
Authored: Tue Jun 20 14:25:14 2017 -0400
Committer: Michael Wall <[email protected]>
Committed: Tue Jun 20 14:25:14 2017 -0400

----------------------------------------------------------------------
 .../core/file/rfile/MultiLevelIndex.java        | 43 ++++++++++-
 .../accumulo/core/file/rfile/PrintInfo.java     |  4 +-
 .../apache/accumulo/core/file/rfile/RFile.java  | 79 ++++++++++++++------
 3 files changed, 100 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/275e91b2/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/275e91b2/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 518e5b1,8e388e5..857fd1c
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@@ -56,10 -55,10 +56,12 @@@ public class PrintInfo implements Keywo
      boolean hash = false;
      @Parameter(names = {"--histogram"}, description = "print a histogram of 
the key-value sizes")
      boolean histogram = false;
+     @Parameter(names = {"--printIndex"}, description = "prints information 
about all the index entries")
+     boolean printIndex = false;
      @Parameter(names = {"--useSample"}, description = "Use sample data for 
--dump, --vis, --histogram options")
      boolean useSample = false;
 +    @Parameter(names = {"--summary"}, description = "Print summary data in 
file")
 +    boolean printSummary = false;
      @Parameter(names = {"--keyStats"}, description = "print key length 
statistics for index and all data")
      boolean keyStats = false;
      @Parameter(description = " <file> { <file> ... }")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/275e91b2/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
----------------------------------------------------------------------

Reply via email to