You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jackrabbit.apache.org by GitBox <gi...@apache.org> on 2021/07/12 20:03:37 UTC
[GitHub] [jackrabbit-oak] averma21 commented on a change in pull request #311: OAK-9480 - Log a warning for improper usage of an index with valueRege…
averma21 commented on a change in pull request #311:
URL: https://github.com/apache/jackrabbit-oak/pull/311#discussion_r667886850
##########
File path: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
##########
@@ -353,6 +356,10 @@ default boolean logWarningForPathFilterMismatch() {
return false;
}
+ default Map<Level, List<String>> getAdditionalMessages() {
Review comment:
done.
##########
File path: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
##########
@@ -491,6 +510,17 @@ public IndexPlan build() {
private final boolean deprecated =
Builder.this.deprecated;
private final boolean logWarningForPathFilterMismatch = Builder.this.logWarningForPathFilterMismatch;
+ private final Map<Level, List<String>> additionalMessages = Builder.this.additionalMessages;
+
+ private String getAdditionalMessageString() {
+ StringBuilder stringBuilder = new StringBuilder();
Review comment:
Fixed. thanks!
##########
File path: oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
##########
@@ -290,13 +292,31 @@ public static void setUseActualEntryCount(boolean useActualEntryCount) {
IndexPlan.Builder plan = defaultPlan();
+ if (plan == null) {
+ return null;
+ }
+
if (filter.getQueryLimits().getStrictPathRestriction().equals(StrictPathRestriction.WARN.name()) && !isPlanWithValidPathFilter()) {
plan.setLogWarningForPathFilterMismatch(true);
}
- if (plan == null) {
- return null;
+ Pattern queryFilterPattern = definition.getQueryFilterRegex() != null ? definition.getQueryFilterRegex() :
+ definition.getPropertyRegex();
+
+ if (queryFilterPattern != null) {
+ if (ft != null && !queryFilterPattern.matcher(ft.toString()).find()) {
+ plan.addAdditionalMessage(Level.WARN, "Potentially improper use of index " + definition.getIndexPath() + " with valueRegex "
Review comment:
done.
##########
File path: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
##########
@@ -491,6 +510,17 @@ public IndexPlan build() {
private final boolean deprecated =
Builder.this.deprecated;
private final boolean logWarningForPathFilterMismatch = Builder.this.logWarningForPathFilterMismatch;
+ private final Map<Level, List<String>> additionalMessages = Builder.this.additionalMessages;
+
+ private String getAdditionalMessageString() {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Map.Entry<Level, List<String>> messages : additionalMessages.entrySet()) {
+ stringBuilder.append(messages.getKey()).append(" : ").append(messages.getValue()).append(", ");
Review comment:
Fixed, thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org