svn commit: r1026446 - in /lucene/dev/trunk/solr/src/java/org/apache/solr/core: MMapDirectoryFactory.java SimpleFSDirectoryFactory.java

[gs...@apache.org]

Author: gsingers
Date: Fri Oct 22 18:49:12 2010
New Revision: 1026446

URL: http://svn.apache.org/viewvc?rev=1026446&view=rev
Log:
SOLR-2187: Add support for directly instantiating MMapDirectory, SimpleFSDirectory

Added:
    lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java

Added: lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java?rev=1026446&view=auto
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java (added)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java Fri Oct 22 18:49:12 2010
@@ -0,0 +1,67 @@
+package org.apache.solr.core;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.MMapDirectory;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.NamedList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ *  Directly provide MMapDirectory instead of relying on {@link org.apache.lucene.store.FSDirectory#open}
+ *
+ * Can set the following parameters:
+ * <ul>
+ *  <li>unmap -- See {@link org.apache.lucene.store.MMapDirectory#setUseUnmap(boolean)}</li>
+ *  <li>maxChunkSize -- The Max chunk size.  See {@link org.apache.lucene.store.MMapDirectory#setMaxChunkSize(int)}</li>
+ * </ul>
+ *
+ **/
+public class MMapDirectoryFactory extends DirectoryFactory {
+  private transient static Logger log = LoggerFactory.getLogger(MMapDirectoryFactory.class);
+  boolean unmapHack;
+  private int maxChunk;
+
+  @Override
+  public Directory open(String path) throws IOException {
+    MMapDirectory mapDirectory = new MMapDirectory(new File(path));
+    try {
+      mapDirectory.setUseUnmap(unmapHack);
+    } catch (Exception e) {
+      log.warn("Unmap not supported on this JVM, continuing on without setting unmap", e);
+    }
+    mapDirectory.setMaxChunkSize(maxChunk);
+    return mapDirectory;
+  }
+
+  @Override
+  public void init(NamedList args) {
+    SolrParams params = SolrParams.toSolrParams( args );
+    maxChunk = params.getInt("maxChunkSize", MMapDirectory.DEFAULT_MAX_BUFF);
+    if (maxChunk <= 0){
+      throw new IllegalArgumentException("maxChunk must be greater than 0");
+    }
+    unmapHack = params.getBool("unmap", true);
+  }
+}

Added: lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java?rev=1026446&view=auto
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java (added)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java Fri Oct 22 18:49:12 2010
@@ -0,0 +1,36 @@
+package org.apache.solr.core;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.SimpleFSDirectory;
+
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ * Factory to instantiate {@link org.apache.lucene.store.SimpleFSDirectory}
+ *
+ **/
+public class SimpleFSDirectoryFactory extends DirectoryFactory {
+
+  @Override
+  public Directory open(String path) throws IOException {
+    return new SimpleFSDirectory(new File(path));
+  }
+}