Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a49691a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a49691a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a49691a6 Branch: refs/heads/ignite-286 Commit: a49691a6158b36a33675467e7ec767264fdd6e56 Parents: 3443afc 38dee89 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 30 15:20:34 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 30 15:20:34 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- modules/cloud/pom.xml | 4 +- .../ignite/codegen/MessageCodeGenerator.java | 26 +- .../configuration/CacheConfiguration.java | 259 +++++++++++--- .../configuration/IgniteConfiguration.java | 344 +++++++++++++++---- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/GridUpdateNotifier.java | 66 +++- .../ignite/internal/IgniteComponentType.java | 36 +- .../apache/ignite/internal/IgniteKernal.java | 83 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../managers/communication/GridIoManager.java | 30 +- .../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 +- .../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 +- .../resources/META-INF/classnames.properties | 13 + .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 13 +- modules/gce/pom.xml | 4 +- .../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 +++++-- .../commands/cache/VisorCacheCommand.scala | 2 +- pom.xml | 3 +- 71 files changed, 4320 insertions(+), 577 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a49691a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a49691a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a49691a6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ----------------------------------------------------------------------
