Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b25194c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b25194c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b25194c Branch: refs/heads/ignite-comm-balance Commit: 2b25194c23de7718333cb2745c12d967077d9b5b Parents: 928c805 88a1ccb Author: sboikov <[email protected]> Authored: Fri Sep 23 19:05:22 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 23 19:05:22 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 12 + .../store/jdbc/CacheAbstractJdbcStore.java | 146 ++++++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 5 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 45 ++- .../store/jdbc/dialect/BasicJdbcDialect.java | 8 +- .../cache/store/jdbc/dialect/DB2Dialect.java | 6 +- .../cache/store/jdbc/dialect/H2Dialect.java | 5 +- .../cache/store/jdbc/dialect/JdbcDialect.java | 18 +- .../cache/store/jdbc/dialect/MySQLDialect.java | 9 +- .../cache/store/jdbc/dialect/OracleDialect.java | 5 +- .../store/jdbc/dialect/SQLServerDialect.java | 14 +- .../internal/GridEventConsumeHandler.java | 5 - .../internal/GridMessageListenHandler.java | 5 - .../internal/binary/BinaryObjectExImpl.java | 164 ++++++--- .../internal/binary/BinaryWriterExImpl.java | 21 +- .../communication/GridIoMessageFactory.java | 16 +- .../processors/cache/GridCacheEntryEx.java | 8 + .../processors/cache/GridCacheMapEntry.java | 9 +- .../GridCacheReturnCompletableWrapper.java | 101 ++++++ .../cache/GridDeferredAckMessageSender.java | 219 ++++++++++++ .../GridDistributedTxRemoteAdapter.java | 65 +++- .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxFinishRequest.java | 33 +- .../dht/GridDhtTxFinishResponse.java | 52 ++- .../dht/GridDhtTxOnePhaseCommitAckRequest.java | 134 +++++++ .../distributed/dht/GridDhtTxPrepareFuture.java | 42 ++- .../dht/GridDhtTxPrepareRequest.java | 93 +++-- .../cache/distributed/dht/GridDhtTxRemote.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 227 +++--------- ...arOptimisticSerializableTxPrepareFuture.java | 4 +- .../near/GridNearOptimisticTxPrepareFuture.java | 7 +- .../GridNearPessimisticTxPrepareFuture.java | 4 +- .../near/GridNearTxFinishFuture.java | 112 +++++- .../continuous/CacheContinuousQueryHandler.java | 5 - .../cache/transactions/IgniteTxAdapter.java | 46 ++- .../cache/transactions/IgniteTxEntry.java | 44 ++- .../cache/transactions/IgniteTxHandler.java | 163 +++++++-- .../transactions/IgniteTxLocalAdapter.java | 27 +- .../cache/transactions/IgniteTxManager.java | 154 +++++++- .../continuous/GridContinuousHandler.java | 8 - .../continuous/GridContinuousProcessor.java | 33 +- .../igfs/IgfsAbstractOutputStream.java | 266 ++++++++++++++ .../internal/processors/igfs/IgfsContext.java | 35 ++ .../processors/igfs/IgfsDataManager.java | 121 +++---- .../internal/processors/igfs/IgfsImpl.java | 109 ++++-- .../processors/igfs/IgfsInputStreamImpl.java | 103 ++++-- .../processors/igfs/IgfsOutputStreamImpl.java | 319 ++++------------- .../igfs/IgfsOutputStreamProxyImpl.java | 163 +++++++++ .../ignite/internal/util/nio/GridNioServer.java | 33 +- .../communication/tcp/TcpCommunicationSpi.java | 5 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 18 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 38 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 48 ++- ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 2 +- ...reBinaryMarshallerWithSqlEscapeSelfTest.java | 28 ++ ...dbcPojoStoreOptimizedMarshallerSelfTest.java | 2 +- ...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 ++ .../binary/BinaryMarshallerSelfTest.java | 53 ++- .../binary/BinaryObjectToStringSelfTest.java | 92 +++++ .../CacheSwapUnswapGetTestSmallQueueSize.java | 35 ++ ...idAbstractCacheInterceptorRebalanceTest.java | 356 +++++++++++++++++++ ...heInterceptorAtomicOffheapRebalanceTest.java | 30 ++ ...GridCacheInterceptorAtomicRebalanceTest.java | 36 ++ ...ceptorTransactionalOffheapRebalanceTest.java | 35 ++ ...heInterceptorTransactionalRebalanceTest.java | 36 ++ .../processors/cache/GridCacheTestEntryEx.java | 4 + .../IgniteCacheInterceptorSelfTestSuite.java | 5 + .../IgniteCachePutRetryAbstractSelfTest.java | 39 +- ...gniteCachePutRetryTransactionalSelfTest.java | 75 +++- ...ContinuousQueryFailoverAbstractSelfTest.java | 99 ++++++ ...eContinuousQueryMultiNodesFilteringTest.java | 161 +++++++++ .../igfs/IgfsAbstractBaseSelfTest.java | 2 +- .../marshaller/MarshallerContextTestImpl.java | 28 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...GridTcpCommunicationSpiRecoverySelfTest.java | 3 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 89 +++++ .../IgniteBinaryObjectsTestSuite.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + .../testsuites/IgniteCacheTestSuite4.java | 2 + .../apache/ignite/schema/parser/DbColumn.java | 16 +- .../parser/dialect/DatabaseMetadataDialect.java | 9 + .../parser/dialect/JdbcMetadataDialect.java | 23 +- .../parser/dialect/MySQLMetadataDialect.java | 24 +- .../parser/dialect/OracleMetadataDialect.java | 5 +- .../ignite/schema/model/PojoDescriptor.java | 24 +- .../src/test/config/jdbc-pojo-store-builtin.xml | 12 +- .../src/test/config/jdbc-pojo-store-obj.xml | 12 +- .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 12 +- .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 14 +- .../store/jdbc/CachePojoStoreXmlSelfTest.java | 13 +- .../CachePojoStoreXmlWithSqlEscapeSelfTest.java | 28 ++ .../testsuites/IgniteSpringTestSuite.java | 5 +- .../config/benchmark-client-mode.properties | 2 + .../config/benchmark-tx-win.properties | 2 + .../yardstick/config/benchmark-tx.properties | 2 + .../yardstick/config/benchmark-win.properties | 2 + modules/yardstick/config/benchmark.properties | 2 + .../cache/IgniteGetAndPutBenchmark.java | 41 +++ .../cache/IgniteGetAndPutTxBenchmark.java | 70 ++++ .../cache/IgniteInvokeTxBenchmark.java | 40 +++ 100 files changed, 3955 insertions(+), 1001 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b25194c/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b25194c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b25194c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
