Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-86
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e1ed4e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e1ed4e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e1ed4e7 Branch: refs/heads/ignite-sql Commit: 7e1ed4e7b619d75fc03c4e259df11caeb0e2a330 Parents: 0349c85 17a1aa2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jan 27 19:11:46 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jan 27 19:11:46 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheEntryEvent.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../configuration/IgniteConfiguration.java | 27 +- .../ignite/dotnet/GridDotNetConfiguration.java | 113 ----- .../dotnet/GridDotNetPortableConfiguration.java | 207 -------- .../GridDotNetPortableTypeConfiguration.java | 219 -------- .../java/org/apache/ignite/dotnet/package.html | 23 - .../org/apache/ignite/internal/GridGainEx.java | 4 +- .../org/apache/ignite/internal/GridTopic.java | 5 +- .../cache/query/GridCacheQueriesEx.java | 16 + .../cache/query/GridCacheQueriesImpl.java | 15 + .../cache/query/GridCacheQueriesProxy.java | 24 + .../cache/query/GridCacheQueryManager.java | 64 +-- .../cache/query/GridCacheSqlQuery.java | 99 ++++ .../cache/query/GridCacheSqlResult.java | 21 + .../cache/query/GridCacheTwoStepQuery.java | 74 +++ .../processors/query/GridQueryIndexing.java | 19 + .../processors/query/GridQueryProcessor.java | 36 ++ .../ignite/interop/InteropConfiguration.java | 30 ++ .../java/org/apache/ignite/interop/package.html | 15 + .../apache/ignite/mxbean/IgniteCacheMXBean.java | 2 +- .../transactions/IgniteTxConcurrency.java | 2 +- .../query/h2/GridH2ResultSetIterator.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 173 ++++--- .../query/h2/opt/GridH2IndexBase.java | 5 +- .../query/h2/sql/GridSqlAggregateFunction.java | 76 +++ .../processors/query/h2/sql/GridSqlAlias.java | 55 +++ .../processors/query/h2/sql/GridSqlColumn.java | 57 +++ .../processors/query/h2/sql/GridSqlConst.java | 39 ++ .../processors/query/h2/sql/GridSqlElement.java | 73 +++ .../query/h2/sql/GridSqlFunction.java | 142 ++++++ .../query/h2/sql/GridSqlFunctionType.java | 78 +++ .../processors/query/h2/sql/GridSqlJoin.java | 68 +++ .../query/h2/sql/GridSqlOperation.java | 73 +++ .../query/h2/sql/GridSqlOperationType.java | 202 ++++++++ .../query/h2/sql/GridSqlParameter.java | 44 ++ .../query/h2/sql/GridSqlQueryParser.java | 495 +++++++++++++++++++ .../query/h2/sql/GridSqlQuerySplitter.java | 252 ++++++++++ .../processors/query/h2/sql/GridSqlSelect.java | 287 +++++++++++ .../query/h2/sql/GridSqlSubquery.java | 44 ++ .../processors/query/h2/sql/GridSqlTable.java | 55 +++ .../processors/query/h2/sql/GridSqlValue.java | 17 + .../query/h2/twostep/GridMapQueryExecutor.java | 270 ++++++++++ .../query/h2/twostep/GridMergeIndex.java | 290 +++++++++++ .../h2/twostep/GridMergeIndexUnsorted.java | 85 ++++ .../query/h2/twostep/GridMergeTable.java | 178 +++++++ .../h2/twostep/GridReduceQueryExecutor.java | 242 +++++++++ .../query/h2/twostep/GridResultPage.java | 59 +++ .../twostep/messages/GridNextPageRequest.java | 59 +++ .../twostep/messages/GridNextPageResponse.java | 180 +++++++ .../query/h2/twostep/messages/GridQueryAck.java | 34 ++ .../twostep/messages/GridQueryFailResponse.java | 46 ++ .../h2/twostep/messages/GridQueryRequest.java | 61 +++ .../cache/GridCacheCrossCacheQuerySelfTest.java | 111 ++++- .../query/h2/sql/GridQueryParsingTest.java | 289 +++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + pom.xml | 132 ++--- 57 files changed, 4526 insertions(+), 770 deletions(-) ----------------------------------------------------------------------
