Merge branch 'sprint-1' into ignite-50
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d106f4ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d106f4ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d106f4ec Branch: refs/heads/ignite-189 Commit: d106f4ec8febbeb93853668aa055a58dd9bc37d5 Parents: 5aef92b 1c5681a Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Feb 12 12:03:20 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Feb 12 12:03:20 2015 +0300 ---------------------------------------------------------------------- modules/clients/src/test/keystore/generate.sh | 25 +- .../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 - .../processors/cache/CacheEntryEvent.java | 5 +- .../processors/cache/CacheEntryImpl.java | 6 +- .../processors/cache/CacheEntryImpl0.java | 6 +- .../processors/cache/CacheInvokeEntry.java | 8 +- .../processors/cache/GridCacheAdapter.java | 142 ++++++++--- .../processors/cache/GridCacheMapEntry.java | 204 +++++++++++----- .../processors/cache/GridCacheStoreManager.java | 10 +- .../processors/cache/GridCacheUtils.java | 12 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../distributed/GridCacheTtlUpdateRequest.java | 2 +- .../GridDistributedCacheAdapter.java | 3 + .../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 +- .../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 +- modules/core/src/test/config/tests.properties | 6 +- .../IgniteComputeTopologyExceptionTest.java | 112 +++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 27 ++- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + ...iteCacheAtomicExpiryPolicyWithStoreTest.java | 49 ++++ .../IgniteCacheExpiryPolicyAbstractTest.java | 154 +++++++++++- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + ...eCacheExpiryPolicyWithStoreAbstractTest.java | 236 +++++++++++++++++++ .../IgniteCacheTxExpiryPolicyWithStoreTest.java | 43 ++++ .../IgniteCacheStoreSessionAbstractTest.java | 10 +- .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../http/jetty/GridJettyRestHandler.java | 2 +- .../apache/ignite/schema/model/PojoField.java | 6 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 86 +++++-- .../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 +- 98 files changed, 1425 insertions(+), 444 deletions(-) ----------------------------------------------------------------------
