Merge branch sprint-1 into ignite-96
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75b5b8b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75b5b8b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75b5b8b3 Branch: refs/heads/ignite-189 Commit: 75b5b8b374735804bf36d8d005894631a6a5d72c Parents: 59299cb 67f2fd8 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Feb 11 22:55:37 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Feb 11 22:55:37 2015 -0800 ---------------------------------------------------------------------- modules/clients/src/test/keystore/generate.sh | 25 +- .../src/main/java/org/apache/ignite/Ignite.java | 10 - .../java/org/apache/ignite/IgniteServices.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 15 +- .../ignite/events/AuthorizationEvent.java | 2 +- .../org/apache/ignite/events/CacheEvent.java | 2 +- .../apache/ignite/events/CheckpointEvent.java | 2 +- .../apache/ignite/events/DeploymentEvent.java | 2 +- .../java/org/apache/ignite/events/JobEvent.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 3 - .../ignite/internal/GridKernalContext.java | 5 - .../ignite/internal/GridKernalContextImpl.java | 13 +- .../apache/ignite/internal/GridProductImpl.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 61 +---- .../internal/managers/GridManagerAdapter.java | 14 +- .../managers/security/GridSecurityImpl.java | 95 -------- .../processors/cache/CacheEntryEvent.java | 5 +- .../processors/cache/CacheEntryImpl.java | 6 +- .../processors/cache/CacheEntryImpl0.java | 6 +- .../processors/cache/CacheInvokeEntry.java | 8 +- .../processors/cache/GridCacheAdapter.java | 130 +++++++--- .../processors/cache/GridCacheMapEntry.java | 198 +++++++++++----- .../processors/cache/GridCacheStoreManager.java | 3 +- .../processors/cache/GridCacheUtils.java | 16 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../distributed/GridCacheTtlUpdateRequest.java | 2 +- .../GridDistributedTxRemoteAdapter.java | 3 + .../IgniteExternalizableExpiryPolicy.java | 14 +- .../distributed/dht/GridDhtCacheAdapter.java | 31 ++- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 17 ++ .../transactions/IgniteTxLocalAdapter.java | 13 +- .../processors/rest/GridRestProcessor.java | 2 +- .../ignite/internal/product/IgniteProduct.java | 8 + .../ignite/internal/util/IgniteUtils.java | 7 +- .../apache/ignite/internal/visor/VisorJob.java | 8 +- .../ignite/internal/visor/cache/VisorCache.java | 10 +- .../visor/cache/VisorCacheClearTask.java | 140 +++++++++-- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheLoadTask.java | 2 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../cache/VisorCacheMetricsCollectorTask.java | 2 +- .../visor/cache/VisorCachePreloadTask.java | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../compute/VisorComputeCancelSessionsTask.java | 4 +- .../compute/VisorComputeMonitoringHolder.java | 16 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 10 +- .../visor/ggfs/VisorGgfsFormatTask.java | 2 +- .../visor/ggfs/VisorGgfsProfilerClearTask.java | 4 +- .../visor/ggfs/VisorGgfsProfilerTask.java | 4 +- .../visor/ggfs/VisorGgfsResetMetricsTask.java | 2 +- .../visor/ggfs/VisorGgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 10 +- .../internal/visor/misc/VisorAckTask.java | 2 +- .../visor/misc/VisorLatestVersionTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 10 +- .../VisorNodeConfigurationCollectorJob.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 49 ++-- .../node/VisorNodeEventsCollectorTask.java | 16 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 2 +- .../visor/query/VisorQueryNextPageTask.java | 4 +- .../internal/visor/query/VisorQueryTask.java | 18 +- .../streamer/VisorStreamerMetricsResetTask.java | 4 +- .../visor/streamer/VisorStreamerResetTask.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 18 +- .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/optimized-classnames.properties | 57 ++--- .../ignite/plugin/security/GridSecurity.java | 97 -------- .../plugin/security/GridSecuritySubject.java | 1 - modules/core/src/test/config/tests.properties | 6 +- .../IgniteComputeTopologyExceptionTest.java | 112 +++++++++ ...iteCacheAtomicExpiryPolicyWithStoreTest.java | 49 ++++ .../IgniteCacheExpiryPolicyAbstractTest.java | 154 +++++++++++- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + ...eCacheExpiryPolicyWithStoreAbstractTest.java | 236 +++++++++++++++++++ .../IgniteCacheTxExpiryPolicyWithStoreTest.java | 43 ++++ .../junits/GridTestKernalContext.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 6 - .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../http/jetty/GridJettyRestHandler.java | 2 +- .../schema-load/src/main/java/media/style.css | 5 + .../apache/ignite/schema/model/PojoField.java | 6 +- .../org/apache/ignite/schema/ui/MessageBox.java | 8 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 88 +++++-- .../org/apache/ignite/IgniteSpringBean.java | 7 - .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 24 +- .../commands/cache/VisorCacheClearCommand.scala | 17 +- .../commands/cache/VisorCacheCommand.scala | 8 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 8 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 6 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 6 +- .../visor/commands/kill/VisorKillCommand.scala | 10 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 22 +- .../commands/top/VisorTopologyCommand.scala | 8 +- .../visor/commands/vvm/VisorVvmCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 68 +++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- .../cache/websession/GridWebSessionFilter.java | 2 +- pom.xml | 51 ++-- 112 files changed, 1481 insertions(+), 781 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 6e6d0bf,64c83fd..c20cf03 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@@ -1857,7 -1920,7 +1911,7 @@@ public abstract class GridCacheMapEntry expiryPlc.ttlUpdated(key, getOrMarshalKeyBytes(), version(), - hasReaders() ? ((GridDhtCacheEntry<K, V>) this).readers() : null); - hasReaders() ? ((GridDhtCacheEntry)this).readers() : null); ++ hasReaders() ? ((GridDhtCacheEntry<K, V>)this).readers() : null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75b5b8b3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java index 4366b61,14f0b7d..6928f43 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java @@@ -63,14 -60,12 +63,14 @@@ public class VisorCacheSwapBackupsTask /** {@inheritDoc} */ @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) { Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>(); + ClusterNode locNode = g.localNode(); - for (GridCache c: g.cachesx()) { + for (GridCache c: ignite.cachesx()) { String cacheName = c.name(); + CacheAffinity<Object> aff = g.affinity(c.name()); if (names.contains(cacheName)) { - Set<CacheEntry> entries = c.entrySet(); + Set<Cache.Entry> entries = c.entrySet(); int before = entries.size(), after = before;
