Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 A8EEF18608 for ; Wed, 13 May 2015 14:48:24 +0000 (UTC) Received: (qmail 35221 invoked by uid 500); 13 May 2015 14:48:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35191 invoked by uid 500); 13 May 2015 14:48:24 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 35182 invoked by uid 99); 13 May 2015 14:48:24 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 14:48:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 29560182369 for ; Wed, 13 May 2015 14:48:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id pPK1prieiUBf for ; Wed, 13 May 2015 14:48:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A7E9D24C65 for ; Wed, 13 May 2015 14:48:07 +0000 (UTC) Received: (qmail 33842 invoked by uid 99); 13 May 2015 14:48:06 -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, 13 May 2015 14:48:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2E23E32B9; Wed, 13 May 2015 14:48:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 13 May 2015 14:48:06 -0000 Message-Id: <1fda660da4b340789997e5718df54344@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646 Repository: incubator-ignite Updated Branches: refs/heads/ignite-471 74c6bab70 -> 505dc6286 Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e4bc104 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e4bc104 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e4bc104 Branch: refs/heads/ignite-471 Commit: 9e4bc1044c7b6b3cc2bcbad4cae9bbebd33bcc14 Parents: d24064a 2dfc187 Author: avinogradov Authored: Fri Apr 24 19:14:24 2015 +0300 Committer: avinogradov Committed: Fri Apr 24 19:14:24 2015 +0300 ---------------------------------------------------------------------- .../aop/aspectj/GridifyAspectJAspect.java | 2 +- .../aspectj/GridifySetToSetAspectJAspect.java | 2 +- .../aspectj/GridifySetToValueAspectJAspect.java | 2 +- .../aop/spring/GridifySetToSetSpringAspect.java | 2 +- .../spring/GridifySetToValueSpringAspect.java | 2 +- .../gridify/aop/spring/GridifySpringAspect.java | 2 +- .../cache/CacheServerNotFoundException.java | 12 +- .../apache/ignite/cache/CachingProvider.java | 3 + .../ignite/events/CacheQueryExecutedEvent.java | 3 +- .../ignite/events/CacheQueryReadEvent.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 15 +- .../org/apache/ignite/internal/IgnitionEx.java | 6 + .../ClusterTopologyServerNotFoundException.java | 12 +- .../deployment/GridDeploymentClassLoader.java | 2 +- .../discovery/GridDiscoveryManager.java | 3 + .../eventstorage/GridEventStorageManager.java | 6 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../cache/CacheStoreBalancingWrapper.java | 6 + .../processors/cache/GridCacheAdapter.java | 9 +- .../processors/cache/GridCacheEntryEx.java | 4 + .../processors/cache/GridCacheIoManager.java | 6 + .../processors/cache/GridCacheMapEntry.java | 20 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 53 +- .../GridDistributedCacheAdapter.java | 20 +- .../distributed/GridDistributedLockRequest.java | 99 +- .../GridDistributedTxRemoteAdapter.java | 3 + .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../cache/distributed/dht/GridDhtGetFuture.java | 9 +- .../distributed/dht/GridDhtLockFuture.java | 20 +- .../distributed/dht/GridDhtLockRequest.java | 7 +- .../dht/GridDhtTransactionalCacheAdapter.java | 21 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/GridPartitionedGetFuture.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 41 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 38 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 56 +- .../colocated/GridDhtColocatedLockFuture.java | 18 +- .../GridDhtPartitionsExchangeFuture.java | 3 + .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 15 +- .../distributed/near/GridNearLockRequest.java | 7 +- .../near/GridNearTransactionalCache.java | 43 +- .../near/GridNearTxFinishFuture.java | 3 + .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 59 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../query/GridCacheQueryFutureAdapter.java | 3 + .../cache/query/GridCacheQueryManager.java | 20 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 3 + .../cache/transactions/IgniteTxAdapter.java | 7 +- .../cache/transactions/IgniteTxEntry.java | 74 +- .../cache/transactions/IgniteTxHandler.java | 27 +- .../transactions/IgniteTxLocalAdapter.java | 106 +- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../closure/GridClosureProcessor.java | 16 +- .../datastreamer/DataStreamProcessor.java | 28 +- .../datastreamer/DataStreamerImpl.java | 3 +- .../datastreamer/DataStreamerRequest.java | 38 +- .../processors/igfs/IgfsFileWorkerBatch.java | 3 + .../internal/processors/igfs/IgfsThread.java | 8 +- .../internal/processors/job/GridJobWorker.java | 9 + .../portable/GridPortableInputStream.java | 26 - .../processors/query/GridQueryProcessor.java | 3 + .../processors/rest/GridRestProcessor.java | 3 + .../service/GridServiceProcessor.java | 9 + .../processors/task/GridTaskWorker.java | 12 + .../timeout/GridTimeoutProcessor.java | 3 + .../ignite/internal/util/IgniteUtils.java | 22 +- .../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 +- .../ignite/internal/util/nio/GridNioServer.java | 6 + .../apache/ignite/internal/util/typedef/X.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 3 + .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../ignite/messaging/MessagingListenActor.java | 3 + .../org/apache/ignite/spi/IgniteSpiThread.java | 3 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 + .../startup/cmdline/CommandLineStartup.java | 5 +- .../startup/cmdline/CommandLineTransformer.java | 3 + .../cache/GridCacheAbstractFullApiSelfTest.java | 514 ++++++- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../cache/IgniteExcangeFutureHistoryTest.java | 74 - .../cache/IgniteExchangeFutureHistoryTest.java | 77 ++ .../CacheNoValueClassOnServerNodeTest.java | 129 ++ .../DataStreamerMultiThreadedSelfTest.java | 101 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 7 +- .../CacheNoValueClassOnServerTestClient.java | 88 ++ .../apache/ignite/tests/p2p/cache/Person.java | 42 + .../CacheConfigurationP2PTestClient.java | 1 - .../processors/hadoop/HadoopDefaultJobInfo.java | 3 + .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 + .../hadoop/jobtracker/HadoopJobTracker.java | 5 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 3 + .../external/HadoopExternalTaskExecutor.java | 3 + .../processors/hadoop/v2/HadoopV2Job.java | 11 +- .../hadoop/v2/HadoopV2TaskContext.java | 9 + .../query/h2/twostep/GridMapQueryExecutor.java | 3 + .../GridCacheAbstractFieldsQuerySelfTest.java | 1284 ------------------ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 235 +++- ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 - ...GridCachePartitionedFieldsQuerySelfTest.java | 115 -- ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 - ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 + ...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 - .../GridCacheReplicatedFieldsQuerySelfTest.java | 157 --- ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 - ...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../http/jetty/GridJettyRestHandler.java | 3 + .../ignite/schema/ui/SchemaImportApp.java | 8 +- .../uri/GridUriDeploymentClassLoader.java | 4 +- 123 files changed, 2234 insertions(+), 2141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e4bc104/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index affdaf0,b8668e6..1fe1f50 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@@ -288,7 -282,16 +288,10 @@@ public class GridCacheIoManager extend } } catch (Throwable e) { - if (X.hasCause(e, ClassNotFoundException.class)) - U.error(log, "Failed to process message (note that distributed services " + - "do not support peer class loading, if you deploy distributed service " + - "you should have all required classes in CLASSPATH on all nodes in topology) " + - "[senderId=" + nodeId + ", err=" + X.cause(e, ClassNotFoundException.class).getMessage() + ']'); - else - U.error(log, "Failed to process message [senderId=" + nodeId + ']', e); + U.error(log, "Failed to process message [senderId=" + nodeId + ", messageType=" + cacheMsg.getClass() + ']', e); + + if (e instanceof Error) + throw (Error)e; } finally { if (depEnabled) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e4bc104/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ----------------------------------------------------------------------