Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9851d87b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9851d87b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9851d87b Branch: refs/heads/ignite-111 Commit: 9851d87b2d5ef3c336abf058a861bd567f992cb6 Parents: 2867eca 3294c60 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Fri Feb 6 10:22:23 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Fri Feb 6 10:22:23 2015 +0300 ---------------------------------------------------------------------- .../MessagingPingPongListenActorExample.java | 4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java | 4 +- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++++++++++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 ------------------ .../cache/store/jdbc/JdbcPojoCacheStore.java | 205 --- .../processors/cache/IgniteCacheProxy.java | 6 - .../processors/rest/GridRestProcessor.java | 2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ++++++++ ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 -------- .../internal/GridListenActorSelfTest.java | 11 +- .../commands/open/VisorOpenCommandSpec.scala | 6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml | 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java | 5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java | 5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 28 files changed, 2988 insertions(+), 2784 deletions(-) ----------------------------------------------------------------------
