Merge branches 'ignite-776' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-776
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81ce0e63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81ce0e63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81ce0e63 Branch: refs/heads/ignite-695 Commit: 81ce0e63926b450ad526ad9dbe8045ec89ae5308 Parents: 8b18e87 1e53395 Author: Andrey <anovi...@gridgain.com> Authored: Thu Apr 30 10:07:51 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Apr 30 10:07:51 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- 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 +- .../configuration/CacheConfiguration.java | 259 ++++++++--- .../configuration/IgniteConfiguration.java | 344 ++++++++++++--- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java | 36 +- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../managers/communication/GridIoManager.java | 22 +- .../communication/GridIoMessageFactory.java | 8 + .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheProcessor.java | 3 +- .../processors/cache/GridCacheSwapManager.java | 35 +- .../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 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +-- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheStartTask.java | 155 +++++++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../resources/META-INF/classnames.properties | 13 + .../core/src/main/resources/ignite.properties | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.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/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 ++++-- .../util/spring/IgniteSpringHelperImpl.java | 2 +- ...gniteProjectionStartStopRestartSelfTest.java | 26 +- .../commands/cache/VisorCacheCommand.scala | 2 +- pom.xml | 5 +- 87 files changed, 6182 insertions(+), 529 deletions(-) ----------------------------------------------------------------------
