Author: chetanm
Date: Wed Sep 9 09:44:43 2015
New Revision: 1701961
URL: http://svn.apache.org/r1701961
Log:
OAK-3367 - Boosting fields not working as expected
Merging 1701750, 1701768, 1701806, 1701948
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 9 09:44:43 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701814,1701959
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701814,1701948,1701959
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1701961&r1=1701960&r2=1701961&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Wed Sep 9 09:44:43 2015
@@ -624,7 +624,7 @@ class IndexDefinition implements Aggrega
private final List<NamePattern> namePatterns;
private final List<PropertyDefinition> nullCheckEnabledProperties;
private final List<PropertyDefinition> notNullCheckEnabledProperties;
- private final List<PropertyDefinition> boostedProps;
+ private final List<PropertyDefinition> nodeScopeAnalyzedProps;
private final boolean indexesAllNodesOfMatchingType;
private final boolean nodeNameIndexed;
@@ -648,15 +648,15 @@ class IndexDefinition implements Aggrega
List<NamePattern> namePatterns = newArrayList();
List<PropertyDefinition> nonExistentProperties = newArrayList();
List<PropertyDefinition> existentProperties = newArrayList();
- List<PropertyDefinition> boostedProps = newArrayList();
+ List<PropertyDefinition> nodeScopeAnalyzedProps = newArrayList();
List<Aggregate.Include> propIncludes = newArrayList();
this.propConfigs = collectPropConfigs(config, namePatterns,
propIncludes, nonExistentProperties,
- existentProperties, boostedProps);
+ existentProperties, nodeScopeAnalyzedProps);
this.propAggregate = new Aggregate(nodeTypeName, propIncludes);
this.aggregate = combine(propAggregate, nodeTypeName);
this.namePatterns = ImmutableList.copyOf(namePatterns);
- this.boostedProps = ImmutableList.copyOf(boostedProps);
+ this.nodeScopeAnalyzedProps =
ImmutableList.copyOf(nodeScopeAnalyzedProps);
this.nullCheckEnabledProperties =
ImmutableList.copyOf(nonExistentProperties);
this.notNullCheckEnabledProperties =
ImmutableList.copyOf(existentProperties);
this.fulltextEnabled = aggregate.hasNodeAggregates() ||
hasAnyFullTextEnabledProperty();
@@ -685,7 +685,7 @@ class IndexDefinition implements Aggrega
this.propAggregate = original.propAggregate;
this.nullCheckEnabledProperties =
original.nullCheckEnabledProperties;
this.notNullCheckEnabledProperties =
original.notNullCheckEnabledProperties;
- this.boostedProps = original.boostedProps;
+ this.nodeScopeAnalyzedProps = original.nodeScopeAnalyzedProps;
this.aggregate = combine(propAggregate, nodeTypeName);
this.fulltextEnabled = aggregate.hasNodeAggregates() ||
original.fulltextEnabled;
this.indexesAllNodesOfMatchingType =
allMatchingNodeByTypeIndexed();
@@ -722,8 +722,8 @@ class IndexDefinition implements Aggrega
return notNullCheckEnabledProperties;
}
- public List<PropertyDefinition> getBoostedProps() {
- return boostedProps;
+ public List<PropertyDefinition> getNodeScopeAnalyzedProps() {
+ return nodeScopeAnalyzedProps;
}
@Override
@@ -825,7 +825,7 @@ class IndexDefinition implements Aggrega
List<Aggregate.Include> propAggregate,
List<PropertyDefinition> nonExistentProperties,
List<PropertyDefinition> existentProperties,
-
List<PropertyDefinition> boostedProps) {
+
List<PropertyDefinition> nodeScopeAnalyzedProps) {
Map<String, PropertyDefinition> propDefns = newHashMap();
NodeState propNode =
config.getChildNode(LuceneIndexConstants.PROP_NODE);
@@ -865,10 +865,9 @@ class IndexDefinition implements Aggrega
//Include props with name, boosted and nodeScopeIndex
if (pd.nodeScopeIndex
- && pd.boost != PropertyDefinition.DEFAULT_BOOST
&& pd.analyzed
&& !pd.isRegexp){
- boostedProps.add(pd);
+ nodeScopeAnalyzedProps.add(pd);
}
}
}
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1701961&r1=1701960&r2=1701961&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Wed Sep 9 09:44:43 2015
@@ -1122,9 +1122,9 @@ public class LucenePropertyIndex impleme
private static Query tokenToQuery(String text, String fieldName,
IndexingRule indexingRule, Analyzer analyzer) {
//Expand the query on fulltext field
if (FieldNames.FULLTEXT.equals(fieldName) &&
- !indexingRule.getBoostedProps().isEmpty()) {
+ !indexingRule.getNodeScopeAnalyzedProps().isEmpty()) {
BooleanQuery in = new BooleanQuery();
- for (PropertyDefinition pd : indexingRule.getBoostedProps()) {
+ for (PropertyDefinition pd :
indexingRule.getNodeScopeAnalyzedProps()) {
Query q = tokenToQuery(text,
FieldNames.createAnalyzedFieldName(pd.name), analyzer);
q.setBoost(pd.boost);
in.add(q, BooleanClause.Occur.SHOULD);
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1701961&r1=1701960&r2=1701961&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Wed Sep 9 09:44:43 2015
@@ -633,6 +633,9 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.FIELD_BOOST, 3.0)
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
TestUtil.child(rules, "nt:folder/properties/prop2")
+ .setProperty(LuceneIndexConstants.PROP_ANALYZED, true)
+ .setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
+ TestUtil.child(rules, "nt:folder/properties/prop3")
.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true)
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
@@ -644,9 +647,9 @@ public class IndexDefinitionTest {
PropertyDefinition pd = rule1.getConfig("prop1");
assertEquals(3.0f, pd.boost, 0);
assertTrue("Analyzed should be assumed to be true for boosted fields",
pd.analyzed);
- assertFalse(rule1.getConfig("prop2").analyzed);
+ assertFalse(rule1.getConfig("prop3").analyzed);
- assertEquals(1, rule1.getBoostedProps().size());
+ assertEquals(2, rule1.getNodeScopeAnalyzedProps().size());
}
//TODO indexesAllNodesOfMatchingType - with nullCheckEnabled
