Merge remote-tracking branch 'upstream/ignite-1.4' into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acfa6110 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acfa6110 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acfa6110 Branch: refs/heads/ignite-264 Commit: acfa6110262655f1420e34194262e50d372f3398 Parents: 1124dee 38baf59 Author: Alexey Goncharuk <[email protected]> Authored: Fri Sep 4 10:55:54 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Sep 4 10:55:54 2015 -0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 +- examples/pom.xml | 2 +- .../messaging/MessagingPingPongExample.java | 6 +- .../CacheClientPortablePutGetExample.java | 4 + .../CacheClientPortableQueryExample.java | 8 +- .../messaging/MessagingPingPongExample.java | 2 +- .../examples/MessagingExamplesSelfTest.java | 3 +- .../examples/MessagingExamplesSelfTest.java | 3 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 5 +- 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 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../distributed/dht/GridDhtLocalPartition.java | 51 +++++- .../dht/GridPartitionedGetFuture.java | 14 +- .../distributed/near/GridNearGetFuture.java | 13 ++ .../query/GridCacheDistributedQueryFuture.java | 5 +- .../query/GridCacheDistributedQueryManager.java | 9 +- .../cache/query/GridCacheQueryManager.java | 177 ++++++------------- .../cache/query/GridCacheQueryRequest.java | 59 ++++++- .../messages/TcpDiscoveryClientAckResponse.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheIncrementTransformTest.java | 2 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 5 - .../IgniteCacheNodeJoinAbstractTest.java | 42 +++++ .../testsuites/IgniteCacheTestSuite3.java | 3 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/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 | 2 +- modules/indexing/pom.xml | 2 +- .../query/h2/opt/GridH2IndexBase.java | 42 +++++ .../query/IgniteSqlSplitterSelfTest.java | 35 +++- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 5 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 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 | 2 +- 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 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 119 ++++++++++++- 70 files changed, 512 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/acfa6110/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ----------------------------------------------------------------------
