lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r1621936 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/ivy-versions.properties solr/ solr/CHANGES.txt solr/core/ solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
Date Tue, 02 Sep 2014 07:09:43 GMT
Author: noble
Date: Tue Sep  2 07:09:43 2014
New Revision: 1621936

URL: http://svn.apache.org/r1621936
Log:
Upgrade Noggit and allow flexible JSON input SOLR-6445

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/ivy-versions.properties   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java

Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1621936&r1=1621935&r2=1621936&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Tue Sep  2 07:09:43 2014
@@ -211,7 +211,7 @@ org.mortbay.jetty.version = 6.1.26
 /org.mortbay.jetty/jetty = ${org.mortbay.jetty.version}
 /org.mortbay.jetty/jetty-util = ${org.mortbay.jetty.version}
 
-/org.noggit/noggit = 0.5
+/org.noggit/noggit = 0.6
 /org.objenesis/objenesis = 1.2
 
 org.ow2.asm.version = 4.1

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1621936&r1=1621935&r2=1621936&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Sep  2 07:09:43 2014
@@ -28,6 +28,7 @@ Carrot2 3.9.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
+Noggit 0.6
 
 Detailed Change List
 ----------------------
@@ -77,6 +78,9 @@ Other Changes
 * LUCENE-5901: Replaced all occurences of LUCENE_CURRENT with LATEST for luceneMatchVersion.
   (Ryan Ernst)
 
+* SOLR-6445: Upgrade Noggit to verion 0.6 to support more flexible JSON input (Noble Paul
, Yonik Seeley)
+
+
 ==================  4.10.0 =================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java?rev=1621936&r1=1621935&r2=1621936&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
Tue Sep  2 07:09:43 2014
@@ -281,7 +281,32 @@ public class JsonLoaderTest extends Solr
     BufferingRequestProcessor p = new BufferingRequestProcessor(null);
     JsonLoader loader = new JsonLoader();
     loader.load(req, rsp, new ContentStreamBase.StringStream(doc), p);
-
+    assertEquals( 2, p.addCommands.size() );
+     doc = "\n" +
+        "\n" +
+        "{bool: true,\n" +
+        " f0: \"v0\",\n" +
+        " f2: {\n" +
+        "    \t  \"boost\": 2.3,\n" +
+        "    \t  \"value\": \"test\"\n" +
+        "    \t   },\n" +
+        "array: [ \"aaa\", \"bbb\" ],\n" +
+        "boosted: {\n" +
+        "    \t      \"boost\": 6.7,\n" +
+        "    \t      \"value\": [ \"aaa\", \"bbb\" ]\n" +
+        "    \t    }\n" +
+        " }\n" +
+        "\n" +
+        "\n" +
+        " {f1: \"v1\",\n" +
+        "  f1: \"v2\",\n" +
+        "   f2: null\n" +
+        "  }\n";
+    req = req("json.command","false");
+    rsp = new SolrQueryResponse();
+    p = new BufferingRequestProcessor(null);
+    loader = new JsonLoader();
+    loader.load(req, rsp, new ContentStreamBase.StringStream(doc), p);
 
     assertEquals( 2, p.addCommands.size() );
 



Mime
View raw message