You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/05 04:23:11 UTC
[13/13] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.1' into ignite-gg-12389
Merge remote-tracking branch 'remotes/origin/ignite-2.1' into ignite-gg-12389
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70d23dda
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70d23dda
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70d23dda
Branch: refs/heads/ignite-gg-12389
Commit: 70d23ddaa8a26f78e7f62c997b5a80354cab2e4a
Parents: 3e3aa59 5b7165c
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 5 07:20:25 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 5 07:20:25 2017 +0300
----------------------------------------------------------------------
.../jdbc2/JdbcPreparedStatementSelfTest.java | 35 ++
.../jdbc/JdbcPreparedStatementSelfTest.java | 35 ++
.../thin/JdbcThinPreparedStatementSelfTest.java | 35 ++
.../PersistentStoreConfiguration.java | 39 +-
.../org/apache/ignite/events/EventType.java | 12 +
.../ignite/events/WalSegmentArchivedEvent.java | 62 ++
.../internal/jdbc/JdbcPreparedStatement.java | 6 +-
.../jdbc/thin/JdbcThinPreparedStatement.java | 2 -
.../internal/jdbc2/JdbcPreparedStatement.java | 12 +-
.../internal/pagemem/wal/record/WALRecord.java | 11 +-
.../processors/cache/ClusterCachesInfo.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 14 +-
.../GridCacheDatabaseSharedManager.java | 6 +-
.../IgniteCacheDatabaseSharedManager.java | 10 +-
.../persistence/IgniteCacheSnapshotManager.java | 8 +
.../persistence/tree/io/TrackingPageIO.java | 12 +-
.../wal/AbstractWalRecordsIterator.java | 289 +++++++++
.../cache/persistence/wal/FileInput.java | 16 +-
.../cache/persistence/wal/FileWALPointer.java | 4 +-
.../wal/FileWriteAheadLogManager.java | 586 +++++++++----------
.../cache/persistence/wal/RecordSerializer.java | 5 +
.../persistence/wal/SegmentArchiveResult.java | 61 ++
.../persistence/wal/SegmentEofException.java | 3 +-
.../wal/reader/IgniteWalIteratorFactory.java | 102 ++++
.../wal/reader/StandaloneGridKernalContext.java | 499 ++++++++++++++++
...ndaloneIgniteCacheDatabaseSharedManager.java | 30 +
.../reader/StandaloneWalRecordsIterator.java | 258 ++++++++
.../wal/serializer/RecordV1Serializer.java | 45 +-
.../utils/PlatformConfigurationUtils.java | 8 +-
.../visor/cache/VisorCacheConfiguration.java | 11 +-
.../visor/node/VisorBasicConfiguration.java | 2 +-
.../node/VisorMemoryPolicyConfiguration.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 32 +-
.../node/VisorNodeDataCollectorJobResult.java | 73 ++-
.../visor/node/VisorNodeDataCollectorTask.java | 14 +-
.../node/VisorNodeDataCollectorTaskResult.java | 28 +-
.../visor/node/VisorPersistenceMetrics.java | 214 +++++++
.../visor/service/VisorServiceTask.java | 10 +-
...unicationBalanceMultipleConnectionsTest.java | 5 +
.../cache/GridCacheAbstractMetricsSelfTest.java | 24 -
.../IgniteSemaphoreAbstractSelfTest.java | 17 +-
...IgnitePersistentStoreDataStructuresTest.java | 2 +
.../wal/IgniteWalHistoryReservationsTest.java | 2 +-
.../db/wal/reader/IgniteWalReaderTest.java | 385 ++++++++++++
.../db/wal/reader/MockWalIteratorFactory.java | 114 ++++
.../ignite/testsuites/IgnitePdsTestSuite2.java | 9 +-
...ileSystemShmemExternalDualAsyncSelfTest.java | 5 +
.../Cache/CacheConfigurationTest.cs | 21 +
.../Cache/Configuration/CacheConfiguration.cs | 75 ++-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 7 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 5 +
.../frontend/app/filters/duration.filter.js | 2 +-
.../states/configuration/caches/affinity.pug | 18 +-
.../states/configuration/caches/general.pug | 50 +-
54 files changed, 2840 insertions(+), 495 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/70d23dda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
----------------------------------------------------------------------