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 419B018B4F for ; Sun, 5 Jul 2015 19:00:29 +0000 (UTC) Received: (qmail 42071 invoked by uid 500); 5 Jul 2015 19:00:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42034 invoked by uid 500); 5 Jul 2015 19:00:29 -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 42025 invoked by uid 99); 5 Jul 2015 19:00:29 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Jul 2015 19:00:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id B414DD2575 for ; Sun, 5 Jul 2015 19:00:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.21 X-Spam-Level: * X-Spam-Status: No, score=1.21 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.571, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 9H0t7EmmUCV7 for ; Sun, 5 Jul 2015 19:00:27 +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 DF09F4C10C for ; Sun, 5 Jul 2015 19:00:16 +0000 (UTC) Received: (qmail 41689 invoked by uid 99); 5 Jul 2015 19:00:16 -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, 05 Jul 2015 19:00:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE38FE0522; Sun, 5 Jul 2015 19:00:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Sun, 05 Jul 2015 19:00:17 -0000 Message-Id: <8098dfd64ed746a197cab0c46f6301a9@git.apache.org> In-Reply-To: <540470ac47904a3782323dfc83011f27@git.apache.org> References: <540470ac47904a3782323dfc83011f27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/19] incubator-ignite git commit: # Merge ignite-sprint-7 to ignite-gg-10416. # Merge ignite-sprint-7 to ignite-gg-10416. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce31bae5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce31bae5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce31bae5 Branch: refs/heads/ignite-1026 Commit: ce31bae57ed9f78d9ae5ce98f9261b26c9f89186 Parents: b12c803 489ab0f Author: Andrey Authored: Thu Jun 18 13:34:41 2015 +0700 Committer: Andrey Committed: Thu Jun 18 13:34:41 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/cache/query/ScanQuery.java | 23 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 ++++++ .../configuration/CacheConfiguration.java | 3 +- .../ignite/internal/GridKernalContextImpl.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 11 +- .../internal/MarshallerContextAdapter.java | 18 +- .../ignite/internal/MarshallerContextImpl.java | 14 +- .../client/GridClientConfiguration.java | 4 +- .../GridClientOptimizedMarshaller.java | 26 + .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../discovery/GridDiscoveryManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 34 +- .../distributed/GridCacheTxRecoveryRequest.java | 26 +- .../GridCacheTxRecoveryResponse.java | 14 +- .../distributed/GridDistributedBaseMessage.java | 77 +-- .../distributed/GridDistributedLockRequest.java | 54 +- .../GridDistributedLockResponse.java | 14 +- .../GridDistributedTxFinishRequest.java | 46 +- .../GridDistributedTxPrepareRequest.java | 62 +-- .../GridDistributedTxPrepareResponse.java | 64 +-- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLockRequest.java | 72 ++- .../distributed/dht/GridDhtLockResponse.java | 18 +- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockRequest.java | 58 +-- .../distributed/near/GridNearLockResponse.java | 26 +- .../near/GridNearTxFinishRequest.java | 26 +- .../near/GridNearTxPrepareRequest.java | 50 +- .../near/GridNearTxPrepareResponse.java | 46 +- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 3 - .../transactions/IgniteTxLocalAdapter.java | 6 +- .../datastructures/DataStructuresProcessor.java | 67 ++- .../plugin/IgnitePluginProcessor.java | 16 +- .../processors/query/GridQueryProcessor.java | 102 ++-- .../messages/GridQueryNextPageResponse.java | 1 + .../rest/client/message/GridRouterRequest.java | 18 + .../rest/client/message/GridRouterResponse.java | 18 + .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 21 + .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 498 +++++++++++++------ .../ignite/spi/discovery/tcp/ServerImpl.java | 221 ++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 12 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../cache/CacheClientStoreSelfTest.java | 228 +++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 ------------ .../GridCacheAbstractFailoverSelfTest.java | 2 + ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCachePutAllFailoverSelfTest.java | 5 - .../cache/GridCacheVersionMultinodeTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 82 +++ .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 189 ++++++- .../dht/GridCacheColocatedFailoverSelfTest.java | 5 - .../GridCachePartitionedFailoverSelfTest.java | 5 - .../GridCachePartitionedTxSalvageSelfTest.java | 37 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - ...CacheClientWriteBehindStoreAbstractTest.java | 104 ++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../DataStreamProcessorSelfTest.java | 3 +- .../marshaller/MarshallerContextTestImpl.java | 18 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../junits/GridTestKernalContext.java | 1 + .../junits/common/GridCommonAbstractTest.java | 11 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 ++ .../testsuites/IgniteCacheTestSuite4.java | 6 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 16 +- .../hibernate/CacheHibernateBlobStore.java | 87 +--- .../CacheHibernateBlobStoreFactory.java | 235 +++++++++ .../hibernate/src/test/config/factory-cache.xml | 59 +++ .../src/test/config/factory-cache1.xml | 61 +++ .../config/factory-incorrect-store-cache.xml | 56 +++ .../CacheHibernateStoreFactorySelfTest.java | 273 ++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + modules/indexing/pom.xml | 2 +- .../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 ++ .../cache/GridCacheQueryMetricsSelfTest.java | 206 -------- .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 9 +- .../GridResourceSpringBeanInjector.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 17 + .../src/test/config/incorrect-store-cache.xml | 57 +++ modules/spring/src/test/config/node.xml | 43 ++ modules/spring/src/test/config/node1.xml | 45 ++ .../test/config/pojo-incorrect-store-cache.xml | 56 +++ modules/spring/src/test/config/store-cache.xml | 59 +++ modules/spring/src/test/config/store-cache1.xml | 62 +++ .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +++++++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 +++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 30 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 154 files changed, 4386 insertions(+), 1615 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce31bae5/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java ----------------------------------------------------------------------