You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/08/22 07:37:28 UTC

[32/32] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3220-1

Merge remote-tracking branch 'remotes/origin/master' into ignite-3220-1

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43b64c06
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43b64c06
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43b64c06

Branch: refs/heads/ignite-3220-1
Commit: 43b64c06e0076c5315a303e51c65a23ea66e05d9
Parents: ea2b19f 2d43607
Author: sboikov <sb...@gridgain.com>
Authored: Mon Aug 22 10:36:41 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Aug 22 10:36:41 2016 +0300

----------------------------------------------------------------------
 .../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  |   17 +-
 .../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 +-
 .../Binary/JavaTypeMappingTest.cs               |   18 +-
 .../Cache/Query/CacheQueriesTest.cs             |   45 +-
 .../Config/cache-query.xml                      |   38 +-
 .../Apache.Ignite.Core/Impl/Binary/JavaTypes.cs |   19 +-
 .../Impl/Handle/HandleRegistry.cs               |   11 +
 .../Impl/Memory/PlatformRawMemory.cs            |    1 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   14 +-
 .../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 +-
 91 files changed, 5111 insertions(+), 1435 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/43b64c06/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------