jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1430280 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
Date Tue, 08 Jan 2013 13:47:21 GMT
Author: alexparvulescu
Date: Tue Jan  8 13:47:21 2013
New Revision: 1430280

URL: http://svn.apache.org/viewvc?rev=1430280&view=rev
Log:
OAK-154 Full text search index
 - switched to SerialMergeScheduler as a temp workaround for merge errors
 - enabled a new JCR test as the corresponding issue was fixed

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java?rev=1430280&r1=1430279&r2=1430280&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java
(original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java
Tue Jan  8 13:47:21 2013
@@ -38,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.SerialMergeScheduler;
 import org.apache.lucene.search.PrefixQuery;
 import org.apache.tika.exception.TikaException;
 
@@ -51,7 +52,9 @@ class LuceneIndexUpdate implements Close
         ClassLoader loader = thread.getContextClassLoader();
         thread.setContextClassLoader(IndexWriterConfig.class.getClassLoader());
         try {
-            return new IndexWriterConfig(VERSION, ANALYZER);
+            IndexWriterConfig config = new IndexWriterConfig(VERSION, ANALYZER);
+            config.setMergeScheduler(new SerialMergeScheduler());
+            return config;
         } finally {
             thread.setContextClassLoader(loader);
         }

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java?rev=1430280&r1=1430279&r2=1430280&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
(original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java
Tue Jan  8 13:47:21 2013
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.core.query.
 import org.apache.jackrabbit.core.query.JoinTest;
 import org.apache.jackrabbit.core.query.LimitAndOffsetTest;
 import org.apache.jackrabbit.core.query.MixinTest;
+import org.apache.jackrabbit.core.query.OrderByTest;
 import org.apache.jackrabbit.core.query.PathQueryNodeTest;
 import org.apache.jackrabbit.core.query.SQL2NodeLocalNameTest;
 import org.apache.jackrabbit.core.query.SQL2OffsetLimitTest;
@@ -38,23 +39,23 @@ public class QueryJcrTest extends TestCa
     public static Test suite() {
         TestSuite suite = new ConcurrentTestSuite(
                 "Jackrabbit query tests using a Lucene based index");
-        suite.addTestSuite(FulltextQueryTest.class);
-        suite.addTestSuite(SQLTest.class);
-        suite.addTestSuite(JoinTest.class);
-        suite.addTestSuite(SkipDeletedNodesTest.class);
-        suite.addTestSuite(PathQueryNodeTest.class);
-        suite.addTestSuite(FulltextSQL2QueryTest.class);
-        suite.addTestSuite(SQL2NodeLocalNameTest.class);
-        suite.addTestSuite(MixinTest.class);
-        suite.addTestSuite(SQL2OuterJoinTest.class);
-        suite.addTestSuite(SQL2OffsetLimitTest.class);
-        suite.addTestSuite(LimitAndOffsetTest.class);
+         suite.addTestSuite(FulltextQueryTest.class);
+         suite.addTestSuite(SQLTest.class);
+         suite.addTestSuite(JoinTest.class);
+         suite.addTestSuite(SkipDeletedNodesTest.class);
+         suite.addTestSuite(PathQueryNodeTest.class);
+         suite.addTestSuite(FulltextSQL2QueryTest.class);
+         suite.addTestSuite(SQL2NodeLocalNameTest.class);
+         suite.addTestSuite(MixinTest.class);
+         suite.addTestSuite(SQL2OuterJoinTest.class);
+         suite.addTestSuite(SQL2OffsetLimitTest.class);
+         suite.addTestSuite(LimitAndOffsetTest.class);
+        suite.addTestSuite(OrderByTest.class);
 
         // FAILURES
         //
-//         suite.addTestSuite(SQL2OrderByTest.class); // order by score is not stable
+        // suite.addTestSuite(SQL2OrderByTest.class); // order by score is not stable
         // suite.addTestSuite(QueryResultTest.class); // OAK-484
-        // suite.addTestSuite(OrderByTest.class); // OAK-466
         // suite.addTestSuite(ParentNodeTest.class); // OAK-309
         // suite.addTestSuite(ExcerptTest.class); // OAK-318
         // suite.addTestSuite(SimilarQueryTest.class); // OAK-319



Mime
View raw message