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 2017/12/11 07:49:42 UTC
[6/6] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-zk
Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af75c427
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af75c427
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af75c427
Branch: refs/heads/ignite-zk
Commit: af75c42734b71f5713395a1f6deb19432df1a3d9
Parents: 479f34e 592fb33
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 11 10:48:58 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 11 10:48:58 2017 +0300
----------------------------------------------------------------------
.../spi/checkpoint/s3/S3CheckpointSpi.java | 37 +++
.../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 6 +
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 28 ++-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 26 +-
...pointSpiStartStopBucketEndpointSelfTest.java | 50 ++++
.../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
.../TcpDiscoveryS3IpFinderAbstractSelfTest.java | 48 +++-
...3IpFinderAwsCredentialsProviderSelfTest.java | 1 +
...scoveryS3IpFinderAwsCredentialsSelfTest.java | 1 +
...scoveryS3IpFinderBucketEndpointSelfTest.java | 61 +++++
.../ignite/testsuites/IgniteS3TestSuite.java | 4 +
.../internal/binary/BinaryClassDescriptor.java | 3 +-
.../ignite/internal/binary/BinaryContext.java | 1 +
.../processors/cache/GridCacheUtils.java | 105 ++++++++
.../distributed/dht/GridDhtCacheAdapter.java | 1 +
.../dht/GridPartitionedGetFuture.java | 30 ++-
.../dht/GridPartitionedSingleGetFuture.java | 27 ++-
.../distributed/near/GridNearGetFuture.java | 32 ++-
.../store/CacheStoreReadFromBackupTest.java | 238 +++++++++++++++++++
...cheTransactionalStoreReadFromBackupTest.java | 32 +++
.../IgnitePdsBinarySortObjectFieldsTest.java | 150 ++++++++++++
.../ignite/testframework/GridTestUtils.java | 41 ++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 2 +
.../ignite/visor/commands/VisorConsole.scala | 25 +-
.../visor/commands/open/VisorOpenCommand.scala | 34 ++-
.../scala/org/apache/ignite/visor/visor.scala | 25 +-
.../frontend/app/services/Messages.service.js | 9 +-
30 files changed, 974 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af75c427/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index d790fa9,4bf54bf..b19babc
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@@ -64,9 -64,11 +64,12 @@@ import org.apache.ignite.internal.Ignit
import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.managers.discovery.IgniteClusterNode;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;