svn commit: r1510893 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: query/ast/FullTextSearchImpl.java spi/query/Filter.java

[thomasm]

Author: thomasm
Date: Tue Aug  6 09:58:01 2013
New Revision: 1510893

URL: http://svn.apache.org/r1510893
Log:
OAK-890 Query: advanced fulltext search conditions (javadocs, small 
improvements)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1510893&r1=1510892&r2=1510893&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
 Tue Aug  6 09:58:01 2013
@@ -176,17 +176,12 @@ public class FullTextSearchImpl extends 
 
     @Override
     public boolean evaluate() {
-        if (OAK_890_ADVANCED_FT_SEARCH) {
-            // the LuceneIndex implementation doesn't currently support
-            // queries that search for words *within* fields; the
-            // field value must match exactly
-        } else {
-            // disable evaluation if a fulltext index is used, as
-            // we don't know what exact options are used in the fulltext index
-            // (stop word, special characters,...)
-            if (selector.index instanceof FulltextQueryIndex) {
-                return true;
-            }
+        // disable evaluation if a fulltext index is used,
+        // to avoid running out of memory if the node is large,
+        // and because we might not implement all features
+        // such as index aggregation
+        if (selector.index instanceof FulltextQueryIndex) {
+            return true;
         }
         
         StringBuilder buff = new StringBuilder();

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java?rev=1510893&r1=1510892&r2=1510893&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
 Tue Aug  6 09:58:01 2013
@@ -52,6 +52,7 @@ public interface Filter {
     /**
      * Get the fulltext search conditions, if any.
      *
+     * @deprecated
      * @return the conditions (an empty collection if not used)
      */
     Collection<String> getFulltextConditions();