ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [22/42] incubator-ignite git commit: Merge branches 'ignite-102' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-102
Date Mon, 02 Feb 2015 15:01:02 GMT
Merge branches 'ignite-102' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-102


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

Branch: refs/heads/ignite-140
Commit: 99e3fa618bcb4581626188046933b157a2acc577
Parents: b0031cc c224017
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Jan 28 10:24:53 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Jan 28 10:24:53 2015 +0700

----------------------------------------------------------------------
 NOTICE.txt                                      |   14 +-
 examples/config/example-cache.xml               |    9 +-
 examples/config/example-compute.xml             |    9 +-
 examples/config/example-streamer.xml            |    9 +-
 examples/config/filesystem/example-ggfs.xml     |    9 +-
 .../examples/misc/springbean/spring-bean.xml    |    9 +-
 .../examples/ScalarStartStopExample.scala       |   73 -
 .../examples/IgniteFsExamplesSelfTest.java      |   26 +-
 .../tests/examples/ScalarExamplesSelfTest.scala |    5 -
 .../spi/checkpoint/s3/S3CheckpointSpiMBean.java |   12 +-
 .../integration/ClientAbstractSelfTest.java     |   20 +-
 .../rest/AbstractRestProcessorSelfTest.java     |    2 +
 .../rest/ClientMemcachedProtocolSelfTest.java   |    4 +-
 .../rest/RestBinaryProtocolSelfTest.java        |    9 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |    9 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   10 +
 .../java/org/apache/ignite/IgniteCache.java     |   15 +
 .../apache/ignite/cache/CacheEntryEvent.java    |    2 +-
 .../org/apache/ignite/cache/CacheMBean.java     |  295 ----
 .../org/apache/ignite/cache/CacheManager.java   |  164 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |  416 +++++-
 .../java/org/apache/ignite/cache/GridCache.java |   15 +-
 .../ignite/cache/affinity/CacheAffinity.java    |    9 +-
 .../fifo/CacheFifoEvictionPolicyMBean.java      |   10 +-
 ...CacheGgfsPerBlockLruEvictionPolicyMBean.java |   18 +-
 .../lru/CacheLruEvictionPolicyMBean.java        |   10 +-
 .../random/CacheRandomEvictionPolicyMBean.java  |    6 +-
 .../ignite/cache/store/CacheStoreSession.java   |    2 +-
 .../client/router/GridTcpRouterMBean.java       |   16 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |  697 +++++----
 .../org/apache/ignite/cluster/ClusterNode.java  |   40 +-
 .../ignite/cluster/ClusterNodeMetrics.java      |  695 ---------
 .../configuration/IgniteConfiguration.java      |   27 +-
 .../ignite/dotnet/GridDotNetConfiguration.java  |  113 --
 .../dotnet/GridDotNetPortableConfiguration.java |  207 ---
 .../GridDotNetPortableTypeConfiguration.java    |  219 ---
 .../java/org/apache/ignite/dotnet/package.html  |   23 -
 .../ignite/internal/ClusterGroupAdapter.java    |    2 +-
 .../internal/ClusterLocalNodeMetrics.java       |  311 ----
 .../ClusterLocalNodeMetricsMXBeanImpl.java      |  309 ++++
 .../ignite/internal/ClusterMetricsImpl.java     |  813 ----------
 .../ignite/internal/ClusterMetricsSnapshot.java | 1397 ++++++++++++++++++
 .../internal/ClusterNodeMetricsMBean.java       |   29 -
 .../org/apache/ignite/internal/GridGainEx.java  |    8 +-
 .../ignite/internal/GridJobExecuteRequest.java  |   95 +-
 .../internal/GridJobExecuteRequestV2.java       |  185 ---
 .../org/apache/ignite/internal/GridKernal.java  |   32 +-
 .../org/apache/ignite/internal/GridTopic.java   |    5 +-
 .../ignite/internal/IgniteClusterAsyncImpl.java |    1 -
 .../internal/IgniteThreadPoolMBeanAdapter.java  |  149 --
 .../internal/IgniteThreadPoolMXBeanAdapter.java |  129 ++
 .../ignite/internal/IgnitionMBeanAdapter.java   |   59 -
 .../ignite/internal/IgnitionMXBeanAdapter.java  |   59 +
 .../discovery/GridDiscoveryManager.java         |    4 +-
 .../internal/mxbean/IgniteStandardMXBean.java   |  277 ++++
 .../apache/ignite/internal/mxbean/package.html  |   24 +
 .../affinity/GridAffinityAssignment.java        |   10 +-
 .../affinity/GridAffinityProcessor.java         |  330 ++++-
 .../processors/cache/CacheMetricsImpl.java      |  586 ++++++++
 .../cache/CacheMetricsMXBeanImpl.java           |  310 ++++
 .../processors/cache/CacheMetricsSnapshot.java  |  518 +++++++
 .../processors/cache/GridCacheAdapter.java      |  377 ++++-
 .../cache/GridCacheEvictionManager.java         |    3 +
 .../processors/cache/GridCacheMBeanAdapter.java |  217 ---
 .../processors/cache/GridCacheMapEntry.java     |   55 +-
 .../cache/GridCacheMetricsAdapter.java          |  260 ----
 .../processors/cache/GridCacheProcessor.java    |   37 -
 .../processors/cache/GridCacheProxyImpl.java    |   25 +-
 .../processors/cache/GridCacheTtlManager.java   |    3 +
 .../processors/cache/GridCacheVersionEx.java    |    9 +
 .../processors/cache/IgniteCacheProxy.java      |   28 +-
 .../cache/distributed/dht/GridDhtCache.java     |   12 +-
 .../dht/GridPartitionedGetFuture.java           |    2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   30 +-
 .../dht/colocated/GridDhtColocatedCache.java    |    4 +-
 .../distributed/near/GridNearCacheAdapter.java  |    7 -
 .../distributed/near/GridNearCacheEntry.java    |    3 +-
 .../distributed/near/GridNearGetFuture.java     |    8 +-
 .../distributed/near/GridNearLockFuture.java    |    6 +-
 .../local/atomic/GridLocalAtomicCache.java      |   24 +-
 .../cache/query/GridCacheQueriesEx.java         |   16 +
 .../cache/query/GridCacheQueriesImpl.java       |   15 +
 .../cache/query/GridCacheQueriesProxy.java      |   24 +
 .../cache/query/GridCacheQueryManager.java      |   64 +-
 .../cache/query/GridCacheSqlQuery.java          |   99 ++
 .../cache/query/GridCacheSqlResult.java         |   21 +
 .../cache/query/GridCacheTwoStepQuery.java      |   74 +
 .../GridCacheContinuousQueryManager.java        |   11 -
 .../cache/transactions/IgniteTxManager.java     |    5 +-
 .../closure/GridClosureProcessor.java           |  624 ++++++--
 .../GridMasterLeaveAwareComputeJobAdapter.java  |   36 -
 .../processors/query/GridQueryIndexing.java     |   19 +
 .../processors/query/GridQueryProcessor.java    |   36 +
 .../processors/resource/GridResourceUtils.java  |    4 +-
 .../handlers/cache/GridCacheCommandHandler.java |    7 +-
 .../handlers/cache/GridCacheRestMetrics.java    |   77 +-
 .../top/GridTopologyCommandHandler.java         |    2 +-
 .../processors/task/GridTaskWorker.java         |   52 +-
 .../apache/ignite/internal/util/GridUtils.java  |   19 +-
 .../GridTcpCommunicationMessageFactory.java     |    5 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   37 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |    2 +-
 .../internal/visor/node/VisorNodeGcTask.java    |    2 +-
 .../ignite/interop/InteropConfiguration.java    |   30 +
 .../java/org/apache/ignite/interop/package.html |   15 +
 .../ignite/mxbean/CacheMetricsMXBean.java       |  245 +++
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |  240 +++
 .../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 -
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |  386 +++++
 .../ignite/mxbean/IgniteMXBeanDescription.java  |   34 +
 .../IgniteMXBeanParametersDescriptions.java     |   34 +
 .../mxbean/IgniteMXBeanParametersNames.java     |   34 +
 .../ignite/mxbean/IgniteStandardMBean.java      |  275 ----
 .../ignite/mxbean/IgniteThreadPoolMBean.java    |  152 --
 .../ignite/mxbean/IgniteThreadPoolMXBean.java   |  152 ++
 .../org/apache/ignite/mxbean/IgnitionMBean.java |  151 --
 .../apache/ignite/mxbean/IgnitionMXBean.java    |  151 ++
 .../ignite/spi/IgniteSpiManagementMBean.java    |   14 +-
 .../noop/NoopAuthenticationSpiMBean.java        |    2 +-
 .../cache/CacheCheckpointSpiMBean.java          |    4 +-
 .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java |   24 +-
 .../sharedfs/SharedFsCheckpointSpiMBean.java    |    6 +-
 .../fifoqueue/FifoQueueCollisionSpiMBean.java   |   18 +-
 .../JobStealingCollisionSpiMBean.java           |   36 +-
 .../PriorityQueueCollisionSpiMBean.java         |   34 +-
 .../tcp/TcpCommunicationSpiMBean.java           |   58 +-
 .../local/LocalDeploymentSpiMBean.java          |    2 +-
 .../spi/discovery/DiscoveryMetricsHelper.java   |  368 -----
 .../spi/discovery/DiscoveryMetricsProvider.java |    2 +-
 .../discovery/DiscoveryNodeMetricsAdapter.java  | 1068 -------------
 .../discovery/tcp/TcpClientDiscoverySpi.java    |    6 +-
 .../tcp/TcpClientDiscoverySpiMBean.java         |   34 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   12 +-
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |   62 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   16 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |   36 +-
 .../memory/MemoryEventStorageSpiMBean.java      |   10 +-
 .../failover/always/AlwaysFailoverSpiMBean.java |    6 +-
 .../JobStealingFailoverSpiMBean.java            |    8 +-
 .../failover/never/NeverFailoverSpiMBean.java   |    2 +-
 .../adaptive/AdaptiveCpuLoadProbe.java          |    2 +-
 .../adaptive/AdaptiveJobCountLoadProbe.java     |    2 +-
 .../adaptive/AdaptiveLoadBalancingSpiMBean.java |    4 +-
 .../AdaptiveProcessingTimeLoadProbe.java        |    2 +-
 .../RoundRobinLoadBalancingSpiMBean.java        |    4 +-
 .../WeightedRandomLoadBalancingSpiMBean.java    |    6 +-
 .../noop/NoopSecureSessionSpiMBean.java         |    2 +-
 .../swapspace/file/FileSwapSpaceSpiMBean.java   |   12 +-
 .../apache/ignite/streamer/StreamerMBean.java   |   34 +-
 .../ignite/streamer/StreamerStageMBean.java     |   24 +-
 .../ignite/streamer/StreamerWindowMBean.java    |   10 +-
 .../index/StreamerIndexProviderMBean.java       |   12 +-
 .../transactions/IgniteTxConcurrency.java       |    2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |   41 +-
 .../core/src/test/config/ggfs-no-endpoint.xml   |  199 ---
 modules/core/src/test/config/ggfs-shmem.xml     |   41 +-
 .../apache/ignite/IgniteCacheAffinityTest.java  |  266 ++++
 .../ignite/internal/ClusterMetricsSelfTest.java |  124 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |    6 +-
 .../ignite/internal/GridDiscoverySelfTest.java  |    2 +-
 .../internal/GridNonHistoryMetricsSelfTest.java |    4 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |    2 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |  752 +++++++++-
 ...cheTransactionalAbstractMetricsSelfTest.java |   20 +-
 .../cache/GridCacheVersionSelfTest.java         |   23 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   14 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |  183 +++
 .../near/GridCacheNearMetricsSelfTest.java      |  163 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   38 +-
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |  161 ++
 .../ignite/p2p/GridP2PClassLoadingSelfTest.java |    2 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |    4 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |    4 +-
 .../GridJobStealingCollisionSpiSelfTest.java    |    4 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  126 ++
 .../GridDiscoveryMetricsHelperSelfTest.java     |  149 --
 .../testframework/GridSpiTestContext.java       |    6 +-
 .../ignite/testframework/GridTestNode.java      |    8 +-
 .../testframework/junits/GridTestIgnite.java    |    6 +
 .../junits/spi/GridSpiAbstractTest.java         |    2 +-
 .../IgniteCacheMetricsSelfTestSuite.java        |    4 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |    2 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |    2 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |    4 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |   49 +-
 .../query/h2/GridH2ResultSetIterator.java       |    2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  173 ++-
 .../query/h2/opt/GridH2IndexBase.java           |    5 +-
 .../query/h2/sql/GridSqlAggregateFunction.java  |   76 +
 .../processors/query/h2/sql/GridSqlAlias.java   |   55 +
 .../processors/query/h2/sql/GridSqlColumn.java  |   57 +
 .../processors/query/h2/sql/GridSqlConst.java   |   39 +
 .../processors/query/h2/sql/GridSqlElement.java |   73 +
 .../query/h2/sql/GridSqlFunction.java           |  142 ++
 .../query/h2/sql/GridSqlFunctionType.java       |   78 +
 .../processors/query/h2/sql/GridSqlJoin.java    |   68 +
 .../query/h2/sql/GridSqlOperation.java          |   73 +
 .../query/h2/sql/GridSqlOperationType.java      |  202 +++
 .../query/h2/sql/GridSqlParameter.java          |   44 +
 .../query/h2/sql/GridSqlQueryParser.java        |  495 +++++++
 .../query/h2/sql/GridSqlQuerySplitter.java      |  252 ++++
 .../processors/query/h2/sql/GridSqlSelect.java  |  287 ++++
 .../query/h2/sql/GridSqlSubquery.java           |   44 +
 .../processors/query/h2/sql/GridSqlTable.java   |   55 +
 .../processors/query/h2/sql/GridSqlValue.java   |   17 +
 .../query/h2/twostep/GridMapQueryExecutor.java  |  270 ++++
 .../query/h2/twostep/GridMergeIndex.java        |  290 ++++
 .../h2/twostep/GridMergeIndexUnsorted.java      |   85 ++
 .../query/h2/twostep/GridMergeTable.java        |  178 +++
 .../h2/twostep/GridReduceQueryExecutor.java     |  242 +++
 .../query/h2/twostep/GridResultPage.java        |   59 +
 .../twostep/messages/GridNextPageRequest.java   |   59 +
 .../twostep/messages/GridNextPageResponse.java  |  180 +++
 .../query/h2/twostep/messages/GridQueryAck.java |   34 +
 .../twostep/messages/GridQueryFailResponse.java |   46 +
 .../h2/twostep/messages/GridQueryRequest.java   |   61 +
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  111 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    5 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  289 ++++
 .../IgniteCacheQuerySelfTestSuite.java          |    4 +
 .../test/resources/spring-ping-pong-partner.xml |   38 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    6 +
 .../uri/GridUriDeploymentSpiMBean.java          |    8 +-
 .../commands/alert/VisorAlertCommand.scala      |    7 +-
 .../commands/top/VisorTopologyCommand.scala     |   11 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    6 +-
 pom.xml                                         |  132 +-
 231 files changed, 13838 insertions(+), 8565 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99e3fa61/pom.xml
----------------------------------------------------------------------


Mime
View raw message