You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by gs...@apache.org on 2009/12/28 19:38:36 UTC
svn commit: r894217 - in /lucene/solr/trunk/src/java/org/apache/solr: schema/ search/ search/function/ search/function/distance/

Author: gsingers
Date: Mon Dec 28 18:38:35 2009
New Revision: 894217

URL: http://svn.apache.org/viewvc?rev=894217&view=rev
Log:
SOLR-1131: put the vector/multi VS into the function package

Added:
    lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java   (contents, props changed)
      - copied, changed from r894211, lucene/solr/trunk/src/java/org/apache/solr/search/MultiValueSource.java
    lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java   (contents, props changed)
      - copied, changed from r894211, lucene/solr/trunk/src/java/org/apache/solr/search/VectorValueSource.java
Removed:
    lucene/solr/trunk/src/java/org/apache/solr/search/MultiValueSource.java
    lucene/solr/trunk/src/java/org/apache/solr/search/VectorValueSource.java
Modified:
    lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java
    lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
    lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
    lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java?rev=894217&r1=894216&r2=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java Mon Dec 28 18:38:35 2009
@@ -29,7 +29,7 @@
 import org.apache.solr.request.TextResponseWriter;
 import org.apache.solr.request.XMLWriter;
 import org.apache.solr.search.QParser;
-import org.apache.solr.search.VectorValueSource;
+import org.apache.solr.search.function.VectorValueSource;
 import org.apache.solr.search.function.ValueSource;
 import org.apache.solr.search.function.distance.DistanceUtils;
 

Copied: lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java (from r894211, lucene/solr/trunk/src/java/org/apache/solr/search/MultiValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java?p2=lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java&p1=lucene/solr/trunk/src/java/org/apache/solr/search/MultiValueSource.java&r1=894211&r2=894217&rev=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/MultiValueSource.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java Mon Dec 28 18:38:35 2009
@@ -1,4 +1,4 @@
-package org.apache.solr.search;
+package org.apache.solr.search.function;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Propchange: lucene/solr/trunk/src/java/org/apache/solr/search/function/MultiValueSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java (from r894211, lucene/solr/trunk/src/java/org/apache/solr/search/VectorValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java?p2=lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java&p1=lucene/solr/trunk/src/java/org/apache/solr/search/VectorValueSource.java&r1=894211&r2=894217&rev=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/VectorValueSource.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java Mon Dec 28 18:38:35 2009
@@ -1,4 +1,4 @@
-package org.apache.solr.search;
+package org.apache.solr.search.function;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,7 @@
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Searcher;
+import org.apache.solr.search.function.MultiValueSource;
 import org.apache.solr.search.function.DocValues;
 import org.apache.solr.search.function.ValueSource;
 

Propchange: lucene/solr/trunk/src/java/org/apache/solr/search/function/VectorValueSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=894217&r1=894216&r2=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Mon Dec 28 18:38:35 2009
@@ -19,7 +19,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Searcher;
 import org.apache.solr.common.SolrException;
-import org.apache.solr.search.MultiValueSource;
+import org.apache.solr.search.function.MultiValueSource;
 import org.apache.solr.search.function.DocValues;
 import org.apache.solr.search.function.ValueSource;
 

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java?rev=894217&r1=894216&r2=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java Mon Dec 28 18:38:35 2009
@@ -17,10 +17,7 @@
  */
 
 import org.apache.solr.search.function.DocValues;
-import org.apache.solr.search.function.ValueSource;
-import org.apache.solr.search.MultiValueSource;
-
-import java.util.List;
+import org.apache.solr.search.function.MultiValueSource;
 
 
 /**

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java?rev=894217&r1=894216&r2=894217&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java Mon Dec 28 18:38:35 2009
@@ -21,7 +21,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.search.function.DocValues;
 import org.apache.solr.search.function.ValueSource;
-import org.apache.solr.search.MultiValueSource;
+import org.apache.solr.search.function.MultiValueSource;
 
 import java.io.IOException;
 import java.util.Map;