From commits-return-991-apmail-apex-commits-archive=apex.apache.org@apex.incubator.apache.org Sun Oct 11 16:05:41 2015 Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5831018CE8 for ; Sun, 11 Oct 2015 16:05:41 +0000 (UTC) Received: (qmail 97315 invoked by uid 500); 11 Oct 2015 16:05:41 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 97275 invoked by uid 500); 11 Oct 2015 16:05:41 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 97266 invoked by uid 99); 11 Oct 2015 16:05:41 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Oct 2015 16:05:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C9A56C059F for ; Sun, 11 Oct 2015 16:05:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id PXw7za37mLEe for ; Sun, 11 Oct 2015 16:05:28 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 28702439F8 for ; Sun, 11 Oct 2015 16:05:18 +0000 (UTC) Received: (qmail 95198 invoked by uid 99); 11 Oct 2015 16:05:17 -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; Sun, 11 Oct 2015 16:05:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5F46E0BB2; Sun, 11 Oct 2015 16:05:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vrozov@apache.org To: commits@apex.incubator.apache.org Date: Sun, 11 Oct 2015 16:05:24 -0000 Message-Id: <17d21600664e4d6ba4e041d2856d15e9@git.apache.org> In-Reply-To: <05481e5f89f84da8afcd24528691195d@git.apache.org> References: <05481e5f89f84da8afcd24528691195d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/29] incubator-apex-core git commit: Merge branch 'APEX-157' into devel-3 Merge branch 'APEX-157' into devel-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/cf97d0b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/cf97d0b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/cf97d0b7 Branch: refs/heads/feature-module Commit: cf97d0b7119edd1feea9ad5c9aac23aa9bf6732b Parents: 4adac06 b799bd2 Author: Timothy Farkas Authored: Tue Sep 29 13:01:35 2015 -0700 Committer: Timothy Farkas Committed: Tue Sep 29 13:01:35 2015 -0700 ---------------------------------------------------------------------- .../stram/plan/logical/LogicalPlan.java | 23 ++++++ .../logical/LogicalPlanConfigurationTest.java | 6 ++ .../stram/plan/logical/LogicalPlanTest.java | 83 +++++++++++++++++++- engine/src/test/resources/testTopology.json | 2 +- 4 files changed, 112 insertions(+), 2 deletions(-) ----------------------------------------------------------------------