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 A4D5B200B8C for ; Fri, 19 Aug 2016 13:48:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A3CD1160ACF; Fri, 19 Aug 2016 11:48:22 +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 783F7160AC9 for ; Fri, 19 Aug 2016 13:48:21 +0200 (CEST) Received: (qmail 79529 invoked by uid 500); 19 Aug 2016 11:48:20 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 78693 invoked by uid 99); 19 Aug 2016 11:48:19 -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, 19 Aug 2016 11:48:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5AA8EF790; Fri, 19 Aug 2016 11:48:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 19 Aug 2016 11:48:41 -0000 Message-Id: <815714830eae4e0cac52396d9c8da3a3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/53] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.6.5' into ignite-1.7.2 archived-at: Fri, 19 Aug 2016 11:48:22 -0000 Merge remote-tracking branch 'remotes/community/ignite-1.6.5' into ignite-1.7.2 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47da1990 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47da1990 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47da1990 Branch: refs/heads/ignite-3299 Commit: 47da19903b0e851ae4cd0f9ee593fd0f031ea2b6 Parents: 8dd39a5 151dfa7 Author: tledkov-gridgain Authored: Wed Aug 10 12:04:49 2016 +0300 Committer: tledkov-gridgain Committed: Wed Aug 10 12:04:49 2016 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 6 +- .../java/org/apache/ignite/IgniteCompute.java | 69 +- .../configuration/ConnectorConfiguration.java | 1 + .../ignite/internal/GridJobExecuteRequest.java | 148 +++- .../ignite/internal/GridJobExecuteResponse.java | 42 +- .../ignite/internal/IgniteComputeImpl.java | 120 ++- .../failover/GridFailoverContextImpl.java | 27 +- .../managers/failover/GridFailoverManager.java | 17 +- .../affinity/GridAffinityProcessor.java | 18 + .../processors/cache/GridCacheSwapManager.java | 22 +- .../distributed/dht/GridDhtCacheAdapter.java | 19 +- .../distributed/dht/GridDhtLocalPartition.java | 33 +- .../cache/distributed/dht/GridReservable.java | 5 +- .../cache/query/GridCacheQueryManager.java | 10 +- .../processors/closure/AffinityTask.java | 17 +- .../closure/GridClosureProcessor.java | 142 +++- .../processors/job/GridJobProcessor.java | 139 ++- .../internal/processors/job/GridJobWorker.java | 203 +++-- .../processors/query/GridQueryProcessor.java | 22 +- .../processors/task/GridTaskWorker.java | 235 +++-- .../ignite/internal/util/IgniteUtils.java | 10 + .../ignite/spi/failover/FailoverContext.java | 15 +- .../spi/failover/always/AlwaysFailoverSpi.java | 15 +- .../GridJobMasterLeaveAwareSelfTest.java | 4 +- ...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +- .../GridTaskFailoverAffinityRunTest.java | 2 +- .../IgniteComputeEmptyClusterGroupTest.java | 8 +- .../binary/GridBinaryAffinityKeySelfTest.java | 6 +- ...acheAbstractUsersAffinityMapperSelfTest.java | 2 +- ...niteDynamicCacheStartStopConcurrentTest.java | 2 +- .../spi/failover/GridFailoverTestContext.java | 6 + .../ignite/testframework/IgniteTestSuite.java | 191 +++++ .../apache/ignite/testsuites/IgniteIgnore.java | 35 + .../testsuites/IgniteIgnoredTestSuite.java | 63 ++ ...eLockPartitionOnAffinityRunAbstractTest.java | 413 +++++++++ ...PartitionOnAffinityRunAtomicCacheOpTest.java | 329 +++++++ ...niteCacheLockPartitionOnAffinityRunTest.java | 852 +++++++++++++++++++ ...LockPartitionOnAffinityRunTxCacheOpTest.java | 33 + ...titionOnAffinityRunWithCollisionSpiTest.java | 204 +++++ .../IgniteCacheAffinityRunTestSuite.java | 45 + .../apache/ignite/cache/spring/SpringCache.java | 44 +- .../ignite/cache/spring/SpringCacheManager.java | 7 +- .../spring/GridSpringCacheManagerSelfTest.java | 438 ++++++++++ .../cache/spring/GridSpringCacheTestKey.java | 61 ++ .../spring/GridSpringCacheTestKeyGenerator.java | 40 + .../spring/GridSpringCacheTestService.java | 181 ++++ .../GridSpringDynamicCacheTestService.java | 85 ++ .../SpringCacheManagerContextInjectionTest.java | 125 +++ .../ignite/cache/spring/spring-caching.xml | 57 ++ .../spring/GridSpringCacheManagerSelfTest.java | 342 -------- .../ignite/spring/GridSpringCacheTestKey.java | 61 -- .../spring/GridSpringCacheTestKeyGenerator.java | 40 - .../spring/GridSpringCacheTestService.java | 125 --- .../GridSpringDynamicCacheTestService.java | 85 -- .../SpringCacheManagerContextInjectionTest.java | 126 --- .../org/apache/ignite/spring/spring-caching.xml | 57 -- .../testsuites/IgniteSpringTestSuite.java | 4 +- 57 files changed, 4284 insertions(+), 1128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 0dd542e,8469a7c..d73b6ca --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@@ -889,8 -967,8 +893,8 @@@ public class GridQueryProcessor extend String sql = qry.getSql(); Object[] args = qry.getArgs(); - final GridQueryFieldsResult res = idx.queryFields(space, sql, F.asList(args), - idx.backupFilter(null, requestTopVer.get(), null)); + final GridQueryFieldsResult res = idx.queryLocalSqlFields(space, sql, F.asList(args), - idx.backupFilter(null, null), qry.isEnforceJoinOrder()); ++ idx.backupFilter(null, requestTopVer.get(), null), qry.isEnforceJoinOrder()); sendQueryExecutedEvent(sql, args); http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47da1990/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java ----------------------------------------------------------------------