You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/12/11 04:57:13 UTC

svn commit: r1644547 - in /jackrabbit/oak/trunk/oak-lucene: pom.xml src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java

Author: chetanm
Date: Thu Dec 11 03:57:13 2014
New Revision: 1644547

URL: http://svn.apache.org/r1644547
Log:
OAK-2282 - Make current testcases pass with new index implementation

Switching the test runs to use the newer LucenePropertyIndex. Also ignoring those test for which we have explicit bug opened

Modified:
    jackrabbit/oak/trunk/oak-lucene/pom.xml
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java

Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1644547&r1=1644546&r2=1644547&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Thu Dec 11 03:57:13 2014
@@ -86,6 +86,22 @@
       org.apache.jackrabbit.core.query.SimpleQueryTest#testNegativeNumber                            <!-- OAK-327 -->
       org.apache.jackrabbit.core.query.SQL2OrderByTest#testOrderByScore
       org.apache.jackrabbit.core.query.FulltextQueryTest#testMultipleOrExpressions                   <!-- TODO -->
+
+      org.apache.jackrabbit.core.query.SQL2QueryResultTest#testSQL2SelectColums                      <!-- OAK-2340 -->
+
+      org.apache.jackrabbit.core.query.JoinTest#testMultiValuedReferenceJoin                         <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.JoinTest#testJoinWithOR                                       <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.JoinTest#testJoinWithOR2                                      <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.JoinTest#testJoinWithOR3                                      <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.SQL2OuterJoinTest#testOuterJoin                               <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.SQL2OuterJoinTest#testOuterJoinMissingNode                    <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.SQL2OuterJoinTest#testOuterJoinExtraNode                      <!-- OAK-2338 -->
+      org.apache.jackrabbit.core.query.SimpleQueryTest#testLogicalExpression                         <!-- OAK-2338 -->
+
+      org.apache.jackrabbit.core.query.OrderByTest#testOrderByScore                                  <!-- OAK-2339 -->
+      org.apache.jackrabbit.core.query.OrderByTest#testOrderByMVP                                    <!-- OAK-2339 -->
+      org.apache.jackrabbit.core.query.SimpleQueryTest#testSimpleQuerySQL4                           <!-- OAK-2339 -->
+      org.apache.jackrabbit.core.query.SimpleQueryTest#testIsNull                                    <!-- OAK-2339 -->
     </known.issues>
   </properties>
 

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1644547&r1=1644546&r2=1644547&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java Thu Dec 11 03:57:13 2014
@@ -18,8 +18,14 @@ package org.apache.jackrabbit.oak.jcr;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
+import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
 import static org.apache.jackrabbit.JcrConstants.NT_FILE;
+import static org.apache.jackrabbit.oak.api.Type.NAME;
 import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
 
 import java.util.Properties;
 import java.util.Set;
@@ -74,12 +80,29 @@ public class LuceneOakRepositoryStub ext
                     && builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
                 // do nothing
             } else {
-                super.initialize(builder);
-                builder.getChildNode(INDEX_DEFINITIONS_NAME)
-                        .getChildNode(name)
-                         //TODO Remove compat mode once OAK-2278 resolved
-                        .setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
+                NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME).child(name);
+                index.setProperty(JCR_PRIMARYTYPE, INDEX_DEFINITIONS_NODE_TYPE, NAME)
+                        .setProperty(TYPE_PROPERTY_NAME, TYPE_LUCENE)
+                        .setProperty(REINDEX_PROPERTY_NAME, true)
+                        .setProperty(LuceneIndexConstants.TEST_MODE, true)
+                        .setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true)
+                        .setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
+
+                NodeBuilder props = index.child(LuceneIndexConstants.INDEX_RULES)
+                        .child("nt:base")
+                        .child(LuceneIndexConstants.PROP_NODE);
+
+                enableFulltextIndex(props.child("allProps"));
             }
         }
+
+        private void enableFulltextIndex(NodeBuilder propNode){
+            propNode.setProperty(LuceneIndexConstants.PROP_ANALYZED, true)
+                    .setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true)
+                    .setProperty(LuceneIndexConstants.PROP_USE_IN_EXCERPT, true)
+                    .setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true)
+                    .setProperty(LuceneIndexConstants.PROP_NAME, LuceneIndexConstants.REGEX_ALL_PROPS)
+                    .setProperty(LuceneIndexConstants.PROP_IS_REGEX, true);
+        }
     }
 }