Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-876-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c74ddc42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c74ddc42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c74ddc42 Branch: refs/heads/ignite-gg-10299 Commit: c74ddc421efafddae3eced31183f989b3803cc49 Parents: c1f0ce2 4f3788d Author: sboikov <sboi...@gridgain.com> Authored: Tue Jun 2 11:56:55 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jun 2 11:56:55 2015 +0300 ---------------------------------------------------------------------- .../hibernate/CacheHibernatePersonStore.java | 202 +--------- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java | 180 ++------- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java | 128 ++++++ .../store/spring/CacheSpringStoreExample.java | 143 +++++++ .../datagrid/store/spring/package-info.java | 22 ++ .../apache/ignite/cache/store/CacheStore.java | 2 + .../ignite/cache/store/CacheStoreSession.java | 22 ++ .../cache/store/CacheStoreSessionListener.java | 133 +++++++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++++++ .../configuration/CacheConfiguration.java | 32 ++ .../configuration/IgniteConfiguration.java | 38 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../managers/communication/GridIoManager.java | 12 +- .../processors/cache/GridCacheProcessor.java | 12 +- .../cache/GridCacheSharedContext.java | 47 ++- .../processors/cache/GridCacheUtils.java | 54 +++ .../cache/store/CacheOsStoreManager.java | 1 - .../cache/store/CacheStoreManager.java | 7 +- .../store/GridCacheStoreManagerAdapter.java | 202 ++++++++-- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++++--- ...cheStoreSessionListenerAbstractSelfTest.java | 315 +++++++++++++++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++++++++++++++++++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 ++++++++ .../IgniteCrossCacheTxStoreSelfTest.java | 147 ++++--- .../loadtests/hashmap/GridCacheTestContext.java | 3 +- .../junits/cache/TestCacheSession.java | 18 + .../cache/TestThreadLocalCacheSession.java | 15 + .../junits/common/GridCommonAbstractTest.java | 24 ++ .../testsuites/IgniteCacheTestSuite4.java | 3 + .../CacheHibernateStoreSessionListener.java | 216 ++++++++++ ...heHibernateStoreSessionListenerSelfTest.java | 228 +++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 2 +- modules/spring/pom.xml | 14 + .../spring/CacheSpringStoreSessionListener.java | 207 ++++++++++ ...CacheSpringStoreSessionListenerSelfTest.java | 197 +++++++++ .../testsuites/IgniteSpringTestSuite.java | 3 + 40 files changed, 3057 insertions(+), 492 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c74ddc42/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 12134d6,e435ed7..2d5fed5 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@@ -59,10 -59,10 +59,10 @@@ public class IgniteCacheQuerySelfTestSu suite.addTestSuite(IgniteCacheLargeResultSelfTest.class); suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class); suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTiredSelfTest.class); + suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class); suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); + // suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); TODO IGNITE-971. suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); // suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); TODO IGNITE-484
