Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-40
Conflicts:
modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ff436dc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff436dc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff436dc6
Branch: refs/heads/ignite-40
Commit: ff436dc67b2da7ad9c8329f12876be823ea05c1d
Parents: 1a05c3f 0acd2d4
Author: Sergey Evdokimov <[email protected]>
Authored: Mon Jan 26 20:25:07 2015 +0300
Committer: Sergey Evdokimov <[email protected]>
Committed: Mon Jan 26 20:25:07 2015 +0300
----------------------------------------------------------------------
LICENSE.txt | 27 +
NOTICE.txt | 61 --
.../examples/ScalarCacheAffinityExample1.scala | 9 +-
.../examples/ScalarCacheAffinityExample2.scala | 9 +-
.../ScalarCacheAffinitySimpleExample.scala | 4 +-
.../scalar/examples/ScalarCacheExample.scala | 13 +-
.../ScalarCachePopularNumbersExample.scala | 14 +-
.../examples/ScalarCacheQueryExample.scala | 11 +-
.../scalar/examples/ScalarClosureExample.scala | 6 +-
.../examples/ScalarContinuationExample.scala | 11 +-
.../examples/ScalarCreditRiskExample.scala | 7 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 13 +-
.../examples/ScalarPiCalculationExample.scala | 7 +-
.../scalar/examples/ScalarPingPongExample.scala | 7 +-
.../scalar/examples/ScalarPrimeExample.scala | 10 +-
.../scalar/examples/ScalarScheduleExample.scala | 6 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 15 +-
.../examples/ScalarStartStopExample.scala | 6 +-
.../scalar/examples/ScalarTaskExample.scala | 12 +-
.../examples/ScalarWorldShortestMapReduce.scala | 6 +-
.../tests/examples/ScalarExamplesSelfTest.scala | 7 +-
.../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 2 +-
.../services/javax.cache.spi.CachingProvider | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 79 +++
.../org/apache/ignite/IgniteCacheMXBean.java | 72 ---
.../org/apache/ignite/IgniteCacheManager.java | 372 ------------
.../apache/ignite/IgniteCachingProvider.java | 190 -------
.../apache/ignite/IgniteNotPeerDeployable.java | 41 --
.../org/apache/ignite/cache/CacheMBean.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 372 ++++++++++++
.../apache/ignite/cache/CacheProjection.java | 6 +
.../apache/ignite/cache/CachingProvider.java | 189 +++++++
.../cache/GridCachePartialUpdateException.java | 64 ---
.../fifo/CacheFifoEvictionPolicyMBean.java | 2 +-
...CacheGgfsPerBlockLruEvictionPolicyMBean.java | 2 +-
.../lru/CacheLruEvictionPolicyMBean.java | 2 +-
.../random/CacheRandomEvictionPolicyMBean.java | 2 +-
.../client/router/GridTcpRouterMBean.java | 2 +-
.../org/apache/ignite/cluster/ClusterNode.java | 2 +-
.../ignite/cluster/ClusterNodeMetrics.java | 2 +-
.../internal/ClusterNodeMetricsMBean.java | 2 +-
.../org/apache/ignite/internal/GridGainEx.java | 4 +-
.../org/apache/ignite/internal/GridKernal.java | 4 +-
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/GridProductImpl.java | 6 +-
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../internal/IgniteThreadPoolMBeanAdapter.java | 4 +-
.../ignite/internal/IgnitionMBeanAdapter.java | 2 +-
.../discovery/GridDiscoveryManager.java | 1 -
.../cache/CacheIteratorConverter.java | 39 ++
.../cache/CacheWeakQueryIteratorsHolder.java | 228 ++++++++
.../processors/cache/GridCacheAdapter.java | 122 +++-
.../processors/cache/GridCacheContext.java | 1 -
.../cache/GridCacheProjectionImpl.java | 5 +
.../processors/cache/GridCacheProxyImpl.java | 12 +
.../processors/cache/IgniteCacheProxy.java | 237 ++++----
.../cache/datastructures/GridCacheSetImpl.java | 3 -
.../dataload/IgniteDataLoaderImpl.java | 1 -
.../processors/job/GridJobProcessor.java | 1 -
.../license/GridLicenseProcessor.java | 6 +-
.../license/os/GridOsLicenseProcessor.java | 2 +-
.../ignite/internal/product/IgniteProduct.java | 67 +++
.../internal/product/IgniteProductLicense.java | 183 ++++++
.../product/IgniteProductLicenseException.java | 70 +++
.../apache/ignite/internal/product/package.html | 23 +
.../apache/ignite/internal/util/GridUtils.java | 3 +-
.../ignite/lang/IgniteNotPeerDeployable.java | 41 ++
.../ignite/lang/IgniteProductVersion.java | 291 ++++++++++
.../org/apache/ignite/mbean/IgniteMBean.java | 386 -------------
.../ignite/mbean/IgniteMBeanDescription.java | 34 --
.../IgniteMBeanParametersDescriptions.java | 34 --
.../mbean/IgniteMBeanParametersNames.java | 34 --
.../ignite/mbean/IgniteStandardMBean.java | 275 ---------
.../ignite/mbean/IgniteThreadPoolMBean.java | 152 -----
.../org/apache/ignite/mbean/IgnitionMBean.java | 151 -----
.../java/org/apache/ignite/mbean/package.html | 23 -
.../apache/ignite/mxbean/IgniteCacheMXBean.java | 72 +++
.../org/apache/ignite/mxbean/IgniteMBean.java | 386 +++++++++++++
.../ignite/mxbean/IgniteMBeanDescription.java | 34 ++
.../IgniteMBeanParametersDescriptions.java | 34 ++
.../mxbean/IgniteMBeanParametersNames.java | 34 ++
.../ignite/mxbean/IgniteStandardMBean.java | 275 +++++++++
.../ignite/mxbean/IgniteThreadPoolMBean.java | 152 +++++
.../org/apache/ignite/mxbean/IgnitionMBean.java | 151 +++++
.../java/org/apache/ignite/mxbean/package.html | 23 +
.../apache/ignite/product/IgniteProduct.java | 66 ---
.../ignite/product/IgniteProductLicense.java | 183 ------
.../product/IgniteProductLicenseException.java | 70 ---
.../ignite/product/IgniteProductVersion.java | 291 ----------
.../java/org/apache/ignite/product/package.html | 23 -
.../ignite/spi/IgniteSpiManagementMBean.java | 2 +-
.../noop/NoopAuthenticationSpiMBean.java | 2 +-
.../cache/CacheCheckpointSpiMBean.java | 2 +-
.../checkpoint/jdbc/JdbcCheckpointSpiMBean.java | 2 +-
.../sharedfs/SharedFsCheckpointSpiMBean.java | 2 +-
.../fifoqueue/FifoQueueCollisionSpiMBean.java | 2 +-
.../JobStealingCollisionSpiMBean.java | 2 +-
.../PriorityQueueCollisionSpiMBean.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 1 -
.../tcp/TcpCommunicationSpiMBean.java | 2 +-
.../local/LocalDeploymentSpiMBean.java | 2 +-
.../ignite/spi/discovery/DiscoverySpi.java | 2 +-
.../tcp/TcpClientDiscoverySpiMBean.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 2 +-
.../tcp/internal/TcpDiscoveryNode.java | 1 -
.../memory/MemoryEventStorageSpiMBean.java | 2 +-
.../failover/always/AlwaysFailoverSpiMBean.java | 2 +-
.../JobStealingFailoverSpiMBean.java | 2 +-
.../failover/never/NeverFailoverSpiMBean.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpiMBean.java | 2 +-
.../RoundRobinLoadBalancingSpiMBean.java | 2 +-
.../WeightedRandomLoadBalancingSpiMBean.java | 2 +-
.../noop/NoopSecureSessionSpiMBean.java | 2 +-
.../swapspace/file/FileSwapSpaceSpiMBean.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 561 +++++++++++++++++++
.../apache/ignite/streamer/StreamerMBean.java | 2 +-
.../ignite/streamer/StreamerStageMBean.java | 2 +-
.../ignite/streamer/StreamerWindowMBean.java | 2 +-
.../index/StreamerIndexProviderMBean.java | 2 +-
.../cache/CacheIteratorConverter.java | 39 --
.../cache/CacheWeakQueryIteratorsHolder.java | 228 --------
.../ignite/internal/GridDiscoverySelfTest.java | 3 +-
.../internal/GridReleaseTypeSelfTest.java | 3 +-
.../GridTopologyBuildVersionSelfTest.java | 3 +-
.../ignite/internal/GridVersionSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 14 +-
.../cache/GridCacheDeploymentSelfTest.java | 12 +-
.../cache/IgniteCachingProviderSelfTest.java | 14 +-
.../dht/GridCacheGlobalLoadTest.java | 78 ++-
...unctionExcludeNeighborsAbstractSelfTest.java | 2 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 25 +-
.../product/GridProductVersionSelfTest.java | 111 ++++
.../marshaller/GridMarshallerAbstractTest.java | 2 +-
.../optimized/GridOptimizedMarshallerTest.java | 4 +-
.../ignite/p2p/GridP2PClassLoadingSelfTest.java | 4 +-
.../GridP2PDifferentClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PHotRedeploymentSelfTest.java | 2 +-
.../ignite/p2p/GridP2PNodeLeftSelfTest.java | 2 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +-
.../product/GridProductVersionSelfTest.java | 111 ----
.../GridAbstractDiscoverySelfTest.java | 2 +-
.../ignite/testframework/GridTestNode.java | 4 +-
.../testframework/junits/GridTestIgnite.java | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +-
.../ignite/util/mbeans/GridMBeanSelfTest.java | 2 +-
modules/extdata/p2p/META-INF/gridgain.xml | 4 +-
.../tests/p2p/CacheDeploymentTestKey.java | 63 +++
.../tests/p2p/CacheDeploymentTestTask1.java | 65 +++
.../tests/p2p/CacheDeploymentTestTask2.java | 56 ++
.../tests/p2p/CacheDeploymentTestTask3.java | 61 ++
.../tests/p2p/CacheDeploymentTestValue.java | 27 +
.../tests/p2p/CacheDeploymentTestValue2.java | 25 +
.../tests/p2p/GridCacheDeploymentTestKey.java | 63 ---
.../tests/p2p/GridCacheDeploymentTestTask1.java | 65 ---
.../tests/p2p/GridCacheDeploymentTestTask2.java | 56 --
.../tests/p2p/GridCacheDeploymentTestTask3.java | 61 --
.../tests/p2p/GridCacheDeploymentTestValue.java | 26 -
.../p2p/GridCacheDeploymentTestValue2.java | 24 -
.../tests/p2p/GridP2PTestTaskExternalPath2.java | 137 -----
.../tests/p2p/GridSingleSplitTestTask.java | 76 ---
.../tests/p2p/P2PTestTaskExternalPath2.java | 137 +++++
.../ignite/tests/p2p/SingleSplitTestTask.java | 76 +++
modules/scalar/readme.txt | 4 +-
.../ignite/scalar/ScalarConversions.scala | 19 +-
.../org/apache/ignite/scalar/lang/Packet.scala | 4 +-
.../ignite/scalar/lang/ScalarAbsClosure.scala | 4 +-
.../scalar/lang/ScalarAbsClosureFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarAbsClosureX.scala | 2 +-
.../scalar/lang/ScalarAbsClosureXFunction.scala | 4 +-
.../ignite/scalar/lang/ScalarAbsPredicate.scala | 2 +-
.../lang/ScalarAbsPredicateFunction.scala | 4 +-
.../scalar/lang/ScalarAbsPredicateX.scala | 2 +-
.../lang/ScalarAbsPredicateXFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarClosure.scala | 2 +-
.../ignite/scalar/lang/ScalarClosure2.scala | 2 +-
.../scalar/lang/ScalarClosure2Function.scala | 2 +-
.../ignite/scalar/lang/ScalarClosure2X.scala | 2 +-
.../scalar/lang/ScalarClosure2XFunction.scala | 4 +-
.../ignite/scalar/lang/ScalarClosure3.scala | 2 +-
.../scalar/lang/ScalarClosure3Function.scala | 4 +-
.../ignite/scalar/lang/ScalarClosure3X.scala | 2 +-
.../scalar/lang/ScalarClosure3XFunction.scala | 4 +-
.../scalar/lang/ScalarClosureFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarClosureX.scala | 2 +-
.../scalar/lang/ScalarClosureXFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarInClosure.scala | 2 +-
.../ignite/scalar/lang/ScalarInClosure2.scala | 2 +-
.../scalar/lang/ScalarInClosure2Function.scala | 2 +-
.../ignite/scalar/lang/ScalarInClosure2X.scala | 2 +-
.../scalar/lang/ScalarInClosure2XFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarInClosure3.scala | 2 +-
.../scalar/lang/ScalarInClosure3Function.scala | 4 +-
.../ignite/scalar/lang/ScalarInClosure3X.scala | 2 +-
.../scalar/lang/ScalarInClosure3XFunction.scala | 4 +-
.../scalar/lang/ScalarInClosureFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarInClosureX.scala | 2 +-
.../scalar/lang/ScalarInClosureXFunction.scala | 4 +-
.../apache/ignite/scalar/lang/ScalarJob.scala | 2 +-
.../ignite/scalar/lang/ScalarOutClosure.scala | 7 +-
.../scalar/lang/ScalarOutClosureFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarOutClosureX.scala | 2 +-
.../scalar/lang/ScalarOutClosureXFunction.scala | 4 +-
.../ignite/scalar/lang/ScalarPredicate.scala | 2 +-
.../ignite/scalar/lang/ScalarPredicate2.scala | 2 +-
.../scalar/lang/ScalarPredicate2Function.scala | 2 +-
.../ignite/scalar/lang/ScalarPredicate2X.scala | 2 +-
.../scalar/lang/ScalarPredicate2XFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarPredicate3.scala | 2 +-
.../scalar/lang/ScalarPredicate3Function.scala | 4 +-
.../ignite/scalar/lang/ScalarPredicate3X.scala | 2 +-
.../scalar/lang/ScalarPredicate3XFunction.scala | 4 +-
.../scalar/lang/ScalarPredicateFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarPredicateX.scala | 2 +-
.../scalar/lang/ScalarPredicateXFunction.scala | 2 +-
.../ignite/scalar/lang/ScalarReducer.scala | 4 +-
.../ignite/scalar/lang/ScalarReducer2.scala | 5 +-
.../scalar/lang/ScalarReducer2Function.scala | 4 +-
.../ignite/scalar/lang/ScalarReducer3.scala | 5 +-
.../scalar/lang/ScalarReducer3Function.scala | 4 +-
.../scalar/lang/ScalarReducerFunction.scala | 2 +-
.../org/apache/ignite/scalar/pimps/Packet.scala | 4 +-
.../apache/ignite/scalar/pimps/PimpedType.scala | 2 +-
.../ignite/scalar/pimps/ScalarCachePimp.scala | 2 +-
.../pimps/ScalarCacheProjectionPimp.scala | 18 +-
.../ignite/scalar/pimps/ScalarGridPimp.scala | 5 +-
.../scalar/pimps/ScalarProjectionPimp.scala | 64 +--
.../scalar/pimps/ScalarTaskThreadContext.scala | 5 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 14 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
.../tests/ScalarAffinityRoutingSpec.scala | 13 +-
.../tests/ScalarCacheProjectionSpec.scala | 8 +-
.../scalar/tests/ScalarCacheQueriesSpec.scala | 9 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 17 +-
.../scalar/tests/ScalarConversionsSpec.scala | 12 +-
.../scalar/tests/ScalarProjectionSpec.scala | 14 +-
.../scalar/tests/ScalarReturnableSpec.scala | 11 +-
.../apache/ignite/scalar/tests/ScalarSpec.scala | 8 +-
.../scalar/testsuites/ScalarSelfTestSuite.scala | 4 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 4 +-
.../uri/GridUriDeploymentSpiMBean.java | 2 +-
.../deployment/uri/META-INF/p2p-gridgain.xml | 2 +-
.../config/VisorConfigurationCommand.scala | 3 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
249 files changed, 4718 insertions(+), 3926 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff436dc6/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteCacheMXBean.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/mxbean/IgniteCacheMXBean.java
index 0000000,bcc14e7..b2edf3f
mode 000000,100644..100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteCacheMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteCacheMXBean.java
@@@ -1,0 -1,72 +1,72 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package org.apache.ignite.mxbean;
+
+ import javax.cache.*;
+ import javax.cache.configuration.*;
+ import javax.cache.management.*;
+
+ /**
- *
++ * Implementation of {@link javax.cache.management.CacheMXBean}.
+ */
+ public class IgniteCacheMXBean implements CacheMXBean {
+ /** */
+ private final Cache<?, ?> cache;
+
+ /**
+ * @param cache Cache.
+ */
+ public IgniteCacheMXBean(Cache<?, ?> cache) {
+ this.cache = cache;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String getKeyType() {
+ return
cache.getConfiguration(CompleteConfiguration.class).getKeyType().getName();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String getValueType() {
+ return
cache.getConfiguration(CompleteConfiguration.class).getValueType().getName();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isReadThrough() {
+ return
cache.getConfiguration(CompleteConfiguration.class).isReadThrough();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isWriteThrough() {
+ return
cache.getConfiguration(CompleteConfiguration.class).isWriteThrough();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isStoreByValue() {
+ return
cache.getConfiguration(CompleteConfiguration.class).isStoreByValue();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isStatisticsEnabled() {
+ return
cache.getConfiguration(CompleteConfiguration.class).isStatisticsEnabled();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isManagementEnabled() {
+ return
cache.getConfiguration(CompleteConfiguration.class).isManagementEnabled();
+ }
+ }
