You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2016/04/28 01:47:25 UTC
[2/2] lucene-solr:branch_5x: SOLR-8891: Fix StrField.toObject and
toExternal to work with docValue IndexableField instances,
optimize createFields
SOLR-8891: Fix StrField.toObject and toExternal to work with docValue IndexableField instances, optimize createFields
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/da961396
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/da961396
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/da961396
Branch: refs/heads/branch_5x
Commit: da961396de915e877651923ccea0271ceacd420d
Parents: 79636a7
Author: yonik <yo...@apache.org>
Authored: Wed Apr 27 18:13:52 2016 -0400
Committer: yonik <yo...@apache.org>
Committed: Wed Apr 27 19:38:15 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/schema/FieldType.java | 7 +++++-
.../java/org/apache/solr/schema/StrField.java | 26 +++++++++++++-------
.../org/apache/solr/schema/DocValuesTest.java | 2 ++
4 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da961396/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d2a7af1..9e02482 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -143,6 +143,9 @@ Bug Fixes
* SOLR-8886: Fix TrieField.toObject(IndexableField) to work for field with docValues
enabled. (yonik)
+* SOLR-8891: Fix StrField.toObject and toExternal to work with docValue IndexableField
+ instances. (yonik)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da961396/solr/core/src/java/org/apache/solr/schema/FieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java
index 40e2bb0..b07c7aa 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -353,7 +353,12 @@ public abstract class FieldType extends FieldProperties {
// currently used in writing XML of the search result (but perhaps
// a more efficient toXML(IndexableField f, Writer w) should be used
// in the future.
- return f.stringValue();
+ String val = f.stringValue();
+ if (val == null) {
+ // docValues will use the binary value
+ val = f.binaryValue().utf8ToString();
+ }
+ return val;
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da961396/solr/core/src/java/org/apache/solr/schema/StrField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/StrField.java b/solr/core/src/java/org/apache/solr/schema/StrField.java
index 8aa8ecf..7bda943 100644
--- a/solr/core/src/java/org/apache/solr/schema/StrField.java
+++ b/solr/core/src/java/org/apache/solr/schema/StrField.java
@@ -40,21 +40,29 @@ public class StrField extends PrimitiveFieldType {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value,
- float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
+ IndexableField fval = createField(field, value, boost);
+
if (field.hasDocValues()) {
- List<IndexableField> fields = new ArrayList<>();
- fields.add(createField(field, value, boost));
+ IndexableField docval;
final BytesRef bytes = new BytesRef(value.toString());
if (field.multiValued()) {
- fields.add(new SortedSetDocValuesField(field.getName(), bytes));
+ docval = new SortedSetDocValuesField(field.getName(), bytes);
} else {
- fields.add(new SortedDocValuesField(field.getName(), bytes));
+ docval = new SortedDocValuesField(field.getName(), bytes);
}
- return fields;
- } else {
- return Collections.singletonList(createField(field, value, boost));
+
+ // Only create a list of we have 2 values...
+ if (fval != null) {
+ List<IndexableField> fields = new ArrayList<>(2);
+ fields.add(fval);
+ fields.add(docval);
+ return fields;
+ }
+
+ fval = docval;
}
+ return Collections.singletonList(fval);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da961396/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index 60b57f4..dfe5458 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -115,6 +115,8 @@ public class DocValuesTest extends SolrTestCaseJ4 {
tstToObj(schema.getField("longdvs"), -11L);
tstToObj(schema.getField("datedv"), new Date(1000));
tstToObj(schema.getField("datedvs"), new Date(1000));
+ tstToObj(schema.getField("stringdv"), "foo");
+ tstToObj(schema.getField("stringdvs"), "foo");
} finally {
searcherRef.decref();