You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/10/06 00:26:26 UTC
svn commit: r1394843 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/
lucene/core/src/test/org/apache/l...
Author: hossman
Date: Fri Oct 5 22:26:24 2012
New Revision: 1394843
URL: http://svn.apache.org/viewvc?rev=1394843&view=rev
Log:
SOLR-3916: Fixed whitespace bug in parsing the fl param (merge r1394836)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/site/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1394843&r1=1394842&r2=1394843&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Fri Oct 5 22:26:24 2012
@@ -1011,4 +1011,53 @@ public class _TestUtil {
}
}
+ /**
+ * Returns a random string in the specified length range consisting
+ * entirely of whitespace characters
+ * @see #WHITESPACE_CHARACTERS
+ */
+ public static String randomWhitespace(Random r, int minLength, int maxLength) {
+ final int end = nextInt(r, minLength, maxLength);
+ StringBuilder out = new StringBuilder();
+ for (int i = 0; i < end; i++) {
+ int offset = nextInt(r, 0, WHITESPACE_CHARACTERS.length-1);
+ char c = WHITESPACE_CHARACTERS[offset];
+ // sanity check
+ Assert.assertTrue("Not really whitespace? (@"+offset+"): " + c, Character.isWhitespace(c));
+ out.append(c);
+ }
+ return out.toString();
+ }
+
+ /** List of characters that match {@link Character#isWhitespace} */
+ public static final char[] WHITESPACE_CHARACTERS = new char[] {
+ // :TODO: is this list exhaustive?
+ '\u0009',
+ '\n',
+ '\u000B',
+ '\u000C',
+ '\r',
+ '\u001C',
+ '\u001D',
+ '\u001E',
+ '\u001F',
+ '\u0020',
+ // '\u0085', faild sanity check?
+ '\u1680',
+ '\u180E',
+ '\u2000',
+ '\u2001',
+ '\u2002',
+ '\u2003',
+ '\u2004',
+ '\u2005',
+ '\u2006',
+ '\u2008',
+ '\u2009',
+ '\u200A',
+ '\u2028',
+ '\u2029',
+ '\u205F',
+ '\u3000',
+ };
}
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1394843&r1=1394842&r2=1394843&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Oct 5 22:26:24 2012
@@ -402,6 +402,8 @@ Bug Fixes
* SOLR-3903: Fixed MissingFormatArgumentException in ConcurrentUpdateSolrServer
(hossman)
+* SOLR-3916: Fixed whitespace bug in parsing the fl param (hossman)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java?rev=1394843&r1=1394842&r2=1394843&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java Fri Oct 5 22:26:24 2012
@@ -201,7 +201,7 @@ public class ReturnFields
sp.eatws();
start = sp.pos;
} else {
- if (ch==' ' || ch == ',' || ch==0) {
+ if (Character.isWhitespace(ch) || ch == ',' || ch==0) {
addField( field, key, augmenters, req );
continue;
}
@@ -215,7 +215,7 @@ public class ReturnFields
// we read "key : "
field = sp.getId(null);
ch = sp.ch();
- if (field != null && (ch==' ' || ch == ',' || ch==0)) {
+ if (field != null && (Character.isWhitespace(ch) || ch == ',' || ch==0)) {
rename.add(field, key);
addField( field, key, augmenters, req );
continue;
@@ -231,7 +231,7 @@ public class ReturnFields
field = sp.getGlobbedId(null);
ch = sp.ch();
- if (field != null && (ch==' ' || ch == ',' || ch==0)) {
+ if (field != null && (Character.isWhitespace(ch) || ch == ',' || ch==0)) {
// "*" looks and acts like a glob, but we give it special treatment
if ("*".equals(field)) {
_wantsAllFields = true;
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java?rev=1394843&r1=1394842&r2=1394843&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java Fri Oct 5 22:26:24 2012
@@ -21,9 +21,13 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.transform.*;
+
+import org.apache.lucene.util._TestUtil;
+
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.Random;
public class ReturnFieldsTest extends SolrTestCaseJ4 {
@@ -302,4 +306,38 @@ public class ReturnFieldsTest extends So
assertFalse(rf.wantsField("xxx"));
assertFalse(rf.wantsAllFields());
}
+
+ public void testWhitespace() {
+ Random r = random();
+ final int iters = atLeast(30);
+
+ for (int i = 0; i < iters; i++) {
+ final boolean aliasId = r.nextBoolean();
+ final boolean aliasFoo = r.nextBoolean();
+
+ final String id = _TestUtil.randomWhitespace(r, 0, 3) +
+ (aliasId ? "aliasId:" : "") +
+ "id" +
+ _TestUtil.randomWhitespace(r, 1, 3);
+ final String foo_i = _TestUtil.randomWhitespace(r, 0, 3) +
+ (aliasFoo ? "aliasFoo:" : "") +
+ "foo_i" +
+ _TestUtil.randomWhitespace(r, 0, 3);
+
+ final String fl = id + (r.nextBoolean() ? "" : ",") + foo_i;
+ ReturnFields rf = new ReturnFields(req("fl", fl));
+
+ assertFalse("score ("+fl+")", rf.wantsScore());
+
+ assertTrue("id ("+fl+")", rf.wantsField("id"));
+ assertTrue("foo_i ("+fl+")", rf.wantsField("foo_i"));
+
+ assertEquals("aliasId ("+fl+")", aliasId, rf.wantsField("aliasId"));
+ assertEquals("aliasFoo ("+fl+")", aliasFoo, rf.wantsField("aliasFoo"));
+
+ assertFalse(rf.wantsField("xxx"));
+ assertFalse(rf.wantsAllFields());
+ }
+ }
+
}