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/04/14 14:09:22 UTC
[1/2] ignite git commit: Removed unused
GridCacheConcurrentMap.randomEntry() method.
Repository: ignite
Updated Branches:
refs/heads/master 9b61a76bd -> ecadf6a0d
Removed unused GridCacheConcurrentMap.randomEntry() method.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af55d729
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af55d729
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af55d729
Branch: refs/heads/master
Commit: af55d7292215dd872ddd2620942655ea6bdf5c01
Parents: 8b56a43
Author: devozerov <vo...@gridgain.com>
Authored: Fri Apr 14 17:08:50 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Apr 14 17:08:50 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheConcurrentMap.java | 5 -----
.../processors/cache/GridCacheConcurrentMapImpl.java | 10 ----------
.../internal/processors/cache/GridNoStorageCacheMap.java | 5 -----
.../dht/GridCachePartitionedConcurrentMap.java | 5 -----
4 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af55d729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index a6738f3..9378f74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -91,11 +91,6 @@ public interface GridCacheConcurrentMap {
public void decrementPublicSize(GridCacheEntryEx e);
/**
- * @return Partition random entry.
- */
- @Nullable public GridCacheMapEntry randomEntry();
-
- /**
* @return Random entry out of hash map.
*/
public Set<KeyCacheObject> keySet(CacheEntryPredicate... filter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/af55d729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 0ef1fdb..76d961a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -343,16 +343,6 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM
}
/** {@inheritDoc} */
- @Deprecated @Nullable @Override public GridCacheMapEntry randomEntry() {
- Iterator<GridCacheMapEntry> iterator = map.values().iterator();
-
- if (iterator.hasNext())
- return iterator.next();
-
- return null;
- }
-
- /** {@inheritDoc} */
@Override public Set<GridCacheMapEntry> entrySet(final CacheEntryPredicate... filter) {
final IgnitePredicate<GridCacheMapEntry> p = new IgnitePredicate<GridCacheMapEntry>() {
@Override public boolean apply(GridCacheMapEntry entry) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/af55d729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
index db3533d..00827ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
@@ -79,11 +79,6 @@ public class GridNoStorageCacheMap implements GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Nullable @Override public GridCacheMapEntry randomEntry() {
- return null;
- }
-
- /** {@inheritDoc} */
@Override public Set<KeyCacheObject> keySet(CacheEntryPredicate... filter) {
return Collections.emptySet();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/af55d729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
index 6230c85..357bf89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
@@ -137,11 +137,6 @@ public class GridCachePartitionedConcurrentMap implements GridCacheConcurrentMap
}
/** {@inheritDoc} */
- @Nullable @Override public GridCacheMapEntry randomEntry() {
- return entries().iterator().next();
- }
-
- /** {@inheritDoc} */
@Override public Set<KeyCacheObject> keySet(final CacheEntryPredicate... filter) {
return new PartitionedSet<KeyCacheObject>() {
@Override protected Set<KeyCacheObject> set(GridDhtLocalPartition part) {
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecadf6a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecadf6a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecadf6a0
Branch: refs/heads/master
Commit: ecadf6a0da77efaf33a7fb7924ea02c385be1e90
Parents: af55d72 9b61a76
Author: devozerov <vo...@gridgain.com>
Authored: Fri Apr 14 17:09:13 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Apr 14 17:09:13 2017 +0300
----------------------------------------------------------------------
.../examples/ScalarCacheAffinityExample.scala | 2 +-
.../ignite/ignite-cassandra-server-template.xml | 6 -
.../tests/ignite-cassandra-client-template.xml | 6 -
.../JettyRestProcessorAbstractSelfTest.java | 12 +-
.../ignite/cache/PartitionLossPolicy.java | 16 +-
.../org/apache/ignite/cache/QueryIndexType.java | 17 +-
.../apache/ignite/internal/LessNamingBean.java | 28 --
.../cache/query/GridCacheSqlIndexMetadata.java | 3 +-
.../cache/query/GridCacheSqlMetadata.java | 3 +-
.../internal/util/IgniteExceptionRegistry.java | 3 +-
.../internal/visor/VisorDataTransferObject.java | 87 ++++++
.../visor/VisorDataTransferObjectInput.java | 156 ++++++++++
.../visor/VisorDataTransferObjectOutput.java | 141 +++++++++
.../ignite/internal/visor/VisorEither.java | 103 +++++++
.../internal/visor/VisorMultiNodeTask.java | 6 +-
.../ignite/internal/visor/VisorOneNodeTask.java | 5 +-
.../internal/visor/VisorTaskArgument.java | 51 +++-
.../visor/binary/VisorBinaryMetadata.java | 139 +++++++++
.../VisorBinaryMetadataCollectorTask.java | 70 +++++
.../VisorBinaryMetadataCollectorTaskResult.java | 87 ++++++
.../visor/binary/VisorBinaryMetadataField.java | 101 +++++++
.../ignite/internal/visor/cache/VisorCache.java | 124 +++++---
.../cache/VisorCacheAffinityConfiguration.java | 91 ++++--
.../visor/cache/VisorCacheAffinityNodeTask.java | 13 +-
.../cache/VisorCacheAffinityNodeTaskArg.java | 86 ++++++
.../cache/VisorCacheAggregatedMetrics.java | 205 ++++++++-----
.../visor/cache/VisorCacheClearTask.java | 100 ++-----
.../visor/cache/VisorCacheClearTaskResult.java | 85 ++++++
.../visor/cache/VisorCacheConfiguration.java | 283 +++++++++++++-----
.../VisorCacheConfigurationCollectorJob.java | 4 +-
.../cache/VisorCacheDefaultConfiguration.java | 58 ----
.../cache/VisorCacheEvictionConfiguration.java | 52 +++-
.../visor/cache/VisorCacheJdbcType.java | 189 ++++++++++++
.../visor/cache/VisorCacheJdbcTypeField.java | 117 ++++++++
.../visor/cache/VisorCacheLoadTask.java | 20 +-
.../visor/cache/VisorCacheLoadTaskArg.java | 101 +++++++
.../visor/cache/VisorCacheMetadataTask.java | 18 +-
.../internal/visor/cache/VisorCacheMetrics.java | 208 +++++++++----
.../cache/VisorCacheMetricsCollectorTask.java | 29 +-
.../VisorCacheMetricsCollectorTaskArg.java | 87 ++++++
.../cache/VisorCacheNearConfiguration.java | 59 ++--
.../visor/cache/VisorCachePartition.java | 57 ++--
.../visor/cache/VisorCachePartitions.java | 43 ++-
.../visor/cache/VisorCachePartitionsTask.java | 7 +-
.../cache/VisorCacheQueryConfiguration.java | 122 --------
.../cache/VisorCacheQueryDetailMetrics.java | 167 -----------
...sorCacheQueryDetailMetricsCollectorTask.java | 146 ---------
.../visor/cache/VisorCacheQueryMetrics.java | 102 -------
.../cache/VisorCacheRebalanceConfiguration.java | 71 +++--
.../VisorCacheResetQueryDetailMetricsTask.java | 71 -----
.../cache/VisorCacheResetQueryMetricsTask.java | 69 -----
.../visor/cache/VisorCacheSqlIndexMetadata.java | 115 ++++++++
.../visor/cache/VisorCacheSqlMetadata.java | 162 ++++++++++
.../visor/cache/VisorCacheStartArg.java | 100 +++++++
.../visor/cache/VisorCacheStartTask.java | 60 +---
.../cache/VisorCacheStoreConfiguration.java | 77 +++--
.../cache/VisorCacheTypeFieldMetadata.java | 92 ------
.../visor/cache/VisorCacheTypeMetadata.java | 294 -------------------
.../internal/visor/cache/VisorPartitionMap.java | 90 ++++++
.../compute/VisorComputeMonitoringHolder.java | 8 +-
.../VisorComputeToggleMonitoringTask.java | 52 ++--
.../VisorComputeToggleMonitoringTaskArg.java | 86 ++++++
.../visor/compute/VisorGatewayTask.java | 4 +-
.../visor/debug/VisorThreadDumpTask.java | 13 +-
.../visor/debug/VisorThreadDumpTaskResult.java | 88 ++++++
.../internal/visor/debug/VisorThreadInfo.java | 234 ++++++++-------
.../visor/debug/VisorThreadLockInfo.java | 51 +++-
.../visor/debug/VisorThreadMonitorInfo.java | 76 +++--
.../visor/event/VisorGridDeploymentEvent.java | 43 ++-
.../visor/event/VisorGridDiscoveryEvent.java | 59 +++-
.../internal/visor/event/VisorGridEvent.java | 66 +++--
.../visor/event/VisorGridEventsLost.java | 15 +-
.../internal/visor/event/VisorGridJobEvent.java | 61 +++-
.../visor/event/VisorGridTaskEvent.java | 61 +++-
.../internal/visor/file/VisorFileBlock.java | 60 +++-
.../internal/visor/file/VisorFileBlockArg.java | 114 +++++++
.../internal/visor/file/VisorFileBlockTask.java | 64 +---
.../visor/file/VisorLatestTextFilesTask.java | 17 +-
.../visor/file/VisorLatestTextFilesTaskArg.java | 86 ++++++
.../ignite/internal/visor/igfs/VisorIgfs.java | 76 +++--
.../internal/visor/igfs/VisorIgfsEndpoint.java | 72 +++--
.../internal/visor/igfs/VisorIgfsMetrics.java | 118 +++++---
.../internal/visor/igfs/VisorIgfsProfiler.java | 24 +-
.../visor/igfs/VisorIgfsProfilerClearTask.java | 11 +-
.../igfs/VisorIgfsProfilerClearTaskResult.java | 85 ++++++
.../visor/igfs/VisorIgfsProfilerEntry.java | 106 +++++--
.../visor/igfs/VisorIgfsProfilerTask.java | 31 +-
.../VisorIgfsProfilerUniformityCounters.java | 38 ++-
.../visor/igfs/VisorIgfsSamplingStateTask.java | 17 +-
.../igfs/VisorIgfsSamplingStateTaskArg.java | 86 ++++++
.../ignite/internal/visor/log/VisorLogFile.java | 43 ++-
.../internal/visor/log/VisorLogSearchArg.java | 114 +++++++
.../visor/log/VisorLogSearchResult.java | 80 +++--
.../internal/visor/log/VisorLogSearchTask.java | 74 +----
.../visor/log/VisorLogSearchTaskResult.java | 92 ++++++
.../visor/node/VisorAtomicConfiguration.java | 49 +++-
.../visor/node/VisorBasicConfiguration.java | 163 ++++++----
.../node/VisorExecutorServiceConfiguration.java | 81 +++--
.../visor/node/VisorGridConfiguration.java | 126 +++++---
.../visor/node/VisorIgfsConfiguration.java | 203 ++++++++-----
.../visor/node/VisorLifecycleConfiguration.java | 39 ++-
.../visor/node/VisorMemoryConfiguration.java | 60 ++--
.../node/VisorMemoryPolicyConfiguration.java | 37 ++-
.../visor/node/VisorMetricsConfiguration.java | 50 +++-
.../VisorNodeConfigurationCollectorJob.java | 4 +-
.../visor/node/VisorNodeDataCollectorJob.java | 63 ++--
.../node/VisorNodeDataCollectorJobResult.java | 109 +++++--
.../visor/node/VisorNodeDataCollectorTask.java | 40 +--
.../node/VisorNodeDataCollectorTaskArg.java | 54 +++-
.../node/VisorNodeDataCollectorTaskResult.java | 110 +++++--
.../node/VisorNodeEventsCollectorTask.java | 133 +--------
.../node/VisorNodeEventsCollectorTaskArg.java | 163 ++++++++++
.../internal/visor/node/VisorNodeGcTask.java | 18 +-
.../visor/node/VisorNodeGcTaskResult.java | 85 ++++++
.../internal/visor/node/VisorNodePingTask.java | 15 +-
.../visor/node/VisorNodePingTaskResult.java | 99 +++++++
.../visor/node/VisorNodeSuppressedErrors.java | 89 ++++++
.../node/VisorNodeSuppressedErrorsTask.java | 23 +-
.../node/VisorPeerToPeerConfiguration.java | 57 ++--
.../visor/node/VisorRestConfiguration.java | 93 +++---
.../node/VisorSegmentationConfiguration.java | 67 +++--
.../visor/node/VisorSpiDescription.java | 89 ++++++
.../visor/node/VisorSpisConfiguration.java | 128 ++++----
.../visor/node/VisorSuppressedError.java | 147 ++++++++++
.../node/VisorTransactionConfiguration.java | 104 +++++--
.../visor/query/VisorCancelQueriesTask.java | 72 -----
.../query/VisorCollectRunningQueriesTask.java | 96 ------
.../internal/visor/query/VisorQueryArg.java | 65 +++-
.../visor/query/VisorQueryCancelTask.java | 72 +++++
.../visor/query/VisorQueryCleanupTask.java | 6 +-
.../visor/query/VisorQueryConfiguration.java | 142 +++++++++
.../visor/query/VisorQueryDetailMetrics.java | 205 +++++++++++++
.../VisorQueryDetailMetricsCollectorTask.java | 146 +++++++++
.../internal/visor/query/VisorQueryEntity.java | 188 ++++++++++++
.../internal/visor/query/VisorQueryField.java | 42 ++-
.../internal/visor/query/VisorQueryIndex.java | 105 +++++++
.../visor/query/VisorQueryIndexField.java | 106 +++++++
.../internal/visor/query/VisorQueryJob.java | 275 -----------------
.../internal/visor/query/VisorQueryMetrics.java | 125 ++++++++
.../visor/query/VisorQueryNextPageTask.java | 33 ++-
.../visor/query/VisorQueryNextPageTaskArg.java | 86 ++++++
.../query/VisorQueryResetDetailMetricsTask.java | 71 +++++
.../visor/query/VisorQueryResetMetricsTask.java | 69 +++++
.../internal/visor/query/VisorQueryResult.java | 97 +++++-
.../visor/query/VisorQueryResultEx.java | 89 ------
.../visor/query/VisorQueryScanRegexFilter.java | 59 ++++
.../query/VisorQueryScanSubstringFilter.java | 64 ----
.../internal/visor/query/VisorQueryTask.java | 120 +++++++-
.../internal/visor/query/VisorQueryUtils.java | 43 ++-
.../query/VisorRunningQueriesCollectorTask.java | 96 ++++++
.../internal/visor/query/VisorRunningQuery.java | 47 ++-
.../internal/visor/query/VisorScanQueryArg.java | 157 ++++++++++
.../visor/query/VisorScanQueryTask.java | 185 ++++++++++++
.../visor/service/VisorServiceDescriptor.java | 31 +-
.../internal/visor/util/VisorTaskUtils.java | 38 ++-
.../plugin/security/SecurityPermissionSet.java | 3 +-
.../ignite/plugin/security/SecuritySubject.java | 3 +-
.../plugin/segmentation/SegmentationPolicy.java | 18 +-
.../resources/META-INF/classnames.properties | 236 +++++++--------
.../resources/META-INF/classnames.properties | 8 -
.../http/jetty/GridJettyObjectMapper.java | 119 ++------
.../commands/cache/VisorCacheClearCommand.scala | 2 +-
.../commands/cache/VisorCacheCommand.scala | 291 +++++++++---------
.../commands/cache/VisorCacheScanCommand.scala | 16 +-
.../config/VisorConfigurationCommand.scala | 183 ++++++------
.../commands/disco/VisorDiscoveryCommand.scala | 22 +-
.../commands/events/VisorEventsCommand.scala | 30 +-
.../visor/commands/gc/VisorGcCommand.scala | 4 +-
.../commands/tasks/VisorTasksCommand.scala | 61 ++--
.../scala/org/apache/ignite/visor/visor.scala | 34 +--
modules/web-console/backend/app/agent.js | 98 +++----
modules/web-console/backend/app/browser.js | 76 +++--
modules/web-console/backend/app/mongo.js | 21 +-
.../frontend/app/modules/agent/agent.module.js | 41 ++-
.../generator/AbstractTransformer.js | 5 -
.../generator/ConfigurationGenerator.js | 44 +--
.../generator/JavaTransformer.service.js | 3 +
.../generator/PlatformGenerator.js | 10 +-
.../defaults/Cache.platform.service.js | 5 -
.../generator/defaults/Cache.service.js | 10 +-
.../generator/defaults/Cluster.service.js | 1 -
.../generator/defaults/IGFS.service.js | 2 +-
.../frontend/app/modules/sql/sql.controller.js | 56 ++--
.../states/configuration/caches/affinity.pug | 2 +-
.../states/configuration/caches/general.pug | 25 ++
.../states/configuration/caches/memory.pug | 64 +---
.../states/configuration/caches/query.pug | 3 +
.../states/configuration/clusters/events.pug | 6 +-
.../configuration/clusters/marshaller.pug | 6 -
.../states/configuration/clusters/swap.pug | 72 -----
.../modules/states/configuration/igfs/misc.pug | 2 +-
.../frontend/controllers/caches-controller.js | 29 --
.../frontend/controllers/clusters-controller.js | 38 ---
.../views/configuration/clusters.tpl.pug | 1 -
.../ignite/console/demo/AgentClusterDemo.java | 2 +
.../src/main/resources/log4j.properties | 1 -
196 files changed, 9599 insertions(+), 4623 deletions(-)
----------------------------------------------------------------------