Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0602417E9A for ; Sat, 2 May 2015 20:25:51 +0000 (UTC) Received: (qmail 38801 invoked by uid 500); 2 May 2015 20:25:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 38772 invoked by uid 500); 2 May 2015 20:25:50 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 38763 invoked by uid 99); 2 May 2015 20:25:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 May 2015 20:25:50 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 May 2015 20:25:46 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 359692732B for ; Sat, 2 May 2015 19:48:26 +0000 (UTC) Received: (qmail 13229 invoked by uid 99); 2 May 2015 15:48:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 May 2015 15:48:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4327AE05D9; Sat, 2 May 2015 15:48:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Sat, 02 May 2015 15:48:38 -0000 Message-Id: <85a993baa8994d7ca39de4e6b604a3bd@git.apache.org> In-Reply-To: <766ae88b48f6458c9e484783c5a7a015@git.apache.org> References: <766ae88b48f6458c9e484783c5a7a015@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-728 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-728 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d59e4c42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d59e4c42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d59e4c42 Branch: refs/heads/ignite-709_2 Commit: d59e4c42fbf3a55afbba9dae3d9e81c9f13e98fa Parents: 8ae6b03 47136b5 Author: Yakov Zhdanov Authored: Wed Apr 29 18:01:14 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 18:01:14 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- modules/cloud/README.txt | 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 +++++++ modules/cloud/pom.xml | 106 ++++ .../cloud/TcpDiscoveryCloudIpFinder.java | 433 +++++++++++++++ .../tcp/ipfinder/cloud/package-info.java | 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 +++++ .../tcp/ipfinder/cloud/package-info.java | 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 ++++ .../ignite/codegen/MessageCodeGenerator.java | 26 +- .../java/org/apache/ignite/IgniteLogger.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../configuration/CacheConfiguration.java | 4 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java | 36 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 28 +- .../communication/GridIoMessageFactory.java | 8 + .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheProcessor.java | 3 +- .../cache/GridCacheSharedContext.java | 2 +- .../processors/cache/GridCacheSwapManager.java | 35 +- .../processors/cache/IgniteCacheProxy.java | 10 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/query/GridCacheQueryManager.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 135 ++++- .../cache/query/GridCacheTwoStepQuery.java | 8 +- .../processors/query/GridQueryIndexing.java | 19 +- .../processors/query/GridQueryProcessor.java | 78 ++- .../messages/GridQueryNextPageResponse.java | 68 ++- .../h2/twostep/messages/GridQueryRequest.java | 21 +- .../util/spring/IgniteSpringHelper.java | 4 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 7 - .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheNodesTask.java | 74 +++ .../visor/cache/VisorCacheStartTask.java | 155 ++++++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 +---- .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java | 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 12 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java | 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java | 10 +- .../jobstealing/JobStealingCollisionSpi.java | 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../resources/META-INF/classnames.properties | 13 + .../core/src/main/resources/ignite.properties | 2 +- .../src/test/config/load/merge-sort-base.xml | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++ .../distributed/GridCacheLockAbstractTest.java | 75 +++ .../DataStreamerMultiThreadedSelfTest.java | 2 + .../logger/java/IgniteJavaLoggerTest.java | 65 --- .../ignite/logger/java/JavaLoggerTest.java | 65 +++ .../junits/logger/GridTestLog4jLogger.java | 10 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 +++++++ modules/gce/pom.xml | 92 ++++ .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 +++++++++++++ .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 +++ .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ .../processors/hadoop/HadoopProcessor.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 169 +++++- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 +--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +- .../query/h2/opt/GridH2RowDescriptor.java | 14 +- .../processors/query/h2/opt/GridH2Table.java | 10 +- .../query/h2/opt/GridH2ValueCacheObject.java | 191 +++++++ .../query/h2/opt/GridLuceneIndex.java | 84 ++- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../query/h2/twostep/GridMergeIndex.java | 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../query/h2/twostep/GridResultPage.java | 80 ++- .../query/h2/twostep/msg/GridH2Array.java | 124 +++++ .../query/h2/twostep/msg/GridH2Boolean.java | 112 ++++ .../query/h2/twostep/msg/GridH2Byte.java | 113 ++++ .../query/h2/twostep/msg/GridH2Bytes.java | 113 ++++ .../query/h2/twostep/msg/GridH2CacheObject.java | 148 +++++ .../query/h2/twostep/msg/GridH2Date.java | 115 ++++ .../query/h2/twostep/msg/GridH2Decimal.java | 134 +++++ .../query/h2/twostep/msg/GridH2Double.java | 113 ++++ .../query/h2/twostep/msg/GridH2Float.java | 113 ++++ .../query/h2/twostep/msg/GridH2Geometry.java | 134 +++++ .../query/h2/twostep/msg/GridH2Integer.java | 113 ++++ .../query/h2/twostep/msg/GridH2JavaObject.java | 113 ++++ .../query/h2/twostep/msg/GridH2Long.java | 113 ++++ .../query/h2/twostep/msg/GridH2Null.java | 78 +++ .../query/h2/twostep/msg/GridH2Short.java | 113 ++++ .../query/h2/twostep/msg/GridH2String.java | 115 ++++ .../query/h2/twostep/msg/GridH2Time.java | 116 ++++ .../query/h2/twostep/msg/GridH2Timestamp.java | 133 +++++ .../query/h2/twostep/msg/GridH2Uuid.java | 133 +++++ .../h2/twostep/msg/GridH2ValueMessage.java | 49 ++ .../twostep/msg/GridH2ValueMessageFactory.java | 201 +++++++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 130 ++++- .../ignite/logger/jcl/IgniteJclLogger.java | 167 ------ .../org/apache/ignite/logger/jcl/JclLogger.java | 167 ++++++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java | 138 ----- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++++ .../util/spring/IgniteSpringHelperImpl.java | 2 +- ...gniteProjectionStartStopRestartSelfTest.java | 26 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 314 ++++++----- .../visor/commands/VisorConsoleCommand.scala | 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 ------------------ .../visor/commands/ack/VisorAckCommand.scala | 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 36 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++++++++++++++++++ .../config/VisorConfigurationCommand.scala | 439 +++++++-------- .../commands/deploy/VisorDeployCommand.scala | 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala | 338 +++++------- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala | 32 +- .../scala/org/apache/ignite/visor/visor.scala | 275 +++++++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- pom.xml | 5 +- 182 files changed, 8304 insertions(+), 3154 deletions(-) ----------------------------------------------------------------------