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/02/15 08:52:02 UTC
[18/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1113c6f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1113c6f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1113c6f9
Branch: refs/heads/ignite-1232
Commit: 1113c6f9e07067633bf1be0ac3f1b61326e5aad7
Parents: ebfddeb c077522
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Dec 8 04:08:57 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Dec 8 04:08:57 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 1 +
examples/config/example-default.xml | 7 +
.../store/auto/CacheBinaryAutoStoreExample.java | 158 ++++++
.../datagrid/store/auto/package-info.java | 22 +
.../store/auto/CacheAutoStoreExample.java | 93 +++-
.../auto/CacheAutoStoreLoadDataExample.java | 85 ----
.../datagrid/store/auto/CacheConfig.java | 81 ---
.../datagrid/store/auto/DbH2ServerStartup.java | 79 ---
.../ignite/examples/util/DbH2ServerStartup.java | 79 +++
.../ignite/examples/util/package-info.java | 22 +
.../store/jdbc/CacheAbstractJdbcStore.java | 12 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 9 +
.../configuration/CacheConfiguration.java | 34 +-
.../ignite/internal/MarshallerContextImpl.java | 7 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 51 +-
.../dht/preloader/GridDhtPartitionDemander.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 9 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../handlers/query/QueryCommandHandler.java | 6 +-
.../optimized/OptimizedMarshallerUtils.java | 16 +-
...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +-
.../IgniteCacheEntryProcessorCallTest.java | 497 +++++++++++++++++++
.../dht/GridCacheTxNodeFailureSelfTest.java | 2 +
.../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 -
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
.../config/GridTestProperties.java | 3 +
.../testframework/junits/GridAbstractTest.java | 7 +
.../IgniteBinaryObjectsCacheTestSuite3.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +
...cheDuplicateEntityConfigurationSelfTest.java | 126 +++++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
.../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +-
.../ignite/schema/ui/SchemaImportApp.java | 14 +
.../yardstick/cache/IgnitePutTxBenchmark.java | 26 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 16 +-
.../apache/ignite/yarn/utils/package-info.java | 22 +
parent/pom.xml | 4 +
39 files changed, 1218 insertions(+), 312 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1113c6f9/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 cc34ebe,fc88c75..5e191cc
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -29,7 -29,9 +29,8 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheQueryInternalKeysSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheQuerySerializationSelfTest;
-import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest;
+ import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheNoClassQuerySelfTest;
@@@ -106,9 -112,11 +107,12 @@@ public class IgniteCacheQuerySelfTestSu
// Parsing
suite.addTestSuite(GridQueryParsingTest.class);
+ // Config.
+ suite.addTestSuite(IgniteCacheDuplicateEntityConfigurationSelfTest.class);
+
// Queries tests.
suite.addTestSuite(IgniteSqlSplitterSelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class);
suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class);
suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class);
suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1113c6f9/parent/pom.xml
----------------------------------------------------------------------