You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/05/26 21:38:15 UTC
svn commit: r1681827 - in /lucene/dev/branches/LUCENE-6481/lucene:
core/src/java/org/apache/lucene/index/ core/src/test/org/apache/lucene/index/
queries/src/java/org/apache/lucene/queries/
Author: mikemccand
Date: Tue May 26 19:38:15 2015
New Revision: 1681827
URL: http://svn.apache.org/r1681827
Log:
LUCENE-6481: woops
Modified:
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/LUCENE-6481/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
Modified: lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1681827&r1=1681826&r2=1681827&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Tue May 26 19:38:15 2015
@@ -631,7 +631,6 @@ public final class SegmentInfos implemen
void updateGeneration(SegmentInfos other) {
lastGeneration = other.lastGeneration;
generation = other.generation;
- System.out.println("UPDATE GEN: " + lastGeneration + " " + generation);
}
void setGeneration(long generation) {
@@ -713,7 +712,6 @@ public final class SegmentInfos implemen
pendingCommit = false;
lastGeneration = generation;
- System.out.println("finishCommit: " + lastGeneration);
return dest;
}
Modified: lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1681827&r1=1681826&r2=1681827&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Tue May 26 19:38:15 2015
@@ -400,7 +400,6 @@ final class StandardDirectoryReader exte
userData = infos.getUserData();
files = Collections.unmodifiableCollection(infos.files(true));
generation = infos.getGeneration();
- System.out.println("getGen: " + generation);
segmentCount = infos.size();
}
Modified: lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1681827&r1=1681826&r2=1681827&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Tue May 26 19:38:15 2015
@@ -2721,25 +2721,5 @@ public class TestIndexWriter extends Luc
r.close();
dir.close();
}
-
- public void testCommitWithNRTReader() throws Exception {
- Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
- IndexWriter w = new IndexWriter(dir, iwc);
- w.commit();
- DirectoryReader r = DirectoryReader.open(w, true);
- System.out.println("R: " + r.getIndexCommit().getGeneration());
- w.addDocument(new Document());
- w.commit();
- DirectoryReader r2 = DirectoryReader.openIfChanged(r);
- assertNotNull(r2);
- System.out.println("R2: " + r2.getIndexCommit().getGeneration());
- w.addDocument(new Document());
- w.commit();
- DirectoryReader r3 = DirectoryReader.openIfChanged(r2);
- assertNotNull(r3);
- System.out.println("R3: " + r3.getIndexCommit().getGeneration());
- IOUtils.close(r, r2, r3, w, dir);
- }
}
Modified: lucene/dev/branches/LUCENE-6481/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java?rev=1681827&r1=1681826&r2=1681827&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java Tue May 26 19:38:15 2015
@@ -20,6 +20,8 @@ package org.apache.lucene.queries;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -197,6 +199,11 @@ public class TermsQuery extends Query im
return BASE_RAM_BYTES_USED + termData.ramBytesUsed();
}
+ @Override
+ public Collection<Accountable> getChildResources() {
+ return Collections.emptyList();
+ }
+
private static class TermAndState {
final String field;
final TermsEnum termsEnum;