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 06F00200AE3 for ; Wed, 4 May 2016 23:57:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 05A221609FC; Wed, 4 May 2016 21:57:29 +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 4F6631609A1 for ; Wed, 4 May 2016 23:57:28 +0200 (CEST) Received: (qmail 92152 invoked by uid 500); 4 May 2016 21:57:27 -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 92142 invoked by uid 99); 4 May 2016 21:57:27 -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; Wed, 04 May 2016 21:57:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5F321DFC6C; Wed, 4 May 2016 21:57:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dpgove@apache.org To: commits@lucene.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:master: SOLR-9064: Adds an explanation of the incoming stream to an UpdateStream's explanation Date: Wed, 4 May 2016 21:57:27 +0000 (UTC) archived-at: Wed, 04 May 2016 21:57:29 -0000 Repository: lucene-solr Updated Branches: refs/heads/master b6f8c6500 -> dccf6a4d9 SOLR-9064: Adds an explanation of the incoming stream to an UpdateStream's explanation Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dccf6a4d Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dccf6a4d Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dccf6a4d Branch: refs/heads/master Commit: dccf6a4d98ba49a3c74bfce220c34e48d6d0a51a Parents: b6f8c65 Author: Dennis Gove Authored: Wed May 4 17:57:12 2016 -0400 Committer: Dennis Gove Committed: Wed May 4 17:57:12 2016 -0400 ---------------------------------------------------------------------- solr/CHANGES.txt | 2 ++ .../java/org/apache/solr/client/solrj/io/stream/UpdateStream.java | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dccf6a4d/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 1ffbb72..31311cd 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -179,6 +179,8 @@ Bug Fixes * SOLR-8792: ZooKeeper ACL support fixed. (Esther Quansah, Ishan Chattopadhyaya, Steve Rowe) +* SOLR-9064: Adds an explanation of the incoming stream to an UpdateStream's explanation (Dennis Gove) + Optimizations ---------------------- * SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation. http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dccf6a4d/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java index 023ff56..5b1aae7 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java @@ -188,6 +188,7 @@ public class UpdateStream extends TupleStream implements Expressible { child.setImplementingClass(getClass().getName()); child.setExpressionType(ExpressionType.STREAM_DECORATOR); child.setExpression(toExpression(factory, false).toString()); + child.addChild(tupleSource.toExplanation(factory)); explanation.addChild(child);