You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/13 11:30:20 UTC
[40/40] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f574701
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f574701
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f574701
Branch: refs/heads/ignite-2.0
Commit: 2f574701995ef644bb8066a0bd99a5985adcb154
Parents: 2e421c2 262a341
Author: devozerov <vo...@gridgain.com>
Authored: Mon Feb 13 14:28:41 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Feb 13 14:28:41 2017 +0300
----------------------------------------------------------------------
NOTICE | 2 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../org/apache/ignite/cache/QueryEntity.java | 21 +
.../org/apache/ignite/cache/query/SqlQuery.java | 25 +
.../internal/GridEventConsumeHandler.java | 5 +
.../ignite/internal/GridKernalContext.java | 1 +
.../ignite/internal/GridKernalContextImpl.java | 1 +
.../internal/GridMessageListenHandler.java | 5 +
.../internal/GridPerformanceSuggestions.java | 92 ----
.../apache/ignite/internal/IgniteKernal.java | 9 +
.../ignite/internal/IgniteVersionUtils.java | 2 +-
.../processors/cache/EntryGetResult.java | 65 +++
.../processors/cache/GridCacheAdapter.java | 125 +++--
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 42 +-
.../processors/cache/GridCacheMapEntry.java | 140 +++++-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../processors/cache/GridCacheUtils.java | 3 +
.../processors/cache/IgniteCacheProxy.java | 3 +
.../processors/cache/ReaderArguments.java | 74 +++
.../distributed/dht/GridDhtCacheAdapter.java | 9 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 83 ++--
.../distributed/dht/GridDhtGetSingleFuture.java | 75 ++-
.../dht/GridPartitionedGetFuture.java | 10 +-
.../dht/GridPartitionedSingleGetFuture.java | 10 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../dht/colocated/GridDhtColocatedCache.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 19 +-
.../local/atomic/GridLocalAtomicCache.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 83 +++-
.../continuous/CacheContinuousQueryHandler.java | 97 +++-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 65 +--
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java | 3 +
.../internal/processors/job/GridJobWorker.java | 4 +
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 88 ++--
.../query/GridQueryTypeDescriptor.java | 7 +
.../suggestions/GridPerformanceSuggestions.java | 105 ++++
.../JvmConfigurationSuggestions.java | 104 ++++
.../suggestions/OsConfigurationSuggestions.java | 127 +++++
.../internal/suggestions/package-info.java | 21 +
.../ignite/internal/util/IgniteUtils.java | 14 +
.../communication/tcp/TcpCommunicationSpi.java | 16 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 90 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 63 ++-
.../messages/TcpDiscoveryAbstractMessage.java | 21 +
modules/core/src/test/config/log4j-test.xml | 6 +
.../internal/GridContinuousTaskSelfTest.java | 79 +++
.../cache/CacheConcurrentReadThroughTest.java | 184 +++++++
.../processors/cache/GridCacheTestEntryEx.java | 30 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 60 ++-
...idCacheAtomicStampedApiSelfAbstractTest.java | 59 +++
.../GridCacheQueueApiSelfAbstractTest.java | 58 +++
.../GridCacheSetAbstractSelfTest.java | 53 +++
.../IgniteAtomicLongApiAbstractSelfTest.java | 27 ++
.../IgniteCountDownLatchAbstractSelfTest.java | 43 ++
.../IgniteLockAbstractSelfTest.java | 54 ++-
.../IgniteSemaphoreAbstractSelfTest.java | 52 +-
.../near/GridNearCacheStoreUpdateTest.java | 466 ++++++++++++++++++
.../GridNearOffheapCacheStoreUpdateTest.java | 35 ++
.../cache/query/IndexingSpiQuerySelfTest.java | 69 ++-
.../IndexingSpiQueryWithH2IndexingSelfTest.java | 36 ++
.../ClientReconnectContinuousQueryTest.java | 201 ++++++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 322 +++++++++++++
.../TcpCommunicationSpiFaultyClientTest.java | 265 +++++++++++
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../ignite/testframework/GridTestNode.java | 1 +
.../testframework/junits/GridAbstractTest.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 7 +
.../IgniteSpiCommunicationSelfTestSuite.java | 5 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 30 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 294 ++++++++++++
.../cache/QueryEntityCaseMismatchTest.java | 107 +++++
.../IgniteCachePartitionedQuerySelfTest.java | 85 ++++
.../h2/GridIndexingSpiAbstractSelfTest.java | 29 +-
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.AspNet.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Cache/Query/CacheLinqTest.cs | 96 ++++
.../Cache/Store/CacheStoreTest.cs | 30 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Core.Schema.nuspec | 2 +-
.../Apache.Ignite.Core.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.EntityFramework.nuspec | 2 +-
.../Apache.Ignite.Linq.nuspec | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 127 ++++-
.../Impl/CacheQueryModelVisitor.cs | 3 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Log4Net.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.NLog.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/web-console/backend/app/agent.js | 34 ++
modules/web-console/backend/app/browser.js | 26 +
.../app/modules/branding/branding.provider.js | 2 +-
modules/web-console/frontend/package.json | 2 +-
.../ignite/console/agent/AgentLauncher.java | 203 ++++----
.../apache/ignite/console/agent/AgentUtils.java | 80 ++++
.../console/agent/handlers/AbstractHandler.java | 110 -----
.../agent/handlers/AbstractListener.java | 104 ++++
.../console/agent/handlers/DatabaseHandler.java | 298 ------------
.../agent/handlers/DatabaseListener.java | 316 ++++++++++++
.../console/agent/handlers/RestHandler.java | 276 -----------
.../console/agent/handlers/RestListener.java | 280 +++++++++++
.../ignite/console/demo/AgentClusterDemo.java | 475 +------------------
.../ignite/console/demo/AgentDemoUtils.java | 79 +++
.../demo/service/DemoCachesLoadService.java | 456 ++++++++++++++++++
.../service/DemoRandomCacheLoadService.java | 120 +++++
.../service/DemoServiceClusterSingleton.java | 41 ++
.../demo/service/DemoServiceKeyAffinity.java | 41 ++
.../service/DemoServiceMultipleInstances.java | 41 ++
.../demo/service/DemoServiceNodeSingleton.java | 41 ++
modules/yardstick/DEVNOTES-standalone.txt | 15 +
modules/yardstick/DEVNOTES.txt | 20 +-
modules/yardstick/README.txt | 119 +++--
.../config/benchmark-sample.properties | 62 +++
modules/yardstick/pom.xml | 4 +-
.../cache/IgnitePutValue8Benchmark.java | 42 ++
parent/pom.xml | 2 +-
pom.xml | 1 +
137 files changed, 6215 insertions(+), 1830 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 0888be3,e274485..0ec10b4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@@ -152,7 -152,13 +152,10 @@@ public class GridCacheUtils
/** Atomics system cache name. */
public static final String ATOMICS_CACHE_NAME = "ignite-atomics-sys-cache";
- /** Marshaller system cache name. */
- public static final String MARSH_CACHE_NAME = "ignite-marshaller-sys-cache";
-
/** */
+ public static final String CONTINUOUS_QRY_LOG_CATEGORY = "org.apache.ignite.continuous.query";
+
+ /** */
public static final String CACHE_MSG_LOG_CATEGORY = "org.apache.ignite.cache.msg";
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index ddc7687,4c89a7c..4c89a7c
mode 100755,100644..100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/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 ed3d1e8,386b8fd..3ef331f
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -242,8 -242,8 +243,9 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(CacheOffheapBatchIndexingSingleTypeTest.class);
suite.addTestSuite(CacheSqlQueryValueCopySelfTest.class);
suite.addTestSuite(IgniteCacheQueryCacheDestroySelfTest.class);
+ suite.addTestSuite(IgniteSqlQueryDedicatedPoolTest.class);
suite.addTestSuite(IgniteSqlEntryCacheModeAgnosticTest.class);
+ suite.addTestSuite(QueryEntityCaseMismatchTest.class);
return suite;
}