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 E5FFE200B91 for ; Mon, 22 Aug 2016 05:26:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E4B2E160AAA; Mon, 22 Aug 2016 03:26:37 +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 0DAC3160AC4 for ; Mon, 22 Aug 2016 05:26:35 +0200 (CEST) Received: (qmail 194 invoked by uid 500); 22 Aug 2016 03:26:35 -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 98917 invoked by uid 99); 22 Aug 2016 03:26:34 -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; Mon, 22 Aug 2016 03:26:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E40BEE098D; Mon, 22 Aug 2016 03:26:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 22 Aug 2016 03:27:00 -0000 Message-Id: <7e20260af4004c1b801faa09dae64478@git.apache.org> In-Reply-To: <97a3dbe690d14f6380d99b1e82cec159@git.apache.org> References: <97a3dbe690d14f6380d99b1e82cec159@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/28] ignite git commit: Merge branches 'ignite-1.7.2' and 'master'. archived-at: Mon, 22 Aug 2016 03:26:38 -0000 Merge branches 'ignite-1.7.2' and 'master'. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d436070 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d436070 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d436070 Branch: refs/heads/master Commit: 2d4360707d9ec242db2733b5dd34fd20d7799a3c Parents: f0c3b34 fa374fb Author: Alexey Kuznetsov Authored: Mon Aug 22 10:26:45 2016 +0700 Committer: Alexey Kuznetsov Committed: Mon Aug 22 10:26:45 2016 +0700 ---------------------------------------------------------------------- .../hibernate/HibernateL2CacheExample.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 27 +- .../apache/ignite/IgniteSystemProperties.java | 10 + .../igfs/secondary/IgfsSecondaryFileSystem.java | 2 +- .../local/LocalIgfsSecondaryFileSystem.java | 396 +++++++ .../igfs/secondary/local/package-info.java | 22 + .../ignite/igfs/secondary/package-info.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 43 +- .../ignite/internal/binary/BinaryContext.java | 21 +- .../binary/BinaryMethodWriteReplacer.java | 59 + .../ignite/internal/binary/BinaryTreeMap.java | 96 ++ .../binary/BinaryTreeMapWriteReplacer.java | 34 + .../ignite/internal/binary/BinaryTreeSet.java | 93 ++ .../binary/BinaryTreeSetWriteReplacer.java | 34 + .../ignite/internal/binary/BinaryUtils.java | 37 +- .../internal/binary/BinaryWriteReplacer.java | 33 + .../internal/binary/BinaryWriterExImpl.java | 35 +- .../processors/cache/GridCacheIoManager.java | 24 +- .../processors/cache/GridCacheMessage.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 19 + .../dht/atomic/GridDhtAtomicCache.java | 176 ++- .../GridNearPessimisticTxPrepareFuture.java | 2 + .../near/GridNearTransactionalCache.java | 2 +- .../near/GridNearTxFinishFuture.java | 28 +- .../cache/distributed/near/GridNearTxLocal.java | 14 +- .../cache/transactions/IgniteTxHandler.java | 1 - .../internal/processors/igfs/IgfsAsyncImpl.java | 5 + .../ignite/internal/processors/igfs/IgfsEx.java | 7 + .../internal/processors/igfs/IgfsFileImpl.java | 20 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../processors/igfs/IgfsOutputStreamImpl.java | 7 +- .../internal/processors/igfs/IgfsUtils.java | 53 + .../local/LocalFileSystemIgfsFile.java | 134 +++ ...fsSecondaryFileSystemPositionedReadable.java | 65 ++ .../util/nio/GridTcpNioCommunicationClient.java | 5 +- .../visor/cache/VisorCacheTypeMetadata.java | 20 +- .../communication/tcp/TcpCommunicationSpi.java | 49 +- .../internal/binary/BinaryTreeSelfTest.java | 341 ++++++ .../CacheSerializableTransactionsTest.java | 5 + .../CacheTxNotAllowReadFromBackupTest.java | 297 +++++ .../IgniteCacheConnectionRecoveryTest.java | 205 ++++ .../IgniteCacheMessageRecoveryAbstractTest.java | 14 +- ...gniteCacheMessageRecoveryIdleConnection.java | 154 --- ...eCacheMessageRecoveryIdleConnectionTest.java | 157 +++ .../CacheEntryProcessorNonSerializableTest.java | 410 +++++++ ...faultIgfsSecondaryFileSystemTestAdapter.java | 117 ++ .../processors/igfs/IgfsAbstractSelfTest.java | 1057 ++++++++++-------- .../igfs/IgfsBackupFailoverSelfTest.java | 2 +- .../igfs/IgfsDualAbstractSelfTest.java | 252 +---- .../igfs/IgfsExUniversalFileSystemAdapter.java | 116 -- ...SecondaryFileSystemDualAbstractSelfTest.java | 76 ++ ...ondaryFileSystemDualAsyncClientSelfTest.java | 28 + ...calSecondaryFileSystemDualAsyncSelfTest.java | 32 + ...condaryFileSystemDualSyncClientSelfTest.java | 28 + ...ocalSecondaryFileSystemDualSyncSelfTest.java | 32 + ...IgfsLocalSecondaryFileSystemTestAdapter.java | 141 +++ .../internal/processors/igfs/IgfsMock.java | 5 + .../IgfsSecondaryFileSystemTestAdapter.java | 118 ++ .../igfs/UniversalFileSystemAdapter.java | 109 -- .../IgniteBinaryObjectsTestSuite.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 8 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 9 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 2 +- .../ignite/igfs/Hadoop1DualAbstractTest.java | 3 +- ...oopFileSystemUniversalFileSystemAdapter.java | 139 --- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 2 +- ...adoopIgfsSecondaryFileSystemTestAdapter.java | 149 +++ .../ClientReconnectAfterClusterRestartTest.java | 225 ++++ ...eLockPartitionOnAffinityRunAbstractTest.java | 17 + .../IgniteCacheWithIndexingTestSuite.java | 5 +- .../parser/dialect/DatabaseMetadataDialect.java | 18 + .../parser/dialect/JdbcMetadataDialect.java | 5 +- .../parser/dialect/OracleMetadataDialect.java | 5 +- .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/parser/DatabaseMetadataParser.java | 4 +- .../ignite/schema/ui/SchemaImportApp.java | 3 +- .../schema/test/AbstractSchemaImportTest.java | 27 +- .../test/generator/CodeGeneratorTest.java | 28 +- .../schema/test/generator/XmlGeneratorTest.java | 22 +- .../ignite/schema/test/model/CacheConfig.txt | 409 +++++++ .../schema/test/model/ignite-type-metadata.xml | 50 +- .../test/parser/DbMetadataParserTest.java | 6 +- 84 files changed, 5023 insertions(+), 1409 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d436070/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d436070/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ----------------------------------------------------------------------