Merge remote-tracking branch 'remotes/origin/master' into ignite-1811
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a728eccc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a728eccc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a728eccc Branch: refs/heads/ignite-1811 Commit: a728eccc0ea44d388ecba610d2489200735b7200 Parents: 97d0c68 fa427dc Author: sboikov <[email protected]> Authored: Fri Jan 15 11:20:20 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 15 11:20:20 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/binary/BinaryUtils.java | 78 ++++++++ .../processors/cache/CacheObjectContext.java | 91 +++++---- .../binary/CacheObjectBinaryProcessorImpl.java | 33 ++-- .../dht/preloader/GridDhtPartitionDemander.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 8 +- .../continuous/CacheContinuousQueryEntry.java | 70 +++---- .../binary/BinaryMarshallerSelfTest.java | 44 ++++- .../cache/GridCacheDeploymentSelfTest.java | 3 +- ...IgniteCacheGetCustomCollectionsSelfTest.java | 128 +++++++++++++ ...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 +++++++++++++++++++ .../platform/PlatformComputeEchoTask.java | 6 +- .../testsuites/IgniteCacheTestSuite4.java | 5 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../yardstick/cache/IgniteGetTxBenchmark.java | 30 +++ 14 files changed, 588 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a728eccc/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index ee2d084,1b8eeda..97557c2 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -286,8 -287,10 +288,11 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(CacheGetFutureHangsSelfTest.class); suite.addTestSuite(IgniteCacheSingleGetMessageTest.class); + suite.addTestSuite(IgniteCacheReadFromBackupTest.class); + suite.addTestSuite(IgniteCacheGetCustomCollectionsSelfTest.class); + suite.addTestSuite(IgniteCacheLoadRebalanceEvictionSelfTest.class); + return suite; } }
