accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [12/12] git commit: ACCUMULO-2057 caused ACCUMULO-2074 ACCUMULO-2075; copy-paste-error, re-adding the patch from ACCUMULO-2057 back into master
Date Fri, 20 Dec 2013 16:10:46 GMT
ACCUMULO-2057 caused ACCUMULO-2074 ACCUMULO-2075; copy-paste-error, re-adding the patch from
ACCUMULO-2057 back into master


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

Branch: refs/heads/master
Commit: 551c6507d5f558fe45aad30b2de42dbf5c3005e0
Parents: 322ee05 6bf68ed
Author: Eric Newton <eric.newton@gmail.com>
Authored: Fri Dec 20 11:10:52 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Fri Dec 20 11:10:52 2013 -0500

----------------------------------------------------------------------
 bin/config.sh                                   |  5 +++
 .../accumulo/core/client/ZooKeeperInstance.java |  5 +--
 .../monitor/util/celltypes/TableLinkType.java   | 15 ++++++++-
 .../org/apache/accumulo/tserver/Tablet.java     | 19 ++++++------
 .../apache/accumulo/tserver/TabletServer.java   |  6 ++--
 .../accumulo/test/ConditionalWriterIT.java      | 32 ++++++++++----------
 6 files changed, 50 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/551c6507/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 7daa21a,d904037..5e9f5ab
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@@ -1079,10 -1079,9 +1079,9 @@@ public class Tablet 
      this(tabletServer, location, extent, trm, CachedConfiguration.getInstance(), tabletsKeyValues);
      splitCreationTime = 0;
    }
--
-   public Tablet(TabletServer tabletServer, Text location, KeyExtent extent, TabletResourceManager
trm, SortedMap<FileRef,DataFileValue> datafiles, String time,
-       long initFlushID, long initCompactID) throws IOException {
-     this(tabletServer, location, extent, trm, CachedConfiguration.getInstance(), datafiles,
time, initFlushID, initCompactID);
++  
+   public Tablet(KeyExtent extent, TabletServer tabletServer, TabletResourceManager trm,
SplitInfo info) throws IOException {
 -    this(tabletServer, new Text(info.dir), extent, trm, CachedConfiguration.getInstance(),
info.datafiles, info.time, info.initFlushID, info.initCompactID, info.lastLocation);
++    this(tabletServer, new Text(info.dir), extent, trm, CachedConfiguration.getInstance(),
info.datafiles, info.time, info.initFlushID, info.initCompactID, info.lastLocation); 
      splitCreationTime = System.currentTimeMillis();
    }
  
@@@ -1094,8 -1093,8 +1093,8 @@@
    static private final List<LogEntry> EMPTY = Collections.emptyList();
  
    private Tablet(TabletServer tabletServer, Text location, KeyExtent extent, TabletResourceManager
trm, Configuration conf,
-       SortedMap<FileRef,DataFileValue> datafiles, String time, long initFlushID, long
initCompactID) throws IOException {
-     this(tabletServer, location, extent, trm, conf, VolumeManagerImpl.get(), EMPTY, datafiles,
time, null, new HashSet<FileRef>(), initFlushID, initCompactID);
 -      SortedMap<FileRef,DataFileValue> datafiles, String time, long initFlushID, long
initCompactID, TServerInstance last) throws IOException {
 -    this(tabletServer, location, extent, trm, conf, VolumeManagerImpl.get(), EMPTY, datafiles,
time, last, new HashSet<FileRef>(), initFlushID, initCompactID);
++      SortedMap<FileRef,DataFileValue> datafiles, String time, long initFlushID, long
initCompactID, TServerInstance lastLocation) throws IOException {
++    this(tabletServer, location, extent, trm, conf, VolumeManagerImpl.get(), EMPTY, datafiles,
time, lastLocation, new HashSet<FileRef>(), initFlushID, initCompactID);
    }
  
    private static String lookupTime(AccumuloConfiguration conf, KeyExtent extent, SortedMap<Key,Value>
tabletsKeyValues) {
@@@ -3572,8 -3573,8 +3573,8 @@@
  
        log.log(TLevel.TABLET_HIST, extent + " split " + low + " " + high);
  
-       newTablets.put(high, new SplitInfo(tabletDirectory, highDatafileSizes, time, lastFlushID,
lastCompactID));
-       newTablets.put(low, new SplitInfo(lowDirectory, lowDatafileSizes, time, lastFlushID,
lastCompactID));
 -      newTablets.put(high, new SplitInfo(tabletDirectory, highDatafileSizes, time, lastFlushID,
lastCompactID, this.lastLocation));
 -      newTablets.put(low, new SplitInfo(lowDirectory, lowDatafileSizes, time, lastFlushID,
lastCompactID, this.lastLocation));
++      newTablets.put(high, new SplitInfo(tabletDirectory, highDatafileSizes, time, lastFlushID,
lastCompactID, lastLocation));
++      newTablets.put(low, new SplitInfo(lowDirectory, lowDatafileSizes, time, lastFlushID,
lastCompactID, lastLocation));
  
        long t2 = System.currentTimeMillis();
  


Mime
View raw message