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 2010/12/19 13:18:45 UTC
svn commit: r1050829 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/src/java/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/search/function/ solr/
Author: mikemccand
Date: Sun Dec 19 12:18:44 2010
New Revision: 1050829
URL: http://svn.apache.org/viewvc?rev=1050829&view=rev
Log:
more verbosity
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1050829&r1=1050828&r2=1050829&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sun Dec 19 12:18:44 2010
@@ -4011,9 +4011,6 @@ public class IndexWriter implements Clos
SegmentInfos sourceSegments = merge.segments;
final int numSegments = sourceSegments.size();
- if (infoStream != null)
- message("merging " + merge.segString(directory));
-
SegmentMerger merger = new SegmentMerger(directory, termIndexInterval, mergedName, merge,
payloadProcessorProvider,
((FieldInfos) docWriter.getFieldInfos().clone()));
@@ -4021,6 +4018,11 @@ public class IndexWriter implements Clos
if (merger.fieldInfos().hasVectors() && merge.mergeDocStores) {
merge.info.setHasVectors(true);
}
+
+ if (infoStream != null) {
+ message("merging " + merge.segString(directory) + " mergeVectors=" + merge.info.getHasVectors());
+ }
+
merge.readers = new SegmentReader[numSegments];
merge.readersClone = new SegmentReader[numSegments];
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1050829&r1=1050828&r2=1050829&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Sun Dec 19 12:18:44 2010
@@ -184,6 +184,7 @@ public class TestConcurrentMergeSchedule
writer = new IndexWriter(directory, newIndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(2));
+ writer.setInfoStream(VERBOSE ? System.out : null);
}
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java?rev=1050829&r1=1050828&r2=1050829&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java Sun Dec 19 12:18:44 2010
@@ -93,6 +93,9 @@ public class FunctionTestSetup extends L
@Before
public void setUp() throws Exception {
super.setUp();
+ if (VERBOSE) {
+ System.out.println("TEST: setUp");
+ }
// prepare a small index with just a few documents.
dir = newDirectory();
anlzr = new StandardAnalyzer(TEST_VERSION_CURRENT);
@@ -102,6 +105,7 @@ public class FunctionTestSetup extends L
iw.w.setMaxBufferedDocs(_TestUtil.nextInt(random, 2, 7));
}
+ iw.w.setInfoStream(VERBOSE ? System.out : null);
// add docs not exactly in natural ID order, to verify we do check the order of docs by scores
int remaining = N_DOCS;
boolean done[] = new boolean[N_DOCS];
@@ -116,9 +120,15 @@ public class FunctionTestSetup extends L
remaining --;
}
if (!doMultiSegment) {
+ if (VERBOSE) {
+ System.out.println("TEST: setUp optimize");
+ }
iw.optimize();
}
iw.close();
+ if (VERBOSE) {
+ System.out.println("TEST: setUp done close");
+ }
}
private void addDoc(RandomIndexWriter iw, int i) throws Exception {