Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-454
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3e5e81b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3e5e81b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3e5e81b
Branch: refs/heads/ignite-454
Commit: d3e5e81bfb1f9044030e48130756695fc2199449
Parents: 073db0c 12f0a8d
Author: avinogradov <[email protected]>
Authored: Thu Mar 19 18:54:29 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Thu Mar 19 18:54:29 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 +-
.../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 ++++---------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 31 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 32 ++
.../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, 490 insertions(+), 579 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3e5e81b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3e5e81b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3e5e81b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
