ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/26] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-5075-cacheStart
Date Tue, 02 May 2017 15:08:07 GMT
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-5075-cacheStart

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab92ab2e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab92ab2e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab92ab2e

Branch: refs/heads/ignite-5075
Commit: ab92ab2ea8031870fe421bda7d300b81bfd27c42
Parents: 0022f6b d4b6fec
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 27 18:01:34 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 27 18:01:34 2017 +0300

----------------------------------------------------------------------
 .../client/memcache/MemcacheRestExample.java    |   2 +-
 .../MemcacheRestExampleNodeStartup.java         |   1 +
 .../ml/math/matrix/CacheMatrixExample.java      |  23 +-
 .../ml/math/matrix/ExampleMatrixStorage.java    |   3 +-
 .../math/matrix/MatrixCustomStorageExample.java |   6 +-
 .../examples/ml/math/matrix/MatrixExample.java  |   4 +-
 .../ml/math/matrix/OffHeapMatrixExample.java    |   6 +-
 .../matrix/SparseDistributedMatrixExample.java  |   8 +-
 .../ml/math/matrix/SparseMatrixExample.java     |   4 +-
 .../examples/ml/math/tracer/TracerExample.java  |   2 +-
 .../ml/math/vector/CacheVectorExample.java      |  19 +-
 .../ml/math/vector/ExampleVectorStorage.java    |   7 +-
 .../ml/math/vector/OffHeapVectorExample.java    |   2 +-
 .../ml/math/vector/SparseVectorExample.java     |   4 -
 .../math/vector/VectorCustomStorageExample.java |   4 -
 .../examples/ml/math/vector/VectorExample.java  |   6 +-
 .../ignite/ignite-cassandra-server-template.xml |   3 -
 .../tests/ignite-cassandra-client-template.xml  |   3 -
 .../client/ClientDefaultCacheSelfTest.java      |   4 +-
 .../JettyRestProcessorAbstractSelfTest.java     | 265 +++++++++++++------
 .../clients/src/test/resources/spring-cache.xml |   9 -
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../configuration/CacheConfiguration.java       |  31 +--
 .../configuration/DataPageEvictionMode.java     |  17 +-
 .../processors/cache/GridCacheAdapter.java      |  19 +-
 .../processors/cache/GridCacheProcessor.java    |   2 +-
 .../evict/PageAbstractEvictionTracker.java      |   7 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   3 +-
 .../processors/cache/local/GridLocalCache.java  |   3 +-
 .../utils/PlatformConfigurationUtils.java       |   2 -
 .../visor/binary/VisorBinaryMetadata.java       |   8 +-
 .../VisorBinaryMetadataCollectorTask.java       |  16 +-
 .../VisorBinaryMetadataCollectorTaskArg.java    |  71 +++++
 .../VisorBinaryMetadataCollectorTaskResult.java |   4 +-
 .../cache/VisorCacheAffinityConfiguration.java  |   8 +-
 .../visor/cache/VisorCacheClearTask.java        |  19 +-
 .../visor/cache/VisorCacheClearTaskArg.java     |  72 +++++
 .../visor/cache/VisorCacheConfiguration.java    | 162 +++++++++++-
 .../VisorCacheConfigurationCollectorJob.java    |  12 +-
 .../VisorCacheConfigurationCollectorTask.java   |   5 +-
 ...VisorCacheConfigurationCollectorTaskArg.java |  74 ++++++
 .../visor/cache/VisorCacheLoadTask.java         |   5 +-
 .../visor/cache/VisorCacheLoadTaskArg.java      |   2 +-
 .../visor/cache/VisorCacheMetadataTask.java     |  14 +-
 .../visor/cache/VisorCacheMetadataTaskArg.java  |  72 +++++
 .../visor/cache/VisorCacheNodesTask.java        |  12 +-
 .../visor/cache/VisorCacheNodesTaskArg.java     |  72 +++++
 .../cache/VisorCacheRebalanceConfiguration.java |  26 ++
 .../visor/cache/VisorCacheRebalanceTask.java    |  13 +-
 .../visor/cache/VisorCacheRebalanceTaskArg.java |  73 +++++
 .../visor/cache/VisorCacheResetMetricsTask.java |  14 +-
 .../cache/VisorCacheResetMetricsTaskArg.java    |  72 +++++
 .../visor/cache/VisorCacheStartArg.java         | 100 -------
 .../visor/cache/VisorCacheStopTask.java         |  17 +-
 .../visor/cache/VisorCacheStopTaskArg.java      |  72 +++++
 .../cache/VisorCacheStoreConfiguration.java     |  14 +
 .../internal/visor/cache/VisorPartitionMap.java |  24 +-
 .../compute/VisorComputeCancelSessionsTask.java |  13 +-
 .../VisorComputeCancelSessionsTaskArg.java      |  76 ++++++
 .../visor/compute/VisorGatewayTask.java         |  87 ++++--
 .../internal/visor/debug/VisorThreadInfo.java   |  64 ++---
 .../visor/debug/VisorThreadMonitorInfo.java     |   8 +-
 .../internal/visor/file/VisorFileBlockArg.java  | 114 --------
 .../visor/igfs/VisorIgfsFormatTask.java         |  14 +-
 .../visor/igfs/VisorIgfsFormatTaskArg.java      |  72 +++++
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |  24 +-
 .../igfs/VisorIgfsProfilerClearTaskArg.java     |  72 +++++
 .../igfs/VisorIgfsProfilerClearTaskResult.java  |   6 +-
 .../visor/igfs/VisorIgfsProfilerTask.java       |  18 +-
 .../visor/igfs/VisorIgfsProfilerTaskArg.java    |  72 +++++
 .../visor/igfs/VisorIgfsResetMetricsTask.java   |  13 +-
 .../igfs/VisorIgfsResetMetricsTaskArg.java      |  73 +++++
 .../internal/visor/log/VisorLogSearchArg.java   | 114 --------
 .../internal/visor/misc/VisorAckTask.java       |  14 +-
 .../internal/visor/misc/VisorAckTaskArg.java    |  72 +++++
 .../misc/VisorChangeGridActiveStateTask.java    |  12 +-
 .../misc/VisorChangeGridActiveStateTaskArg.java |  71 +++++
 .../visor/node/VisorBasicConfiguration.java     | 211 ++++++++++++++-
 .../visor/node/VisorBinaryConfiguration.java    | 131 +++++++++
 .../node/VisorBinaryTypeConfiguration.java      | 150 +++++++++++
 .../visor/node/VisorCacheKeyConfiguration.java  | 108 ++++++++
 .../visor/node/VisorExecutorConfiguration.java  | 108 ++++++++
 .../node/VisorExecutorServiceConfiguration.java | 115 ++++++++
 .../visor/node/VisorGridConfiguration.java      | 110 ++++++++
 .../visor/node/VisorHadoopConfiguration.java    | 145 ++++++++++
 .../visor/node/VisorIgfsConfiguration.java      |  42 ++-
 .../node/VisorMemoryPolicyConfiguration.java    |  41 +++
 .../internal/visor/node/VisorNodePingTask.java  |  13 +-
 .../visor/node/VisorNodePingTaskArg.java        |  73 +++++
 .../visor/node/VisorNodeSuppressedErrors.java   |   6 +-
 .../node/VisorNodeSuppressedErrorsTask.java     |  12 +-
 .../node/VisorNodeSuppressedErrorsTaskArg.java  |  74 ++++++
 .../visor/node/VisorOdbcConfiguration.java      | 114 ++++++++
 .../visor/node/VisorRestConfiguration.java      | 207 ++++++++++++++-
 .../node/VisorSegmentationConfiguration.java    |  13 +
 .../visor/node/VisorServiceConfiguration.java   | 176 ++++++++++++
 .../internal/visor/query/VisorQueryArg.java     | 155 -----------
 .../visor/query/VisorQueryCancelTask.java       |  12 +-
 .../visor/query/VisorQueryCancelTaskArg.java    |  71 +++++
 .../visor/query/VisorQueryCleanupTask.java      |  10 +-
 .../visor/query/VisorQueryCleanupTaskArg.java   |  75 ++++++
 .../VisorQueryDetailMetricsCollectorTask.java   |  17 +-
 ...VisorQueryDetailMetricsCollectorTaskArg.java |  71 +++++
 .../query/VisorQueryResetDetailMetricsTask.java |   6 +-
 .../visor/query/VisorQueryResetMetricsTask.java |  18 +-
 .../query/VisorQueryResetMetricsTaskArg.java    |  72 +++++
 .../query/VisorRunningQueriesCollectorTask.java |  16 +-
 .../VisorRunningQueriesCollectorTaskArg.java    |  71 +++++
 .../internal/visor/query/VisorScanQueryArg.java | 157 -----------
 .../visor/service/VisorCancelServiceTask.java   |  12 +-
 .../service/VisorCancelServiceTaskArg.java      |  72 +++++
 .../internal/visor/util/VisorTaskUtils.java     |  23 ++
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   8 +-
 .../resources/META-INF/classnames.properties    |  39 ++-
 .../spring-cache-client-benchmark-1.xml         |   3 -
 .../spring-cache-client-benchmark-2.xml         |   3 -
 .../spring-cache-client-benchmark-3.xml         |   3 -
 modules/core/src/test/config/example-cache.xml  |   3 -
 modules/core/src/test/config/igfs-loopback.xml  |  18 --
 modules/core/src/test/config/igfs-shmem.xml     |  18 --
 .../src/test/config/load/cache-benchmark.xml    |   4 -
 .../test/config/load/cache-client-benchmark.xml |   2 -
 .../config/load/dsi-49-server-production.xml    |   2 -
 .../src/test/config/load/dsi-load-client.xml    |   2 -
 .../src/test/config/load/dsi-load-server.xml    |   2 -
 .../core/src/test/config/spring-multicache.xml  |  17 --
 .../config/websession/example-cache-base.xml    |   3 -
 .../IgniteClientReconnectCacheTest.java         |  12 +-
 ...ryConfigurationCustomSerializerSelfTest.java |   4 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   2 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |   1 -
 .../cache/GridCachePutAllFailoverSelfTest.java  |   1 -
 .../CacheLateAffinityAssignmentTest.java        |   1 -
 ...GridCachePreloadRestartAbstractSelfTest.java |   1 -
 .../dht/IgniteCacheMultiTxLockSelfTest.java     |   1 -
 ...idCachePartitionedHitsAndMissesSelfTest.java |   1 -
 .../GridCachePartitionedNodeRestartTest.java    |   1 -
 ...ePartitionedOptimisticTxNodeRestartTest.java |   1 -
 .../GridCacheReplicatedNodeRestartSelfTest.java |   2 -
 .../cache/eviction/EvictionAbstractTest.java    |   1 -
 .../lru/LruNearEvictionPolicySelfTest.java      |   1 -
 .../LruNearOnlyNearEvictionPolicySelfTest.java  |   1 -
 .../paged/PageEvictionAbstractTest.java         |  13 +-
 ...LruNearEnabledPageEvictionMultinodeTest.java |  28 ++
 ...LruNearEnabledPageEvictionMultinodeTest.java |  28 ++
 ...DeadlockDetectionMessageMarshallingTest.java |   2 +-
 .../IgniteDataStreamerPerformanceTest.java      |   1 -
 .../loadtests/GridCacheMultiNodeLoadTest.java   |   1 -
 .../capacity/spring-capacity-cache.xml          |   3 -
 .../loadtests/colocation/spring-colocation.xml  |   5 -
 .../GridCachePartitionedAtomicLongLoadTest.java |   1 -
 .../GridInternalTasksLoadBalancingSelfTest.java |   7 +-
 .../configvariations/ConfigVariations.java      |   2 -
 .../testframework/junits/GridAbstractTest.java  |   7 +-
 .../IgniteCacheEvictionSelfTestSuite.java       |   4 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   2 +-
 .../webapp/META-INF/ignite-webapp-config.xml    |  12 -
 .../java/org/apache/ignite/ml/math/Tracer.java  |  57 ++--
 .../matrix/SparseDistributedMatrixStorage.java  |   3 -
 .../config/cache-query-continuous-default.xml   |   1 -
 .../Config/ignite-config.xml                    |   1 -
 .../Cache/CacheConfigurationTest.cs             |  10 -
 .../Config/Compute/compute-grid1.xml            |   3 -
 .../Config/Compute/compute-grid2.xml            |   1 -
 .../Config/Dynamic/dynamic-data.xml             |   2 -
 .../Config/cache-query-continuous.xml           |   4 -
 .../Config/native-client-test-cache.xml         |   9 -
 .../IgniteConfigurationSerializerTest.cs        |   1 -
 .../Cache/Configuration/CacheConfiguration.cs   |  12 -
 .../Configuration/NearCacheConfiguration.cs     |   2 +-
 .../IgniteConfigurationSection.xsd              |   5 -
 .../http/jetty/GridJettyObjectMapper.java       |  13 +-
 modules/rocketmq/licenses/apache-2.0.txt        | 202 ++++++++++++++
 .../stream/rocketmq/RocketMQStreamerTest.java   |   8 +-
 .../scalar/src/test/resources/spring-cache.xml  |   3 -
 .../java/org/apache/ignite/internal/cache.xml   |   3 -
 .../apache/ignite/internal/filtered-cache.xml   |   3 -
 .../apache/ignite/internal/invalid-cache.xml    |   6 -
 .../visor/commands/ack/VisorAckCommand.scala    |   5 +-
 .../commands/cache/VisorCacheClearCommand.scala |   5 +-
 .../commands/cache/VisorCacheCommand.scala      |   1 -
 .../commands/cache/VisorCacheResetCommand.scala |   4 +-
 .../commands/cache/VisorCacheStopCommand.scala  |   4 +-
 .../config/VisorConfigurationCommand.scala      |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   5 +-
 .../web-console/backend/app/browsersHandler.js  |   3 +-
 modules/web-console/backend/app/mongo.js        |   5 +-
 .../app/modules/agent/AgentManager.service.js   |   3 +-
 .../generator/ConfigurationGenerator.js         |   9 +-
 .../generator/PlatformGenerator.js              |   7 +-
 .../generator/defaults/Cache.service.js         |   1 -
 .../generator/defaults/Cluster.service.js       |   4 +-
 .../frontend/app/modules/sql/sql.controller.js  |   2 +-
 .../states/configuration/caches/memory.pug      |   9 -
 .../states/configuration/clusters/discovery.pug |   8 +-
 .../demo/service/DemoCachesLoadService.java     |   1 -
 .../service/DemoRandomCacheLoadService.java     |   1 -
 .../webapp2/META-INF/ignite-webapp-config.xml   |  12 -
 .../config/ignite-base-load-config.xml          |  31 +++
 parent/pom.xml                                  |   1 +
 200 files changed, 4554 insertions(+), 1433 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ab92ab2e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 55690b2,d6225c0..cfc267e
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -652,14 -705,11 +652,14 @@@ public class GridCacheProcessor extend
  
      /**
       * @param cfg Cache configuration.
 +     * @param caches Caches map.
 +     * @param templates Templates map.
       * @throws IgniteCheckedException If failed.
       */
 -    private void registerCache(CacheConfiguration<?, ?> cfg) throws IgniteCheckedException
{
 +    private void registerCache(CacheConfiguration cfg,
 +        Map<String, CacheJoinNodeDiscoveryData.CacheInfo> caches,
 +        Map<String, CacheJoinNodeDiscoveryData.CacheInfo> templates) throws IgniteCheckedException
{
-         assert cfg.getName() != null;
+         CU.validateCacheName(cfg.getName());
 -
          cloneCheckSerializable(cfg);
  
          CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg);


Mime
View raw message