You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/24 08:22:11 UTC

[53/65] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0

Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0


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

Branch: refs/heads/ignite-5024
Commit: 6e2c51d340e9d28f0bed05cfb571fe4b32733fd9
Parents: a900dc6 ad7e4a0
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 21 17:30:39 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 21 17:30:39 2017 +0300

----------------------------------------------------------------------
 .../platform/cache/PlatformCache.java           |  24 +-
 .../platform/cluster/PlatformClusterGroup.java  |  17 ++
 .../utils/PlatformConfigurationUtils.java       |   4 +
 .../query/h2/opt/GridH2SpatialIndex.java        |   8 +-
 .../query/h2/database/H2PkHashIndex.java        |   6 +-
 .../query/h2/database/H2TreeIndex.java          |   6 +-
 .../query/h2/database/InlineIndexHelper.java    |  14 -
 .../query/h2/opt/GridH2IndexBase.java           |   4 +-
 .../query/h2/opt/GridH2MetaTable.java           |   8 +-
 .../query/h2/opt/GridH2PrimaryScanIndex.java    |   7 +-
 .../processors/query/h2/opt/GridH2Row.java      |   2 +-
 .../query/h2/opt/GridH2ScanIndex.java           |   4 +-
 .../processors/query/h2/opt/GridH2Table.java    |   7 +-
 .../query/h2/opt/GridH2TreeIndex.java           |   7 +-
 .../processors/query/h2/sql/DmlAstUtils.java    |   3 -
 .../processors/query/h2/sql/GridSqlAlias.java   |  20 +-
 .../query/h2/sql/GridSqlQueryParser.java        |   4 +
 .../processors/query/h2/sql/GridSqlTable.java   |  46 ++++
 .../query/h2/twostep/GridMergeIndex.java        |   1 +
 .../query/h2/twostep/GridMergeIndexSorted.java  |   6 +-
 .../h2/twostep/GridMergeIndexUnsorted.java      |   6 +-
 .../query/h2/twostep/GridMergeTable.java        |  12 +-
 .../query/h2/twostep/GridThreadLocalTable.java  |   9 +-
 .../query/IgniteSqlSplitterSelfTest.java        |  34 ++-
 .../h2/database/InlineIndexHelperTest.java      |   8 -
 .../query/h2/sql/GridQueryParsingTest.java      |  29 ++-
 .../ExpiryCacheHolderTest.cs                    |  10 +
 .../Apache.Ignite.Core.Tests.csproj             |   1 +
 .../Cache/Affinity/AffinityFunctionTest.cs      |   2 +-
 .../Cache/CacheConfigurationTest.cs             |   3 +
 .../Cache/CacheTestAsyncWrapper.cs              |  16 +-
 .../Cache/PartitionLossTest.cs                  | 260 +++++++++++++++++++
 .../IgniteConfigurationSerializerTest.cs        |   7 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   5 +-
 .../Apache.Ignite.Core.csproj                   |   1 +
 .../Cache/Configuration/CacheConfiguration.cs   |  13 +
 .../Cache/Configuration/PartitionLossPolicy.cs  |  68 +++++
 .../dotnet/Apache.Ignite.Core/Cache/ICache.cs   |  15 ++
 .../dotnet/Apache.Ignite.Core/IIgnite.cs        |  12 +
 .../IgniteConfigurationSection.xsd              |  15 ++
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  48 +++-
 .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs    |   5 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |  27 ++
 .../Impl/Common/DelegateConverter.cs            |   1 +
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  16 +-
 modules/spring-data/pom.xml                     |   2 +-
 .../support/IgniteRepositoryFactoryBean.java    |   7 +
 parent/pom.xml                                  |   6 +-
 48 files changed, 745 insertions(+), 91 deletions(-)
----------------------------------------------------------------------