Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-5816
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/208517aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/208517aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/208517aa Branch: refs/heads/ignite-5816 Commit: 208517aa96c3fd1a8116a23189dec3e745db6349 Parents: e4c102b be5a9ea Author: Alexey Goncharuk <[email protected]> Authored: Thu Jul 27 14:27:12 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Jul 27 14:27:12 2017 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 18 +- .../org/apache/ignite/cache/CacheManager.java | 4 +- .../discovery/GridDiscoveryManager.java | 10 + .../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/GridCacheProcessor.java | 80 +- .../processors/cache/IgniteCacheProxy.java | 2818 +----------------- .../processors/cache/IgniteCacheProxyImpl.java | 1810 +++++++++++ ...arOptimisticSerializableTxPrepareFuture.java | 9 + .../near/GridNearOptimisticTxPrepareFuture.java | 15 + .../GridNearPessimisticTxPrepareFuture.java | 9 +- .../persistence/freelist/FreeListImpl.java | 4 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 +- .../platform/cache/PlatformCache.java | 33 +- .../ignite/internal/util/IgniteUtils.java | 65 + .../visor/cache/VisorCacheJdbcType.java | 2 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 55 +- .../cache/store/jdbc/model/BinaryTest.java | 122 + .../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 | 67 +- .../cache/IgniteCacheStartStopLoadTest.java | 1 - .../dht/NotMappedPartitionInTxTest.java | 264 ++ .../MemoryPolicyInitializationTest.java | 3 +- .../db/IgnitePdsWholeClusterRestartTest.java | 2 + .../marshaller/GridMarshallerAbstractTest.java | 10 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../testsuites/IgniteCacheTestSuite5.java | 2 + ...eDbSingleNodeWithIndexingWalRestoreTest.java | 197 ++ .../IgnitePdsWithIndexingTestSuite.java | 2 + modules/web-console/backend/.eslintrc | 39 +- modules/web-console/backend/package.json | 27 +- modules/web-console/frontend/.eslintrc | 40 +- modules/web-console/frontend/app/app.config.js | 3 +- modules/web-console/frontend/app/app.js | 45 +- .../components/activities-user-dialog/index.js | 28 +- .../app/components/bs-select-menu/style.scss | 16 + .../app/components/bs-select-menu/template.pug | 2 + .../page-configure-advanced/controller.js | 9 +- .../components/page-configure-basic/service.js | 8 +- .../app/components/page-configure/controller.js | 12 +- .../page-configure/controller.spec.js | 48 - .../page-configure/services/PageConfigure.js | 18 +- .../components/web-console-header/component.js | 12 +- .../app/components/web-console-header/index.js | 4 +- .../frontend/app/data/jdbc-types.json | 6 +- .../frontend/app/decorator/select.js | 77 - .../frontend/app/decorator/tooltip.js | 73 - .../frontend/app/modules/ace.module.js | 6 +- .../app/modules/branding/branding.module.js | 16 +- .../generator/ConfigurationGenerator.js | 2 +- .../generator/PlatformGenerator.js | 4 +- .../frontend/app/modules/demo/Demo.module.js | 10 +- .../app/modules/dialog/dialog.controller.js | 4 - .../app/modules/form/field/label.directive.js | 4 +- .../app/modules/form/field/tooltip.directive.js | 4 +- .../frontend/app/modules/sql/sql.controller.js | 2 +- .../frontend/app/modules/sql/sql.module.js | 66 +- .../frontend/app/modules/states/admin.state.js | 6 +- .../app/modules/states/configuration.state.js | 35 +- .../summary/summary-zipper.service.js | 2 +- .../frontend/app/modules/states/errors.state.js | 4 +- .../frontend/app/modules/states/logout.state.js | 12 +- .../app/modules/states/password.state.js | 4 +- .../app/modules/states/profile.state.js | 9 +- .../frontend/app/modules/states/signin.state.js | 32 +- .../app/modules/user/AclRoute.provider.js | 6 +- .../frontend/app/modules/user/user.module.js | 30 +- .../frontend/app/primitives/dropdown/index.scss | 68 - .../frontend/app/primitives/modal/index.scss | 9 + .../services/AngularStrapSelect.decorator.js | 77 + .../services/AngularStrapTooltip.decorator.js | 103 + .../app/services/CopyToClipboard.service.js | 4 +- .../app/services/LegacyTable.service.js | 2 +- modules/web-console/frontend/app/vendor.js | 8 +- modules/web-console/frontend/package.json | 57 +- .../views/configuration/domains-import.tpl.pug | 4 +- modules/web-console/frontend/views/index.pug | 14 +- 88 files changed, 5198 insertions(+), 3535 deletions(-) ----------------------------------------------------------------------
