You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/02/20 19:47:22 UTC
svn commit: r1661189 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/
lucene/core/src/test/org/apache/lucene/index/ lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/store/...
Author: rmuir
Date: Fri Feb 20 18:47:21 2015
New Revision: 1661189
URL: http://svn.apache.org/r1661189
Log:
LUCENE-6266: Remove unnecessary Directory parameters from SIS/SIPC/SI
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Fri Feb 20 18:47:21 2015
@@ -102,6 +102,9 @@ API Changes
* LUCENE-6268: Replace FieldValueFilter and DocValuesRangeFilter with equivalent
queries that support approximations. (Adrien Grand)
+* LUCENE-6266: Remove unnecessary Directory params from SegmentInfo.toString,
+ SegmentInfos.files/toString, and SegmentCommitInfo.toString. (Robert Muir)
+
Other
* LUCENE-6248: Remove unused odd constants from StandardSyntaxParser.jj
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java Fri Feb 20 18:47:21 2015
@@ -340,7 +340,7 @@ class BufferedUpdatesStream implements A
} else {
dir = null;
}
- infoStream.message("BD", "prune sis=" + segmentInfos.toString(dir) + " minGen=" + minGen + " packetCount=" + updates.size());
+ infoStream.message("BD", "prune sis=" + segmentInfos + " minGen=" + minGen + " packetCount=" + updates.size());
}
final int limit = updates.size();
for(int delIDX=0;delIDX<limit;delIDX++) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java Fri Feb 20 18:47:21 2015
@@ -583,7 +583,7 @@ final class IndexFileDeleter implements
}
// Save files so we can decr on next checkpoint/commit:
- lastFiles.addAll(segmentInfos.files(directory, false));
+ lastFiles.addAll(segmentInfos.files(false));
}
if (infoStream.isEnabled("IFD")) {
long t1 = System.nanoTime();
@@ -595,7 +595,7 @@ final class IndexFileDeleter implements
assert locked();
// If this is a commit point, also incRef the
// segments_N file:
- for(final String fileName: segmentInfos.files(directory, isCommit)) {
+ for(final String fileName: segmentInfos.files(isCommit)) {
incRef(fileName);
}
}
@@ -670,7 +670,7 @@ final class IndexFileDeleter implements
void decRef(SegmentInfos segmentInfos) throws IOException {
assert locked();
- decRef(segmentInfos.files(directory, false));
+ decRef(segmentInfos.files(false));
}
public boolean exists(String fileName) {
@@ -802,7 +802,7 @@ final class IndexFileDeleter implements
userData = segmentInfos.getUserData();
segmentsFileName = segmentInfos.getSegmentsFileName();
generation = segmentInfos.getGeneration();
- files = Collections.unmodifiableCollection(segmentInfos.files(directory, true));
+ files = Collections.unmodifiableCollection(segmentInfos.files(true));
segmentCount = segmentInfos.size();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Fri Feb 20 18:47:21 2015
@@ -1489,7 +1489,7 @@ public class IndexWriter implements Clos
// for test purpose
final synchronized Collection<String> getIndexFileNames() throws IOException {
- return segmentInfos.files(directory, true);
+ return segmentInfos.files(true);
}
// for test purpose
@@ -2694,7 +2694,7 @@ public class IndexWriter implements Clos
// we are trying to sync all referenced files, a
// merge completes which would otherwise have
// removed the files we are now syncing.
- filesToCommit = toCommit.files(directory, false);
+ filesToCommit = toCommit.files(false);
deleter.incRef(filesToCommit);
}
success = true;
@@ -4142,7 +4142,7 @@ public class IndexWriter implements Clos
*
* @lucene.internal */
public synchronized String segString(SegmentCommitInfo info) {
- return info.toString(info.info.dir, numDeletedDocs(info) - info.getDelCount());
+ return info.toString(numDeletedDocs(info) - info.getDelCount());
}
private synchronized void doWait() {
@@ -4175,7 +4175,7 @@ public class IndexWriter implements Clos
// called only from assert
private boolean filesExist(SegmentInfos toSync) throws IOException {
- Collection<String> files = toSync.files(directory, false);
+ Collection<String> files = toSync.files(false);
for(final String fileName: files) {
assert slowFileExists(directory, fileName): "file " + fileName + " does not exist; files=" + Arrays.toString(directory.listAll());
// If this trips it means we are missing a call to
@@ -4280,7 +4280,7 @@ public class IndexWriter implements Clos
boolean success = false;
final Collection<String> filesToSync;
try {
- filesToSync = toSync.files(directory, false);
+ filesToSync = toSync.files(false);
directory.sync(filesToSync);
success = true;
} finally {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java Fri Feb 20 18:47:21 2015
@@ -345,10 +345,19 @@ public class SegmentCommitInfo {
}
this.delCount = delCount;
}
+
+ /**
+ * Returns a description of this segment.
+ * @deprecated Use {@link #toString(int)} instead.
+ */
+ @Deprecated
+ public String toString(Directory dir, int pendingDelCount) {
+ return toString(pendingDelCount);
+ }
/** Returns a description of this segment. */
- public String toString(Directory dir, int pendingDelCount) {
- String s = info.toString(dir, delCount + pendingDelCount);
+ public String toString(int pendingDelCount) {
+ String s = info.toString(delCount + pendingDelCount);
if (delGen != -1) {
s += ":delGen=" + delGen;
}
@@ -363,7 +372,7 @@ public class SegmentCommitInfo {
@Override
public String toString() {
- return toString(info.dir, 0);
+ return toString(0);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Fri Feb 20 18:47:21 2015
@@ -169,7 +169,18 @@ public final class SegmentInfo {
@Override
public String toString() {
- return toString(dir, 0);
+ return toString(0);
+ }
+
+
+ /**
+ * Used for debugging.
+ *
+ * @deprecated Use {@link #toString(int)} instead.
+ */
+ @Deprecated
+ public String toString(Directory dir, int delCount) {
+ return toString(delCount);
}
/** Used for debugging. Format may suddenly change.
@@ -182,15 +193,12 @@ public final class SegmentInfo {
* has 45 documents; it has 4 deletions (this part is
* left off when there are no deletions).</p>
*/
- public String toString(Directory dir, int delCount) {
+ public String toString(int delCount) {
StringBuilder s = new StringBuilder();
s.append(name).append('(').append(version == null ? "?" : version).append(')').append(':');
char cfs = getUseCompoundFile() ? 'c' : 'C';
s.append(cfs);
- if (this.dir != dir) {
- s.append('x');
- }
s.append(docCount);
if (delCount != 0) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Fri Feb 20 18:47:21 2015
@@ -707,13 +707,20 @@ public final class SegmentInfos implemen
}
write(dir);
}
+
+ /**
+ * Returns all file names referenced by SegmentInfo.
+ * @deprecated Use {@link #files(boolean)} instead.
+ */
+ @Deprecated
+ public final Collection<String> files(Directory dir, boolean includeSegmentsFile) throws IOException {
+ return files(includeSegmentsFile);
+ }
- /** Returns all file names referenced by SegmentInfo
- * instances matching the provided Directory (ie files
- * associated with any "external" segments are skipped).
+ /** Returns all file names referenced by SegmentInfo.
* The returned collection is recomputed on each
* invocation. */
- public Collection<String> files(Directory dir, boolean includeSegmentsFile) throws IOException {
+ public Collection<String> files(boolean includeSegmentsFile) throws IOException {
HashSet<String> files = new HashSet<>();
if (includeSegmentsFile) {
final String segmentFileName = getSegmentsFileName();
@@ -724,10 +731,7 @@ public final class SegmentInfos implemen
final int size = size();
for(int i=0;i<size;i++) {
final SegmentCommitInfo info = info(i);
- assert info.info.dir == dir;
- if (info.info.dir == dir) {
- files.addAll(info.files());
- }
+ files.addAll(info.files());
}
return files;
@@ -768,9 +772,19 @@ public final class SegmentInfos implemen
prepareCommit(dir);
finishCommit(dir);
}
+
+ /**
+ * Returns readable description of this segment.
+ * @deprecated Use {@link #toString()} instead.
+ */
+ @Deprecated
+ public String toString(Directory dir) {
+ return toString();
+ }
/** Returns readable description of this segment. */
- public String toString(Directory directory) {
+ @Override
+ public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append(getSegmentsFileName()).append(": ");
final int count = size();
@@ -779,7 +793,7 @@ public final class SegmentInfos implemen
buffer.append(' ');
}
final SegmentCommitInfo info = info(i);
- buffer.append(info.toString(directory, 0));
+ buffer.append(info.toString(0));
}
return buffer.toString();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Fri Feb 20 18:47:21 2015
@@ -232,7 +232,7 @@ public final class SegmentReader extends
public String toString() {
// SegmentInfo.toString takes dir and number of
// *pending* deletions; so we reverse compute that here:
- return si.toString(si.info.dir, si.info.getDocCount() - numDocs - si.getDelCount());
+ return si.toString(si.info.getDocCount() - numDocs - si.getDelCount());
}
/**
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Fri Feb 20 18:47:21 2015
@@ -393,7 +393,7 @@ final class StandardDirectoryReader exte
segmentsFileName = infos.getSegmentsFileName();
this.dir = dir;
userData = infos.getUserData();
- files = Collections.unmodifiableCollection(infos.files(dir, true));
+ files = Collections.unmodifiableCollection(infos.files(true));
generation = infos.getGeneration();
segmentCount = infos.size();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java Fri Feb 20 18:47:21 2015
@@ -241,7 +241,7 @@ public class TestDemoParallelLeafReader
@Override
public void close() throws IOException {
w.close();
- if (DEBUG) System.out.println("TEST: after close writer index=" + SegmentInfos.readLatestCommit(indexDir).toString(indexDir));
+ if (DEBUG) System.out.println("TEST: after close writer index=" + SegmentInfos.readLatestCommit(indexDir));
/*
DirectoryReader r = mgr.acquire();
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Fri Feb 20 18:47:21 2015
@@ -824,7 +824,7 @@ public class MockDirectoryWrapper extend
}
try {
- Set<String> ghosts = new HashSet<>(sis.files(in, false));
+ Set<String> ghosts = new HashSet<>(sis.files(false));
for (String s : ghosts) {
if (endSet.contains(s) && !startSet.contains(s)) {
assert pendingDeletions.contains(s);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1661189&r1=1661188&r2=1661189&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Fri Feb 20 18:47:21 2015
@@ -584,7 +584,7 @@ public class SnapPuller {
private boolean hasUnusedFiles(Directory indexDir, IndexCommit commit) throws IOException {
String segmentsFileName = commit.getSegmentsFileName();
SegmentInfos infos = SegmentInfos.readCommit(indexDir, segmentsFileName);
- Set<String> currentFiles = new HashSet<>(infos.files(indexDir, true));
+ Set<String> currentFiles = new HashSet<>(infos.files(true));
String[] allFiles = indexDir.listAll();
for (String file : allFiles) {
if (!file.equals(segmentsFileName) && !currentFiles.contains(file) && !file.endsWith(".lock")) {