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 th...@apache.org on 2021/01/25 17:06:15 UTC
svn commit: r1885902 - in /jackrabbit/oak/branches/1.22: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/
oak-search/src/main/java/org/apache/jackr...
Author: thomasm
Date: Mon Jan 25 17:06:14 2021
New Revision: 1885902
URL: http://svn.apache.org/viewvc?rev=1885902&view=rev
Log:
OAK-9306 Faceting: IllegalArgumentException: dimension ... was not indexed
Modified:
jackrabbit/oak/branches/1.22/ (props changed)
jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
jackrabbit/oak/branches/1.22/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
Propchange: jackrabbit/oak/branches/1.22/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1884709
Modified: jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1885902&r1=1885901&r2=1885902&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Mon Jan 25 17:06:14 2021
@@ -1638,15 +1638,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;
@@ -1669,17 +1674,20 @@ public class LucenePropertyIndex extends
String facetFieldName = FulltextIndex.parseFacetField(columnName);
if (facets != null) {
- ImmutableList.Builder res = new ImmutableList.Builder<Facet>();
- 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/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java?rev=1885902&r1=1885901&r2=1885902&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java (original)
+++ jackrabbit/oak/branches/1.22/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FacetHelper.java Mon Jan 25 17:06:14 2021
@@ -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/branches/1.22/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java?rev=1885902&r1=1885901&r2=1885902&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java (original)
+++ jackrabbit/oak/branches/1.22/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java Mon Jan 25 17:06:14 2021
@@ -71,8 +71,8 @@ import static org.apache.jackrabbit.oak.
public abstract class FulltextIndex implements AdvancedQueryIndex, QueryIndex, NativeQueryIndex,
AdvanceFulltextQueryIndex {
- private final Logger LOG = LoggerFactory
- .getLogger(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(FulltextIndex.class);
+
private final PerfLogger PERF_LOGGER =
new PerfLogger(LoggerFactory.getLogger(getClass() + ".perf"));
@@ -491,7 +491,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);
}
}