You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/09/15 01:27:16 UTC
svn commit: r1624925 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java
Author: uschindler
Date: Sun Sep 14 23:27:15 2014
New Revision: 1624925
URL: http://svn.apache.org/r1624925
Log:
Merged revision(s) 1624924 from lucene/dev/trunk:
Don't use a SimpleFSLockFactory for RAMDirectoryFactory in Solr (fails tests in trunk)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java?rev=1624925&r1=1624924&r2=1624925&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java Sun Sep 14 23:27:15 2014
@@ -187,10 +187,10 @@ public class CachingDirectoryFactoryTest
if (tracker == null) {
tracker = new Tracker();
tracker.path = path;
- tracker.dir = df.get(path, DirContext.DEFAULT, null);
+ tracker.dir = df.get(path, DirContext.DEFAULT, "single");
dirs.put(path, tracker);
} else {
- tracker.dir = df.get(path, DirContext.DEFAULT, null);
+ tracker.dir = df.get(path, DirContext.DEFAULT, "single");
}
tracker.refCnt.incrementAndGet();
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java?rev=1624925&r1=1624924&r2=1624925&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java Sun Sep 14 23:27:15 2014
@@ -43,8 +43,8 @@ public class RAMDirectoryFactoryTest ext
}
};
String path = "/fake/path";
- Directory dir1 = factory.get(path, DirContext.DEFAULT, null);
- Directory dir2 = factory.get(path, DirContext.DEFAULT, null);
+ Directory dir1 = factory.get(path, DirContext.DEFAULT, "single");
+ Directory dir2 = factory.get(path, DirContext.DEFAULT, "single");
assertEquals("RAMDirectoryFactory should not create new instance of RefCntRamDirectory " +
"every time open() is called for the same path", dir1, dir2);
@@ -54,7 +54,7 @@ public class RAMDirectoryFactoryTest ext
private void dotestOpenSucceedForEmptyDir() throws IOException {
RAMDirectoryFactory factory = new RAMDirectoryFactory();
- Directory dir = factory.get("/fake/path", DirContext.DEFAULT, null);
+ Directory dir = factory.get("/fake/path", DirContext.DEFAULT, "single");
assertNotNull("RAMDirectoryFactory should create RefCntRamDirectory even if the path doen't lead " +
"to index directory on the file system", dir);
factory.release(dir);