You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/09/08 15:41:15 UTC
[33/50] [abbrv] ignite git commit: Merge remote-tracking branch
'ignite-gg/ignite-1.6.7' into ignite-1.7.2
Merge remote-tracking branch 'ignite-gg/ignite-1.6.7' into ignite-1.7.2
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
# modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
# modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a259da2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a259da2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a259da2
Branch: refs/heads/ignite-961
Commit: 4a259da296946740e180d25559e5cacba60a97ad
Parents: fea3eea 1ef150e
Author: EdShangGG <es...@gridgain.com>
Authored: Tue Aug 30 14:39:13 2016 +0300
Committer: EdShangGG <es...@gridgain.com>
Committed: Tue Aug 30 14:39:13 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 15 +
.../processors/cache/CacheLazyEntry.java | 2 +
.../EntryProcessorResourceInjectorProxy.java | 105 ++++
.../processors/cache/GridCacheMapEntry.java | 13 +-
.../processors/cache/IgniteCacheProxy.java | 112 +++-
.../GridNearAtomicSingleUpdateFuture.java | 17 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +-
.../local/atomic/GridLocalAtomicCache.java | 18 +-
.../processors/cache/query/CacheQuery.java | 11 +-
.../query/GridCacheDistributedQueryManager.java | 22 +-
.../cache/query/GridCacheLocalQueryManager.java | 3 +-
.../cache/query/GridCacheQueryAdapter.java | 69 ++-
.../cache/query/GridCacheQueryBean.java | 8 +-
.../cache/query/GridCacheQueryInfo.java | 8 +-
.../cache/query/GridCacheQueryManager.java | 125 ++--
.../cache/query/GridCacheQueryRequest.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 5 +-
.../processors/odbc/escape/OdbcEscapeUtils.java | 115 ++--
.../processors/resource/GridResourceIoc.java | 438 ++++++++++----
.../resource/GridResourceProcessor.java | 396 ++++++-------
.../cache/GridCacheAbstractFullApiSelfTest.java | 393 +++++++++++--
.../cache/GridCacheAbstractSelfTest.java | 140 ++++-
.../GridCacheTransformEventSelfTest.java | 66 ++-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 2 +
.../GridCacheQueryTransformerSelfTest.java | 570 +++++++++++++++++++
.../odbc/OdbcEscapeSequenceSelfTest.java | 164 +++++-
.../multijvm/IgniteCacheProcessProxy.java | 6 +
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../GridTransformSpringInjectionSelfTest.java | 186 ++++++
.../testsuites/IgniteSpringTestSuite.java | 7 +-
.../commands/cache/VisorCacheStopCommand.scala | 5 +-
.../IgniteInvokeWithInjectionBenchmark.java | 74 +++
.../IgniteInvokeWithInjectionTxBenchmark.java | 30 +
33 files changed, 2564 insertions(+), 577 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a259da2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a259da2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 9935f93,454ce04..4b4275f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@@ -1439,12 -1478,9 +1436,12 @@@ public abstract class GridCacheQueryMan
res = loc ?
executeQuery(qry, qryInfo.arguments(), loc, qry.subjectId(), taskName,
- recipient(qryInfo.senderId(), qryInfo.requestId())) :
+ recipient(qryInfo.senderId(), qryInfo.requestId())) :
queryResult(qryInfo, taskName);
+ if (res == null)
+ return;
+
iter = res.iterator(recipient(qryInfo.senderId(), qryInfo.requestId()));
type = res.type();
@@@ -1793,7 -1848,8 +1809,8 @@@
* @return Iterator.
* @throws IgniteCheckedException In case of error.
*/
- @Nullable private QueryResult<K, V> queryResult(final GridCacheQueryInfo qryInfo, String taskName) throws IgniteCheckedException {
- private QueryResult<K, V> queryResult(final GridCacheQueryInfo qryInfo,
++ @Nullable private QueryResult<K, V> queryResult(final GridCacheQueryInfo qryInfo,
+ String taskName) throws IgniteCheckedException {
assert qryInfo != null;
final UUID sndId = qryInfo.senderId();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a259da2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a259da2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 0203354,3652acd..4198535
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -126,18 -116,7 +127,19 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(IgniteBinaryWrappedObjectFieldsQuerySelfTest.class);
suite.addTestSuite(IgniteCacheQueryH2IndexingLeakTest.class);
suite.addTestSuite(IgniteCacheQueryNoRebalanceSelfTest.class);
+ suite.addTestSuite(GridCacheQueryTransformerSelfTest.class);
+ suite.addTestSuite(IgniteCachePrimitiveFieldsQuerySelfTest.class);
+
+ suite.addTestSuite(IgniteCacheJoinQueryWithAffinityKeyTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinCollocatedAndNotTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinPartitionedAndReplicatedTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinQueryConditionsTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinTest.class);
+ suite.addTestSuite(IgniteCacheJoinPartitionedAndReplicatedTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinNoIndexTest.class);
+ suite.addTestSuite(IgniteCrossCachesJoinsQueryTest.class);
+ suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
+ suite.addTestSuite(IgniteCacheDistributedJoinCustomAffinityMapper.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a259da2/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
----------------------------------------------------------------------
diff --cc modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
index 3b70556,67b117d..587d46b
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@@ -18,7 -18,8 +18,9 @@@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+ import org.apache.ignite.cache.spring.GridSpringCacheManagerSelfTest;
+ import org.apache.ignite.cache.spring.SpringCacheManagerContextInjectionTest;
+import org.apache.ignite.internal.IgniteSpringBeanTest;
import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactorySelfTest;
import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactorySelfTest;
import org.apache.ignite.cache.store.spring.CacheSpringStoreSessionListenerSelfTest;