Merge branch 'ignite-757' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edcf921c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edcf921c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edcf921c Branch: refs/heads/ignite-286 Commit: edcf921cde63ee551fc3b9e8a02873cc40813360 Parents: dfca76b 856b847 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Apr 29 16:34:10 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Apr 29 16:34:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 26 ++- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java | 36 +++- .../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 +- .../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 +++++++++--- 53 files changed, 3507 insertions(+), 331 deletions(-) ----------------------------------------------------------------------
