Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca253a8a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca253a8a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca253a8a Branch: refs/heads/ignite-1026 Commit: ca253a8a845129ece37fca3a12c384d8b9ef3e76 Parents: 8343058 dc05e88 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jun 17 12:21:53 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jun 17 12:21:53 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++++++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 ++++++++++ .../configuration/CacheConfiguration.java | 3 +- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../processors/cache/GridCacheProcessor.java | 23 +- .../processors/query/GridQueryProcessor.java | 102 +++++-- .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 87 ++++-- .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 12 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../GridCacheAbstractFailoverSelfTest.java | 2 + ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCacheVersionMultinodeTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 69 ++++- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +-- .../junits/common/GridCommonAbstractTest.java | 11 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 +++ modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 16 +- .../hibernate/CacheHibernateBlobStore.java | 87 +----- .../CacheHibernateBlobStoreFactory.java | 235 +++++++++++++++ .../hibernate/src/test/config/factory-cache.xml | 59 ++++ .../src/test/config/factory-cache1.xml | 61 ++++ .../config/factory-incorrect-store-cache.xml | 56 ++++ .../CacheHibernateStoreFactorySelfTest.java | 273 +++++++++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + modules/indexing/pom.xml | 2 +- .../CacheAbstractQueryMetricsSelfTest.java | 205 +++++++++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 ++ .../cache/GridCacheQueryMetricsSelfTest.java | 206 ------------- .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 9 +- .../GridResourceSpringBeanInjector.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 17 ++ .../src/test/config/incorrect-store-cache.xml | 57 ++++ modules/spring/src/test/config/node.xml | 43 +++ modules/spring/src/test/config/node1.xml | 45 +++ .../test/config/pojo-incorrect-store-cache.xml | 56 ++++ modules/spring/src/test/config/store-cache.xml | 59 ++++ modules/spring/src/test/config/store-cache1.xml | 62 ++++ .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +++++++++++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 ++++++++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 87 files changed, 2520 insertions(+), 500 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca253a8a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 174b7a0,718e6ba..4f2486b --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@@ -687,9 -716,16 +714,9 @@@ public class GridQueryProcessor extend } /** - * @return Message factory for {@link GridIoManager}. - */ - public MessageFactory messageFactory() { - return idx == null ? null : idx.messageFactory(); - } - - /** * Closeable iterator. */ - private static interface ClIter<X> extends AutoCloseable, Iterator<X> { + private interface ClIter<X> extends AutoCloseable, Iterator<X> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca253a8a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ----------------------------------------------------------------------
