You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/07/11 09:27:49 UTC
[50/50] ignite git commit: Merge branch 'ignite-2.1'
Merge branch 'ignite-2.1'
# Conflicts:
# modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecfbc2c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecfbc2c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecfbc2c9
Branch: refs/heads/master
Commit: ecfbc2c97464ad7da3f24afaaf1868a2d2fdb87e
Parents: 01f504f a668a22
Author: devozerov <vo...@gridgain.com>
Authored: Tue Jul 11 12:17:41 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Jul 11 12:17:41 2017 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryDdlExample.java | 119 ++++++++++
.../ignite/examples/datagrid/JdbcExample.java | 135 ++++++++++++
.../CacheExamplesMultiNodeSelfTest.java | 9 +
.../ignite/examples/CacheExamplesSelfTest.java | 8 +
.../apache/ignite/IgniteSystemProperties.java | 2 +-
.../configuration/IgniteConfiguration.java | 15 +-
.../PersistentStoreConfiguration.java | 24 ++
.../ignite/internal/pagemem/FullPageId.java | 32 +--
.../ignite/internal/pagemem/PageSupport.java | 36 +--
...ishSnapshotOperationAckDiscoveryMessage.java | 84 -------
.../snapshot/SnapshotCheckParameters.java | 75 -------
.../pagemem/snapshot/SnapshotOperation.java | 220 -------------------
.../pagemem/snapshot/SnapshotOperationType.java | 49 -----
...artSnapshotOperationAckDiscoveryMessage.java | 149 -------------
.../StartSnapshotOperationDiscoveryMessage.java | 192 ----------------
.../pagemem/store/IgnitePageStoreManager.java | 40 ++--
.../delta/DataPageInsertFragmentRecord.java | 6 +-
.../wal/record/delta/DataPageInsertRecord.java | 6 +-
.../wal/record/delta/DataPageRemoveRecord.java | 6 +-
.../delta/DataPageSetFreeListPageRecord.java | 6 +-
.../wal/record/delta/DataPageUpdateRecord.java | 6 +-
.../wal/record/delta/FixCountRecord.java | 6 +-
.../record/delta/FixLeftmostChildRecord.java | 6 +-
.../pagemem/wal/record/delta/FixRemoveId.java | 6 +-
.../wal/record/delta/InitNewPageRecord.java | 6 +-
.../wal/record/delta/InnerReplaceRecord.java | 6 +-
.../pagemem/wal/record/delta/InsertRecord.java | 6 +-
.../pagemem/wal/record/delta/MergeRecord.java | 6 +-
.../wal/record/delta/MetaPageAddRootRecord.java | 6 +-
.../wal/record/delta/MetaPageCutRootRecord.java | 6 +-
.../wal/record/delta/MetaPageInitRecord.java | 6 +-
.../delta/MetaPageInitRootInlineRecord.java | 6 +-
.../record/delta/MetaPageInitRootRecord.java | 4 +-
.../delta/MetaPageUpdateLastAllocatedIndex.java | 4 +-
...aPageUpdateLastSuccessfulFullSnapshotId.java | 4 +-
.../MetaPageUpdateLastSuccessfulSnapshotId.java | 4 +-
.../delta/MetaPageUpdateNextSnapshotId.java | 4 +-
.../MetaPageUpdatePartitionDataRecord.java | 6 +-
.../wal/record/delta/NewRootInitRecord.java | 6 +-
.../wal/record/delta/PageDeltaRecord.java | 14 +-
.../delta/PageListMetaResetCountRecord.java | 6 +-
.../record/delta/PagesListAddPageRecord.java | 6 +-
.../delta/PagesListInitNewPageRecord.java | 6 +-
.../record/delta/PagesListRemovePageRecord.java | 2 +-
.../record/delta/PagesListSetNextRecord.java | 6 +-
.../delta/PagesListSetPreviousRecord.java | 6 +-
.../record/delta/PartitionDestroyRecord.java | 20 +-
.../record/delta/PartitionMetaStateRecord.java | 16 +-
.../pagemem/wal/record/delta/RecycleRecord.java | 6 +-
.../pagemem/wal/record/delta/RemoveRecord.java | 6 +-
.../pagemem/wal/record/delta/ReplaceRecord.java | 6 +-
.../record/delta/SplitExistingPageRecord.java | 6 +-
.../record/delta/SplitForwardPageRecord.java | 6 +-
.../record/delta/TrackingPageDeltaRecord.java | 6 +-
.../cache/CacheAffinitySharedManager.java | 10 +-
.../processors/cache/ClusterCachesInfo.java | 32 ++-
.../cache/DynamicCacheDescriptor.java | 13 --
.../processors/cache/ExchangeActions.java | 34 +--
.../GridCachePartitionExchangeManager.java | 51 +----
.../processors/cache/GridCacheProcessor.java | 26 ++-
.../cache/GridCacheSharedContext.java | 6 +-
.../dht/GridClientPartitionTopology.java | 76 ++++---
.../distributed/dht/GridDhtCacheEntry.java | 6 -
.../distributed/dht/GridDhtLocalPartition.java | 45 ----
.../dht/GridDhtPartitionTopology.java | 7 +-
.../dht/GridDhtPartitionTopologyImpl.java | 163 +++++++-------
.../distributed/dht/GridDhtTxFinishFuture.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 5 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 24 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 2 +-
.../GridDhtPartitionSupplyMessage.java | 20 +-
.../GridDhtPartitionsExchangeFuture.java | 67 ++----
.../near/GridNearTxFinishFuture.java | 4 +-
.../cache/persistence/DataStructure.java | 46 ++--
.../GridCacheDatabaseSharedManager.java | 43 ++--
.../persistence/GridCacheOffheapManager.java | 4 +-
.../persistence/IgniteCacheSnapshotManager.java | 150 -------------
.../cache/persistence/MetadataStorage.java | 2 +-
.../cache/persistence/file/FileIO.java | 154 +++++++++++++
.../cache/persistence/file/FileIODecorator.java | 98 +++++++++
.../cache/persistence/file/FileIOFactory.java | 45 ++++
.../cache/persistence/file/FilePageStore.java | 51 ++---
.../persistence/file/FilePageStoreManager.java | 38 ++--
.../persistence/file/RandomAccessFileIO.java | 110 ++++++++++
.../file/RandomAccessFileIOFactory.java | 42 ++++
.../persistence/freelist/FreeListImpl.java | 6 +-
.../cache/persistence/freelist/PagesList.java | 36 +--
.../persistence/pagemem/FullPageIdTable.java | 54 ++---
.../cache/persistence/pagemem/PageMemoryEx.java | 4 +-
.../persistence/pagemem/PageMemoryImpl.java | 72 +++---
.../snapshot/IgniteCacheSnapshotManager.java | 161 ++++++++++++++
.../snapshot/SnapshotDiscoveryMessage.java | 33 +++
.../persistence/snapshot/SnapshotOperation.java | 44 ++++
.../cache/persistence/tree/BPlusTree.java | 16 +-
.../wal/AbstractWalRecordsIterator.java | 22 +-
.../cache/persistence/wal/FileInput.java | 40 ++--
.../wal/FileWriteAheadLogManager.java | 161 +++++++-------
.../wal/reader/IgniteWalIteratorFactory.java | 13 +-
.../wal/reader/StandaloneGridKernalContext.java | 15 +-
.../reader/StandaloneIgnitePluginProcessor.java | 38 ++++
.../reader/StandaloneWalRecordsIterator.java | 37 ++--
.../wal/serializer/RecordV1Serializer.java | 76 +++----
.../cache/transactions/IgniteTxAdapter.java | 4 +-
.../transactions/IgniteTxLocalAdapter.java | 15 +-
.../datastructures/DataStructuresProcessor.java | 12 +-
.../platform/cluster/PlatformClusterGroup.java | 39 +++-
.../utils/PlatformConfigurationUtils.java | 8 +-
.../internal/processors/query/QueryUtils.java | 8 +-
.../internal/visor/cache/VisorCacheMetrics.java | 12 +-
.../node/VisorMemoryPolicyConfiguration.java | 11 +-
.../internal/visor/query/VisorQueryEntity.java | 32 ++-
.../resources/META-INF/classnames.properties | 16 +-
.../affinity/AffinityHistoryCleanupTest.java | 182 ---------------
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 52 ++---
...idAbstractCacheInterceptorRebalanceTest.java | 2 -
.../cache/GridCacheDeploymentSelfTest.java | 7 +-
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 22 +-
...ffinityAssignmentNodeJoinValidationTest.java | 46 +---
.../CacheLateAffinityAssignmentTest.java | 4 +-
...CacheLoadingConcurrentGridStartSelfTest.java | 2 -
...idCachePartitionedPreloadEventsSelfTest.java | 143 ------------
...LateAffDisabledMultiNodeFullApiSelfTest.java | 35 ---
...LateAffDisabledMultiNodeFullApiSelfTest.java | 34 ---
.../IgnitePdsCacheRebalancingAbstractTest.java | 74 +++++++
...gnitePdsRecoveryAfterFileCorruptionTest.java | 35 ++-
.../db/IgnitePdsWholeClusterRestartTest.java | 1 -
...ckpointSimulationWithRealCpDisabledTest.java | 74 +++----
.../db/file/IgnitePdsEvictionTest.java | 16 +-
.../db/wal/IgniteWalFlushFailoverTest.java | 195 ++++++++++++++++
.../wal/IgniteWalHistoryReservationsTest.java | 29 ++-
.../db/wal/IgniteWalRecoveryTest.java | 10 +-
.../db/wal/crc/IgniteDataIntegrityTests.java | 10 +-
.../db/wal/reader/IgniteWalReaderTest.java | 9 +-
.../db/wal/reader/MockWalIteratorFactory.java | 8 +-
.../pagemem/NoOpPageStoreManager.java | 22 +-
.../IgniteChangeGlobalStateFailOverTest.java | 56 +++--
.../GridActivationPartitionedCacheSuit.java | 2 -
...ContinuousQueryFailoverAbstractSelfTest.java | 2 -
.../processors/igfs/IgfsStreamsSelfTest.java | 1 -
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
.../junits/GridTestKernalContext.java | 10 +
.../IgniteCacheFullApiSelfTestSuite.java | 6 -
.../testsuites/IgniteCacheTestSuite2.java | 2 -
.../ignite/testsuites/IgnitePdsTestSuite2.java | 4 +
.../cache/query/CacheQueryPartitionInfo.java | 46 +++-
.../query/h2/DmlStatementsProcessor.java | 28 ++-
.../processors/query/h2/H2DatabaseType.java | 10 +
.../processors/query/h2/H2RowDescriptor.java | 13 ++
.../internal/processors/query/h2/H2Utils.java | 27 +++
.../processors/query/h2/IgniteH2Indexing.java | 30 ++-
.../query/h2/database/InlineIndexHelper.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 5 +-
...oreQueryWithMultipleClassesPerCacheTest.java | 185 ++++++++++++++++
.../processors/query/IgniteSqlRoutingTest.java | 211 ++++++++++++++++--
.../h2/database/InlineIndexHelperTest.java | 4 +
.../IgnitePdsWithIndexingTestSuite.java | 2 +
modules/ml/pom.xml | 3 +-
.../main/java/org/apache/ignite/ml/Model.java | 1 -
.../ml/clustering/BaseKMeansClusterer.java | 2 -
.../apache/ignite/ml/clustering/Clusterer.java | 3 +-
.../clustering/KMeansDistributedClusterer.java | 46 ++--
.../ml/clustering/KMeansLocalClusterer.java | 11 +-
.../apache/ignite/ml/math/DistanceMeasure.java | 1 -
.../ignite/ml/math/EuclideanDistance.java | 2 +-
.../java/org/apache/ignite/ml/math/Matrix.java | 2 -
.../java/org/apache/ignite/ml/math/Tracer.java | 1 -
.../org/apache/ignite/ml/math/VectorUtils.java | 4 +-
.../math/exceptions/ConvergenceException.java | 5 +-
.../exceptions/MathIllegalStateException.java | 4 +-
.../ignite/ml/math/functions/Functions.java | 8 +-
.../apache/ignite/ml/math/impls/CacheUtils.java | 23 +-
.../ml/math/impls/matrix/AbstractMatrix.java | 2 -
.../impls/matrix/SparseDistributedMatrix.java | 4 +-
.../impls/storage/matrix/MapWrapperStorage.java | 7 +-
.../matrix/SparseDistributedMatrixStorage.java | 7 +-
.../vector/SparseLocalOnHeapVectorStorage.java | 8 +-
.../ml/math/impls/vector/MapWrapperVector.java | 3 +-
.../apache/ignite/ml/math/util/MatrixUtil.java | 1 -
.../ignite/ml/math/d3-matrix-template.html | 2 +
.../ignite/ml/math/d3-vector-template.html | 2 +
.../org/apache/ignite/ml/IgniteMLTestSuite.java | 4 +-
.../ml/clustering/ClusteringTesetSuite.java | 32 ---
.../ml/clustering/ClusteringTestSuite.java | 32 +++
.../KMeansDistributedClustererTest.java | 28 ++-
.../ignite/ml/math/MathImplLocalTestSuite.java | 1 -
.../org/apache/ignite/ml/math/TracerTest.java | 3 +
.../matrix/SparseDistributedMatrixTest.java | 24 +-
.../OLSMultipleLinearRegressionTest.java | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +
.../Binary/BinaryFooterTest.cs | 178 +++++++++++++++
.../Binary/BinarySelfTest.cs | 32 ---
.../Cache/PersistentStoreTest.cs | 45 +++-
.../Deployment/CacheGetFunc.cs | 50 +++++
.../Deployment/PeerAssemblyLoadingTest.cs | 24 ++
.../IgniteConfigurationSerializerTest.cs | 11 +-
.../IgniteConfigurationTest.cs | 15 +-
.../Apache.Ignite.Core.csproj | 2 +
.../Cache/Configuration/CacheConfiguration.cs | 3 +-
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 9 +
.../IgniteConfigurationSection.xsd | 15 ++
.../Impl/Binary/BinaryObject.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 2 +-
.../Impl/Binary/BinaryObjectSchemaField.cs | 3 +
.../Impl/Binary/BinaryObjectSchemaSerializer.cs | 93 ++++++--
.../Impl/Binary/BinaryReader.cs | 49 +----
.../Impl/Cluster/ClusterGroupImpl.cs | 14 ++
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 7 +
.../PersistentStore/PersistentStoreMetrics.cs | 88 ++++++++
.../PersistentStore/IPersistentStoreMetrics.cs | 87 ++++++++
.../PersistentStoreConfiguration.cs | 156 ++++++++-----
.../org/apache/ignite/spark/IgniteRDD.scala | 6 +-
.../apache/ignite/spark/impl/IgniteSqlRDD.scala | 6 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 5 -
modules/web-console/backend/app/mongo.js | 2 +
modules/web-console/frontend/app/app.js | 2 +
.../cluster-select/cluster-select.controller.js | 72 +++---
.../cluster-select/cluster-select.pug | 10 +-
.../frontend/app/filters/id8.filter.js | 20 ++
.../app/modules/agent/AgentManager.service.js | 4 +-
.../generator/AbstractTransformer.js | 4 +-
.../generator/ConfigurationGenerator.js | 33 ++-
.../states/configuration/domains/query.pug | 9 +
.../frontend/controllers/domains-controller.js | 7 +-
.../views/templates/agent-download.tpl.pug | 4 +-
224 files changed, 3937 insertions(+), 2874 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfbc2c9/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 71631b2,4787c4d..90b7970
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@@ -77,17 -78,7 +78,18 @@@
<Compile Include="Binary\BinarySelfTestSimpleName.cs" />
<Compile Include="Binary\EnumsTestOnline.cs" />
<Compile Include="Cache\PersistentStoreTest.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.CompiledQuery.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.DateTime.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Aggregates.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Join.LocalCollection.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Strings.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Functions.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Numerics.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Introspection.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Misc.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Custom.cs" />
+ <Compile Include="Cache\Query\Linq\CacheLinqTest.Contains.cs" />
+ <Compile Include="Deployment\CacheGetFunc.cs" />
<Compile Include="Deployment\GetAddressFunc.cs" />
<Compile Include="Deployment\PeerAssemblyLoadingAllApisTest.cs" />
<Compile Include="Deployment\PeerAssemblyLoadingVersioningTest.cs" />