Merge branches 'ignite-gg-9933' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eebcc9c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eebcc9c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eebcc9c7 Branch: refs/heads/ignite-496 Commit: eebcc9c72e8f81a49ec1a78a1b5fd90b0e9b6256 Parents: 06324b1 d6fdf05 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Mar 19 17:18:22 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Mar 19 17:18:22 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 169 ++++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../deployment/GridDeploymentLocalStore.java | 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../discovery/GridDiscoveryManager.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 3 - .../continuous/CacheContinuousQueryManager.java | 4 - .../optimized/OptimizedClassDescriptor.java | 20 +- .../optimized/OptimizedMarshaller.java | 30 +- .../optimized/OptimizedMarshallerUtils.java | 50 +- .../optimized/OptimizedObjectInputStream.java | 20 +- .../optimized/OptimizedObjectOutputStream.java | 22 +- .../core/src/test/config/store/jdbc/Ignite.xml | 82 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 562 ++++--------------- .../internal/ClusterNodeMetricsSelfTest.java | 31 +- .../processors/service/DummyService.java | 4 + .../optimized/OptimizedMarshallerTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 8 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../config/benchmark-multicast.properties | 2 +- 22 files changed, 455 insertions(+), 582 deletions(-) ----------------------------------------------------------------------
