accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Fri, 20 Sep 2013 20:55:37 GMT
Merge branch '1.5.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 3ad3f8b38f2ac5b1cfeb26edcaa7f014bf13c793
Parents: b02c83f 2c9dee3
Author: Eric Newton <eric.newton@gmail.com>
Authored: Fri Sep 20 16:55:41 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Fri Sep 20 16:55:41 2013 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/tabletserver/Tablet.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ad3f8b3/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index 4e06c1d,a3d3627..bd15958
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@@ -1248,16 -1319,11 +1250,17 @@@ public class Tablet 
     * yet another constructor - this one allows us to avoid costly lookups into the Metadata
table if we already know the files we need - as at split time
     */
    private Tablet(final TabletServer tabletServer, final Text location, final KeyExtent extent,
final TabletResourceManager trm, final Configuration conf,
 -      final FileSystem fs, final List<LogEntry> logEntries, final SortedMap<String,DataFileValue>
datafiles, String time, final TServerInstance lastLocation,
 -      Set<String> scanFiles, long initFlushID, long initCompactID) throws IOException
{
 -    this.location = new Path(ServerConstants.getTablesDir() + "/" + extent.getTableId().toString()
+ location.toString());
 +      final VolumeManager fs, final List<LogEntry> logEntries, final SortedMap<FileRef,DataFileValue>
datafiles, String time,
 +      final TServerInstance lastLocation, Set<FileRef> scanFiles, long initFlushID,
long initCompactID) throws IOException {
 +    Path locationPath;
 +    if (location.find(":") >= 0) {
 +      locationPath = new Path(location.toString());
 +    } else {
 +      locationPath = new Path(ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId().toString()
+ location.toString());
 +    }
 +    this.location = locationPath.makeQualified(fs.getFileSystemByPath(locationPath));
      this.lastLocation = lastLocation;
+     this.tabletDirectory = location.toString();
      this.conf = conf;
      this.acuTableConf = tabletServer.getTableConfiguration(extent);
      


Mime
View raw message