ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [02/15] incubator-ignite git commit: Merge branches 'ignite-344' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-344
Date Wed, 04 Mar 2015 12:24:10 GMT
Merge branches 'ignite-344' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-344


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

Branch: refs/heads/ignite-386
Commit: 5b0d7db77cdbca9c2d33b3c64f567f61faec8a8f
Parents: 4348d9c b81c6a2
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Mar 3 15:34:35 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Mar 3 15:34:35 2015 +0700

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |   12 +
 config/ignite-log4j.xml                         |    2 +-
 examples/pom-standalone.xml                     |    2 +-
 .../datagrid/CacheContinuousQueryExample.java   |    2 +-
 .../store/CacheNodeWithStoreStartup.java        |    6 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |  115 +-
 ipc/shmem/Makefile.am                           |   15 +
 ipc/shmem/igniteshmem/Makefile.am               |   15 +
 ipc/shmem/include/Makefile.am                   |   15 +
 modules/clients/src/test/keystore/generate.sh   |   15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    4 +-
 .../java/org/apache/ignite/IgniteCluster.java   |    8 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |    2 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   18 +-
 .../ignite/cache/query/ContinuousQuery.java     |   18 +-
 .../apache/ignite/cache/store/CacheStore.java   |    4 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |    2 +-
 .../ignite/cache/store/CacheStoreSession.java   |   17 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |    2 +-
 .../configuration/IgniteConfiguration.java      |    5 +-
 .../configuration/QueryConfiguration.java       |   37 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |    6 +-
 .../ignite/internal/GridKernalContext.java      |   10 +-
 .../ignite/internal/GridKernalContextImpl.java  |   14 +-
 .../apache/ignite/internal/GridProperties.java  |   78 -
 .../ignite/internal/GridUpdateNotifier.java     |    2 +-
 .../apache/ignite/internal/IgniteKernal.java    |   41 +-
 .../ignite/internal/IgniteProperties.java       |   79 +
 .../ignite/internal/IgniteVersionUtils.java     |    8 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  592 +++----
 .../internal/events/DiscoveryCustomEvent.java   |    3 +
 .../affinity/GridAffinityAssignmentCache.java   |   13 +-
 .../processors/cache/CacheMetricsImpl.java      |    4 +
 .../processors/cache/GridCacheContext.java      |   19 +
 .../processors/cache/GridCacheMapEntry.java     |    9 +
 .../processors/cache/GridCacheProcessor.java    |   15 +
 .../processors/cache/GridCacheStoreManager.java |   18 +-
 .../processors/cache/IgniteCacheProxy.java      |    6 +-
 .../GridDistributedCacheAdapter.java            |    2 +
 .../distributed/dht/GridDhtCacheEntry.java      |    3 +
 .../distributed/dht/GridDhtLocalPartition.java  |    5 +
 .../dht/atomic/GridDhtAtomicCache.java          |    2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |    2 +-
 .../cache/transactions/IgniteTxManager.java     |    7 +-
 .../processors/cluster/ClusterProcessor.java    |   46 +
 .../dataload/IgniteDataLoaderImpl.java          |   29 +-
 .../plugin/IgnitePluginProcessor.java           |   24 +
 .../ignite/internal/util/IgniteUtils.java       |   90 +-
 .../ignite/internal/visor/cache/VisorCache.java |  190 +--
 .../cache/VisorCacheAffinityConfiguration.java  |   53 +-
 .../visor/cache/VisorCacheConfiguration.java    |  484 +-----
 .../cache/VisorCacheDefaultConfiguration.java   |   27 +-
 .../cache/VisorCacheEvictionConfiguration.java  |   81 +-
 .../cache/VisorCacheNearConfiguration.java      |   42 +-
 .../cache/VisorCachePreloadConfiguration.java   |   54 +-
 .../cache/VisorCacheStoreConfiguration.java     |  148 +-
 .../VisorCacheWriteBehindConfiguration.java     |  137 --
 .../visor/node/VisorAtomicConfiguration.java    |   27 +-
 .../visor/node/VisorBasicConfiguration.java     |  197 +--
 .../node/VisorCacheQueryConfiguration.java      |   45 +-
 .../node/VisorExecutorServiceConfiguration.java |   54 +-
 .../visor/node/VisorGridConfiguration.java      |  177 +-
 .../visor/node/VisorIgfsConfiguration.java      |  244 +--
 .../visor/node/VisorLifecycleConfiguration.java |    9 +-
 .../visor/node/VisorMetricsConfiguration.java   |   29 +-
 .../node/VisorPeerToPeerConfiguration.java      |   28 +-
 .../visor/node/VisorQueryConfiguration.java     |   65 +-
 .../visor/node/VisorRestConfiguration.java      |   80 +-
 .../node/VisorSegmentationConfiguration.java    |   45 +-
 .../visor/node/VisorSpisConfiguration.java      |   92 +-
 .../node/VisorTransactionConfiguration.java     |   62 +-
 .../internal/visor/util/VisorTaskUtils.java     |    4 +-
 .../optimized-classnames.previous.properties    |   15 +
 .../optimized/optimized-classnames.properties   | 1565 +-----------------
 .../apache/ignite/plugin/PluginProvider.java    |    5 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  137 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  116 ++
 .../TcpDiscoveryCustomEventMessage.java         |    3 +
 .../core/src/main/resources/ignite.properties   |    2 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  |   63 +-
 .../internal/GridUpdateNotifierSelfTest.java    |    2 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |  440 +++++
 .../cache/GridCacheAbstractMetricsSelfTest.java |   42 +
 ...acheAbstractUsersAffinityMapperSelfTest.java |  207 +++
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |   45 +
 .../GridCachePartitionedLocalStoreSelfTest.java |   51 +
 ...chePartitionedOffHeapLocalStoreSelfTest.java |   56 +
 .../GridCacheReplicatedLocalStoreSelfTest.java  |   51 +
 ...heReplicatedUsersAffinityMapperSelfTest.java |   45 +
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |   51 +
 .../GridCacheTxUsersAffinityMapperSelfTest.java |   45 +
 .../GridCacheQueueCleanupSelfTest.java          |    1 -
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   38 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    8 +-
 .../config/GridTestProperties.java              |   10 +-
 .../junits/cache/TestCacheSession.java          |    5 +
 .../cache/TestThreadLocalCacheSession.java      |    5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    4 +
 modules/extdata/p2p/pom.xml                     |    6 -
 .../client/hadoop/GridHadoopClientProtocol.java |    6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  412 +++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |   10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  413 -----
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |    4 +-
 .../hadoop/GridHadoopClassLoader.java           |   12 +-
 .../processors/hadoop/GridHadoopSetup.java      |    8 +-
 .../processors/hadoop/GridHadoopUtils.java      |    4 +-
 .../collections/GridHadoopHashMultimapBase.java |    2 +-
 .../GridHadoopExternalCommunication.java        |   14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |    6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |    2 +-
 .../GridHadoopClientProtocolSelfTest.java       |    6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |    2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |    2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |    2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |    1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    2 +-
 .../hadoop/GridHadoopGroupingTest.java          |    4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |    9 +-
 modules/hibernate/pom.xml                       |    6 -
 .../HibernateReadWriteAccessStrategy.java       |   81 +-
 modules/indexing/pom.xml                        |    6 -
 modules/jta/pom.xml                             |    6 -
 modules/scalar/pom.xml                          |   12 +-
 .../ignite/schema/generator/PojoGenerator.java  |    3 +-
 .../schema/generator/SnippetGenerator.java      |  138 ++
 .../ignite/schema/generator/XmlGenerator.java   |    8 +-
 .../apache/ignite/schema/model/PojoField.java   |   11 +-
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |    2 +
 .../apache/ignite/schema/load/model/Ignite.xml  |  133 +-
 modules/spring/pom.xml                          |    6 -
 modules/visor-console/pom.xml                   |    7 -
 .../commands/alert/VisorAlertCommand.scala      |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |  116 +-
 .../commands/cache/VisorCacheScanCommand.scala  |    7 +-
 .../config/VisorConfigurationCommand.scala      |  141 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    2 +-
 .../visor/commands/node/VisorNodeCommand.scala  |    6 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   89 +-
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 +-
 modules/web/pom.xml                             |    6 -
 modules/winservice/IgniteService.sln            |    2 +-
 .../IgniteService/IgniteService.csproj          |    2 +-
 .../config/benchmark-atomic-win.properties      |   15 +
 .../config/benchmark-atomic.properties          |   15 +
 .../config/benchmark-compute-win.properties     |   15 +
 .../config/benchmark-compute.properties         |   15 +
 .../config/benchmark-multicast.properties       |   15 +
 .../config/benchmark-query-win.properties       |   15 +
 .../yardstick/config/benchmark-query.properties |   15 +
 .../config/benchmark-tx-win.properties          |   15 +
 .../yardstick/config/benchmark-tx.properties    |   15 +
 .../yardstick/config/benchmark-win.properties   |   15 +
 modules/yardstick/config/benchmark.properties   |   15 +
 .../yardstick/config/ignite-store-config.xml    |   15 +-
 pom.xml                                         |  152 +-
 159 files changed, 3884 insertions(+), 5012 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b0d7db7/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------


Mime
View raw message