Author: thomasm
Date: Tue Dec 22 15:39:20 2020
New Revision: 1884709
URL: http://svn.apache.org/viewvc?rev=1884709&view=rev
Log:
OAK-9306 Faceting: IllegalArgumentException: dimension ... was not indexed
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1884709&r1=1884708&r2=1884709&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Tue Dec 22 15:39:20 2020
@@ -1610,15 +1610,20 @@ public class LucenePropertyIndex extends
String facetFieldName =
FulltextIndex.parseFacetField(columnName);
Facets facets = FacetHelper.getFacets(searcher, query, plan,
config);
if (facets != null) {
- ImmutableList.Builder<Facet> res = new
ImmutableList.Builder<>();
- FacetResult topChildren =
facets.getTopChildren(numberOfFacets, facetFieldName);
- if (topChildren != null) {
- for (LabelAndValue lav : topChildren.labelValues) {
- res.add(new Facet(
- lav.label, lav.value.intValue()
- ));
+ try {
+ ImmutableList.Builder<Facet> res = new
ImmutableList.Builder<>();
+ FacetResult topChildren =
facets.getTopChildren(numberOfFacets, facetFieldName);
+ if (topChildren != null) {
+ for (LabelAndValue lav : topChildren.labelValues) {
+ res.add(new Facet(
+ lav.label, lav.value.intValue()
+ ));
+ }
+ return res.build();
}
- return res.build();
+ } catch (IllegalArgumentException iae) {
+ LOG.debug(iae.getMessage(), iae);
+ LOG.warn("facets for {} not yet indexed: " + iae,
facetFieldName);
}
}
return null;
@@ -1641,17 +1646,20 @@ public class LucenePropertyIndex extends
String facetFieldName = FulltextIndex.parseFacetField(columnName);
if (facets != null) {
- ImmutableList.Builder<Facet> res = new
ImmutableList.Builder<>();
- FacetResult topChildren =
facets.getTopChildren(numberOfFacets, facetFieldName);
-
- if (topChildren != null) {
- for (LabelAndValue lav : topChildren.labelValues) {
- res.add(new Facet(
- lav.label, lav.value.intValue()
- ));
+ try {
+ ImmutableList.Builder<Facet> res = new
ImmutableList.Builder<>();
+ FacetResult topChildren =
facets.getTopChildren(numberOfFacets, facetFieldName);
+ if (topChildren != null) {
+ for (LabelAndValue lav : topChildren.labelValues) {
+ res.add(new Facet(
+ lav.label, lav.value.intValue()
+ ));
+ }
+ return res.build();
}
-
- return res.build();
+ } catch (IllegalArgumentException iae) {
+ LOG.debug(iae.getMessage(), iae);
+ LOG.warn("facets for {} not yet indexed: " + iae,
facetFieldName);
}
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java?rev=1884709&r1=1884708&r2=1884709&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
Tue Dec 22 15:39:20 2020
@@ -92,7 +92,8 @@ public class FacetHelper {
facetsMap.put(facetField, facets);
} catch (IllegalArgumentException iae) {
- LOGGER.warn("facets for {} not yet indexed", facetField);
+ LOGGER.debug(iae.getMessage(), iae);
+ LOGGER.warn("facets for {} not yet indexed: " + iae,
facetField);
}
}
if (facetsMap.size() > 0) {
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java?rev=1884709&r1=1884708&r2=1884709&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
Tue Dec 22 15:39:20 2020
@@ -498,7 +498,9 @@ public abstract class FulltextIndex impl
writer.endObject();
return
PropertyValues.newString(writer.toString());
}
- } catch (Exception e) {
+ } catch (IOException | RuntimeException e) {
+ LOG.warn(e.getMessage());
+ LOG.debug(e.getMessage(), e);
throw new RuntimeException(e);
}
}
