Merge branches 'ignite-843' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f85ed753 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f85ed753 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f85ed753 Branch: refs/heads/ignite-843 Commit: f85ed75320c268bcbee334e2b8e1fe1c619fb084 Parents: db79305 5c30f9c Author: Andrey <anovi...@gridgain.com> Authored: Mon Jun 1 09:56:53 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Jun 1 09:56:53 2015 +0700 ---------------------------------------------------------------------- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 18 +- dev-tools/gradlew | 163 ++++-- dev-tools/slurp.sh | 14 +- dev-tools/src/main/groovy/jiraslurp.groovy | 313 +++++++---- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../org/apache/ignite/cache/CacheMetrics.java | 187 ++++++- .../org/apache/ignite/igfs/IgfsUserContext.java | 119 +++++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../apache/ignite/internal/IgniteKernal.java | 4 +- .../internal/igfs/common/IgfsMarshaller.java | 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 ++++++++++++- .../cache/CacheMetricsMXBeanImpl.java | 100 ++++ .../processors/cache/CacheMetricsSnapshot.java | 380 +++++++++++--- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 +++-- .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 +++---- .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java | 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java | 52 +- .../ignite/internal/util/GridJavaProcess.java | 30 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 +++ .../org/apache/ignite/services/Service.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 -- .../spi/swapspace/file/FileSwapSpaceSpi.java | 8 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++++++++++++++ .../service/ClosureServiceClientsNodesTest.java | 245 +++++++++ .../testframework/GridSpiTestContext.java | 25 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheMetricsSelfTestSuite.java | 1 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +- modules/hadoop/pom.xml | 2 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 ++++-- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 107 ++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 +- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 ---- .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 ++++++++ .../processors/hadoop/igfs/HadoopIgfsEx.java | 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 +- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 + .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 + .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 + .../query/h2/sql/BaseH2CompareQueryTest.java | 16 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/README.txt | 28 + modules/mesos/licenses/apache-2.0.txt | 202 ++++++++ modules/mesos/licenses/jetty-epl-license.txt | 69 +++ modules/mesos/pom.xml | 101 ++++ .../apache/ignite/mesos/ClusterProperties.java | 519 +++++++++++++++++++ .../apache/ignite/mesos/IgniteFramework.java | 119 +++++ .../apache/ignite/mesos/IgniteScheduler.java | 361 +++++++++++++ .../org/apache/ignite/mesos/IgniteTask.java | 86 +++ .../org/apache/ignite/mesos/package-info.java | 22 + .../ignite/mesos/resource/IgniteProvider.java | 234 +++++++++ .../ignite/mesos/resource/JettyServer.java | 61 +++ .../ignite/mesos/resource/ResourceHandler.java | 142 +++++ .../ignite/mesos/resource/ResourceProvider.java | 120 +++++ .../ignite/mesos/resource/package-info.java | 22 + .../main/resources/ignite-default-config.xml | 35 ++ .../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++ .../ignite/mesos/IgniteSchedulerSelfTest.java | 464 +++++++++++++++++ modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../licenses/jcraft-revised-bsd.txt | 28 - modules/visor-console/pom.xml | 2 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 ++- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 4 + pom.xml | 14 +- scripts/git-patch-prop.sh | 2 +- 129 files changed, 6011 insertions(+), 1102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f85ed753/pom.xml ----------------------------------------------------------------------
