ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-49
Date Wed, 28 Jan 2015 11:33:44 GMT
Merge branch 'sprint-1' into ignite-49

Conflicts:
	modules/core/src/main/java/org/apache/ignite/mxbean/IgniteCacheMXBean.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20c77282
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20c77282
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20c77282

Branch: refs/heads/ignite-117
Commit: 20c772820fd3a15aedc4eb9b01f5a3c8d1beaa26
Parents: 321ca78 17a1aa2
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Jan 27 17:36:17 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Jan 27 17:36:17 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 +
 .../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 ++---
 56 files changed, 4525 insertions(+), 769 deletions(-)
----------------------------------------------------------------------



Mime
View raw message