lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1550676 - in /lucene/dev/trunk: lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ solr/ solr/core/src/java/org/apache/solr/search/ solr/core/src/test/org/apache/solr/search/function/
Date Fri, 13 Dec 2013 10:25:43 GMT
Author: shalin
Date: Fri Dec 13 10:25:43 2013
New Revision: 1550676

URL: http://svn.apache.org/r1550676
Log:
SOLR-3702: Reverting commit because it breaks QueryEqualityTest

Removed:
    lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConcatenateFunction.java
Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1550676&r1=1550675&r2=1550676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Dec 13 10:25:43 2013
@@ -127,9 +127,6 @@ New Features
 * SOLR-1871: The 'map' function query accepts a ValueSource as target and
   default value. (Chris Harris, shalin)
 
-* SOLR-3702: A 'concat' function query to support concatenation of Strings.
-  (Ted Strauss, Andrey Kudryavtsev via shalin)
-
 Bug Fixes
 ----------------------
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1550676&r1=1550675&r2=1550676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java Fri
Dec 13 10:25:43 2013
@@ -779,13 +779,6 @@ public abstract class ValueSourceParser 
       }
     });
 
-    addParser("concat", new ValueSourceParser() {
-      @Override
-      public ValueSource parse(FunctionQParser fp) throws SyntaxError {
-        return new ConcatenateFunction(fp.parseValueSourceList());
-      }
-    });
-
   }
 
   private static TInfo parseTerm(FunctionQParser fp) throws SyntaxError {

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=1550676&r1=1550675&r2=1550676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
(original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
Fri Dec 13 10:25:43 2013
@@ -754,24 +754,4 @@ public class TestFunctionQuery extends S
     }
   }
 
-  public void testConcatFunction() {
-    clearIndex();
-
-    assertU(adoc("id", "1", "field1_t", "buzz", "field2_t", "word"));
-    assertU(adoc("id", "2", "field1_t", "1", "field2_t", "2","field4_t", "4"));
-    assertU(commit());
-
-    assertQ(req("q","id:1",
-        "fl","field:concat(field1_t,field2_t)"),
-        " //str[@name='field']='buzzword'");
-
-    assertQ(req("q","id:2",
-        "fl","field:concat(field1_t,field2_t, field3_t, field4_t)"),
-        " //str[@name='field']='124'");
-
-    assertQ(req("q","id:1",
-        "fl","field:def(concat(field3_t, field4_t), 'defValue')"),
-        " //str[@name='field']='defValue'");
-  }
-
 }



Mime
View raw message