You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/11/13 16:52:02 UTC

svn commit: r1714226 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/schema/TrieDoubleField.java core/src/java/org/apache/solr/schema/TrieLongField.java

Author: cpoerschke
Date: Fri Nov 13 15:52:02 2015
New Revision: 1714226

URL: http://svn.apache.org/viewvc?rev=1714226&view=rev
Log:
SOLR-8287: TrieDoubleField and TrieLongField now override toNativeType

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieLongField.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1714226&r1=1714225&r2=1714226&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Nov 13 15:52:02 2015
@@ -388,6 +388,9 @@ Bug Fixes
   if the last published state is something else if it has already registered with ZK.
   (Ishan Chattopadhyaya, Mark Miller via noble)
 
+* SOLR-8287: TrieDoubleField and TrieLongField now override toNativeType
+  (Ishan Chattopadhyaya via Christine Poerschke)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java?rev=1714226&r1=1714225&r2=1714226&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java Fri Nov 13 15:52:02 2015
@@ -56,6 +56,14 @@ public class TrieDoubleField extends Tri
   }
   
   @Override
+  public Object toNativeType(Object val) {
+    if(val==null) return null;
+    if (val instanceof Number) return ((Number) val).doubleValue();
+    if (val instanceof String) return Double.parseDouble((String) val);
+    return super.toNativeType(val);
+  }
+
+  @Override
   protected ValueSource getSingleValueSource(SortedSetSelector.Type choice, SchemaField f) {
     
     return new SortedSetFieldSource(f.getName(), choice) {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieLongField.java?rev=1714226&r1=1714225&r2=1714226&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieLongField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieLongField.java Fri Nov 13 15:52:02 2015
@@ -50,6 +50,19 @@ public class TrieLongField extends TrieF
   }
 
   @Override
+  public Object toNativeType(Object val) {
+    if(val==null) return null;
+    if (val instanceof Number) return ((Number) val).longValue();
+    try {
+      if (val instanceof String) return Long.parseLong((String) val);
+    } catch (NumberFormatException e) {
+      Double v = Double.parseDouble((String) val);
+      return v.longValue();
+    }
+    return super.toNativeType(val);
+  }
+
+  @Override
   protected ValueSource getSingleValueSource(SortedSetSelector.Type choice, SchemaField f) {
     
     return new SortedSetFieldSource(f.getName(), choice) {