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 2019/04/03 07:02:56 UTC
[ignite] 02/03: Merge remote-tracking branch
'remotes/origin/master' into ignite-9720
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-9720
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit d429160ccbba4857fd0b0ad952342d7128c885d6
Merge: 79610fe 4daa681
Author: sboikov <sb...@apache.org>
AuthorDate: Wed Apr 3 10:00:18 2019 +0300
Merge remote-tracking branch 'remotes/origin/master' into ignite-9720
modules/cassandra/store/pom.xml | 12 +
.../internal/client/thin/ReliableChannel.java | 25 +-
.../cache/distributed/dht/CompoundLockFuture.java | 112 ---
.../dht/GridDhtTxAbstractEnlistFuture.java | 8 +-
.../dht/GridDhtTxQueryEnlistFuture.java | 2 +-
.../near/GridNearTxAbstractEnlistFuture.java | 5 +-
.../near/GridNearTxSelectForUpdateFuture.java | 462 ------------
.../distributed/near/TxTopologyVersionFuture.java | 176 -----
.../ignite/internal/util/HostAndPortRange.java | 3 +
.../org/apache/ignite/client/ConnectionTest.java | 73 ++
.../cache/CacheGetRemoveSkipStoreTest.java | 4 +-
.../processors/cache/CacheRemoveAllSelfTest.java | 4 +-
.../cache/GridCacheVariableTopologySelfTest.java | 4 +-
...IgniteCacheInvokeReadThroughSingleNodeTest.java | 4 +-
.../cache/IgniteCacheInvokeReadThroughTest.java | 4 +-
.../IgniteCacheReadThroughEvictionSelfTest.java | 4 +-
.../GridCacheMultiNodeLockAbstractTest.java | 4 +-
.../GridCacheNodeFailureAbstractTest.java | 9 +-
.../IgniteTxRemoveTimeoutObjectsTest.java | 4 +-
.../near/GridCachePartitionedEventSelfTest.java | 4 +-
.../transactions/TxRollbackAsyncNearCacheTest.java | 4 +-
.../tcp/GridTcpCommunicationSpiLanLoadTest.java | 2 -
.../spi/discovery/AbstractDiscoverySelfTest.java | 2 -
.../testframework/junits/GridAbstractTest.java | 206 +++---
.../junits/JUnit3TestLegacySupport.java | 33 +-
.../junits/common/GridCommonAbstractTest.java | 4 +-
.../junits/spi/GridSpiAbstractTest.java | 12 +-
.../util/mbeans/GridMBeanDisableSelfTest.java | 8 +-
.../cache/query/GridCacheTwoStepQuery.java | 26 +-
.../query/h2/DhtResultSetEnlistFuture.java | 63 --
.../processors/query/h2/H2FieldsIterator.java | 5 +-
.../processors/query/h2/H2KeyValueIterator.java | 2 +-
.../processors/query/h2/H2ResultSetIterator.java | 7 +-
.../internal/processors/query/h2/H2Utils.java | 15 -
.../processors/query/h2/IgniteH2Indexing.java | 472 ++++++------
.../query/h2/NearResultSetEnlistFuture.java | 59 --
.../internal/processors/query/h2/QueryParser.java | 82 ++-
.../query/h2/QueryParserResultSelect.java | 61 +-
.../processors/query/h2/ResultSetEnlistFuture.java | 136 ----
.../processors/query/h2/dml/UpdatePlanBuilder.java | 12 +-
.../query/h2/sql/GridSqlQueryParser.java | 55 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 84 ++-
.../processors/query/h2/sql/GridSqlSelect.java | 24 +
.../query/h2/twostep/GridMapQueryExecutor.java | 197 +----
.../query/h2/twostep/GridReduceQueryExecutor.java | 157 +---
.../query/h2/twostep/MapQueryResults.java | 15 +-
.../query/h2/twostep/ReduceQueryRun.java | 14 -
.../query/h2/twostep/ReduceResultPage.java | 20 +-
.../org/apache/ignite/client/ClientTestSuite.java | 3 +-
...cheMvccPartitionedSelectForUpdateQueryTest.java | 47 --
...acheMvccReplicatedSelectForUpdateQueryTest.java | 30 -
.../CacheMvccSelectForUpdateQueryAbstractTest.java | 370 ----------
.../CacheMvccSelectForUpdateQueryBasicTest.java | 789 +++++++++++++++++++++
.../mvcc/CacheMvccSelectForUpdateQueryTest.java | 184 +++++
.../IgniteBinaryCacheQueryTestSuite2.java | 3 +
.../testsuites/IgniteCacheMvccSqlTestSuite.java | 9 +-
56 files changed, 1720 insertions(+), 2415 deletions(-)