more internal refactoring in directory providers

elastic · Sep 22, 2011 · c1ca21f · c1ca21f
1 parent 25fe56c
commit c1ca21f
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 68 deletions.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/DirectoryService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/DirectoryService.java
@@ -27,7 +27,7 @@
  */
 public interface DirectoryService {
 
-    Directory build() throws IOException;
+    Directory[] build() throws IOException;
 
     void renameFile(Directory dir, String from, String to) throws IOException;
 

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/Store.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/Store.java
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.store;
 
+import org.apache.lucene.store.Directory;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -39,14 +40,25 @@ public class StoreFileMetaData implements Streamable {
 
     private String checksum;
 
+    private transient Directory directory;
+
     StoreFileMetaData() {
     }
 
     public StoreFileMetaData(String name, long length, long lastModified, String checksum) {
+        this(name, length, lastModified, checksum, null);
+    }
+
+    public StoreFileMetaData(String name, long length, long lastModified, String checksum, @Nullable Directory directory) {
         this.name = name;
         this.lastModified = lastModified;
         this.length = length;
         this.checksum = checksum;
+        this.directory = directory;
+    }
+
+    public Directory directory() {
+        return this.directory;
     }
 
     public String name() {

diff --git a/.../elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java b/.../elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java
@@ -39,9 +39,9 @@ public class MmapFsDirectoryService extends FsDirectoryService {
         super(shardId, indexSettings, indexStore);
     }
 
-    @Override public Directory build() throws IOException {
+    @Override public Directory[] build() throws IOException {
         File location = indexStore.shardIndexLocation(shardId);
         FileSystemUtils.mkdirs(location);
-        return new MMapDirectory(location, buildLockFactory());
+        return new Directory[]{new MMapDirectory(location, buildLockFactory())};
     }
 }
diff --git a/...s/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java b/...s/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java
@@ -39,9 +39,9 @@ public class NioFsDirectoryService extends FsDirectoryService {
         super(shardId, indexSettings, indexStore);
     }
 
-    @Override public Directory build() throws IOException {
+    @Override public Directory[] build() throws IOException {
         File location = indexStore.shardIndexLocation(shardId);
         FileSystemUtils.mkdirs(location);
-        return new NIOFSDirectory(location, buildLockFactory());
+        return new Directory[]{new NIOFSDirectory(location, buildLockFactory())};
     }
 }
diff --git a/...lasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java b/...lasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java
@@ -39,9 +39,9 @@ public class SimpleFsDirectoryService extends FsDirectoryService {
         super(shardId, indexSettings, indexStore);
     }
 
-    @Override public Directory build() throws IOException {
+    @Override public Directory[] build() throws IOException {
         File location = indexStore.shardIndexLocation(shardId);
         FileSystemUtils.mkdirs(location);
-        return new SimpleFSDirectory(location, buildLockFactory());
+        return new Directory[]{new SimpleFSDirectory(location, buildLockFactory())};
     }
 }
diff --git a/...search/src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java b/...search/src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java
@@ -46,8 +46,8 @@ public class ByteBufferDirectoryService extends AbstractIndexShardComponent impl
         this.byteBufferCache = byteBufferCache;
     }
 
-    @Override public Directory build() {
-        return new CustomByteBufferDirectory(byteBufferCache);
+    @Override public Directory[] build() {
+        return new Directory[]{new CustomByteBufferDirectory(byteBufferCache)};
     }
 
     @Override public void renameFile(Directory dir, String from, String to) throws IOException {

diff --git a/...es/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java b/...es/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java
@@ -40,8 +40,8 @@ public class RamDirectoryService extends AbstractIndexShardComponent implements
         super(shardId, indexSettings);
     }
 
-    @Override public Directory build() {
-        return new CustomRAMDirectory();
+    @Override public Directory[] build() {
+        return new Directory[]{new CustomRAMDirectory()};
     }
 
     @Override public void renameFile(Directory dir, String from, String to) throws IOException {