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/08/01 09:26:29 UTC

[46/47] ignite git commit: Merge branch ignite-2.1.3 into master

Merge branch ignite-2.1.3 into master


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

Branch: refs/heads/master
Commit: 8b576c14b7f017ff7fcb098673ec20ccf4bf0491
Parents: ece7cf9 4d323f3
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Aug 1 11:20:54 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Aug 1 11:20:54 2017 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorAbstractSelfTest.java     |   18 +-
 .../apache/ignite/IgniteSystemProperties.java   |    6 +
 .../org/apache/ignite/cache/CacheManager.java   |    4 +-
 .../IgniteDiagnosticPrepareContext.java         |    3 +-
 .../apache/ignite/internal/IgniteKernal.java    |    3 +-
 .../discovery/GridDiscoveryManager.java         |   10 +
 .../mem/file/MappedFileMemoryProvider.java      |    3 +-
 .../cache/CacheAffinitySharedManager.java       |   23 +-
 .../processors/cache/CacheOperationContext.java |   15 +
 .../processors/cache/ClusterCachesInfo.java     |  135 +-
 .../processors/cache/ExchangeActions.java       |    4 +-
 .../cache/GatewayProtectedCacheProxy.java       | 1754 +++++++++++
 .../processors/cache/GridCacheAdapter.java      |   16 +-
 .../GridCachePartitionExchangeManager.java      |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   82 +-
 .../processors/cache/GridCacheUtils.java        |    7 +-
 .../cache/IgniteCacheOffheapManagerImpl.java    |   26 +-
 .../processors/cache/IgniteCacheProxy.java      | 2818 +-----------------
 .../processors/cache/IgniteCacheProxyImpl.java  | 1828 ++++++++++++
 .../dht/GridDhtTransactionalCacheAdapter.java   |    7 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   24 +-
 .../GridDhtPartitionsExchangeFuture.java        |   20 +-
 ...arOptimisticSerializableTxPrepareFuture.java |    9 +
 .../near/GridNearOptimisticTxPrepareFuture.java |   15 +
 .../GridNearPessimisticTxPrepareFuture.java     |    9 +-
 .../GridCacheDatabaseSharedManager.java         |    7 +-
 .../persistence/freelist/FreeListImpl.java      |   22 +-
 .../wal/FileWriteAheadLogManager.java           |   37 +-
 .../reader/StandaloneWalRecordsIterator.java    |    4 +-
 .../cache/transactions/IgniteTxHandler.java     |   51 +-
 .../cache/transactions/IgniteTxManager.java     |    7 +-
 .../cluster/GridClusterStateProcessor.java      |    3 +-
 .../datastructures/GridCacheLockImpl.java       |   13 +-
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |    2 +-
 .../processors/odbc/SqlListenerProcessor.java   |    3 +-
 .../platform/cache/PlatformCache.java           |   33 +-
 .../ignite/internal/util/IgniteUtils.java       |   65 +
 .../ignite/internal/util/nio/GridNioServer.java |    7 +-
 .../internal/visor/debug/VisorThreadInfo.java   |   10 +-
 .../internal/visor/query/VisorQueryTask.java    |    2 +-
 .../visor/query/VisorScanQueryTask.java         |    2 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   38 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   55 +-
 .../cache/store/jdbc/model/BinaryTest.java      |  121 +
 .../cache/store/jdbc/model/BinaryTestKey.java   |   87 +
 .../cache/CacheEntryProcessorCopySelfTest.java  |   11 +-
 .../cache/CacheStopAndDestroySelfTest.java      |    1 +
 .../cache/GridCacheAbstractSelfTest.java        |    1 +
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |    6 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |    4 +-
 .../IgniteCacheConfigVariationsFullApiTest.java |    6 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    1 -
 .../processors/cache/IgniteCacheGroupsTest.java |   89 +-
 .../cache/IgniteCacheStartStopLoadTest.java     |    1 -
 .../dht/NotMappedPartitionInTxTest.java         |  264 ++
 .../IgnitePdsCacheRebalancingAbstractTest.java  |    2 +
 .../MemoryPolicyInitializationTest.java         |    3 +-
 .../db/IgnitePdsWholeClusterRestartTest.java    |    2 +
 .../TxOptimisticDeadlockDetectionTest.java      |    2 +
 .../marshaller/GridMarshallerAbstractTest.java  |   10 +-
 .../testframework/junits/GridAbstractTest.java  |    4 +-
 .../junits/common/GridCommonAbstractTest.java   |    6 +-
 .../testsuites/IgniteCacheTestSuite5.java       |    2 +
 .../ignite/tests/p2p/JobStealingTask.java       |   12 +-
 .../org/apache/ignite/tests/p2p/NodeFilter.java |   30 +
 .../apache/ignite/stream/flume/IgniteSink.java  |    7 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |   24 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |    5 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   21 +-
 .../cache/index/H2DynamicTableSelfTest.java     |   32 +
 ...eDbSingleNodeWithIndexingWalRestoreTest.java |  197 ++
 .../IgnitePdsWithIndexingTestSuite.java         |    2 +
 .../apache/ignite/stream/mqtt/MqttStreamer.java |    6 +-
 .../cpp/core/include/ignite/impl/ignite_impl.h  |    2 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |    3 +-
 modules/web-console/backend/app/settings.js     |    3 +-
 modules/web-console/backend/index.js            |   16 +-
 modules/web-console/backend/middlewares/api.js  |   38 +-
 modules/web-console/frontend/app/app.config.js  |    3 +-
 modules/web-console/frontend/app/app.js         |   10 +-
 .../app/components/bs-select-menu/style.scss    |   16 +
 .../app/components/bs-select-menu/template.pug  |    2 +
 .../components/grid-item-selected/component.js  |   28 +
 .../components/grid-item-selected/controller.js |   38 +
 .../app/components/grid-item-selected/index.js  |   24 +
 .../components/grid-item-selected/template.pug  |   17 +
 .../list-of-registered-users.tpl.pug            |    4 +-
 .../app/components/ui-grid-hovering/cell.js     |   48 +
 .../app/components/ui-grid-hovering/hovering.js |   31 +
 .../app/components/ui-grid-hovering/index.js    |   30 +
 .../app/components/ui-grid-hovering/style.scss  |   22 +
 .../app/components/ui-grid-hovering/viewport.js |   42 +
 .../frontend/app/controllers/auth.controller.js |    9 +-
 .../frontend/app/data/jdbc-types.json           |    6 +-
 .../app/modules/agent/AgentManager.service.js   |   24 +-
 .../app/modules/agent/AgentModal.service.js     |    8 +-
 .../frontend/app/modules/demo/Demo.module.js    |   22 +-
 .../frontend/app/modules/sql/sql.controller.js  |   11 +-
 .../states/configuration/clusters/hadoop.pug    |    2 +-
 .../configuration/summary/summary.worker.js     |    4 +-
 .../frontend/app/modules/states/errors.state.js |    2 +-
 .../app/modules/states/password.state.js        |    2 +
 .../app/modules/states/profile.state.js         |    2 +-
 .../frontend/app/modules/states/signin.state.js |    6 +-
 .../app/modules/user/AclRoute.provider.js       |   50 -
 .../frontend/app/modules/user/user.module.js    |   35 +-
 .../frontend/app/primitives/dropdown/index.scss |   68 -
 .../frontend/app/services/Messages.service.js   |    7 +
 .../web-console/frontend/views/signin.tpl.pug   |    2 +-
 .../views/templates/agent-download.tpl.pug      |    2 -
 110 files changed, 5459 insertions(+), 3341 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b576c14/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
----------------------------------------------------------------------
diff --cc modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
index 8dddf43,6d98ec0..34b3749
--- a/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
@@@ -62,8 -47,13 +62,8 @@@ namespace ignit
               *
               * @param env Environment.
               */
 -            IgniteImpl(SP_IgniteEnvironment env, jobject javaRef);
 -            
 -            /**
 -             * Destructor.
 -             */
 -            ~IgniteImpl();
 +            IgniteImpl(SP_IgniteEnvironment env);
-             
+ 
              /**
               * Get name of the Ignite.
               *