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 BF03E200B40 for ; Fri, 1 Jul 2016 14:16:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BC35F160A73; Fri, 1 Jul 2016 12:16:23 +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 E7276160A7D for ; Fri, 1 Jul 2016 14:16:22 +0200 (CEST) Received: (qmail 26461 invoked by uid 500); 1 Jul 2016 12:16:22 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 25656 invoked by uid 99); 1 Jul 2016 12:16:21 -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; Fri, 01 Jul 2016 12:16:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76AF0ED499; Fri, 1 Jul 2016 12:16:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: wikier@apache.org To: commits@marmotta.apache.org Date: Fri, 01 Jul 2016 12:16:38 -0000 Message-Id: <83982f753e314fe1b427705bf78e1b2b@git.apache.org> In-Reply-To: <0c93744831644a95b1f7a126f277272d@git.apache.org> References: <0c93744831644a95b1f7a126f277272d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/25] marmotta git commit: Merge branch 'MARMOTTA-640' into develop, closes #20 archived-at: Fri, 01 Jul 2016 12:16:23 -0000 Merge branch 'MARMOTTA-640' into develop, closes #20 Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/db3a593f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/db3a593f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/db3a593f Branch: refs/heads/MARMOTTA-584 Commit: db3a593fa0763214a8ee53727f68d78d0b62c5a6 Parents: 45a68a2 b1b899c Author: Sergio Fernández Authored: Mon Jun 20 12:47:53 2016 +0200 Committer: Sergio Fernández Committed: Mon Jun 20 12:47:53 2016 +0200 ---------------------------------------------------------------------- .../kiwi/sparql/builder/SQLBuilder.java | 20 +++----- .../builder/collect/PatternCollector.java | 9 ++-- .../kiwi/sparql/builder/model/SQLUnion.java | 10 ++-- .../optimizer/DistinctLimitOptimizer.java | 3 +- .../sparql/sail/KiWiSparqlSailConnection.java | 2 +- .../kiwi/sparql/test/KiWiSparqlTest.java | 36 ++++++++++++-- .../kiwi/sparql/test/MARMOTTA-640_1.sparql | 33 +++++++++++++ .../kiwi/sparql/test/MARMOTTA-640_2.sparql | 51 ++++++++++++++++++++ 8 files changed, 135 insertions(+), 29 deletions(-) ----------------------------------------------------------------------