accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Mon, 25 Aug 2014 16:10:21 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java


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

Branch: refs/heads/master
Commit: 5c48ec8a3032088df85cf09e34651add1e873195
Parents: 21d3c88 3d3d301
Author: Keith Turner <kturner@apache.org>
Authored: Mon Aug 25 12:01:23 2014 -0400
Committer: Keith Turner <kturner@apache.org>
Committed: Mon Aug 25 12:01:23 2014 -0400

----------------------------------------------------------------------
 .../system/SourceSwitchingIterator.java         |  2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    | 61 +++++++++++++-------
 .../accumulo/tserver/InMemoryMapTest.java       | 44 ++++++++++++++
 3 files changed, 85 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c48ec8a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index 999bd68,5f6d9ce..b3d0b92
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@@ -542,6 -550,17 +552,17 @@@ public class InMemoryMap 
        return this;
      }
      
+     private synchronized FileSKVIterator getReader() throws IOException {
+       if (reader == null) {
+         Configuration conf = CachedConfiguration.getInstance();
+         FileSystem fs = TraceFileSystem.wrap(FileSystem.getLocal(conf));
+         
 -        reader = new RFileOperations().openReader(memDumpFile, true, fs, conf, ServerConfiguration.getSiteConfiguration());
++        reader = new RFileOperations().openReader(memDumpFile, true, fs, conf, SiteConfiguration.getInstance());
+       }
+ 
+       return reader;
+     }
+ 
      @Override
      public SortedKeyValueIterator<Key,Value> iterator() throws IOException {
        if (iter == null)


Mime
View raw message