Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-8853: Don't return a FileSwitchDirectory when asked for a FS directory.

This commit is contained in:
Adrien Grand 2019-06-18 17:05:18 +02:00
parent ed42d36c7b
commit 2e468abecc
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
View File

@ -1416,11 +1416,7 @@ public abstract class LuceneTestCase extends Assert {
Directory fsdir = newFSDirectoryImpl(clazz, f, lf); Directory fsdir = newFSDirectoryImpl(clazz, f, lf);
if (rarely()) { if (rarely()) {
List<String> fileExtensions =
Arrays.asList("fdt", "fdx", "tim", "tip", "si", "fnm", "pos", "dii", "dim", "nvm", "nvd", "dvm", "dvd");
Collections.shuffle(fileExtensions, random());
fileExtensions = fileExtensions.subList(0, 1 + random().nextInt(fileExtensions.size()));
fsdir = new FileSwitchDirectory(new HashSet<>(fileExtensions), fsdir, newFSDirectoryImpl(clazz, f, lf), true);
} }
BaseDirectoryWrapper wrapped = wrapDirectory(random(), fsdir, bare); BaseDirectoryWrapper wrapped = wrapDirectory(random(), fsdir, bare);
return wrapped; return wrapped;
@ -1430,6 +1426,14 @@ public abstract class LuceneTestCase extends Assert {
} }
} }
private static Directory newFileSwitchDirectory(Random random, Directory dir1, Directory dir2) {
List<String> fileExtensions =
Arrays.asList("fdt", "fdx", "tim", "tip", "si", "fnm", "pos", "dii", "dim", "nvm", "nvd", "dvm", "dvd");
Collections.shuffle(fileExtensions, random);
fileExtensions = fileExtensions.subList(0, 1 + random.nextInt(fileExtensions.size()));
return new FileSwitchDirectory(new HashSet<>(fileExtensions), dir1, dir2, true);
}
/** /**
* Returns a new Directory instance, using the specified random * Returns a new Directory instance, using the specified random
* with contents copied from the provided directory. See * with contents copied from the provided directory. See
@ -1632,6 +1636,16 @@ public abstract class LuceneTestCase extends Assert {
if (clazzName.equals("random")) { if (clazzName.equals("random")) {
if (rarely(random)) { if (rarely(random)) {
clazzName = RandomPicks.randomFrom(random, CORE_DIRECTORIES); clazzName = RandomPicks.randomFrom(random, CORE_DIRECTORIES);
} else if (rarely(random)) {
String clazzName1 = rarely(random)
? RandomPicks.randomFrom(random, CORE_DIRECTORIES)
: ByteBuffersDirectory.class.getName();
String clazzName2 = rarely(random)
? RandomPicks.randomFrom(random, CORE_DIRECTORIES)
: ByteBuffersDirectory.class.getName();
return newFileSwitchDirectory(random,
newDirectoryImpl(random, clazzName1, lf),
newDirectoryImpl(random, clazzName2, lf));
} else { } else {
clazzName = ByteBuffersDirectory.class.getName(); clazzName = ByteBuffersDirectory.class.getName();
} }