You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2012/01/31 16:55:39 UTC
svn commit: r1238676 - in /lucene/dev/branches/branch_3x/solr: CHANGES.txt
core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
Author: mvg
Date: Tue Jan 31 15:55:39 2012
New Revision: 1238676
URL: http://svn.apache.org/viewvc?rev=1238676&view=rev
Log:
SOLR-3073: Fixed 'Invalid UUID string' error
Modified:
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1238676&r1=1238675&r2=1238676&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Jan 31 15:55:39 2012
@@ -174,6 +174,9 @@ Bug Fixes
* SOLR-2280: commitWithin ignored for a delete query (Juan Grande via janhoy)
+* SOLR-3073: Fixed 'Invalid UUID string' error when having an UUID field as
+ the unique key and executing a distributed grouping request. (Devon Krisman, Martijn van Groningen)
+
Other Changes
----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java?rev=1238676&r1=1238675&r2=1238676&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java Tue Jan 31 15:55:39 2012
@@ -180,7 +180,7 @@ public class TopGroupsResultTransformer
documents.add(document);
Document doc = retrieveDocument(uniqueField, searchGroup.scoreDocs[i].doc);
- document.add("id", uniqueField.getType().toObject(doc.getFieldable(uniqueField.getName())));
+ document.add("id", uniqueField.getType().toExternal(doc.getFieldable(uniqueField.getName())));
if (!Float.isNaN(searchGroup.scoreDocs[i].score)) {
document.add("score", searchGroup.scoreDocs[i].score);
}
@@ -228,7 +228,7 @@ public class TopGroupsResultTransformer
documents.add(document);
Document doc = retrieveDocument(uniqueField, scoreDoc.doc);
- document.add("id", uniqueField.getType().toObject(doc.getFieldable(uniqueField.getName())));
+ document.add("id", uniqueField.getType().toExternal(doc.getFieldable(uniqueField.getName())));
if (rb.getGroupingSpec().isNeedScore()) {
document.add("score", scoreDoc.score);
}