Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0FE4B200B27 for ; Tue, 7 Jun 2016 18:49:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0EBAE160968; Tue, 7 Jun 2016 16:49:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2F64D160A36 for ; Tue, 7 Jun 2016 18:49:53 +0200 (CEST) Received: (qmail 1558 invoked by uid 500); 7 Jun 2016 16:49:52 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 1352 invoked by uid 99); 7 Jun 2016 16:49:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2016 16:49:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F6E1DFDA9; Tue, 7 Jun 2016 16:49:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: noble@apache.org To: commits@lucene.apache.org Date: Tue, 07 Jun 2016 16:49:52 -0000 Message-Id: <7ee0c1b0da8d469981ec552b06f4b949@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] lucene-solr:branch_6x: SOLR-7123: Syntax modified. Multiple paths can be added in the split parameter itself (pipe separated) archived-at: Tue, 07 Jun 2016 16:49:54 -0000 Repository: lucene-solr Updated Branches: refs/heads/branch_6x bacac1c33 -> 262872309 SOLR-7123: Syntax modified. Multiple paths can be added in the split parameter itself (pipe separated) Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7f6be6e8 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7f6be6e8 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7f6be6e8 Branch: refs/heads/branch_6x Commit: 7f6be6e893baab6b4f5bf31e01cc684111a6e3ed Parents: d4ede8b Author: Noble Paul Authored: Tue Jun 7 22:19:09 2016 +0530 Committer: Noble Paul Committed: Tue Jun 7 22:19:09 2016 +0530 ---------------------------------------------------------------------- .../src/java/org/apache/solr/handler/loader/JsonLoader.java | 7 +++---- .../core/src/test/org/apache/solr/handler/JsonLoaderTest.java | 2 +- .../java/org/apache/solr/common/util/JsonRecordReader.java | 6 +----- .../org/apache/solr/common/util/TestJsonRecordReader.java | 6 ++---- 4 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f6be6e8/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java index ffbfe97..2c5b6ac 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java @@ -125,9 +125,8 @@ public class JsonLoader extends ContentStreamLoader { String path = (String) req.getContext().get(PATH); if (UpdateRequestHandler.DOC_PATH.equals(path) || "false".equals(req.getParams().get("json.command"))) { String split = req.getParams().get("split"); - String childSplit = req.getParams().get("child.split"); String[] f = req.getParams().getParams("f"); - handleSplitMode(split, childSplit, f, reader); + handleSplitMode(split, f, reader); return; } parser = new JSONParser(reader); @@ -194,7 +193,7 @@ public class JsonLoader extends ContentStreamLoader { } } - private void handleSplitMode(String split, String childSplit, String[] fields, final Reader reader) throws IOException { + private void handleSplitMode(String split, String[] fields, final Reader reader) throws IOException { if (split == null) split = "/"; if (fields == null || fields.length == 0) fields = new String[]{"$FQN:/**"}; final boolean echo = "true".equals(req.getParams().get("echo")); @@ -209,7 +208,7 @@ public class JsonLoader extends ContentStreamLoader { } - JsonRecordReader jsonRecordReader = JsonRecordReader.getInst(split, childSplit, Arrays.asList(fields)); + JsonRecordReader jsonRecordReader = JsonRecordReader.getInst(split, Arrays.asList(fields)); jsonRecordReader.streamRecords(parser, new JsonRecordReader.Handler() { ArrayList docs = null; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f6be6e8/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java index a904d9e..7e4d28a 100644 --- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java @@ -370,7 +370,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 { "b:[{c:c1, e:e1},{c:c2, e :e2, d:{p:q}}]," + "x:y" + "}}"; - req = req("split", "/", "child.split" , "/a/b" ); + req = req("split", "/|/a/b" ); req.getContext().put("path","/update/json/docs"); rsp = new SolrQueryResponse(); p = new BufferingRequestProcessor(null); http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f6be6e8/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java index 12c0d83..2025197 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java @@ -34,11 +34,10 @@ public class JsonRecordReader { private Node rootNode = new Node("/", (Node) null); - public static JsonRecordReader getInst(String split, String childSplit, List fieldMappings) { + public static JsonRecordReader getInst(String split, List fieldMappings) { JsonRecordReader jsonRecordReader = new JsonRecordReader(); jsonRecordReader.addSplit(split); - if (childSplit != null) jsonRecordReader.addSplit(childSplit); for (String s : fieldMappings) { String path = s; int idx = s.indexOf(':'); @@ -52,9 +51,6 @@ public class JsonRecordReader { return jsonRecordReader; } - public static JsonRecordReader getInst(String split, List fieldMappings) { - return getInst(split, null, fieldMappings); - } private JsonRecordReader() { } http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f6be6e8/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java index e11cc29..9da3bd5 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java @@ -42,8 +42,6 @@ public class TestJsonRecordReader extends SolrTestCaseJ4 { " {\"c\":\"C2\",\"d\":\"D2\"}\n" + " ]\n" + "}"; -// System.out.println(json); -// All parameters are mapped with field name JsonRecordReader streamer = JsonRecordReader.getInst("/b", Arrays.asList( "a_s:/a", "c_s:/b/c", @@ -208,7 +206,7 @@ public class TestJsonRecordReader extends SolrTestCaseJ4 { "b:{c:d}," + "x:y" + "}}"; - JsonRecordReader streamer = JsonRecordReader.getInst("/", "/a/b", Arrays.asList("/a/x", "/a/b/*")); + JsonRecordReader streamer = JsonRecordReader.getInst("/|/a/b", Arrays.asList("/a/x", "/a/b/*")); streamer.streamRecords(new StringReader(json), (record, path) -> { assertEquals(record.get("x"), "y"); assertEquals(((Map) record.get(null)).get("c"), "d"); @@ -227,7 +225,7 @@ public class TestJsonRecordReader extends SolrTestCaseJ4 { assertEquals(m.get("c"), "c2"); assertEquals(m.get("e"), "e2"); }); - streamer = JsonRecordReader.getInst("/", "/a/b", Arrays.asList("$FQN:/**")); + streamer = JsonRecordReader.getInst("/|/a/b", Arrays.asList("$FQN:/**")); streamer.streamRecords(new StringReader(json), (record, path) -> { assertEquals(record.get("a.x"), "y"); List l = (List) record.get(null);