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 2015/10/13 11:33:18 UTC
svn commit: r1708313 -
/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
Author: thomasm
Date: Tue Oct 13 09:33:18 2015
New Revision: 1708313
URL: http://svn.apache.org/viewvc?rev=1708313&view=rev
Log:
OAK-3495 Query engine: disable or restrict built-in full-text engine (backport to 1.0)
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1708313&r1=1708312&r2=1708313&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java Tue Oct 13 09:33:18 2015
@@ -215,13 +215,23 @@ public class FullTextSearchImpl extends
private static void appendString(StringBuilder buff, PropertyValue p) {
if (p.isArray()) {
- for (String v : p.getValue(STRINGS)) {
- buff.append(v).append(' ');
+ if (p.getType() == Type.BINARIES) {
+ // OAK-3495: don't try to load binaries as this would
+ // run out of memory
+ } else {
+ for (String v : p.getValue(STRINGS)) {
+ buff.append(v).append(' ');
+ }
}
} else {
- buff.append(p.getValue(STRING)).append(' ');
+ if (p.getType() == Type.BINARY) {
+ // OAK-3495: don't try to load binaries as this would
+ // run out of memory
+ } else {
+ buff.append(p.getValue(STRING)).append(' ');
+ }
}
- }
+ }
public void bindSelector(SourceImpl source) {
selector = source.getExistingSelector(selectorName);