Author: thomasm
Date: Wed Sep 2 10:19:04 2015
New Revision: 1700755
URL: http://svn.apache.org/r1700755
Log:
OAK-3281 Test failures on trunk: SolrIndexQueryTestIT.sql2
Modified:
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Modified:
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1700755&r1=1700754&r2=1700755&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Wed Sep 2 10:19:04 2015
@@ -47,6 +47,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
+import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -130,9 +131,12 @@ public class SolrQueryIndex implements F
}
// property restriction OR native language property restriction
defined AND property restriction handled
- if (filter.getPropertyRestrictions() != null &&
filter.getPropertyRestrictions().size() > 0
- && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
|| filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
- || configuration.useForPropertyRestrictions()) &&
!hasIgnoredProperties(filter.getPropertyRestrictions(), configuration)) {
+ if (filter.getPropertyRestrictions() != null
+ && filter.getPropertyRestrictions().size() > 0
+ && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
+ || filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
+ || configuration.useForPropertyRestrictions())
+ && !hasIgnoredProperties(filter.getPropertyRestrictions(),
configuration)) {
match++;
}
@@ -434,6 +438,7 @@ public class SolrQueryIndex implements F
|| (configuration.getUsedProperties().size() > 0 &&
!configuration.getUsedProperties().contains(propertyName)) // not explicitly
contained in the used properties
|| propertyName.contains("/") // no child-level
property restrictions
|| "rep:excerpt".equals(propertyName) // rep:excerpt
is handled by the query engine
+ ||
QueryConstants.RESTRICTION_LOCAL_NAME.equals(propertyName)
||
configuration.getIgnoredProperties().contains(propertyName));
}
Modified:
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1700755&r1=1700754&r2=1700755&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Wed Sep 2 10:19:04 2015
@@ -45,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
+import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -127,9 +128,12 @@ public class SolrQueryIndex implements F
}
// property restriction OR native language property restriction
defined AND property restriction handled
- if (filter.getPropertyRestrictions() != null &&
filter.getPropertyRestrictions().size() > 0
- && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
|| filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
- || configuration.useForPropertyRestrictions()) &&
!hasIgnoredProperties(filter.getPropertyRestrictions(), configuration)) {
+ if (filter.getPropertyRestrictions() != null
+ && filter.getPropertyRestrictions().size() > 0
+ && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
+ || filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
+ || configuration.useForPropertyRestrictions())
+ && !hasIgnoredProperties(filter.getPropertyRestrictions(),
configuration)) {
match++;
}
@@ -431,6 +435,7 @@ public class SolrQueryIndex implements F
|| (configuration.getUsedProperties().size() > 0 &&
!configuration.getUsedProperties().contains(propertyName)) // not explicitly
contained in the used properties
|| propertyName.contains("/") // no child-level
property restrictions
|| "rep:excerpt".equals(propertyName) // rep:excerpt
is handled by the query engine
+ ||
QueryConstants.RESTRICTION_LOCAL_NAME.equals(propertyName)
||
configuration.getIgnoredProperties().contains(propertyName));
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1700755&r1=1700754&r2=1700755&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Wed Sep 2 10:19:04 2015
@@ -45,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
+import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -127,9 +128,12 @@ public class SolrQueryIndex implements F
}
// property restriction OR native language property restriction
defined AND property restriction handled
- if (filter.getPropertyRestrictions() != null &&
filter.getPropertyRestrictions().size() > 0
- && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
|| filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
- || configuration.useForPropertyRestrictions()) &&
!hasIgnoredProperties(filter.getPropertyRestrictions(), configuration)) {
+ if (filter.getPropertyRestrictions() != null
+ && filter.getPropertyRestrictions().size() > 0
+ && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null
+ || filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
+ || configuration.useForPropertyRestrictions())
+ && !hasIgnoredProperties(filter.getPropertyRestrictions(),
configuration)) {
match++;
}
@@ -429,6 +433,7 @@ public class SolrQueryIndex implements F
|| (configuration.getUsedProperties().size() > 0 &&
!configuration.getUsedProperties().contains(propertyName)) // not explicitly
contained in the used properties
|| propertyName.contains("/") // no child-level
property restrictions
|| "rep:excerpt".equals(propertyName) // rep:excerpt
is handled by the query engine
+ ||
QueryConstants.RESTRICTION_LOCAL_NAME.equals(propertyName)
||
configuration.getIgnoredProperties().contains(propertyName));
}
