You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/07/06 20:22:43 UTC

[4/4] accumulo git commit: ACCUMULO-3339 comments, formatting

ACCUMULO-3339 comments, formatting


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

Branch: refs/heads/master
Commit: 3e5acd5b54cea7d1fb88ba8199f3d06bf47812ef
Parents: 0e9f2b0
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Jul 6 14:22:29 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Jul 6 14:22:29 2015 -0400

----------------------------------------------------------------------
 .../accumulo/tserver/tablet/TabletData.java     | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3e5acd5b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
index a076284..cb9015e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
@@ -56,6 +56,9 @@ import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/*
+ * Basic information needed to create a tablet.
+ */
 public class TabletData {
   private static Logger log = LoggerFactory.getLogger(TabletData.class);
 
@@ -67,10 +70,10 @@ public class TabletData {
   private long compactID = -1;
   private TServerInstance lastLocation = null;
   private Map<Long,List<FileRef>> bulkImported = new HashMap<>();
-  private String directory = null;
   private long splitTime = 0;
+  private String directory = null;
 
-  // read tablet data from metadata tables
+  // Read tablet data from metadata tables
   public TabletData(KeyExtent extent, VolumeManager fs, Iterator<Entry<Key,Value>> entries) {
     final Text family = new Text();
     Text rowName = extent.getMetadataEntry();
@@ -118,11 +121,11 @@ public class TabletData {
     }
   }
 
-  // read basic root table metadata from zookeeper
+  // Read basic root table metadata from zookeeper
   public TabletData(VolumeManager fs, ZooReader rdr) throws IOException {
     Path location = new Path(MetadataTableUtil.getRootTabletDir());
 
-    // cleanUpFiles() has special handling for deleting files
+    // cleanReplacement() has special handling for deleting files
     FileStatus[] files = fs.listStatus(location);
     Collection<String> goodPaths = RootFiles.cleanupReplacement(fs, files, true);
     for (String good : goodPaths) {
@@ -140,9 +143,14 @@ public class TabletData {
     directory = MetadataTableUtil.getRootTabletDir();
   }
 
-  // split
-  public TabletData(String tabletDirectory, SortedMap<FileRef,DataFileValue> highDatafileSizes, String time, long lastFlushID, long lastCompactID,
-      TServerInstance lastLocation, Map<Long,List<FileRef>> bulkIngestedFiles) {
+  // Data pulled from an existing tablet to make a split
+  public TabletData(String tabletDirectory,
+      SortedMap<FileRef,DataFileValue> highDatafileSizes,
+      String time,
+      long lastFlushID,
+      long lastCompactID,
+      TServerInstance lastLocation,
+      Map<Long,List<FileRef>> bulkIngestedFiles) {
     this.directory = tabletDirectory;
     this.dataFiles = highDatafileSizes;
     this.time = time;