Merge branches 'ignite-sql-tests' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/381a8b96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/381a8b96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/381a8b96 Branch: refs/heads/ignite-sql-tests Commit: 381a8b962a65ebf1c3b86f5015d9c8a896dd5780 Parents: 6c55f86 fc6d9bf d6cf7b4 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Mar 5 01:58:24 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Mar 5 01:58:24 2015 +0300 ---------------------------------------------------------------------- .../misc/lifecycle/LifecycleExample.java | 4 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/readme.md | 4 +- modules/clients/readme.pdf | Bin 52230 -> 47887 bytes .../integration/ClientAbstractSelfTest.java | 3 - .../apache/ignite/cache/store/CacheStore.java | 49 - .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../apache/ignite/internal/GridDiagnostic.java | 15 +- .../ignite/internal/GridUpdateNotifier.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 31 +- .../ignite/internal/processors/igfs/IgfsEx.java | 6 + .../shmem/IpcSharedMemoryServerEndpoint.java | 3 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheConfiguration.java | 10 - .../visor/cache/VisorCacheLoadTask.java | 3 +- .../node/VisorCacheQueryConfiguration.java | 78 - .../visor/node/VisorGridConfiguration.java | 10 - .../visor/node/VisorIgfsConfiguration.java | 7 +- .../visor/node/VisorQueryConfiguration.java | 106 - .../apache/ignite/lifecycle/LifecycleBean.java | 36 +- .../ignite/lifecycle/LifecycleEventType.java | 20 +- .../apache/ignite/marshaller/Marshaller.java | 2 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../SpringApplicationContextResource.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 4 +- .../PriorityQueueCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 18 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/failover/never/NeverFailoverSpi.java | 2 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 4 +- .../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes .../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes .../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../internal/GridLifecycleBeanSelfTest.java | 76 +- .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 8 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 8 +- .../clock/GridTimeSyncProcessorSelfTest.java | 2 +- .../colocation/GridTestLifecycleBean.java | 2 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 8 +- .../core/src/test/resources/log/ignite.log.tst | 13706 ----------------- .../hadoop/IgfsHadoopFileSystemWrapper.java | 44 +- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 48 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 54 +- .../hadoop/SecondaryFileSystemProvider.java | 111 + .../GridHadoopExternalCommunication.java | 2 +- ...oopSecondaryFileSystemConfigurationTest.java | 541 + .../testsuites/IgniteHadoopTestSuite.java | 2 + .../hibernate/CacheHibernateBlobStore.java | 2 +- .../rest/protocols/http/jetty/rest.html | 19 +- .../schema/generator/SnippetGenerator.java | 2 +- .../schema/parser/DatabaseMetadataParser.java | 7 +- .../ignite/internal/GridFactorySelfTest.java | 10 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../scala/org/apache/ignite/visor/Packet.scala | 38 - .../ignite/visor/commands/VisorConsole.scala | 18 +- .../ignite/visor/commands/ack/Packet.scala | 55 - .../visor/commands/ack/VisorAckCommand.scala | 2 +- .../ignite/visor/commands/alert/Packet.scala | 108 - .../ignite/visor/commands/cache/Packet.scala | 127 - .../commands/cache/VisorCacheCommand.scala | 23 +- .../ignite/visor/commands/config/Packet.scala | 55 - .../config/VisorConfigurationCommand.scala | 15 - .../ignite/visor/commands/deploy/Packet.scala | 76 - .../ignite/visor/commands/disco/Packet.scala | 72 - .../ignite/visor/commands/events/Packet.scala | 97 - .../ignite/visor/commands/gc/Packet.scala | 61 - .../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes .../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes .../ignite/visor/commands/kill/Packet.scala | 78 - .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../ignite/visor/commands/node/Packet.scala | 60 - .../ignite/visor/commands/ping/Packet.scala | 50 - .../visor/commands/ping/VisorPingCommand.scala | 2 +- .../ignite/visor/commands/start/Packet.scala | 90 - .../ignite/visor/commands/tasks/Packet.scala | 116 - .../commands/tasks/VisorTasksCommand.scala | 26 +- .../ignite/visor/commands/top/Packet.scala | 87 - .../ignite/visor/commands/vvm/Packet.scala | 61 - pom.xml | 50 +- 97 files changed, 895 insertions(+), 15596 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/381a8b96/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index 303439d,e817db0,a6ec05c..46c675a --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@@@ -149,8 -147,9 -153,10 +146,8 @@@@ public class VisorCacheConfiguration im cfg.startSize = ccfg.getStartSize(); cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName(); cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory(); -- cfg.maxQryIterCnt = ccfg.getMaximumQueryIteratorCount(); cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations(); cfg.memoryMode = ccfg.getMemoryMode(); - cfg.indexingSpiName = ccfg.getIndexingSpiName(); cfg.interceptor = compactClass(ccfg.getInterceptor()); cfg.valBytes = ccfg.isStoreValueBytes(); cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/381a8b96/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ----------------------------------------------------------------------
