You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2010/05/06 10:20:40 UTC
svn commit: r941607 [2/2] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/
lucene/backwards/src/test/org/apache/lucene/analysis/ lucen...
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Thu May 6 08:20:38 2010
@@ -67,6 +67,7 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.MockRAMDirectory;
+import org.apache.lucene.store.NoLockFactory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.store.SingleInstanceLockFactory;
import org.apache.lucene.util.UnicodeUtil;
@@ -775,7 +776,7 @@ public class TestIndexWriter extends Luc
writer.close();
long gen = SegmentInfos.getCurrentSegmentGeneration(dir);
- assertTrue("segment generation should be > 1 but got " + gen, gen > 1);
+ assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
// Make the next segments file, with last byte
// missing, to simulate a writer that crashed while
@@ -835,7 +836,7 @@ public class TestIndexWriter extends Luc
writer.close();
long gen = SegmentInfos.getCurrentSegmentGeneration(dir);
- assertTrue("segment generation should be > 1 but got " + gen, gen > 1);
+ assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
String fileNameIn = SegmentInfos.getCurrentSegmentFileName(dir);
String fileNameOut = IndexFileNames.fileNameFromGeneration(IndexFileNames.SEGMENTS,
@@ -900,7 +901,7 @@ public class TestIndexWriter extends Luc
writer.close();
long gen = SegmentInfos.getCurrentSegmentGeneration(dir);
- assertTrue("segment generation should be > 1 but got " + gen, gen > 1);
+ assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
String[] files = dir.listAll();
for(int i=0;i<files.length;i++) {
@@ -2323,7 +2324,7 @@ public class TestIndexWriter extends Luc
public void testImmediateDiskFull() throws IOException {
MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- dir.setMaxSizeInBytes(dir.getRecomputedActualSizeInBytes());
+ dir.setMaxSizeInBytes(Math.max(1, dir.getRecomputedActualSizeInBytes()));
final Document doc = new Document();
doc.add(new Field("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
try {
@@ -2641,7 +2642,7 @@ public class TestIndexWriter extends Luc
writer.close();
long gen = SegmentInfos.getCurrentSegmentGeneration(dir);
- assertTrue("segment generation should be > 1 but got " + gen, gen > 1);
+ assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
final String segmentsFileName = SegmentInfos.getCurrentSegmentFileName(dir);
IndexInput in = dir.openInput(segmentsFileName);
@@ -2670,7 +2671,8 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
-
+ writer.commit();
+
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -3531,7 +3533,8 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
-
+ writer.commit();
+
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -3582,7 +3585,8 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
-
+ writer.commit();
+
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -3667,6 +3671,7 @@ public class TestIndexWriter extends Luc
dir2 = new MockRAMDirectory();
writer2 = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ writer2.commit();
cms = (ConcurrentMergeScheduler) writer2.getConfig().getMergeScheduler();
readers = new IndexReader[NUM_COPY];
@@ -4820,4 +4825,62 @@ public class TestIndexWriter extends Luc
w.close();
dir.close();
}
+
+ public void testNoCommits() throws Exception {
+ // Tests that if we don't call commit(), the directory has 0 commits. This has
+ // changed since LUCENE-2386, where before IW would always commit on a fresh
+ // new index.
+ Directory dir = new RAMDirectory();
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ try {
+ IndexReader.listCommits(dir);
+ fail("listCommits should have thrown an exception over empty index");
+ } catch (IndexNotFoundException e) {
+ // that's expected !
+ }
+ // No changes still should generate a commit, because it's a new index.
+ writer.close();
+ assertEquals("expected 1 commits!", 1, IndexReader.listCommits(dir).size());
+ }
+
+ public void testEmptyFSDirWithNoLock() throws Exception {
+ // Tests that if FSDir is opened w/ a NoLockFactory (or SingleInstanceLF),
+ // then IndexWriter ctor succeeds. Previously (LUCENE-2386) it failed
+ // when listAll() was called in IndexFileDeleter.
+ FSDirectory dir = FSDirectory.open(new File(TEMP_DIR, "emptyFSDirNoLock"), NoLockFactory.getNoLockFactory());
+ new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))).close();
+ }
+
+ public void testEmptyDirRollback() throws Exception {
+ // Tests that if IW is created over an empty Directory, some documents are
+ // indexed, flushed (but not committed) and then IW rolls back, then no
+ // files are left in the Directory.
+ Directory dir = new MockRAMDirectory();
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(2));
+ // Creating over empty dir should not create any files.
+ assertEquals(0, dir.listAll().length);
+ Document doc = new Document();
+ // create as many files as possible
+ doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ writer.addDocument(doc);
+ // Adding just one document does not call flush yet.
+ assertEquals("only the stored and term vector files should exist in the directory", 5, dir.listAll().length);
+
+ doc = new Document();
+ doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ writer.addDocument(doc);
+ // The second document should cause a flush.
+ assertTrue("flush should have occurred and files created", dir.listAll().length > 5);
+
+ // After rollback, IW should remove all files
+ writer.rollback();
+ assertEquals("no files should exist in the directory after rollback", 0, dir.listAll().length);
+
+ // Since we rolled-back above, that close should be a no-op
+ writer.close();
+ assertEquals("expected a no-op close after IW.rollback()", 0, dir.listAll().length);
+ }
+
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Thu May 6 08:20:38 2010
@@ -750,7 +750,7 @@ public class TestIndexWriterDelete exten
MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter modifier = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
-
+ modifier.commit();
dir.failOn(failure.reset());
for (int i = 0; i < keywords.length; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Thu May 6 08:20:38 2010
@@ -134,6 +134,7 @@ public class TestIndexWriterExceptions e
MockIndexWriter writer = new MockIndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setRAMBufferSizeMB(0.1));
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).setSuppressExceptions();
//writer.setMaxBufferedDocs(10);
+ writer.commit();
if (VERBOSE)
writer.setInfoStream(System.out);
@@ -171,6 +172,7 @@ public class TestIndexWriterExceptions e
MockIndexWriter writer = new MockIndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setRAMBufferSizeMB(0.2));
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).setSuppressExceptions();
//writer.setMaxBufferedDocs(10);
+ writer.commit();
if (VERBOSE)
writer.setInfoStream(System.out);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Thu May 6 08:20:38 2010
@@ -561,6 +561,7 @@ public class TestIndexWriterReader exten
public void testAfterCommit() throws Exception {
Directory dir1 = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir1, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ writer.commit();
writer.setInfoStream(infoStream);
// create the index
@@ -828,4 +829,15 @@ public class TestIndexWriterReader exten
w.close();
dir.close();
}
+
+ public void testEmptyIndex() throws Exception {
+ // Ensures that getReader works on an empty index, which hasn't been committed yet.
+ Directory dir = new MockRAMDirectory();
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ IndexReader r = w.getReader();
+ assertEquals(0, r.numDocs());
+ r.close();
+ w.close();
+ }
+
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Thu May 6 08:20:38 2010
@@ -82,10 +82,7 @@ public class TestNoDeletionPolicy extend
doc.add(new Field("c", "a" + i, Store.YES, Index.ANALYZED));
writer.addDocument(doc);
writer.commit();
- // the reason to expect i + 2 commits is because when IndexWriter is
- // created it creates a first commit. If this ever changes, then the
- // expected should be i + 1 (and this comment removed).
- assertEquals("wrong number of commits !", i + 2, IndexReader.listCommits(dir).size());
+ assertEquals("wrong number of commits !", i + 1, IndexReader.listCommits(dir).size());
}
writer.close();
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Thu May 6 08:20:38 2010
@@ -1,23 +1,4 @@
package org.apache.lucene.index;
-// Intentionally not in org.apache.lucene.index, to assert
-// that we do not require any package private access.
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
import java.util.Collection;
import java.io.File;
@@ -44,8 +25,8 @@ import org.apache.lucene.util._TestUtil;
// http://lucenebook.com
//
-public class TestSnapshotDeletionPolicy extends LuceneTestCase
-{
+public class TestSnapshotDeletionPolicy extends LuceneTestCase {
+
public static final String INDEX_PATH = "test.snapshots";
public void testSnapshotDeletionPolicy() throws Exception {
@@ -118,7 +99,8 @@ public class TestSnapshotDeletionPolicy
TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)).setIndexDeletionPolicy(dp)
.setMaxBufferedDocs(2));
-
+ writer.commit();
+
final Thread t = new Thread() {
@Override
public void run() {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Thu May 6 08:20:38 2010
@@ -122,7 +122,8 @@ public class TestStressIndexing extends
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10).setMergeScheduler(
mergeScheduler));
-
+ modifier.commit();
+
TimedThread[] threads = new TimedThread[4];
int numThread = 0;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Thu May 6 08:20:38 2010
@@ -141,6 +141,7 @@ public class TestStressIndexing2 extends
IndexWriter w = new MockIndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE).setRAMBufferSizeMB(
0.1).setMaxBufferedDocs(maxBufferedDocs));
+ w.commit();
LogMergePolicy lmp = (LogMergePolicy) w.getConfig().getMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestLockFactory.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestLockFactory.java Thu May 6 08:20:38 2010
@@ -82,7 +82,7 @@ public class TestLockFactory extends Luc
NoLockFactory.class.isInstance(dir.getLockFactory()));
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
-
+ writer.commit(); // required so the second open succeed
// Create a 2nd IndexWriter. This is normally not allowed but it should run through since we're not
// using any locks:
IndexWriter writer2 = null;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=941607&r1=941606&r2=941607&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java Thu May 6 08:20:38 2010
@@ -66,17 +66,22 @@ public class TestWindowsMMap extends Luc
new File(TEMP_DIR,"testLuceneMmap").getAbsolutePath();
public void testMmapIndex() throws Exception {
- FSDirectory storeDirectory;
- storeDirectory = new MMapDirectory(new File(storePathname), null);
-
+ // sometimes the directory is not cleaned by rmDir, because on Windows it
+ // may take some time until the files are finally dereferenced. So clean the
+ // directory up front, or otherwise new IndexWriter will fail.
+ File dirPath = new File(storePathname);
+ rmDir(dirPath);
+ MMapDirectory dir = new MMapDirectory(dirPath, null);
+
// plan to add a set of useful stopwords, consider changing some of the
// interior filters.
StandardAnalyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT, Collections.emptySet());
// TODO: something about lock timeouts and leftover locks.
- IndexWriter writer = new IndexWriter(storeDirectory, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer)
.setOpenMode(OpenMode.CREATE));
- IndexSearcher searcher = new IndexSearcher(storeDirectory, true);
+ writer.commit();
+ IndexSearcher searcher = new IndexSearcher(dir, true);
for(int dx = 0; dx < 1000; dx ++) {
String f = randomField();
@@ -87,14 +92,16 @@ public class TestWindowsMMap extends Luc
searcher.close();
writer.close();
- rmDir(new File(storePathname));
+ rmDir(dirPath);
}
- private void rmDir(File dir) {
- File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
- files[i].delete();
- }
- dir.delete();
- }
+ private void rmDir(File dir) {
+ if (!dir.exists()) {
+ return;
+ }
+ for (File file : dir.listFiles()) {
+ file.delete();
+ }
+ dir.delete();
+ }
}
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/lucene_2_4/solr:748824
/lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
Propchange: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 08:20:38 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091