ignite git commit: Fixed test.
Repository: ignite Updated Branches: refs/heads/ignite-1171 f5dcaf35e -> af23e31f0 Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af23e31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af23e31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af23e31f Branch: refs/heads/ignite-1171 Commit: af23e31f08d72212091f60cc3cd15fbfca7b7590 Parents: f5dcaf3 Author: sboikov Authored: Wed Sep 23 10:01:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 10:01:13 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 35 +--- 1 file changed, 30 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/af23e31f/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 7354cd3..0280e9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -1179,21 +1179,36 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { * @throws Exception If failed */ public void testCustomEventRace1_1() throws Exception { -customEventRace1(true, false); +try { +customEventRace1(true, false); +} +finally { +stopAllGrids(); +} } /** * @throws Exception If failed */ public void testCustomEventRace1_2() throws Exception { -customEventRace1(false, false); +try { +customEventRace1(false, false); +} +finally { +stopAllGrids(); +} } /** * @throws Exception If failed */ public void testCustomEventRace1_3() throws Exception { -customEventRace1(true, true); +try { +customEventRace1(true, true); +} +finally { +stopAllGrids(); +} } /** @@ -1289,14 +1304,24 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { * @throws Exception If failed */ public void testCustomEventCoordinatorFailure1() throws Exception { -customEventCoordinatorFailure(true); +try { +customEventCoordinatorFailure(true); +} +finally { +stopAllGrids(); +} } /** * @throws Exception If failed */ public void testCustomEventCoordinatorFailure2() throws Exception { -customEventCoordinatorFailure(false); +try { +customEventCoordinatorFailure(false); +} +finally { +stopAllGrids(); +} } /**
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1524 [deleted] 862dec7c8
ignite git commit: IGNITE-843 Fixed dirty check logic.
Repository: ignite Updated Branches: refs/heads/ignite-843 d6cacf230 -> 469b4bb7f IGNITE-843 Fixed dirty check logic. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/469b4bb7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/469b4bb7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/469b4bb7 Branch: refs/heads/ignite-843 Commit: 469b4bb7fef7c3584cc21d4fdda5ae01e481ac03 Parents: d6cacf2 Author: Alexey Kuznetsov Authored: Wed Sep 23 14:11:33 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 14:11:33 2015 +0700 -- .../src/main/js/controllers/caches-controller.js | 8 .../src/main/js/controllers/clusters-controller.js | 8 .../src/main/js/controllers/common-module.js | 3 +++ .../src/main/js/controllers/metadata-controller.js | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/469b4bb7/modules/control-center-web/src/main/js/controllers/caches-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index 06b01f6..d1b487a 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -352,7 +352,7 @@ controlCenterModule.controller('cachesController', [ function selectItem() { $table.tableReset(); -$scope.selectedItem = item; +$scope.selectedItem = angular.copy(item); if (item) sessionStorage.lastSelectedCache = angular.toJson(item._id); @@ -471,14 +471,14 @@ controlCenterModule.controller('cachesController', [ }); if (idx >= 0) -angular.extend($scope.caches[idx], item); +$scope.caches[idx] = item; else { item._id = _id; - $scope.caches.push(item); -$scope.selectItem(item); } +$scope.selectItem(item); + $common.showInfo('Cache "' + item.name + '" saved.'); }) .error(function (errMsg) { http://git-wip-us.apache.org/repos/asf/ignite/blob/469b4bb7/modules/control-center-web/src/main/js/controllers/clusters-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 3ae80f6..2289058 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -275,7 +275,7 @@ controlCenterModule.controller('clustersController', [ function selectItem() { $table.tableReset(); -$scope.selectedItem = item; +$scope.selectedItem = angular.copy(item); if (item && item._id) sessionStorage.lastSelectedCluster = angular.toJson(item._id); @@ -393,14 +393,14 @@ controlCenterModule.controller('clustersController', [ }); if (idx >= 0) -angular.extend($scope.clusters[idx], item); +$scope.clusters[idx] = item; else { item._id = _id; - $scope.clusters.push(item); -$scope.selectItem(item); } +$scope.selectItem(item); + $common.showInfo('Cluster "' + item.name + '" saved.'); }) .error(function (errMsg) { http://git-wip-us.apache.org/repos/asf/ignite/blob/469b4bb7/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index fab158c..db7866d 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -552,6 +552,9 @@ controlCenterModule.service('$common', [ var curValue = curModel[field.model]; var
ignite git commit: IGNITE-843 Fixed dirty check logic.
Repository: ignite Updated Branches: refs/heads/ignite-843 469b4bb7f -> 301b8b4c0 IGNITE-843 Fixed dirty check logic. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/301b8b4c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/301b8b4c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/301b8b4c Branch: refs/heads/ignite-843 Commit: 301b8b4c0c04d1539580388a871b64d158d8665f Parents: 469b4bb Author: Alexey Kuznetsov Authored: Wed Sep 23 14:34:57 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 14:34:57 2015 +0700 -- .../src/main/js/controllers/caches-controller.js | 2 +- .../src/main/js/controllers/clusters-controller.js | 2 +- .../control-center-web/src/main/js/controllers/common-module.js| 2 +- .../src/main/js/controllers/metadata-controller.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/301b8b4c/modules/control-center-web/src/main/js/controllers/caches-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index d1b487a..1210045 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -471,7 +471,7 @@ controlCenterModule.controller('cachesController', [ }); if (idx >= 0) -$scope.caches[idx] = item; +angular.extend($scope.caches[idx], item); else { item._id = _id; $scope.caches.push(item); http://git-wip-us.apache.org/repos/asf/ignite/blob/301b8b4c/modules/control-center-web/src/main/js/controllers/clusters-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 2289058..270045d 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -393,7 +393,7 @@ controlCenterModule.controller('clustersController', [ }); if (idx >= 0) -$scope.clusters[idx] = item; +angular.extend($scope.clusters[idx], item); else { item._id = _id; $scope.clusters.push(item); http://git-wip-us.apache.org/repos/asf/ignite/blob/301b8b4c/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index db7866d..c193db5 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -552,7 +552,7 @@ controlCenterModule.service('$common', [ var curValue = curModel[field.model]; var srcValue = srcModel[field.model]; -if (typeof(curValue) == 'string' && (curValue.length == 0) && (srcValue === undefined)) +if ((_.isArray(curValue) || _.isString(curValue)) && (curValue.length == 0) && (srcValue === undefined)) curValue = undefined; var isCur = isDefined(curValue); http://git-wip-us.apache.org/repos/asf/ignite/blob/301b8b4c/modules/control-center-web/src/main/js/controllers/metadata-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 77785c8..792f510 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -798,7 +798,7 @@ controlCenterModule.controller('metadataController', [ }); if (idx >= 0) -$scope.metadatas[idx] = savedMeta; +angular.extend($scope.metadatas[idx], savedMeta); else $scope.metadatas.push(savedMeta);
[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/812db681 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/812db681 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/812db681 Branch: refs/heads/ignite-843 Commit: 812db6816a86b14b7df44a861cc3956339e48bc9 Parents: e1e8f83 301b8b4 Author: Andrey Authored: Wed Sep 23 14:48:59 2015 +0700 Committer: Andrey Committed: Wed Sep 23 14:48:59 2015 +0700 -- .../src/main/js/controllers/caches-controller.js | 6 +++--- .../src/main/js/controllers/clusters-controller.js | 6 +++--- .../src/main/js/controllers/common-module.js | 3 +++ .../src/main/js/controllers/metadata-controller.js | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) --
[1/2] ignite git commit: # IGNITE-843 Change active cache selection on sql
Repository: ignite Updated Branches: refs/heads/ignite-843 301b8b4c0 -> 812db6816 # IGNITE-843 Change active cache selection on sql Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1e8f836 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1e8f836 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1e8f836 Branch: refs/heads/ignite-843 Commit: e1e8f836c6b74a4e6b9726011cd5dc6fde941600 Parents: d6cacf2 Author: Andrey Authored: Wed Sep 23 14:43:54 2015 +0700 Committer: Andrey Committed: Wed Sep 23 14:43:54 2015 +0700 -- .../src/main/js/controllers/sql-controller.js | 20 +++ .../src/main/js/public/stylesheets/style.scss | 9 +++-- .../src/main/js/views/sql/sql.jade | 21 ++-- 3 files changed, 29 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1e8f836/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 7c57a9e..d6b56d1 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -253,9 +253,13 @@ controlCenterModule.controller('sqlController', $http.post('/agent/topology') .success(function (caches) { -_.sortBy(caches, 'name').map(function (cache) { -$scope.caches.push(cache); -}) +$scope.caches = _.sortBy(caches, 'name'); + +if ($scope.caches.length > 0) +_.forEach($scope.notebook.paragraphs, function (paragraph) { +if (!paragraph.cacheName || !_.find($scope.caches, {name: paragraph.cacheName})) +paragraph.cacheName = $scope.caches[0].name; +}); }) .error(function (err, status) { if (status == 503) @@ -349,7 +353,7 @@ controlCenterModule.controller('sqlController', $scope.execute = function (paragraph) { _saveNotebook(); -paragraph.queryArgs = { query: paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cache.name }; +paragraph.queryArgs = { query: paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cacheName }; $http.post('/agent/query', paragraph.queryArgs) .success(function (res) { @@ -369,7 +373,7 @@ controlCenterModule.controller('sqlController', _cancelRefresh(paragraph); -$http.post('/agent/query', {query: 'EXPLAIN ' + paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cache.name}) +$http.post('/agent/query', {query: 'EXPLAIN ' + paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cacheName}) .success(_processQueryResult(paragraph)) .error(function (errMsg) { paragraph.errMsg = errMsg; @@ -381,7 +385,7 @@ controlCenterModule.controller('sqlController', _cancelRefresh(paragraph); -$http.post('/agent/scan', {pageSize: paragraph.pageSize, cacheName: paragraph.cache.name}) +$http.post('/agent/scan', {pageSize: paragraph.pageSize, cacheName: paragraph.cacheName}) .success(_processQueryResult(paragraph)) .error(function (errMsg) { paragraph.errMsg = errMsg; @@ -389,7 +393,7 @@ controlCenterModule.controller('sqlController', }; $scope.nextPage = function(item) { -$http.post('/agent/query/fetch', {queryId: item.queryId, pageSize: item.pageSize, cacheName: item.cache.name}) +$http.post('/agent/query/fetch', {queryId: item.queryId, pageSize: item.pageSize, cacheName: item.cacheName}) .success(function (res) { item.page++; @@ -446,7 +450,7 @@ controlCenterModule.controller('sqlController', }; $scope.exportAll = function(paragraph) { -$http.post('/agent/query/getAll', {query: paragraph.query, cacheName: paragraph.cache.name}) +$http.post('/agent/query/getAll', {query: paragraph.query, cacheName: paragraph.cacheName}) .success(function (item) { _export(paragraph.name + '-all.csv', item.meta, item.rows); }) http://git-wip-us.apache.org/repos/asf/ignite/blob/e1e8f836/modules/control-center-web/src/main/js/public/stylesheets/style.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index f6daddb..
ignite git commit: IGNITE-843 Agent: renamed -drv to -d. Add defaults, minor readme.txt cleanup.
Repository: ignite Updated Branches: refs/heads/ignite-843 812db6816 -> d5b4b4ed5 IGNITE-843 Agent: renamed -drv to -d. Add defaults, minor readme.txt cleanup. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5b4b4ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5b4b4ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5b4b4ed Branch: refs/heads/ignite-843 Commit: d5b4b4ed526b8e950fc86d5a3256d1b56d0a8d41 Parents: 812db68 Author: Alexey Kuznetsov Authored: Wed Sep 23 15:14:58 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 15:14:58 2015 +0700 -- modules/control-center-agent/README.txt | 41 .../jdbc-drivers/README.txt | 2 +- .../apache/ignite/agent/AgentConfiguration.java | 12 +++--- 3 files changed, 23 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/modules/control-center-agent/README.txt -- diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt index cdf384d..2c90020 100644 --- a/modules/control-center-agent/README.txt +++ b/modules/control-center-agent/README.txt @@ -8,10 +8,10 @@ Two main functions of Ignite Web Agent: You may need to specify URI for connect to Ignite REST server via "-n" option. 2. Proxy between Ignite Web Console and user RDBMS to collect database metadata for later CacheTypeMetadata configuration. -You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via "-drv" option. +You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via "-d" option. Usage example: -ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://webconsole.example.com +ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://console.example.com Test drive of Ignite Web Agent: In order to simplify evaluation two test drive modes were implemented: @@ -55,38 +55,29 @@ Configuration file: Example configuration file: token=1a2b3c4d5f -serverURI=wss://webconsole.example.com:3001 +serverURI=wss://console.example.com:3001 test-drive-sql=true Options: -h, --help - Print this help message. - + Print this help message -c, --config - Path to optional configuration file. - --drv, --driver-folder - Path to folder with JDBC drivers, for example "/home/user/drivers". - Default: "./jdbc-drivers". - + Path to configuration file +-d, --driver-folder + Path to folder with JDBC drivers, default value: ./jdbc-drivers -n, --node-uri - URI for connect to Ignite REST server, for example: "http://localhost:8080";. - Default: "http://localhost:8080";. - --t, --token - User's security token. - + URI for connect to Ignite REST server, default value: + http://localhost:8080 -s, --server-uri - URI for connect to Ignite Web Agent, for example: "wss://webconsole.example.com:3001". - Default: "wss://localhost:3001". - + URI for connect to Ignite Web Console via web-socket protocol, default + value: wss://localhost:3001 -tm, --test-drive-metadata - Start H2 database with sample tables in same process. - JDBC URL for connect to sample database: jdbc:h2:mem:test-drive-db - + Start H2 database with sample tables in same process. JDBC URL for + connecting to sample database: jdbc:h2:mem:test-drive-db -ts, --test-drive-sql - Create cache and populate it with sample data for use in query. - + Create cache and populate it with sample data for use in query +-t, --token + User's security token Ignite Web Agent Build Instructions == http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/modules/control-center-agent/jdbc-drivers/README.txt -- diff --git a/modules/control-center-agent/jdbc-drivers/README.txt b/modules/control-center-agent/jdbc-drivers/README.txt index bd7c488..cad43b7 100644 --- a/modules/control-center-agent/jdbc-drivers/README.txt +++ b/modules/control-center-agent/jdbc-drivers/README.txt @@ -6,5 +6,5 @@ you need to copy JDBC drivers in this folder. This is default folder for JDBC drivers. -Also, you could specify custom folder using option: "-drv CUSTOM_PATH_TO_FOLDER_WITH_JDBC_DRIVERS". +Also, you could specify custom folder using option: "-d CUSTOM_PATH_TO_FOLDER_WITH_JDBC_DRIVERS". http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java --
[2/2] ignite git commit: IGNITE-843 Reworked login and landing page.
IGNITE-843 Reworked login and landing page. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/882b4791 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/882b4791 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/882b4791 Branch: refs/heads/ignite-843 Commit: 882b4791e5bb20559de4be730f07407174557203 Parents: f782cbc Author: vsisko Authored: Wed Sep 23 16:39:07 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 16:39:07 2015 +0700 -- .../src/main/js/controllers/common-module.js| 28 +++- .../src/main/js/public/stylesheets/style.scss | 18 +++-- .../src/main/js/views/includes/controls.jade| 27 .../src/main/js/views/includes/header.jade | 2 +- .../src/main/js/views/index.jade| 70 +--- .../src/main/js/views/login.jade| 62 - .../main/js/views/templates/agent-download.jade | 2 +- 7 files changed, 96 insertions(+), 113 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/882b4791/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index c193db5..fbc7068 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1830,10 +1830,12 @@ controlCenterModule.controller('activeLink', [ controlCenterModule.controller('auth', [ '$scope', '$modal', '$http', '$window', '$common', '$focus', function ($scope, $modal, $http, $window, $common, $focus) { -$scope.action = 'login'; +$scope.loginAction = 'login'; $scope.userDropdown = [{text: 'Profile', href: '/profile'}]; +$focus('login_user_email'); + if (!$scope.becomeUsed) { if ($scope.user && $scope.user.admin) $scope.userDropdown.push({text: 'Admin Panel', href: '/admin'}); @@ -1844,34 +1846,20 @@ controlCenterModule.controller('auth', [ if ($scope.token && !$scope.error) $focus('user_password'); -// Pre-fetch modal dialogs. -var loginModal = $modal({scope: $scope, templateUrl: '/login', show: false}); - -// Show login modal. -$scope.login = function () { -loginModal.$promise.then(function () { -loginModal.show(); - -$focus('user_email'); -}); -}; - // Try to authorize user with provided credentials. $scope.auth = function (action, user_info) { $http.post('/' + action, user_info) .success(function () { -loginModal.hide(); - $window.location = '/configuration/clusters'; }) -.error(function (data, status) { +.error(function (err, status) { if (status == 403) { -loginModal.hide(); - $window.location = '/password/reset'; } +else if (action == 'login') +$common.showPopoverMessage(undefined, undefined, 'login_user_email', err); else -$common.showError(data, 'top', '#errors-container'); +$common.showPopoverMessage(undefined, undefined, 'signup_user_email', err); }); }; @@ -1882,7 +1870,7 @@ controlCenterModule.controller('auth', [ $common.showInfo('Password successfully changed'); $scope.user_info = {email: data}; -$scope.login(); +$window.location = '/'; }) .error(function (data, state) { $common.showError(data); http://git-wip-us.apache.org/repos/asf/ignite/blob/882b4791/modules/control-center-web/src/main/js/public/stylesheets/style.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 6410f7b..c5bd9f6 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -323,16 +323,16 @@ h1, h2, h3, h4, h5, h6 { } } -.modal-body { +.login-footer { +@extend .modal-footer; + margin-left: 20px; margin-right: 20px; } -.block-display-image img { -max-width: 100%; -max-height: 450px; -margin: aut
[1/2] ignite git commit: IGNITE-843 WIP on "More info...".
Repository: ignite Updated Branches: refs/heads/ignite-843 d5b4b4ed5 -> 882b4791e IGNITE-843 WIP on "More info...". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f782cbcc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f782cbcc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f782cbcc Branch: refs/heads/ignite-843 Commit: f782cbcce15e4f0d0e3bcd9343a8fcd7e2edae19 Parents: d5b4b4e Author: Alexey Kuznetsov Authored: Wed Sep 23 16:17:26 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 16:17:26 2015 +0700 -- .../src/main/js/controllers/models/caches.json | 17 ++ .../main/js/controllers/models/clusters.json| 13 --- .../main/js/controllers/models/metadata.json| 15 +--- .../src/main/js/controllers/models/summary.json | 17 ++ .../src/main/js/public/stylesheets/style.scss | 21 +++-- .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../main/js/views/configuration/metadata.jade | 2 +- .../main/js/views/configuration/summary.jade| 2 +- .../src/main/js/views/includes/controls.jade| 24 10 files changed, 51 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/modules/control-center-web/src/main/js/controllers/models/caches.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index 5baf9fd..bb16f74 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -2,19 +2,16 @@ "screenTip": { "workflowTitle": "On This Screen:", "workflowContent": [ - "", - " Configure Caches", - " Link Metadata to Caches", - " Link Caches to Clusters", - "" + "Configure Caches", + "Link Metadata to Caches", + "Link Caches to Clusters", + "More info..." ], "whatsNextTitle": "Next Steps:", "whatsNextContent": [ - "", - " Continue to Metadata", - " Continue to Summary", - " Back to Clusters", - "" + "Continue to Metadata", + "Continue to Summary", + "Back to Clusters" ] }, "general": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/modules/control-center-web/src/main/js/controllers/models/clusters.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index e07d31f9..ca612bc 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -2,17 +2,14 @@ "screenTip": { "workflowTitle": "On This Screen:", "workflowContent": [ - "", - " Configure Clusters", - " Link Clusters to Caches", - "" + "Configure Clusters", + "Link Clusters to Caches", + "More info..." ], "whatsNextTitle": "Next Steps:", "whatsNextContent": [ - "", - " Continue to Caches", - " Continue to Summary", - "" + "Continue to Caches", + "Continue to Summary" ] }, "general": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/modules/control-center-web/src/main/js/controllers/models/metadata.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json index aecf9c8..ba46792 100644 --- a/modules/control-center-web/src/main/js/controllers/models/metadata.json +++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json @@ -2,18 +2,15 @@ "screenTip": { "workflowTitle": "On This Screen:", "workflowContent": [ - "", - " Manually enter Metadata", - " Load Metadata from Database", - "" + "Manually enter Metadata", + "Load Metadata from Database", + "More info..." ], "whatsNextTitle": "Next Steps:", "whatsNextContent": [ - "", - " Continue to Summary", - " Back to Caches", - " Back to Clusters", - "" + "Continue to Summary", + "Back to Caches", + "Back to Clusters" ] }, "metadata": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/modules/control-center-web/src/main/js/controllers/models/summary.json
ignite git commit: IGNITE-843 Typo.
Repository: ignite Updated Branches: refs/heads/ignite-843 882b4791e -> b51288afb IGNITE-843 Typo. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b51288af Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b51288af Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b51288af Branch: refs/heads/ignite-843 Commit: b51288afbcb2671ba715206c1ce7225c4bbacfe0 Parents: 882b479 Author: Alexey Kuznetsov Authored: Wed Sep 23 16:42:35 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 16:42:35 2015 +0700 -- modules/control-center-web/src/main/js/views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b51288af/modules/control-center-web/src/main/js/views/index.jade -- diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade index 6465672..b85b05d 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -76,5 +76,5 @@ block container .col-xs-6.col-sm-6.col-md-6 .col-sm-10.col-sm-offset-1 .login-footer -button#signup.btn.btn-primary(ng-click='auth("register", user_info)' ng-disabled='signupForm.$invalid') Sign In +button#signup.btn.btn-primary(ng-click='auth("register", user_info)' ng-disabled='signupForm.$invalid') Sign Up
ignite git commit: IGNITE-843 Fixed dirty check logic.
Repository: ignite Updated Branches: refs/heads/ignite-843 b51288afb -> 224f52eb3 IGNITE-843 Fixed dirty check logic. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/224f52eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/224f52eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/224f52eb Branch: refs/heads/ignite-843 Commit: 224f52eb3b52da6fe93b3ec741e77700c1905491 Parents: b51288a Author: Alexey Kuznetsov Authored: Wed Sep 23 16:49:17 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 16:49:17 2015 +0700 -- .../control-center-web/src/main/js/controllers/common-module.js | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/224f52eb/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index fbc7068..f20c279 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -555,6 +555,9 @@ controlCenterModule.service('$common', [ if ((_.isArray(curValue) || _.isString(curValue)) && (curValue.length == 0) && (srcValue === undefined)) curValue = undefined; +if (_.isBoolean(curValue) && !curValue && srcValue === undefined) +curValue = undefined; + var isCur = isDefined(curValue); var isSrc = isDefined(srcValue);
ignite git commit: IGNITE-843 Minor changes to landing page.
Repository: ignite Updated Branches: refs/heads/ignite-843 224f52eb3 -> a4fe5d1cf IGNITE-843 Minor changes to landing page. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4fe5d1c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4fe5d1c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4fe5d1c Branch: refs/heads/ignite-843 Commit: a4fe5d1cf7926aa3ba3a198e4e1dcf8b3d3409ab Parents: 224f52e Author: Alexey Kuznetsov Authored: Wed Sep 23 17:06:53 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 17:06:53 2015 +0700 -- .../src/main/js/views/index.jade| 21 +--- 1 file changed, 14 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4fe5d1c/modules/control-center-web/src/main/js/views/index.jade -- diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade index b85b05d..f1123d2 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -22,15 +22,22 @@ mixin lbl(txt) block container .row(ng-controller='auth') .docs-header -h1 -| Apache Ignite Web Console +h1 Apache Ignite Web Console +hr .docs-content p Apache Ignite Web Console is utility for the configuration of Apache Ignitetm Grid. -p With Apache Ignite Web Console you can: -ul -li Create cluster configurations -li Load metadata from database -li Execute SQL queries +.block-callout-parent +table +tbody +tr +td.block-callout-left +i.fa.fa-check-square.block-callout-header-left +label.block-callout-header-left With Apache Ignite Web Console you can: +ul +li Create cluster configurations +li Load metadata from database +li Execute SQL queries +hr .col-xs-6.col-sm-6.col-md-6(ng-init='loginAction == "login"') form(name='loginForm') .modal-body.row
ignite git commit: IGNITE-843 Minor changes to landing page.
Repository: ignite Updated Branches: refs/heads/ignite-843 a4fe5d1cf -> 93e7470d7 IGNITE-843 Minor changes to landing page. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93e7470d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93e7470d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93e7470d Branch: refs/heads/ignite-843 Commit: 93e7470d7e003705579ebd14166914c2eeb696d7 Parents: a4fe5d1 Author: Alexey Kuznetsov Authored: Wed Sep 23 17:15:04 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 17:15:04 2015 +0700 -- modules/control-center-web/src/main/js/views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/93e7470d/modules/control-center-web/src/main/js/views/index.jade -- diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade index f1123d2..346834d 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -25,7 +25,7 @@ block container h1 Apache Ignite Web Console hr .docs-content -p Apache Ignite Web Console is utility for the configuration of Apache Ignitetm Grid. +p Apache Ignite Web Console is an interactive console for the Apache Ignitetm Grid. .block-callout-parent table tbody
ignite git commit: IGNITE-843 WIP on "More info...".
Repository: ignite Updated Branches: refs/heads/ignite-843 93e7470d7 -> 619b5361c IGNITE-843 WIP on "More info...". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/619b5361 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/619b5361 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/619b5361 Branch: refs/heads/ignite-843 Commit: 619b5361c9e24c45de11342506783329a6fc846d Parents: 93e7470 Author: Alexey Kuznetsov Authored: Wed Sep 23 17:28:09 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 17:28:09 2015 +0700 -- .../src/main/js/controllers/caches-controller.js | 4 .../src/main/js/controllers/clusters-controller.js | 4 .../src/main/js/controllers/metadata-controller.js | 4 .../src/main/js/controllers/models/caches.json | 2 +- .../src/main/js/controllers/models/clusters.json | 2 +- .../src/main/js/controllers/models/metadata.json | 2 +- .../src/main/js/controllers/models/summary.json| 2 +- .../src/main/js/controllers/summary-controller.js | 4 .../src/main/js/views/includes/controls.jade | 6 +- 9 files changed, 25 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/619b5361/modules/control-center-web/src/main/js/controllers/caches-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index 1210045..d732755 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -26,6 +26,10 @@ controlCenterModule.controller('cachesController', [ $scope.ui = $common.formUI(); +$scope.showMoreInfo = function () { +$common.showInfo('TODO: show modal with more info'); +}; + $scope.joinTip = $common.joinTip; $scope.getModel = $common.getModel; $scope.javaBuildInClasses = $common.javaBuildInClasses; http://git-wip-us.apache.org/repos/asf/ignite/blob/619b5361/modules/control-center-web/src/main/js/controllers/clusters-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 270045d..2b3b584 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -26,6 +26,10 @@ controlCenterModule.controller('clustersController', [ $scope.ui = $common.formUI(); +$scope.showMoreInfo = function () { +$common.showInfo('TODO: show modal with more info'); +}; + $scope.joinTip = $common.joinTip; $scope.getModel = $common.getModel; $scope.compactJavaName = $common.compactJavaName; http://git-wip-us.apache.org/repos/asf/ignite/blob/619b5361/modules/control-center-web/src/main/js/controllers/metadata-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 792f510..103c0ef 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -29,6 +29,10 @@ controlCenterModule.controller('metadataController', [ $scope.ui = $common.formUI(); +$scope.showMoreInfo = function () { +$common.showInfo('TODO: show modal with more info'); +}; + $scope.agentGoal = 'load metadata from database schema'; $scope.agentTestDriveOption = '--test-drive-metadata'; http://git-wip-us.apache.org/repos/asf/ignite/blob/619b5361/modules/control-center-web/src/main/js/controllers/models/caches.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index bb16f74..987cada 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -5,7 +5,7 @@ "Configure Caches", "Link Metadata to Caches", "Link Caches to Clusters", -
ignite git commit: IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure.
Repository: ignite Updated Branches: refs/heads/master 0a41ae572 -> b3bcf4aee IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bcf4ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bcf4ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bcf4ae Branch: refs/heads/master Commit: b3bcf4aeecf9aa1bd6d19e94c8da7b09741f5410 Parents: 0a41ae5 Author: iveselovskiy Authored: Wed Sep 23 13:45:01 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 13:45:01 2015 +0300 -- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 87 ++-- .../processors/igfs/IgfsMetaManager.java| 193 -- .../processors/igfs/IgfsAbstractSelfTest.java | 201 ++- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- 8 files changed, 409 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java index b02d0f1..a187a90 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java @@ -451,7 +451,7 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return File information for specified path or {@code null} if such path does not exist. * @throws IgniteException In case of error. */ -public IgfsFile info(IgfsPath path) throws IgniteException; +@Nullable public IgfsFile info(IgfsPath path) throws IgniteException; /** * Gets used space in bytes. http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 44a3fa9..6ac2b64 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -436,7 +436,7 @@ public class CacheConfiguration extends MutableConfiguration { * @return {@code this} for chaining. */ public CacheConfiguration setName(String name) { -A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty."); +A.ensure(name == null || !name.isEmpty(), "Name cannot be empty."); this.name = name; http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 695db38..0dd0307 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -472,8 +472,7 @@ public final class IgfsImpl implements IgfsEx { @SuppressWarnings("ConstantConditions") @Override public IgfsStatus globalSpace() { return safeOp(new Callable() { -@Override -public IgfsStatus call() throws Exception { +@Override public IgfsStatus call() throws Exception { IgniteBiTuple space = igfsCtx.kernalContext().grid().compute().execute( new IgfsGlobalSpaceTask(name()), null); @@ -560,7 +559,7 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ -@Override public IgfsFile info(final IgfsPath path) { +@Override @Nullable public IgfsFile info(final IgfsPath path) { A.notNull(path, "path"); return safeOp(new Callable() { @@ -692,64 +691,12 @@ public final class IgfsImpl implements IgfsEx { return null; } -IgfsPath destParent = dest.parent(); +IgfsFileInfo info = meta.move(src, dest); -// Resolve sou
ignite git commit: IGNITE-843 WIP Description of SQL screen.
Repository: ignite Updated Branches: refs/heads/ignite-843 619b5361c -> 09c14d5d0 IGNITE-843 WIP Description of SQL screen. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09c14d5d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09c14d5d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09c14d5d Branch: refs/heads/ignite-843 Commit: 09c14d5d04bdd338a84c6c048d598cc48808eba7 Parents: 619b536 Author: Alexey Kuznetsov Authored: Wed Sep 23 17:46:08 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 17:46:08 2015 +0700 -- .../src/main/js/views/includes/controls.jade| 2 +- .../src/main/js/views/sql/sql.jade | 20 2 files changed, 21 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/09c14d5d/modules/control-center-web/src/main/js/views/includes/controls.jade -- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index ced2851..e273454 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -18,7 +18,7 @@ mixin block-callout(workflowTitle, workflowContent, whatsNextTitle, whatsNextCon .block-callout-parent table tbody -tr(height='100%') +tr td.block-callout-left(width='50%') i.fa.fa-check-square.block-callout-header-left label.block-callout-header-left #{workflowTitle} http://git-wip-us.apache.org/repos/asf/ignite/blob/09c14d5d/modules/control-center-web/src/main/js/views/sql/sql.jade -- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 5763412..25ad779 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -31,6 +31,26 @@ mixin btn-toolbar-data(btn, kind, tip) i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom') block container +.block-callout-parent +table +tbody +tr +td.block-callout-left(width='50%') +i.fa.fa-check-square.block-callout-header-left +label.block-callout-header-left With SQL Notebook you can: +ul +li Create any number of paragraphs +li Execute and explain SQL queries +li Execute scan queries +li View data in tabular form and as charts +td.block-callout-right(width='50%') +i.fa.fa-check-square.block-callout-header-right +label.block-callout-header-right To execute SQL you need: +ul +li Start Apache Ignite Cluster with caches +li Populate caches with data +li Start Apache Ignite Web Agent +li Create paragraph, enter some SQL and execute it .row .col-sm-12(ng-init='noteId = "#{noteId}"') .docs-content(ng-controller='sqlController' )
[1/3] ignite git commit: IGNITE-843 Login / sign up in one column.
Repository: ignite Updated Branches: refs/heads/ignite-843 09c14d5d0 -> 91c38aa42 IGNITE-843 Login / sign up in one column. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/763cfc25 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/763cfc25 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/763cfc25 Branch: refs/heads/ignite-843 Commit: 763cfc259737976caf3a06b08f1b62eced17c384 Parents: 09c14d5 Author: vsisko Authored: Wed Sep 23 18:10:15 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 18:10:15 2015 +0700 -- .../src/main/js/public/stylesheets/style.scss | 10 ++- .../src/main/js/views/index.jade| 83 +--- 2 files changed, 45 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/763cfc25/modules/control-center-web/src/main/js/public/stylesheets/style.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index c5bd9f6..b317408 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -326,8 +326,8 @@ h1, h2, h3, h4, h5, h6 { .login-footer { @extend .modal-footer; -margin-left: 20px; -margin-right: 20px; +padding-left: 8px; +padding-right: 4px; } .modal-body { @@ -1296,6 +1296,8 @@ a { } .block-callout-parent { +margin-top: 10px; + table { width: 100% } @@ -1491,6 +1493,10 @@ a { background-color: rgba(255, 255, 255, 1) !important; } +.dw-loading { +min-height: 200px; +} + .dw-loading > .dw-loading-body > .dw-loading-text { left: -50%; } http://git-wip-us.apache.org/repos/asf/ignite/blob/763cfc25/modules/control-center-web/src/main/js/views/index.jade -- diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade index 346834d..21b0435 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -17,7 +17,7 @@ extends templates/layout mixin lbl(txt) -label.col-xs-5.col-sm-4.required #{txt} +label.col-xs-4.col-sm-3.col-sm-offset-1.required #{txt} block container .row(ng-controller='auth') @@ -38,50 +38,41 @@ block container li Load metadata from database li Execute SQL queries hr -.col-xs-6.col-sm-6.col-md-6(ng-init='loginAction == "login"') -form(name='loginForm') -.modal-body.row -.col-sm-10.col-sm-offset-1 -p(ng-show='loginAction == "password/forgot"') +form(name='loginForm') +.modal-body.row +.col-sm-6.col-sm-offset-3 +.details-row +p.col-xs-10.col-sm-10.col-sm-offset-1(ng-show='action == "password/forgot"') | That's ok! Simply enter your email below and a reset password link will be sent to you via email. You can then follow that link and select a new password. -.details-row -+lbl('Email:') -.col-xs-7.col-sm-8 - input#login_user_email.form-control(enter-focus-next='login_user_password' type='email' ng-model='user_info.email' placeholder='y...@domain.com' required on-enter='loginAction == "password/forgot" && loginForm.$valid && auth(loginAction, user_info)') -.details-row(ng-show='loginAction != "password/forgot"') -+lbl('Password:') -.col-xs-7.col-sm-8 - input#login_user_password.form-control(type='password' ng-model='user_info.password' placeholder='Password' ng-required='loginAction != "password/forgot"' on-enter='loginAction == "login" && loginForm.$valid && auth(loginAction, user_info)') -.col-xs-6.col-sm-6.col-md-6 -form(name='signupForm') -.modal-body.row -.col-sm-10.col-sm-offset-1 -.details-row -+lbl('Full Name:') -.col-xs-7.col-sm-8 - input#signup_user_name.form-control(enter-focus-next='signup_user_email' type='text' ng-model='user_info.username' placeholder='John Smith' required) -.details-row -+lbl('Ema
[2/3] ignite git commit: IGNITE-843 WIP Description of SQL screen.
IGNITE-843 WIP Description of SQL screen. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/772d9685 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/772d9685 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/772d9685 Branch: refs/heads/ignite-843 Commit: 772d96853b3b0e94f2c5259fc9260393f96c1633 Parents: 763cfc2 Author: vsisko Authored: Wed Sep 23 18:11:04 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 18:11:04 2015 +0700 -- .../src/main/js/controllers/common-module.js | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/772d9685/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index f20c279..6df4c7f 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1833,11 +1833,11 @@ controlCenterModule.controller('activeLink', [ controlCenterModule.controller('auth', [ '$scope', '$modal', '$http', '$window', '$common', '$focus', function ($scope, $modal, $http, $window, $common, $focus) { -$scope.loginAction = 'login'; +$scope.action = 'login'; $scope.userDropdown = [{text: 'Profile', href: '/profile'}]; -$focus('login_user_email'); +$focus('user_email'); if (!$scope.becomeUsed) { if ($scope.user && $scope.user.admin) @@ -1859,10 +1859,8 @@ controlCenterModule.controller('auth', [ if (status == 403) { $window.location = '/password/reset'; } -else if (action == 'login') -$common.showPopoverMessage(undefined, undefined, 'login_user_email', err); else -$common.showPopoverMessage(undefined, undefined, 'signup_user_email', err); +$common.showPopoverMessage(undefined, undefined, 'user_email', err); }); };
[3/3] ignite git commit: IGNITE-843 Tweak screens callouts.
IGNITE-843 Tweak screens callouts. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91c38aa4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91c38aa4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91c38aa4 Branch: refs/heads/ignite-843 Commit: 91c38aa42335180e0c9a302433d26bd98058bca0 Parents: 772d968 Author: Alexey Kuznetsov Authored: Wed Sep 23 18:11:25 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 18:11:25 2015 +0700 -- .../main/js/controllers/summary-controller.js | 60 +++- .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../main/js/views/configuration/metadata.jade | 2 +- .../main/js/views/configuration/summary.jade| 4 +- .../src/main/js/views/includes/controls.jade| 2 +- .../src/main/js/views/sql/sql.jade | 40 ++--- 7 files changed, 59 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/controllers/summary-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js index 08c8f0e..b91ed09 100644 --- a/modules/control-center-web/src/main/js/controllers/summary-controller.js +++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js @@ -16,7 +16,7 @@ */ // Controller for Summary screen. -controlCenterModule.controller('summaryController', ['$scope', '$http', '$common', function ($scope, $http, $common) { +controlCenterModule.controller('summaryController', ['$scope', '$http', '$common', '$loading', function ($scope, $http, $common, $loading) { $scope.joinTip = $common.joinTip; $scope.getModel = $common.getModel; @@ -161,38 +161,44 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common return $common.isDefined($generatorJava.metadatas) && $generatorJava.metadatas.length > 0; }; -$http.post('clusters/list').success(function (data) { -$scope.clusters = data.clusters; +$loading.start('loadingSummaryScreen'); -if ($scope.clusters.length > 0) { -// Populate clusters with caches. -_.forEach($scope.clusters, function (cluster) { -cluster.caches = _.filter(data.caches, function (cache) { -return _.contains(cluster.caches, cache._id); +$http.post('clusters/list') +.success(function (data) { +$scope.clusters = data.clusters; + +if ($scope.clusters.length > 0) { +// Populate clusters with caches. +_.forEach($scope.clusters, function (cluster) { +cluster.caches = _.filter(data.caches, function (cache) { +return _.contains(cluster.caches, cache._id); +}); }); -}); -var restoredId = sessionStorage.summarySelectedId; +var restoredId = sessionStorage.summarySelectedId; -var selectIdx = 0; +var selectIdx = 0; -if (restoredId) { -var idx = _.findIndex($scope.clusters, function (cluster) { -return cluster._id == restoredId; -}); +if (restoredId) { +var idx = _.findIndex($scope.clusters, function (cluster) { +return cluster._id == restoredId; +}); -if (idx >= 0) -selectIdx = idx; -else -delete sessionStorage.summarySelectedId; -} +if (idx >= 0) +selectIdx = idx; +else +delete sessionStorage.summarySelectedId; +} -$scope.selectItem($scope.clusters[selectIdx]); +$scope.selectItem($scope.clusters[selectIdx]); -$scope.$watch('selectedItem', function (val) { -if (val) -sessionStorage.summarySelectedId = val._id; -}, true); -} -}); +$scope.$watch('selectedItem', function (val) { +if (val) +sessionStorage.summarySelectedId = val._id; +}, true); +} +}) +.finally(function () { +$loading.finish('loadingSummaryScreen'); +}); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/configuration/caches.jade --
ignite git commit: IGNITE-843 Tweak screens callouts.
Repository: ignite Updated Branches: refs/heads/ignite-843 91c38aa42 -> 53fd6ba32 IGNITE-843 Tweak screens callouts. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53fd6ba3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53fd6ba3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53fd6ba3 Branch: refs/heads/ignite-843 Commit: 53fd6ba3223cf4059cc529c8d759a8ab302ef55e Parents: 91c38aa Author: Alexey Kuznetsov Authored: Wed Sep 23 18:16:43 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 23 18:16:43 2015 +0700 -- .../control-center-web/src/main/js/views/configuration/caches.jade | 2 +- .../src/main/js/views/configuration/clusters.jade | 2 +- .../src/main/js/views/configuration/metadata.jade | 2 +- .../src/main/js/views/configuration/summary.jade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/53fd6ba3/modules/control-center-web/src/main/js/views/configuration/caches.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index a7721a5..664d812 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -25,7 +25,7 @@ block content .docs-header h1 Create and Configure Ignite Caches .docs-body(ng-controller='cachesController') -div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen..."}') +div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen...", className: "page-loading-overlay"}') div(ng-if='ui.ready') +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent') hr http://git-wip-us.apache.org/repos/asf/ignite/blob/53fd6ba3/modules/control-center-web/src/main/js/views/configuration/clusters.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index c503b6d..7d28c17 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -25,7 +25,7 @@ block content .docs-header h1 Create and Configure Ignite Clusters .docs-body(ng-controller='clustersController') -div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen..."}') +div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen...", className: "page-loading-overlay"}') div(ng-if='ui.ready') +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent') hr http://git-wip-us.apache.org/repos/asf/ignite/blob/53fd6ba3/modules/control-center-web/src/main/js/views/configuration/metadata.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade index cff8aef..40d9f33 100644 --- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade +++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade @@ -25,7 +25,7 @@ block content .docs-header h1 Create and Configure Cache Type Metadata .docs-body(ng-controller='metadataController') -div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata screen..."}') +div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata screen...", className: "page-loading-overlay"}') div(ng-if='ui.ready') +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent') hr http://git-wip-us.apache.org/repos/asf/ignite/blob/53fd6ba3/modules/control-center-web/src/main/js/views/configuration/summary.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index 1336efc..93f514e 100644 -
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272
Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70b8d3d7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70b8d3d7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70b8d3d7 Branch: refs/heads/ignite-1272 Commit: 70b8d3d7474ff75716e29b1b88c88c11b1a59d85 Parents: 1ff1fea 04f4f54 Author: Denis Magda Authored: Wed Sep 23 14:25:32 2015 +0300 Committer: Denis Magda Committed: Wed Sep 23 14:25:32 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 97 +++- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +-- 2 files changed, 81 insertions(+), 49 deletions(-) --
[1/3] ignite git commit: ignite-1524 Fixed processing of ClientReconnectMessage
Repository: ignite Updated Branches: refs/heads/ignite-1272 3fa7e4f77 -> 70b8d3d74 ignite-1524 Fixed processing of ClientReconnectMessage Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04f4f54a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04f4f54a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04f4f54a Branch: refs/heads/ignite-1272 Commit: 04f4f54a7ff1d43fa3baf4fa07865a8163796a82 Parents: 1942d75 Author: sboikov Authored: Wed Sep 23 09:31:59 2015 +0300 Committer: sboikov Committed: Wed Sep 23 09:31:59 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 97 +++- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +-- 2 files changed, 81 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/04f4f54a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 4ce46e8..8a205d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2958,70 +2958,81 @@ class ServerImpl extends TcpDiscoveryImpl { * @param msg Client reconnect message. */ private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg) { +UUID nodeId = msg.creatorNodeId(); + UUID locNodeId = getLocalNodeId(); boolean isLocNodeRouter = locNodeId.equals(msg.routerNodeId()); if (!msg.verified()) { -assert isLocNodeRouter; - -msg.verify(locNodeId); +TcpDiscoveryNode node = ring.node(nodeId); -if (ring.hasRemoteNodes()) { -sendMessageAcrossRing(msg); +assert node == null || node.isClient(); -return; +if (node != null) { +node.clientRouterNodeId(msg.routerNodeId()); +node.aliveCheck(spi.maxMissedClientHbs); } -} - -UUID nodeId = msg.creatorNodeId(); -TcpDiscoveryNode node = ring.node(nodeId); +if (isLocalNodeCoordinator()) { +msg.verify(locNodeId); -assert node == null || node.isClient(); +if (node != null) { +Collection pending = msgHist.messages(msg.lastMessageId(), node); -if (node != null) { -assert node.isClient(); +if (pending != null) { +msg.pendingMessages(pending); +msg.success(true); -node.clientRouterNodeId(msg.routerNodeId()); -node.aliveCheck(spi.maxMissedClientHbs); +if (log.isDebugEnabled()) +log.debug("Accept client reconnect, restored pending messages " + +"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +} +else { +if (log.isDebugEnabled()) +log.debug("Failing reconnecting client node because failed to restore pending " + +"messages [locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); -if (isLocalNodeCoordinator()) { -Collection pending = msgHist.messages(msg.lastMessageId(), node); +processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, +node.id(), node.internalOrder())); +} +} +else if (log.isDebugEnabled()) +log.debug("Reconnecting client node is already failed [nodeId=" + nodeId + ']'); -if (pending != null) { -msg.pendingMessages(pending); -msg.success(true); +if (isLocNodeRouter) { +ClientMessageWorker wrk = clientMsgWorkers.get(nodeId); -if (log.isDebugEnabled()) -log.debug("Accept client reconnect, restored pending messages " + -"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +if (wrk != null) +wrk.addMessage(msg); +
[2/3] ignite git commit: ignite-1272: storing user class descriptors in a new map depending on their class loader. Implemented onUndeploy method for portable marshaller
ignite-1272: storing user class descriptors in a new map depending on their class loader. Implemented onUndeploy method for portable marshaller Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ff1fea0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ff1fea0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ff1fea0 Branch: refs/heads/ignite-1272 Commit: 1ff1fea046acf1721557942e2c4f057e64223619 Parents: 3fa7e4f Author: Denis Magda Authored: Wed Sep 23 14:17:51 2015 +0300 Committer: Denis Magda Committed: Wed Sep 23 14:17:51 2015 +0300 -- .../deployment/GridDeploymentLocalStore.java| 8 +-- .../GridDeploymentPerLoaderStore.java | 8 +-- .../GridDeploymentPerVersionStore.java | 8 +-- .../internal/portable/PortableContext.java | 59 ++-- .../portable/api/PortableMarshaller.java| 5 ++ .../ignite/marshaller/AbstractMarshaller.java | 12 +++- .../ignite/marshaller/jdk/JdkMarshaller.java| 7 ++- .../optimized/OptimizedMarshaller.java | 4 +- 8 files changed, 89 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ff1fea0/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java index 420eea8..d095efb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java @@ -39,7 +39,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.AbstractMarshaller; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.deployment.DeploymentListener; import org.apache.ignite.spi.deployment.DeploymentResource; @@ -541,8 +541,8 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { ctx.resource().onUndeployed(dep); // Clear optimized marshaller's cache. -if (ctx.config().getMarshaller() instanceof OptimizedMarshaller) - ((OptimizedMarshaller)ctx.config().getMarshaller()).onUndeploy(ldr); +if (ctx.config().getMarshaller() instanceof AbstractMarshaller) + ((AbstractMarshaller)ctx.config().getMarshaller()).onUndeploy(ldr); clearSerializationCaches(); @@ -572,4 +572,4 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { undeploy(ldr); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1ff1fea0/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java index 6ca74eb..4ba308c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java @@ -39,7 +39,7 @@ import org.apache.ignite.internal.util.GridClassLoaderCache; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.AbstractMarshaller; import org.apache.ignite.spi.deployment.DeploymentSpi; import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED; @@ -511,8 +511,8 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { ctx.cache().onUndeployed(ldr); // Clear optimized marshaller's cache. -if (ctx.config().getMarshaller() instanceof OptimizedMarshaller) - ((OptimizedMarshaller)ctx.config().getMarshaller()).onUndeploy(ldr); +if (ctx.config().getMarshaller() instanceof AbstractMarshal
ignite git commit: Fixed test.
Repository: ignite Updated Branches: refs/heads/ignite-1.4 04f4f54a7 -> 517d0f584 Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/517d0f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/517d0f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/517d0f58 Branch: refs/heads/ignite-1.4 Commit: 517d0f584f67e9291b7f6f2efe3f42b7131f6a25 Parents: 04f4f54 Author: sboikov Authored: Wed Sep 23 15:43:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 15:43:13 2015 +0300 -- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/517d0f58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 647746e..a3d9948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -365,13 +365,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr U.sleep(random(START_DELAY.get1(), START_DELAY.get2())); -if (stop.get()) -return; - log.info("Restarting node " + idx); startGrid(idx); +if (stop.get()) +return; + U.sleep(1000); }
ignite git commit: minor
Repository: ignite Updated Branches: refs/heads/ignite-1171 af23e31f0 -> dc4764259 minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc476425 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc476425 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc476425 Branch: refs/heads/ignite-1171 Commit: dc47642591b6c203e0713e74706ee57c424e1f29 Parents: af23e31 Author: Yakov Zhdanov Authored: Wed Sep 23 16:17:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:17:15 2015 +0300 -- modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dc476425/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +}
ignite git commit: minor
Repository: ignite Updated Branches: refs/heads/ignite-1171 dc4764259 -> e46ae60d5 minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e46ae60d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e46ae60d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e46ae60d Branch: refs/heads/ignite-1171 Commit: e46ae60d531f49645877b568b6c8e45a07957686 Parents: dc47642 Author: Yakov Zhdanov Authored: Wed Sep 23 16:31:54 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:31:54 2015 +0300 -- .../ignite/internal/processors/cache/DynamicCacheDescriptor.java | 3 --- .../cache/query/continuous/CacheContinuousQueryManager.java | 1 - 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e46ae60d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index 4c08544..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/e46ae60d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index 32637b30..c719f1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -47,7 +47,6 @@ import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.cluster.ClusterTopologyException; -import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
ignite git commit: Merging IGNITE-1171 - fixed problems with custom events in discovery
Repository: ignite Updated Branches: refs/heads/ignite-1.4 517d0f584 -> 6f3ef6a84 Merging IGNITE-1171 - fixed problems with custom events in discovery Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f3ef6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f3ef6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f3ef6a8 Branch: refs/heads/ignite-1.4 Commit: 6f3ef6a84ee1c3e77d32ca9930835d1720918e20 Parents: 517d0f5 Author: Yakov Zhdanov Authored: Wed Sep 23 16:36:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:36:15 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 20 files changed, 864 insertions(+), 425 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index f3c3be9..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; @@ -156,6 +153,13 @@ public class DynamicCacheDescriptor { } /** + * @return Started flag. + */ +public boolean started() { +return started; +} + +/** * @return Cache configuration. */ public CacheConfiguration cacheConfiguration() { http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 34c571c..eb76233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1435,6 +1435,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private static final long serialVersionUID = 0L; /** */ +@GridToStringInclude private Af
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1171 [deleted] e46ae60d5
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1171-debug [deleted] 29cd3dbc5
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1171-test [deleted] e75917d47
ignite git commit: ignite-1272: fixing new bugs
Repository: ignite Updated Branches: refs/heads/ignite-1272 70b8d3d74 -> 1e8e162e0 ignite-1272: fixing new bugs Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e8e162e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e8e162e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e8e162e Branch: refs/heads/ignite-1272 Commit: 1e8e162e0e3066fda126d7ca8cfe13c74efad914 Parents: 70b8d3d Author: Denis Magda Authored: Wed Sep 23 16:50:33 2015 +0300 Committer: Denis Magda Committed: Wed Sep 23 16:50:33 2015 +0300 -- .../internal/portable/PortableContext.java | 19 +++ 1 file changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1e8e162e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index c6b9b51..c7ad2d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -482,6 +482,25 @@ public class PortableContext implements Externalizable { desc = descByCls.get(cls); } catch (ClassNotFoundException e) { +if (userType && !ldr.equals(IgniteUtils.gridClassLoader())) { +// Type name can be not registered in a system cache. Try to get from local map. +desc = userTypesMap(ldr).get(typeId); + +if (desc != null) +return desc; + +// Class might have been loaded by default class loader. +desc = userTypesMap(IgniteUtils.gridClassLoader()).get(typeId); + +if (desc != null) { +U.log(null, "Unable to load type's class with required class loader. Using type's class " + +"loaded by system class loader [typeId=" + typeId + ", ldr=" + ldr + ", cls=" + +desc.describedClass().getName()); + +return desc; +} +} + throw new PortableInvalidClassException(e); } catch (IgniteCheckedException e) {
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272
Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53980808 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53980808 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53980808 Branch: refs/heads/ignite-1272 Commit: 53980808bc89763ad6688a33f582eed38c71c129 Parents: 1e8e162 6f3ef6a Author: Denis Magda Authored: Wed Sep 23 16:56:43 2015 +0300 Committer: Denis Magda Committed: Wed Sep 23 16:56:43 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 21 files changed, 867 insertions(+), 428 deletions(-) --
[1/3] ignite git commit: Fixed test.
Repository: ignite Updated Branches: refs/heads/ignite-1272 1e8e162e0 -> 53980808b Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/517d0f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/517d0f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/517d0f58 Branch: refs/heads/ignite-1272 Commit: 517d0f584f67e9291b7f6f2efe3f42b7131f6a25 Parents: 04f4f54 Author: sboikov Authored: Wed Sep 23 15:43:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 15:43:13 2015 +0300 -- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/517d0f58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 647746e..a3d9948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -365,13 +365,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr U.sleep(random(START_DELAY.get1(), START_DELAY.get2())); -if (stop.get()) -return; - log.info("Restarting node " + idx); startGrid(idx); +if (stop.get()) +return; + U.sleep(1000); }
[2/3] ignite git commit: Merging IGNITE-1171 - fixed problems with custom events in discovery
Merging IGNITE-1171 - fixed problems with custom events in discovery Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f3ef6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f3ef6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f3ef6a8 Branch: refs/heads/ignite-1272 Commit: 6f3ef6a84ee1c3e77d32ca9930835d1720918e20 Parents: 517d0f5 Author: Yakov Zhdanov Authored: Wed Sep 23 16:36:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:36:15 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 20 files changed, 864 insertions(+), 425 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index f3c3be9..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; @@ -156,6 +153,13 @@ public class DynamicCacheDescriptor { } /** + * @return Started flag. + */ +public boolean started() { +return started; +} + +/** * @return Cache configuration. */ public CacheConfiguration cacheConfiguration() { http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 34c571c..eb76233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1435,6 +1435,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private static final long serialVersionUID = 0L; /** */ +@GridToStringInclude private AffinityTopologyVersion topVer; /** @@ -1455,5 +1456,10 @@ public class Grid
ignite git commit: Fixed PostBuildEvent for Apache.Ignite.exe project.
Repository: ignite Updated Branches: refs/heads/ignite-1282 f0bac562c -> e39236fe5 Fixed PostBuildEvent for Apache.Ignite.exe project. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e39236fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e39236fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e39236fe Branch: refs/heads/ignite-1282 Commit: e39236fe5143038d8d906580a56320a329e9261c Parents: f0bac56 Author: vozerov-gridgain Authored: Wed Sep 23 17:10:48 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 17:10:48 2015 +0300 -- .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e39236fe/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj -- diff --git 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 index 239898e..8d130aa 100644 --- 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 @@ -232,6 +232,10 @@ + +copy $(SolutionDir)\Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe $(ProjectDir)$(OutDir) +copy $(SolutionDir)\Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe.config $(ProjectDir)$(OutDir) +
ignite git commit: Fixed PostBuildEvent for Apache.Ignite.exe project.
Repository: ignite Updated Branches: refs/heads/ignite-1282 e39236fe5 -> ff189d9dc Fixed PostBuildEvent for Apache.Ignite.exe project. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff189d9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff189d9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff189d9d Branch: refs/heads/ignite-1282 Commit: ff189d9dce368384c46a8af616a984dbbbe6a9a0 Parents: e39236f Author: vozerov-gridgain Authored: Wed Sep 23 17:33:12 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 17:33:12 2015 +0300 -- .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff189d9d/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj -- diff --git 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 index 8d130aa..68bc223 100644 --- 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 @@ -233,8 +233,8 @@ -copy $(SolutionDir)\Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe $(ProjectDir)$(OutDir) -copy $(SolutionDir)\Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe.config $(ProjectDir)$(OutDir) +copy /Y $(SolutionDir)Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe $(ProjectDir)$(OutDir) +copy /Y $(SolutionDir)Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe.config $(ProjectDir)$(OutDir)
ignite git commit: IGNITE-843 Removed not needed any more "Log In" in header.
Repository: ignite Updated Branches: refs/heads/ignite-843 53fd6ba32 -> 6160ae6b1 IGNITE-843 Removed not needed any more "Log In" in header. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6160ae6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6160ae6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6160ae6b Branch: refs/heads/ignite-843 Commit: 6160ae6b19c5dbebca90cb8c83ac1d2c0c7ff898 Parents: 53fd6ba Author: AKuznetsov Authored: Wed Sep 23 21:56:49 2015 +0700 Committer: AKuznetsov Committed: Wed Sep 23 21:56:49 2015 +0700 -- modules/control-center-web/src/main/js/views/includes/header.jade | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6160ae6b/modules/control-center-web/src/main/js/views/includes/header.jade -- diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade index 368f61a..3364e88 100644 --- a/modules/control-center-web/src/main/js/views/includes/header.jade +++ b/modules/control-center-web/src/main/js/views/includes/header.jade @@ -38,5 +38,3 @@ header#header.header li(ng-if='user') a.dropdown-toggle(data-toggle='dropdown' ng-class='{active: isActive("/profile") || isActive("/admin")}' bs-dropdown='userDropdown' data-placement='bottom-right') {{user.username}} span.caret -li.nav-login(ng-if='!user') -a(href='/') Log In
ignite git commit: ignite-1272: try to load class using default class loader when the class hasn't been registered in a cache
Repository: ignite Updated Branches: refs/heads/ignite-1272 53980808b -> 9166dfb2b ignite-1272: try to load class using default class loader when the class hasn't been registered in a cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9166dfb2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9166dfb2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9166dfb2 Branch: refs/heads/ignite-1272 Commit: 9166dfb2b2780a0efc252a401f9ce0b93181f1a4 Parents: 5398080 Author: Denis Magda Authored: Wed Sep 23 18:10:40 2015 +0300 Committer: Denis Magda Committed: Wed Sep 23 18:10:40 2015 +0300 -- .../internal/portable/PortableContext.java | 53 1 file changed, 33 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9166dfb2/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index c7ad2d4..d5a3c5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -82,6 +82,9 @@ public class PortableContext implements Externalizable { private static final long serialVersionUID = 0L; /** */ +private static final ClassLoader dfltLdr = U.gridClassLoader(); + +/** */ static final PortableIdMapper DFLT_ID_MAPPER = new IdMapperWrapper(null); /** */ @@ -463,14 +466,14 @@ public class PortableContext implements Externalizable { return desc; if (ldr == null) -ldr = IgniteUtils.gridClassLoader(); +ldr = dfltLdr; if (userType) { desc = userTypesMap(ldr).get(typeId); // If the type hasn't been loaded by default class loader then we mustn't return the descriptor from here // giving a chance to a custom class loader to reload type's class. -if (desc != null && ldr.equals(IgniteUtils.gridClassLoader())) +if (desc != null && ldr.equals(dfltLdr)) return desc; } @@ -482,28 +485,15 @@ public class PortableContext implements Externalizable { desc = descByCls.get(cls); } catch (ClassNotFoundException e) { -if (userType && !ldr.equals(IgniteUtils.gridClassLoader())) { -// Type name can be not registered in a system cache. Try to get from local map. -desc = userTypesMap(ldr).get(typeId); - -if (desc != null) -return desc; - -// Class might have been loaded by default class loader. -desc = userTypesMap(IgniteUtils.gridClassLoader()).get(typeId); - -if (desc != null) { -U.log(null, "Unable to load type's class with required class loader. Using type's class " + -"loaded by system class loader [typeId=" + typeId + ", ldr=" + ldr + ", cls=" + -desc.describedClass().getName()); - -return desc; -} -} +if (userType && !ldr.equals(dfltLdr) && (desc = descriptorLoadingFailover(typeId, ldr)) != null) +return desc; throw new PortableInvalidClassException(e); } catch (IgniteCheckedException e) { +if (userType && !ldr.equals(dfltLdr) && (desc = descriptorLoadingFailover(typeId, ldr)) != null) +return desc; + throw new PortableException("Failed resolve class for ID: " + typeId, e); } @@ -517,6 +507,29 @@ public class PortableContext implements Externalizable { } /** + * The method must be used in case when it wasn't possible to load user type's class using custom class loader. + * + * There are several reasons why this may happen. First, type's name can be not registered in a system cache. + * Second, class might have been predefined explicitly and loaded by default class loader. + * + * @param typeId Type ID. + * @param ldr Class loader that failed to load type's class. + * @return Type descriptor on success, {@code null} on failure. + */ +private PortableClassDescriptor descriptorLoadingFailover(int typeId, ClassLoader ldr) { +assert !ldr.equals(dfltLdr); + +// Type name can be not registered in a system cache. Try to get from local map. +PortableClassDescriptor desc = userTypesMap(ldr).get(typeId); + +if
ignite git commit: Minor fix in examples.
Repository: ignite Updated Branches: refs/heads/ignite-1282 ff189d9dc -> f16c73639 Minor fix in examples. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f16c7363 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f16c7363 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f16c7363 Branch: refs/heads/ignite-1282 Commit: f16c736395b67aad98585560b8aee203550dd898 Parents: ff189d9 Author: vozerov-gridgain Authored: Wed Sep 23 18:16:57 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 18:16:57 2015 +0300 -- .../platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f16c7363/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs index 4f9625f..eb119f9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs @@ -35,7 +35,7 @@ namespace Apache.Ignite.Core.Tests.Examples /// /// Examples source code path. /// -public static readonly string ExamplesSourcePath = Path.Combine(IgniteHome, @"platforms\dotnet\Examples"); +public static readonly string ExamplesSourcePath = Path.Combine(IgniteHome, @"platforms\dotnet\examples"); /// /// Gets the full configuration path.
[12/30] ignite git commit: Merge branch 'ignite-1.4'
Merge branch 'ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eae4df1e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eae4df1e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eae4df1e Branch: refs/heads/ignite-843 Commit: eae4df1e5207cfa124e25dff5079c1405ae01803 Parents: 1021d4e 8b94494 Author: vozerov-gridgain Authored: Mon Sep 21 17:15:38 2015 +0300 Committer: vozerov-gridgain Committed: Mon Sep 21 17:15:38 2015 +0300 -- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 ++-- .../dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) --
[08/30] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ccd0b31 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ccd0b31 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ccd0b31 Branch: refs/heads/ignite-843 Commit: 7ccd0b315192657f5fb2cde565ae4a12e4764b40 Parents: 909 d08ecf1 Author: vozerov-gridgain Authored: Fri Sep 18 16:56:38 2015 +0300 Committer: vozerov-gridgain Committed: Fri Sep 18 16:56:38 2015 +0300 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[06/30] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d08ecf11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d08ecf11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d08ecf11 Branch: refs/heads/ignite-843 Commit: d08ecf11704b9b4b56ea81f9f03d10311ff9d27c Parents: 4c101dc d64fc9d Author: sboikov Authored: Fri Sep 18 14:11:41 2015 +0300 Committer: sboikov Committed: Fri Sep 18 14:11:41 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[23/30] ignite git commit: ignite-973 - fix
ignite-973 - fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0be45e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0be45e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0be45e3 Branch: refs/heads/ignite-843 Commit: f0be45e309f9a594334209a251c069f9ba3db120 Parents: e51fb42 Author: S.Vladykin Authored: Tue Sep 22 13:36:40 2015 +0300 Committer: S.Vladykin Committed: Tue Sep 22 13:36:40 2015 +0300 -- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 3 +++ .../internal/processors/query/h2/opt/GridH2Table.java | 10 +- .../internal/processors/cache/CacheIndexStreamerTest.java | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f0be45e3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index 07c49a5..4a16284 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -119,6 +119,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onUnswap(Object val, boolean beforeRmv) throws IgniteCheckedException { +if (peekValue(VAL_COL) != null) +return; + setValue(VAL_COL, desc.wrap(val, desc.valueType())); notifyAll(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0be45e3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index 66241b4..bf318b2 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -55,6 +55,8 @@ import org.h2.value.Value; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; +import static org.apache.ignite.internal.processors.query.h2.opt.GridH2AbstractKeyValueRow.VAL_COL; + /** * H2 Table implementation. */ @@ -372,6 +374,12 @@ public class GridH2Table extends TableBase { if (!del) { GridH2Row old = pk.put(row); // Put to PK. +if (old instanceof GridH2AbstractKeyValueRow) { // Unswap value on replace. +GridH2AbstractKeyValueRow kvOld = (GridH2AbstractKeyValueRow)old; + +kvOld.onUnswap(kvOld.getValue(VAL_COL), true); +} + int len = idxs.size(); int i = 1; @@ -399,7 +407,7 @@ public class GridH2Table extends TableBase { GridH2Row old = pk.remove(row); if (old instanceof GridH2AbstractKeyValueRow) { // Unswap value. -Value v = row.getValue(GridH2AbstractKeyValueRow.VAL_COL); +Value v = row.getValue(VAL_COL); if (v != null) ((GridH2AbstractKeyValueRow)old).onUnswap(v.getObject(), true); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0be45e3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java index 25c3b81..23f4e91 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import
[02/30] ignite git commit: IGNITE-1370 Deprecate StreamTupleExtractor in favor of new Stream*Single*TupleExtractor.
IGNITE-1370 Deprecate StreamTupleExtractor in favor of new Stream*Single*TupleExtractor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1dee96e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1dee96e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1dee96e Branch: refs/heads/ignite-843 Commit: b1dee96e0d2b6130959400615b29b02721075392 Parents: 4d9734a Author: Raul Kripalani Authored: Tue Sep 15 00:48:46 2015 +0100 Committer: Raul Kripalani Committed: Tue Sep 15 00:48:46 2015 +0100 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/stream/StreamAdapter.java | 64 .../stream/StreamSingleTupleExtractor.java | 40 .../ignite/stream/StreamTupleExtractor.java | 23 +++ .../ignite/stream/socket/SocketStreamer.java| 2 +- .../stream/socket/SocketStreamerSelfTest.java | 6 +- 6 files changed, 107 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1dee96e/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java index 8e961b9..814d235 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java @@ -20,6 +20,7 @@ package org.apache.ignite.examples.streaming.wordcount.socket; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.util.Map; + import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; @@ -31,7 +32,7 @@ import org.apache.ignite.examples.ExamplesUtils; import org.apache.ignite.examples.streaming.wordcount.CacheConfig; import org.apache.ignite.examples.streaming.wordcount.QueryWords; import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.stream.StreamTupleExtractor; +import org.apache.ignite.stream.StreamSingleTupleExtractor; import org.apache.ignite.stream.socket.SocketMessageConverter; import org.apache.ignite.stream.socket.SocketStreamer; @@ -108,7 +109,7 @@ public class WordsSocketStreamerServer { } }); -sockStmr.setTupleExtractor(new StreamTupleExtractor() { +sockStmr.setSingleTupleExtractor(new StreamSingleTupleExtractor() { @Override public Map.Entry extract(String word) { // By using AffinityUuid we ensure that identical // words are processed on the same cluster node. http://git-wip-us.apache.org/repos/asf/ignite/blob/b1dee96e/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java index ffa0821..e7d224c 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java @@ -37,8 +37,9 @@ import org.apache.ignite.IgniteDataStreamer; * */ public abstract class StreamAdapter { -/** Tuple extractor. */ -private StreamTupleExtractor extractor; + +/** Tuple extractor extracting a single tuple from an event */ +private StreamSingleTupleExtractor singleTupleExtractor; /** Tuple extractor that supports extracting N tuples from a single event (1:n cardinality). */ private StreamMultipleTupleExtractor multipleTupleExtractor; @@ -60,11 +61,22 @@ public abstract class StreamAdapter { * Stream adapter. * * @param stmr Streamer. - * @param extractor Tuple extractor. + * @param extractor Tuple extractor (1:1). */ -protected StreamAdapter(IgniteDataStreamer stmr, StreamTupleExtractor extractor) { +protected StreamAdapter(IgniteDataStreamer stmr, StreamSingleTupleExtractor extractor) { this.stmr = stmr; -this.extractor = extractor; +this.singleTupleExtractor = extractor; +} + +/** + * Stream adapter. + * + * @param stmr Streamer. + * @param extractor Tuple extractor (1:n). + */ +protected StreamAdapter(IgniteDataStreamer stmr, StreamMultipleTupleExtractor extractor) { +this.stmr = stmr; +this.multipleTupleExtractor = extractor; } /** @@ -83,16 +9
[13/30] ignite git commit: IGNITE-535 (WIP) MQTT Streamer.
IGNITE-535 (WIP) MQTT Streamer. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53683e20 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53683e20 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53683e20 Branch: refs/heads/ignite-843 Commit: 53683e20d304dfd96d544f286e8460d3829598d8 Parents: 6b53f1b Author: Raul Kripalani Authored: Mon Sep 21 16:23:28 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:23:28 2015 +0100 -- modules/mqtt/pom.xml| 39 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 336 +++--- .../stream/mqtt/IgniteMqttStreamerTest.java | 435 +++ .../ignite/stream/mqtt/TestTupleExtractors.java | 28 -- 4 files changed, 741 insertions(+), 97 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/53683e20/modules/mqtt/pom.xml -- diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml index b108180..4b0b46c 100644 --- a/modules/mqtt/pom.xml +++ b/modules/mqtt/pom.xml @@ -37,7 +37,8 @@ 1.0.2 -0.7 +5.11.1 +2.0.0 @@ -54,9 +55,29 @@ -org.eclipse.moquette -moquette-broker -${mosquette.version} +com.github.rholder +guava-retrying +${guava-retryier.version} + + + +org.apache.activemq +activemq-broker +${activemq.version} +test + + + +org.apache.activemq +activemq-kahadb-store +${activemq.version} +test + + + +org.apache.activemq +activemq-mqtt +${activemq.version} test @@ -86,16 +107,6 @@ -bintray -http://dl.bintray.com/andsel/maven/ - -true - - -false - - - Eclipse Paho Repo https://repo.eclipse.org/content/repositories/paho-releases/ http://git-wip-us.apache.org/repos/asf/ignite/blob/53683e20/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java -- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java index 00a89ab..b86d385 100644 --- a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -20,6 +20,10 @@ package org.apache.ignite.stream.mqtt; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteException; @@ -29,12 +33,19 @@ import org.apache.ignite.stream.StreamAdapter; import org.apache.ignite.stream.StreamMultipleTupleExtractor; import org.apache.ignite.stream.StreamSingleTupleExtractor; +import com.github.rholder.retry.Retryer; +import com.github.rholder.retry.RetryerBuilder; +import com.github.rholder.retry.StopStrategies; +import com.github.rholder.retry.StopStrategy; +import com.github.rholder.retry.WaitStrategies; +import com.github.rholder.retry.WaitStrategy; +import com.google.common.base.Joiner; +import com.google.common.base.Predicate; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClientPersistence; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; /** @@ -90,8 +101,20 @@ public class MqttStreamer extends StreamAdapter impleme private Integer disconnectForciblyTimeout; +private WaitStrategy retryWaitStrategy = WaitStrategies.fibonacciWait(); + +private StopStrategy retryStopStrategy = StopStrategies.neverStop(); + +private MqttConnectionRetrier connectionRetrier; + private volatile boolean stopped = true; +private volatile boolean connected; + +private String cachedLogPrefix; + +private boolean blockUntilConnected; + /** * Starts streamer. * @@ -109,18 +132,21 @@ public class MqttStreamer extends StreamAdapter impleme // parameter validations A.notNull(getStr
[19/30] ignite git commit: IGNITE-1522 - Made cache entry listener configurations transient in cache configuration
IGNITE-1522 - Made cache entry listener configurations transient in cache configuration Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e51fb420 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e51fb420 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e51fb420 Branch: refs/heads/ignite-843 Commit: e51fb420d1284465c7cbe55a28c2374ddf67d495 Parents: 621eb0f Author: Valentin Kulichenko Authored: Mon Sep 21 23:29:20 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Sep 21 23:29:20 2015 -0700 -- .../configuration/CacheConfiguration.java | 15 + .../IgniteCacheEntryListenerAbstractTest.java | 65 +++- 2 files changed, 79 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e51fb420/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 7d1e14d..44a3fa9 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -19,6 +19,7 @@ package org.apache.ignite.configuration; import java.io.Serializable; import java.util.Collection; +import java.util.HashSet; import javax.cache.Cache; import javax.cache.configuration.CompleteConfiguration; import javax.cache.configuration.Factory; @@ -1799,6 +1800,20 @@ public class CacheConfiguration extends MutableConfiguration { return this; } +/** + * Creates a copy of current configuration and removes all cache entry listeners. + * They are executed only locally and should never be sent to remote nodes. + * + * @return Configuration object that will be serialized. + */ +protected Object writeReplace() { +CacheConfiguration cfg = new CacheConfiguration<>(this); + +cfg.listenerConfigurations = new HashSet<>(); + +return cfg; +} + /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheConfiguration.class, this); http://git-wip-us.apache.org/repos/asf/ignite/blob/e51fb420/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 78a6700..3fdd7fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -17,6 +17,10 @@ package org.apache.ignite.internal.processors.cache; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,11 +36,13 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import javax.cache.configuration.CacheEntryListenerConfiguration; import javax.cache.configuration.Factory; +import javax.cache.configuration.FactoryBuilder; import javax.cache.configuration.MutableCacheEntryListenerConfiguration; import javax.cache.event.CacheEntryCreatedListener; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryExpiredListener; import javax.cache.event.CacheEntryListener; +import javax.cache.event.CacheEntryListenerException; import javax.cache.event.CacheEntryRemovedListener; import javax.cache.event.CacheEntryUpdatedListener; import javax.cache.event.EventType; @@ -358,6 +364,34 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb } /** + * @throws Exception If failed. + */ +public void testSerialization() throws Exception { +if (cacheMode() == LOCAL) +return; + +AtomicBoolean serialized = new AtomicBoolean(); + +NonSerializableListener lsnr = new NonSerializableListener(serialized); + +jcache(0).registerCacheEntryListener(new MutableCacheEntryListenerConfiguration<>( +FactoryBuilder.factoryOf(lsnr), +null, +true, +false +)); + +try { +startGrid(gridCount()); +} +fi
[28/30] ignite git commit: Merge branch 'ignite-1.4'
Merge branch 'ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0a41ae57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0a41ae57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0a41ae57 Branch: refs/heads/ignite-843 Commit: 0a41ae57215e9d2d208d33f7a46653c4be43de9c Parents: 88acd31 1942d75 Author: vozerov-gridgain Authored: Tue Sep 22 17:53:41 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 22 17:53:41 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +-- .../configuration/CacheConfiguration.java | 15 +++ .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 .../processors/cache/GridCacheProcessor.java| 10 +- .../cache/GridCacheSwapEntryImpl.java | 31 - .../processors/cache/GridCacheSwapManager.java | 80 - .../datastreamer/DataStreamerImpl.java | 2 - .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../IgniteCachePutRetryAbstractSelfTest.java| 33 ++ ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +-- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 ++--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 -- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + 20 files changed, 448 insertions(+), 137 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0a41ae57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java --
[11/30] ignite git commit: ignite-1500 Invalid docs in distributed data structures classes
ignite-1500 Invalid docs in distributed data structures classes Signed-off-by: Anton Vinogradov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1021d4ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1021d4ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1021d4ea Branch: refs/heads/ignite-843 Commit: 1021d4eaf4b8318786f3ea7e44e5acef2fbb9004 Parents: c28cec1 Author: agura Authored: Fri Sep 18 15:24:46 2015 +0300 Committer: Anton Vinogradov Committed: Mon Sep 21 10:34:35 2015 +0300 -- .../java/org/apache/ignite/IgniteAtomicLong.java | 15 ++- .../org/apache/ignite/IgniteAtomicReference.java | 9 +++-- .../java/org/apache/ignite/IgniteAtomicSequence.java | 9 +++-- .../java/org/apache/ignite/IgniteAtomicStamped.java | 13 + 4 files changed, 17 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..77a5830 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -26,29 +26,26 @@ import java.io.Closeable; * Distributed atomic long includes the following main functionality: * * - * Method {@link #get()} synchronously gets current value of atomic long. + * Method {@link #get()} gets current value of atomic long. * * - * Various {@code get..(..)} methods synchronously get current value of atomic long + * Various {@code get..(..)} methods get current value of atomic long * and increase or decrease value of atomic long. * * - * Method {@link #addAndGet(long l)} synchronously sums {@code l} with current value of atomic long + * Method {@link #addAndGet(long l)} sums {@code l} with current value of atomic long * and returns result. * * - * Method {@link #incrementAndGet()} synchronously increases value of atomic long and returns result. + * Method {@link #incrementAndGet()} increases value of atomic long and returns result. * * - * Method {@link #decrementAndGet()} synchronously decreases value of atomic long and returns result. + * Method {@link #decrementAndGet()} decreases value of atomic long and returns result. * * - * Method {@link #getAndSet(long l)} synchronously gets current value of atomic long and sets {@code l} + * Method {@link #getAndSet(long l)} gets current value of atomic long and sets {@code l} * as value of atomic long. * - * - * All previously described methods have asynchronous analogs. - * * * Method {@link #name()} gets name of atomic long. * http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java index a33cf35..a1e6e8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java @@ -26,17 +26,14 @@ import java.io.Closeable; * Distributed atomic reference includes the following main functionality: * * - * Method {@link #get()} synchronously gets current value of an atomic reference. + * Method {@link #get()} gets current value of an atomic reference. * * - * Method {@link #set(Object)} synchronously and unconditionally sets the value in the an atomic reference. + * Method {@link #set(Object)} unconditionally sets the value in the an atomic reference. * * - * Methods {@code compareAndSet(...)} synchronously and conditionally set the value in the an atomic reference. + * Methods {@code compareAndSet(...)} conditionally set the value in the an atomic reference. * - * - * All previously described methods have asynchronous analogs. - * * * Method {@link #name()} gets name of atomic reference. * http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java index 313aba5..a1e1392 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java +++ b/modules/core/src/main/ja
[26/30] ignite git commit: Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap
Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca2bce00 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca2bce00 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca2bce00 Branch: refs/heads/ignite-843 Commit: ca2bce00516142a1204fb9226c938174047e72d6 Parents: 72c3eef Author: sboikov Authored: Tue Sep 22 15:04:27 2015 +0300 Committer: sboikov Committed: Tue Sep 22 15:04:27 2015 +0300 -- .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca2bce00/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index c11f541..ca5442a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -119,7 +119,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onUnswap(Object val, boolean beforeRmv) throws IgniteCheckedException { -if (peekValue(VAL_COL) != null) +Value val0 = peekValue(VAL_COL); + +if (val0 != null && !(val0 instanceof WeakValue)) return; setValue(VAL_COL, desc.wrap(val, desc.valueType()));
[27/30] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1942d758 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1942d758 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1942d758 Branch: refs/heads/ignite-843 Commit: 1942d75856ab6d317b743de71b53a29abf81316a Parents: ca2bce0 Author: sboikov Authored: Tue Sep 22 17:36:18 2015 +0300 Committer: sboikov Committed: Tue Sep 22 17:36:18 2015 +0300 -- .../IgniteCachePutRetryAbstractSelfTest.java| 33 1 file changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1942d758/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index 943caeb..76f12c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -168,6 +168,13 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst /** * @throws Exception If failed. */ +public void testGetAndPut() throws Exception { +checkRetry(Test.GET_AND_PUT, TestMemoryMode.HEAP, false); +} + +/** + * @throws Exception If failed. + */ public void testPutStoreEnabled() throws Exception { checkRetry(Test.PUT, TestMemoryMode.HEAP, true); } @@ -275,6 +282,29 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst break; } +case GET_AND_PUT: { +for (int i = 0; i < keysCnt; i++) +cache.put(i, 0); + +while (System.currentTimeMillis() < stopTime) { +Integer expOld = iter; + +Integer val = ++iter; + +for (int i = 0; i < keysCnt; i++) { +Integer old = cache.getAndPut(i, val); + +assertTrue("Unexpected old value [old=" + old + ", exp=" + expOld + ']', +expOld.equals(old) || val.equals(old)); +} + +for (int i = 0; i < keysCnt; i++) +assertEquals(val, cache.get(i)); +} + +break; +} + case PUT_ALL: { while (System.currentTimeMillis() < stopTime) { Integer val = ++iter; @@ -495,6 +525,9 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst PUT, /** */ +GET_AND_PUT, + +/** */ PUT_ALL, /** */
[15/30] ignite git commit: Merge branch 'master' into feature/ignite-535-mqtt
Merge branch 'master' into feature/ignite-535-mqtt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03f3a3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03f3a3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03f3a3b Branch: refs/heads/ignite-843 Commit: f03f3a3b48fa105f318e9493440671188770f4ef Parents: 53683e2 421a523 Author: Raul Kripalani Authored: Mon Sep 21 16:36:53 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:36:53 2015 +0100 -- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java| 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../configuration/NearCacheConfiguration.java | 18 +- .../apache/ignite/internal/IgniteKernal.java| 7 - .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheEvictionResponse.java| 2 +- .../processors/cache/GridCacheIoManager.java| 47 ++-- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvccManager.java | 34 ++- .../GridCachePartitionExchangeManager.java | 41 +++- .../processors/cache/GridCacheProcessor.java| 28 ++- .../GridDistributedLockResponse.java| 6 +- .../GridDistributedTxPrepareResponse.java | 6 +- .../distributed/dht/GridDhtLocalPartition.java | 26 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java| 11 +- .../colocated/GridDhtColocatedLockFuture.java | 44 +++- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionsExchangeFuture.java| 19 +- .../distributed/near/GridNearGetResponse.java | 6 +- .../distributed/near/GridNearLockFuture.java| 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 20 +- .../near/GridNearTxFinishResponse.java | 6 +- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQueryAdapter.java | 170 - .../query/GridCacheQueryFutureAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 30 ++- .../cache/query/GridCacheQueryResponse.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../ignite/internal/util/GridSpinBusyLock.java | 10 + .../ignite/spi/discovery/tcp/ServerImpl.java| 12 +- .../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +- .../distributed/CacheAffEarlySelfTest.java | 245 +++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 - .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../cache/CacheIndexStreamerTest.java | 137 +++ ...CacheScanPartitionQueryFallbackSelfTest.java | 244 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 - .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - .../ignite/visor/commands/VisorConsole.scala| 37 ++- .../config/benchmark-put-indexed-val.properties | 2 +- modules/yardstick/config/ignite-base-config.xml | 2 +- .../yardstick/IgniteBenchmarkArguments.java | 24 +- .../org/apache/ignite/yardstick/IgniteNode.java | 12 +- 57 files changed, 1084 insertions(+), 535 deletions(-) --
[18/30] ignite git commit: ignite-973 Fixed atomic cache 'remove' to always provide old value for indexing
ignite-973 Fixed atomic cache 'remove' to always provide old value for indexing Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/621eb0f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/621eb0f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/621eb0f7 Branch: refs/heads/ignite-843 Commit: 621eb0f75bbe1a0a623229dded38a3549309eead Parents: 8b94494 Author: sboikov Authored: Mon Sep 21 21:37:52 2015 +0300 Committer: sboikov Committed: Mon Sep 21 21:37:52 2015 +0300 -- .../processors/cache/GridCacheMapEntry.java | 37 +--- .../processors/cache/GridCacheProcessor.java| 2 +- .../processors/cache/GridCacheSwapManager.java | 24 ++--- .../datastreamer/DataStreamerImpl.java | 2 -- 4 files changed, 37 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/621eb0f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index f2bb646..961c792 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1588,6 +1588,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme boolean hasValPtr = hasOffHeapPointer(); +if (old == null) +old = saveValueForIndexUnlocked(); + // Update index inside synchronization since it can be updated // in load methods without actually holding entry lock. clearIndex(old); @@ -2163,6 +2166,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme // Must persist inside synchronization in non-tx mode. cctx.store().remove(null, keyValue(false)); +if (oldVal == null) +oldVal = saveValueForIndexUnlocked(); + // Update index inside synchronization since it can be updated // in load methods without actually holding entry lock. clearIndex(oldVal); @@ -3342,7 +3348,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme try { synchronized (this) { -CacheObject expiredVal = saveValueForIndexUnlocked(); +CacheObject expiredVal = saveOldValueUnlocked(false); boolean hasOldBytes = hasOffHeapPointer(); @@ -3523,12 +3529,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme try { GridCacheQueryManager qryMgr = cctx.queries(); -if (qryMgr != null && qryMgr.enabled()) { -qryMgr.store(key, -val, -ver, -expireTime); -} +if (qryMgr.enabled()) +qryMgr.store(key, val, ver, expireTime); } catch (IgniteCheckedException e) { throw new GridCacheIndexUpdateException(e); @@ -3547,8 +3549,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme try { GridCacheQueryManager qryMgr = cctx.queries(); -if (qryMgr != null) -qryMgr.remove(key(), prevVal == null ? null : prevVal); +if (qryMgr.enabled()) +qryMgr.remove(key(), prevVal); } catch (IgniteCheckedException e) { throw new GridCacheIndexUpdateException(e); @@ -3562,10 +3564,19 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme * @return Previous value or {@code null}. * @throws IgniteCheckedException If failed to retrieve previous value. */ -protected CacheObject saveValueForIndexUnlocked() throws IgniteCheckedException { +protected final CacheObject saveValueForIndexUnlocked() throws IgniteCheckedException { +return saveOldValueUnlocked(true); +} + +/** + * @param qryOnly If {@code true} reads old value only if query indexing is enabled. + * @return Previous value or {@code null}. + * @throws IgniteCheckedException If failed to retrieve previous value. + */ +private CacheObject saveOldValueUnlocked(boolean qryOnly) throws IgniteCheckedException { assert Thread.holdsLock(this); -if (cctx.queries() == null) +if (qryOnly && !cctx.queri
[14/30] ignite git commit: IGNITE-1370 Refactor StreamTupleExtractor API for 0..1 and 0..n extraction.
IGNITE-1370 Refactor StreamTupleExtractor API for 0..1 and 0..n extraction. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/421a5234 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/421a5234 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/421a5234 Branch: refs/heads/ignite-843 Commit: 421a5234b5a7e56e36952a4c1976b3118310073e Parents: eae4df1 b80b171 Author: Raul Kripalani Authored: Mon Sep 21 16:28:12 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:28:12 2015 +0100 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++-- .../stream/StreamMultipleTupleExtractor.java| 38 +++ .../stream/StreamSingleTupleExtractor.java | 40 +++ .../ignite/stream/StreamTupleExtractor.java | 20 ++-- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../stream/socket/SocketStreamerSelfTest.java | 112 ++- 7 files changed, 270 insertions(+), 52 deletions(-) --
[04/30] ignite git commit: IGNITE-535 (WIP) Implement MQTT Streamer.
IGNITE-535 (WIP) Implement MQTT Streamer. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b53f1bb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b53f1bb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b53f1bb Branch: refs/heads/ignite-843 Commit: 6b53f1bb2699ae7a6ea8ae277de1bfc3ecbd7b6a Parents: b80b171 Author: Raul Kripalani Authored: Tue Sep 15 00:45:58 2015 +0100 Committer: Raul Kripalani Committed: Tue Sep 15 22:30:09 2015 +0100 -- modules/mqtt/pom.xml| 110 + .../apache/ignite/stream/mqtt/MqttStreamer.java | 243 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 50 .../mqtt/IgniteMqttStreamerTestSuite.java | 34 +++ .../ignite/stream/mqtt/TestTupleExtractors.java | 28 +++ pom.xml | 1 + 6 files changed, 466 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b53f1bb/modules/mqtt/pom.xml -- diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml new file mode 100644 index 000..b108180 --- /dev/null +++ b/modules/mqtt/pom.xml @@ -0,0 +1,110 @@ + + + + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + + +org.apache.ignite +ignite-parent +1 +../../parent + + +ignite-mqtt +1.5.0-SNAPSHOT +http://ignite.apache.org + + +1.0.2 +0.7 + + + + +org.apache.ignite +ignite-core +${project.version} + + + +org.eclipse.paho +org.eclipse.paho.client.mqttv3 +${paho.version} + + + +org.eclipse.moquette +moquette-broker +${mosquette.version} +test + + + +org.apache.ignite +ignite-log4j +${project.version} +test + + + +org.apache.ignite +ignite-spring +${project.version} +test + + + +org.apache.ignite +ignite-core +${project.version} +test-jar +test + + + + + + +bintray +http://dl.bintray.com/andsel/maven/ + +true + + +false + + + +Eclipse Paho Repo + https://repo.eclipse.org/content/repositories/paho-releases/ + +true + + +false + + + + + http://git-wip-us.apache.org/repos/asf/ignite/blob/6b53f1bb/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java -- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java new file mode 100644 index 000..00a89ab --- /dev/null +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -0,0 +1,243 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.stream.mqtt; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.stream.StreamAdapter; +import org.apache.ignite.stream.StreamMultipleTupleExtractor; +import org.apache.ignite.stream.StreamSingleTupleExtractor; + +import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; +import org.eclipse.paho.client
[05/30] ignite git commit: Fixed yardstick config.
Fixed yardstick config. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c101dc2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c101dc2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c101dc2 Branch: refs/heads/ignite-843 Commit: 4c101dc23be2365c6983381cac9dbe68873040d8 Parents: 3676cbe Author: sboikov Authored: Fri Sep 18 14:11:07 2015 +0300 Committer: sboikov Committed: Fri Sep 18 14:11:07 2015 +0300 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c101dc2/modules/yardstick/config/ignite-base-config.xml -- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 6e94b3c..c77cc9a 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -25,7 +25,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";> - +
[20/30] ignite git commit: Cleaned documentation. Set ATOMIC mode as default using specific constant.
Cleaned documentation. Set ATOMIC mode as default using specific constant. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50f75bd6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50f75bd6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50f75bd6 Branch: refs/heads/ignite-843 Commit: 50f75bd6111b5b9163391e4c0913ff5b696a2862 Parents: e51fb42 Author: Denis Magda Authored: Tue Sep 22 11:44:22 2015 +0300 Committer: Denis Magda Committed: Tue Sep 22 11:44:22 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java| 17 + .../processors/cache/GridCacheProcessor.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/50f75bd6/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java index 9e0f81e..92b5aa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java @@ -33,11 +33,6 @@ public enum CacheAtomicityMode { /** * Specified fully {@code ACID}-compliant transactional cache behavior. See * {@link Transaction} for more information about transactions. - * - * This mode is currently the default cache atomicity mode. However, cache - * atomicity mode will be changed to {@link #ATOMIC} starting from version {@code 5.2}, - * so it is recommended that desired atomicity mode is explicitly configured - * instead of relying on default value. */ TRANSACTIONAL, @@ -49,18 +44,16 @@ public enum CacheAtomicityMode { * In addition to transactions and locking, one of the main differences in {@code ATOMIC} mode * is that bulk writes, such as {@code putAll(...)}, {@code removeAll(...)}, and {@code transformAll(...)} * methods, become simple batch operations which can partially fail. In case of partial - * failure {@link org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException} will be thrown which will contain a list of keys - * for which the update failed. It is recommended that bulk writes are used whenever multiple keys - * need to be inserted or updated in cache, as they reduce number of network trips and provide - * better performance. + * failure {@link org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException} will be thrown + * which will contain a list of keys for which the update failed. It is recommended that bulk writes are used + * whenever multiple keys need to be inserted or updated in cache, as they reduce number of network trips and + * provide better performance. * * Note that even without locking and transactions, {@code ATOMIC} mode still provides * full consistency guarantees across all cache nodes. * * Also note that all data modifications in {@code ATOMIC} mode are guaranteed to be atomic * and consistent with writes to the underlying persistent store, if one is configured. - * - * This mode is currently implemented for {@link CacheMode#PARTITIONED} caches only. */ ATOMIC; @@ -76,4 +69,4 @@ public enum CacheAtomicityMode { @Nullable public static CacheAtomicityMode fromOrdinal(int ord) { return ord >= 0 && ord < VALS.length ? VALS[ord] : null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/50f75bd6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 7c16136..9c325aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -271,7 +271,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { cfg.setRebalanceMode(ASYNC); if (cfg.getAtomicityMode() == null) -cfg.setAtomicityMode(ATOMIC); +cfg.setAtomicityMode(CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE); if (cfg.getWriteSynchronizationMode() == null) cfg.setWriteSynchronizationMode(PRIMARY_SYNC);
[17/30] ignite git commit: IGNITE-535 Merge MQTT Streamer into master.
IGNITE-535 Merge MQTT Streamer into master. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88acd318 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88acd318 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88acd318 Branch: refs/heads/ignite-843 Commit: 88acd318b84ce3bff8c061bb34718e0e5f7127fb Parents: 421a523 296dd6e Author: Raul Kripalani Authored: Mon Sep 21 17:26:04 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 17:26:04 2015 +0100 -- modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ pom.xml | 1 + 5 files changed, 1313 insertions(+) --
[01/30] ignite git commit: IGNITE-1370 Streamers: Implement multiple tuple extractor.
Repository: ignite Updated Branches: refs/heads/ignite-843 6160ae6b1 -> 34b373e1f IGNITE-1370 Streamers: Implement multiple tuple extractor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d9734a0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d9734a0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d9734a0 Branch: refs/heads/ignite-843 Commit: 4d9734a0842f0a46310c1f6261fdf42371db8705 Parents: b736c46 Author: Raul Kripalani Authored: Thu Sep 3 23:31:08 2015 +0100 Committer: Raul Kripalani Committed: Sun Sep 13 01:20:24 2015 +0100 -- .../org/apache/ignite/stream/StreamAdapter.java | 48 - .../stream/StreamMultipleTupleExtractor.java| 38 +++ .../ignite/stream/StreamTupleExtractor.java | 5 + .../ignite/stream/socket/SocketStreamer.java| 3 +- .../stream/socket/SocketStreamerSelfTest.java | 104 +++ 5 files changed, 171 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4d9734a0/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java index 97edcbb..ffa0821 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java @@ -18,6 +18,7 @@ package org.apache.ignite.stream; import java.util.Map; + import org.apache.ignite.Ignite; import org.apache.ignite.IgniteDataStreamer; @@ -26,11 +27,22 @@ import org.apache.ignite.IgniteDataStreamer; * streaming from different data sources. The purpose of adapters is to * convert different message formats into Ignite stream key-value tuples * and feed the tuples into the provided {@link org.apache.ignite.IgniteDataStreamer}. + * + * Two types of tuple extractors are supported: + * + * A single tuple extractor, which extracts either no or 1 tuple out of a message. See + * see {@link #setTupleExtractor(StreamTupleExtractor)}. + * A multiple tuple extractor, which is capable of extracting multiple tuples out of a single message, in the + * form of a {@link Map}. See {@link #setMultipleTupleExtractor(StreamMultipleTupleExtractor)}. + * */ public abstract class StreamAdapter { /** Tuple extractor. */ private StreamTupleExtractor extractor; +/** Tuple extractor that supports extracting N tuples from a single event (1:n cardinality). */ +private StreamMultipleTupleExtractor multipleTupleExtractor; + /** Streamer. */ private IgniteDataStreamer stmr; @@ -84,6 +96,20 @@ public abstract class StreamAdapter { } /** + * @return Provided tuple extractor (for 1:n cardinality). + */ +public StreamMultipleTupleExtractor getMultipleTupleExtractor() { +return multipleTupleExtractor; +} + +/** + * @param multipleTupleExtractor Extractor for 1:n tuple extraction. + */ +public void setMultipleTupleExtractor(StreamMultipleTupleExtractor multipleTupleExtractor) { +this.multipleTupleExtractor = multipleTupleExtractor; +} + +/** * @return Provided {@link Ignite} instance. */ public Ignite getIgnite() { @@ -98,14 +124,28 @@ public abstract class StreamAdapter { } /** - * Converts given message to a tuple and adds it to the underlying streamer. + * Converts given message to 1 or many tuples (depending on the type of extractor) and adds it/them to the + * underlying streamer. + * + * If both a {@link #multipleTupleExtractor} and a {@link #extractor} have been set, the former will take precedence + * and the latter will be ignored. * * @param msg Message to convert. */ protected void addMessage(T msg) { -Map.Entry e = extractor.extract(msg); +if (multipleTupleExtractor == null) { +Map.Entry e = extractor.extract(msg); + +if (e != null) +stmr.addData(e); -if (e != null) -stmr.addData(e); +} else { +Map m = multipleTupleExtractor.extract(msg); + +if (m != null) +stmr.addData(m); + +} } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4d9734a0/modules/core/src/main/java/org/apache/ignite/stream/StreamMultipleTupleExtractor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamMultipleTupleExtractor.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamMultiple
[10/30] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b94494a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b94494a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b94494a Branch: refs/heads/ignite-843 Commit: 8b94494a4817780961c203e0b2b52715baa3b6da Parents: 84a2300 7ccd0b3 Author: Yakov Zhdanov Authored: Fri Sep 18 23:16:10 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Sep 18 23:16:10 2015 +0300 -- .../src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- modules/yardstick/config/ignite-base-config.xml| 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) --
[03/30] ignite git commit: Merge branch 'master' into feature/ignite-1370.
Merge branch 'master' into feature/ignite-1370. # Conflicts: # modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b80b1719 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b80b1719 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b80b1719 Branch: refs/heads/ignite-843 Commit: b80b17196269a036da65d781eb772a317039b014 Parents: b1dee96 6e48c9c Author: Raul Kripalani Authored: Tue Sep 15 18:28:09 2015 +0100 Committer: Raul Kripalani Committed: Tue Sep 15 18:28:09 2015 +0100 -- RELEASE_NOTES.txt |2 +- examples/config/example-default.xml | 76 - examples/config/example-ignite.xml | 56 +- examples/config/filesystem/README.txt |2 +- examples/config/filesystem/example-igfs.xml |7 - .../config/portable/example-ignite-portable.xml | 44 - .../ignite/examples/portable/Address.java | 72 - .../ignite/examples/portable/Employee.java | 93 - .../ignite/examples/portable/EmployeeKey.java | 90 - .../portable/ExamplePortableNodeStartup.java| 36 - .../ignite/examples/portable/Organization.java | 93 - .../examples/portable/OrganizationType.java | 32 - ...mputeClientPortableTaskExecutionExample.java | 154 - .../portable/computegrid/ComputeClientTask.java | 116 - .../portable/computegrid/package-info.java | 21 - .../CacheClientPortablePutGetExample.java | 230 -- .../CacheClientPortableQueryExample.java| 325 -- .../portable/datagrid/package-info.java | 21 - .../ignite/examples/portable/package-info.java | 21 - .../CacheClientPortableExampleTest.java | 46 - .../ComputeClientPortableExampleTest.java | 37 - .../testsuites/IgniteExamplesSelfTestSuite.java |6 - modules/clients/pom.xml |7 + modules/clients/src/test/config/jdbc-config.xml | 55 + .../jdbc2/JdbcComplexQuerySelfTest.java | 316 ++ .../internal/jdbc2/JdbcConnectionSelfTest.java | 268 ++ .../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 140 + .../internal/jdbc2/JdbcLocalCachesSelfTest.java | 156 + .../internal/jdbc2/JdbcMetadataSelfTest.java| 334 ++ .../jdbc2/JdbcPreparedStatementSelfTest.java| 730 .../internal/jdbc2/JdbcResultSetSelfTest.java | 751 .../internal/jdbc2/JdbcStatementSelfTest.java | 292 ++ .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 11 + modules/core/pom.xml| 21 - .../src/main/java/org/apache/ignite/Ignite.java |7 - .../java/org/apache/ignite/IgniteCache.java | 44 +- .../org/apache/ignite/IgniteJdbcDriver.java | 281 +- .../java/org/apache/ignite/IgnitePortables.java | 370 -- .../apache/ignite/IgniteSystemProperties.java |5 +- .../configuration/CacheConfiguration.java | 70 +- .../ignite/internal/GridKernalContext.java |7 +- .../ignite/internal/GridKernalContextImpl.java | 10 +- .../apache/ignite/internal/GridLoggerProxy.java |6 +- .../org/apache/ignite/internal/IgniteEx.java|9 + .../apache/ignite/internal/IgniteKernal.java| 14 +- .../ignite/internal/IgniteNodeAttributes.java |5 +- .../internal/executor/GridExecutorService.java |4 +- .../ignite/internal/jdbc/JdbcConnection.java|4 + .../internal/jdbc/JdbcConnectionInfo.java | 91 - .../internal/jdbc/JdbcDatabaseMetadata.java |4 + .../internal/jdbc/JdbcPreparedStatement.java|4 + .../ignite/internal/jdbc/JdbcResultSet.java |4 + .../internal/jdbc/JdbcResultSetMetadata.java|4 + .../ignite/internal/jdbc/JdbcStatement.java |4 + .../apache/ignite/internal/jdbc/JdbcUtils.java |4 + .../ignite/internal/jdbc2/JdbcConnection.java | 777 .../internal/jdbc2/JdbcDatabaseMetadata.java| 1401 +++ .../internal/jdbc2/JdbcPreparedStatement.java | 411 ++ .../ignite/internal/jdbc2/JdbcQueryTask.java| 361 ++ .../ignite/internal/jdbc2/JdbcResultSet.java| 1520 +++ .../internal/jdbc2/JdbcResultSetMetadata.java | 171 + .../ignite/internal/jdbc2/JdbcStatement.java| 456 +++ .../apache/ignite/internal/jdbc2/JdbcUtils.java | 155 + .../deployment/GridDeploymentStoreAdapter.java |4 +- .../discovery/GridDiscoveryManager.java | 10 - .../portable/GridPortableMarshaller.java|2 +- .../portable/PortableClassDescriptor.java | 10 +- .../internal/portable/PortableContext.java | 32 +- .../portable/PortableMetaDataCollector.java |6 +- .../portable/PortableMetaDataHandler.java |4 +- .../internal/portable/PortableMetaDataImpl.java | 14 +- .../internal/portable/PortableObjectEx.java |6 +- .../internal/portable/PortableObject
[30/30] ignite git commit: Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843 Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34b373e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34b373e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34b373e1 Branch: refs/heads/ignite-843 Commit: 34b373e1f18403e83e90284b393c17981993beea Parents: 6160ae6 b3bcf4a Author: AKuznetsov Authored: Wed Sep 23 22:45:03 2015 +0700 Committer: AKuznetsov Committed: Wed Sep 23 22:45:03 2015 +0700 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java| 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../processors/cache/GridCacheProcessor.java| 10 +- .../cache/GridCacheSwapEntryImpl.java | 31 +- .../processors/cache/GridCacheSwapManager.java | 80 ++- .../datastreamer/DataStreamerImpl.java | 2 - .../internal/processors/igfs/IgfsImpl.java | 87 +-- .../processors/igfs/IgfsMetaManager.java| 193 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 12 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java| 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../IgniteCachePutRetryAbstractSelfTest.java| 33 + .../processors/igfs/IgfsAbstractSelfTest.java | 201 -- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++-- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 +++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - modules/yardstick/config/ignite-base-config.xml | 2 +- pom.xml | 1 + 46 files changed, 2464 insertions(+), 443 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/34b373e1/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/34b373e1/pom.xml -- diff --cc pom.xml index 569f5d7,c19a9b7..a76185b --- a/pom.xml +++ b/pom.xml @@@ -76,7 -75,7 +76,8 @@@ modules/kafka modules/yarn modules/jms11 + modules/mqtt +modules/json modules/zookeeper modules/platform
[22/30] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1040872 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1040872 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1040872 Branch: refs/heads/ignite-843 Commit: a1040872f37cf4fd1dc20584c68307f420d0d3af Parents: 33fe30d 50f75bd Author: sboikov Authored: Tue Sep 22 12:59:14 2015 +0300 Committer: sboikov Committed: Tue Sep 22 12:59:14 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java| 17 + .../processors/cache/GridCacheProcessor.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) --
[24/30] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39dace45 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39dace45 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39dace45 Branch: refs/heads/ignite-843 Commit: 39dace45c81aef7cb913fcf4f98a7d71e34beebd Parents: f0be45e a104087 Author: S.Vladykin Authored: Tue Sep 22 13:38:21 2015 +0300 Committer: S.Vladykin Committed: Tue Sep 22 13:38:21 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +-- .../processors/cache/GridCacheProcessor.java| 2 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- 4 files changed, 125 insertions(+), 25 deletions(-) --
[25/30] ignite git commit: ignite-1516 Optimize GridH2AbstractKeyValueRow.getValue
ignite-1516 Optimize GridH2AbstractKeyValueRow.getValue Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72c3eef2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72c3eef2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72c3eef2 Branch: refs/heads/ignite-843 Commit: 72c3eef2aa31df4a68b46a8877809cc0f49c1368 Parents: 39dace4 Author: sboikov Authored: Tue Sep 22 13:51:09 2015 +0300 Committer: sboikov Committed: Tue Sep 22 13:51:09 2015 +0300 -- .../processors/cache/GridCacheAdapter.java | 8 +-- .../processors/cache/GridCacheMapEntry.java | 14 ++--- .../processors/cache/GridCacheProcessor.java| 6 +-- .../cache/GridCacheSwapEntryImpl.java | 31 +-- .../processors/cache/GridCacheSwapManager.java | 56 +--- .../processors/query/h2/IgniteH2Indexing.java | 19 --- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 49 ++--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +++- .../query/h2/opt/GridH2RowDescriptor.java | 5 ++ .../cache/CacheIndexStreamerTest.java | 33 +--- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + 12 files changed, 158 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 1fc94ec..ae987b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -805,9 +805,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 961c792..4bf0aa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -512,7 +512,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } } else -e = detached() ? cctx.swap().read(this, true, true, true) : cctx.swap().readAndRemove(this); +e = detached() ? cctx.swap().read(this, true, true, true, false) : cctx.swap().readAndRemove(this); if (log.isDebugEnabled()) log.debug("Read swap entry [swapEntry=" + e + ", cacheEntry=" + this + ']'); @@ -2840,7 +2840,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } if (offheap || swap) { -GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap); +GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap, true); return e != null ? e.value() : null; } @@ -3581,14 +3581,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme CacheObject val = rawGetOrUnmarshalUnlocked(false); -if (val == null) { -GridCacheSwapEntry swapEntry = cctx.swap().read(key, true, true); - -if (swapEntry == null) -return null; - -return swapEntry.value(); -} +if (val == null) +val = cctx.swap().readValue(key, true, true); return val; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 9c325aa..e92ea57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/a
[07/30] ignite git commit: Removed "incubator" paths from IgniteManager.
Removed "incubator" paths from IgniteManager. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9092 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9092 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9092 Branch: refs/heads/ignite-843 Commit: 9092a078d035eeb5ada47be8287901eaff3d Parents: d64fc9d Author: vozerov-gridgain Authored: Fri Sep 18 16:56:18 2015 +0300 Committer: vozerov-gridgain Committed: Fri Sep 18 16:56:18 2015 +0300 -- .../src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9092/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs -- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs index 0edaeab..8fd8825 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs @@ -351,8 +351,6 @@ namespace Apache.Ignite.Core.Impl { AppendTestClasses(ggHome + "\\examples", cpStr); AppendTestClasses(ggHome + "\\modules", cpStr); -AppendTestClasses(ggHome + "\\..\\incubator-ignite\\examples", cpStr); -AppendTestClasses(ggHome + "\\..\\incubator-ignite\\modules", cpStr); } string ggLibs = ggHome + "\\libs";
[09/30] ignite git commit: minor (fixed warning messages)
minor (fixed warning messages) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84a23008 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84a23008 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84a23008 Branch: refs/heads/ignite-843 Commit: 84a230084e9488a4ddb9b52f86ecd6c623baf745 Parents: d64fc9d Author: Yakov Zhdanov Authored: Fri Sep 18 23:15:59 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Sep 18 23:15:59 2015 +0300 -- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/84a23008/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 3e50b94..4ce46e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -4437,9 +4437,8 @@ class ServerImpl extends TcpDiscoveryImpl { LT.warn(log, null, "Unknown connection detected (is some other software connecting to " + "this Ignite port?" + -(!spi.isSslEnabled() ? " missed SSL configuration?" : "" ) + -") [rmtAddr=" + sock.getRemoteSocketAddress() + -", locAddr=" + sock.getLocalSocketAddress() + ']'); +(!spi.isSslEnabled() ? " missing SSL configuration on remote node?" : "" ) + +") [rmtAddr=" + sock.getInetAddress() + ']', true); return; } @@ -4555,8 +4554,9 @@ class ServerImpl extends TcpDiscoveryImpl { U.error(log, "Caught exception on handshake [err=" + e +", sock=" + sock + ']', e); if (X.hasCause(e, SSLException.class) && spi.isSslEnabled() && !spi.isNodeStopping0()) -LT.warn(log, null, "Failed to initialize connection. Not encrypted data received. " + -"Missed SSL configuration on node? [sock=" + sock + ']'); +LT.warn(log, null, "Failed to initialize connection " + +"(missing SSL configuration on remote node?) " + +"[rmtAddr=" + sock.getInetAddress() + ']', true); else if ((X.hasCause(e, ObjectStreamException.class) || !sock.isClosed()) && !spi.isNodeStopping0()) { if (U.isMacInvalidArgumentError(e)) @@ -5293,4 +5293,4 @@ class ServerImpl extends TcpDiscoveryImpl { this.sock = sock; } } -} \ No newline at end of file +}
[16/30] ignite git commit: IGNITE-535 Finish MQTT Streamer docs and tests. Upgrade latter to AMQ 5.12.0.
IGNITE-535 Finish MQTT Streamer docs and tests. Upgrade latter to AMQ 5.12.0. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/296dd6e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/296dd6e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/296dd6e7 Branch: refs/heads/ignite-843 Commit: 296dd6e7d86fe6d0914a9fbf8062632c04e4d22c Parents: f03f3a3 Author: Raul Kripalani Authored: Mon Sep 21 17:24:44 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 17:24:44 2015 +0100 -- modules/mqtt/pom.xml| 9 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 156 ++- .../stream/mqtt/IgniteMqttStreamerTest.java | 80 +- 3 files changed, 224 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/296dd6e7/modules/mqtt/pom.xml -- diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml index 4b0b46c..21511e8 100644 --- a/modules/mqtt/pom.xml +++ b/modules/mqtt/pom.xml @@ -37,7 +37,7 @@ 1.0.2 -5.11.1 +5.12.0 2.0.0 @@ -69,13 +69,6 @@ org.apache.activemq -activemq-kahadb-store -${activemq.version} -test - - - -org.apache.activemq activemq-mqtt ${activemq.version} test http://git-wip-us.apache.org/repos/asf/ignite/blob/296dd6e7/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java -- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java index b86d385..f18ae42 100644 --- a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -62,12 +62,17 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; * Specifying the subscriber's QoS for a single topic or for multiple topics. * Allows setting {@link MqttConnectOptions} to support features like last will testament, persistent * sessions, etc. - * Specifying the client ID. + * Specifying the client ID. A random one will be generated and maintained throughout reconnections if the user + * does not provide one. + * (Re-)Connection retries based on the guava-retrying library. Retry wait and retry stop policies + * can be configured. + * Blocking the start() method until connected for the first time. * * - * Note: features like durable subscriptions, last will testament, etc. must be configured via the + * Note: features like durable subscriptions, last will testament, etc. can be configured via the * {@link #connectOptions} property. * + * @see https://github.com/rholder/guava-retrying";>guava-retrying library * @author Raul Kripalani */ public class MqttStreamer extends StreamAdapter implements MqttCallback { @@ -75,46 +80,65 @@ public class MqttStreamer extends StreamAdapter impleme /** Logger. */ private IgniteLogger log; +/** The MQTT client object for internal use. */ private MqttClient client; +/** The broker URL, set by the user. */ private String brokerUrl; +/** The topic to subscribe to, if a single topic. */ private String topic; +/** The quality of service to use for a single topic subscription (optional). */ private Integer qualityOfService; +/** The topics to subscribe to, if many. */ private List topics; +/** The qualities of service to use for multiple topic subscriptions. If specified, it must contain the same + * number of elements as {@link #topics}. */ private List qualitiesOfService; -/** Client ID in case we're using durable subscribers. */ +/** The MQTT client ID (optional). */ private String clientId; +/** A configurable persistence mechanism. If not set, Paho will use its default. */ private MqttClientPersistence persistence; +/** The MQTT client connect options, where users can configured the last will and testament, durability, etc. */ private MqttConnectOptions connectOptions; -// disconnect parameters +/** Quiesce timeout on disconnection. */ private Integer disconnectQuiesceTimeout; +/** Whether to disconnect forcibly or not. */ private boolean disconnectForcibly; +/** If disconnecting forcibly, the timeout. */ private Integer disconnectForciblyTimeout; +/** The strategy to determine how long to wait between retry attempts. By default, this streamer uses a
[29/30] ignite git commit: IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure.
IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bcf4ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bcf4ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bcf4ae Branch: refs/heads/ignite-843 Commit: b3bcf4aeecf9aa1bd6d19e94c8da7b09741f5410 Parents: 0a41ae5 Author: iveselovskiy Authored: Wed Sep 23 13:45:01 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 13:45:01 2015 +0300 -- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 87 ++-- .../processors/igfs/IgfsMetaManager.java| 193 -- .../processors/igfs/IgfsAbstractSelfTest.java | 201 ++- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- 8 files changed, 409 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java index b02d0f1..a187a90 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java @@ -451,7 +451,7 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return File information for specified path or {@code null} if such path does not exist. * @throws IgniteException In case of error. */ -public IgfsFile info(IgfsPath path) throws IgniteException; +@Nullable public IgfsFile info(IgfsPath path) throws IgniteException; /** * Gets used space in bytes. http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 44a3fa9..6ac2b64 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -436,7 +436,7 @@ public class CacheConfiguration extends MutableConfiguration { * @return {@code this} for chaining. */ public CacheConfiguration setName(String name) { -A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty."); +A.ensure(name == null || !name.isEmpty(), "Name cannot be empty."); this.name = name; http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 695db38..0dd0307 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -472,8 +472,7 @@ public final class IgfsImpl implements IgfsEx { @SuppressWarnings("ConstantConditions") @Override public IgfsStatus globalSpace() { return safeOp(new Callable() { -@Override -public IgfsStatus call() throws Exception { +@Override public IgfsStatus call() throws Exception { IgniteBiTuple space = igfsCtx.kernalContext().grid().compute().execute( new IgfsGlobalSpaceTask(name()), null); @@ -560,7 +559,7 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ -@Override public IgfsFile info(final IgfsPath path) { +@Override @Nullable public IgfsFile info(final IgfsPath path) { A.notNull(path, "path"); return safeOp(new Callable() { @@ -692,64 +691,12 @@ public final class IgfsImpl implements IgfsEx { return null; } -IgfsPath destParent = dest.parent(); +IgfsFileInfo info = meta.move(src, dest); -// Resolve source file info. -FileDescriptor srcDesc = getFileDescriptor(src
[21/30] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33fe30da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33fe30da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33fe30da Branch: refs/heads/ignite-843 Commit: 33fe30da620e4f08cee959104805f3527b597700 Parents: e51fb42 Author: sboikov Authored: Tue Sep 22 12:55:18 2015 +0300 Committer: sboikov Committed: Tue Sep 22 12:55:18 2015 +0300 -- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- 2 files changed, 119 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/33fe30da/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java index 66275b3..14417c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java @@ -21,12 +21,25 @@ import java.io.IOException; import java.io.InputStream; import java.net.Socket; import java.net.SocketTimeoutException; +import java.util.Collections; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; + /** * Client-based discovery SPI test with failure detection timeout enabled. */ @@ -60,7 +73,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov /** {@inheritDoc} */ @Override protected TcpDiscoverySpi getDiscoverySpi() { -return useTestSpi ? new TestTcpDiscoverySpi() : super.getDiscoverySpi(); +return useTestSpi ? new TestTcpDiscoverySpi2() : super.getDiscoverySpi(); } /** @@ -117,16 +130,16 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov private void checkFailureThresholdWorkability() throws Exception { useTestSpi = true; -TestTcpDiscoverySpi firstSpi = null; -TestTcpDiscoverySpi secondSpi = null; +TestTcpDiscoverySpi2 firstSpi = null; +TestTcpDiscoverySpi2 secondSpi = null; try { startServerNodes(2); checkNodes(2, 0); -firstSpi = (TestTcpDiscoverySpi)(G.ignite("server-0").configuration().getDiscoverySpi()); -secondSpi = (TestTcpDiscoverySpi)(G.ignite("server-1").configuration().getDiscoverySpi()); +firstSpi = (TestTcpDiscoverySpi2)(G.ignite("server-0").configuration().getDiscoverySpi()); +secondSpi = (TestTcpDiscoverySpi2)(G.ignite("server-1").configuration().getDiscoverySpi()); assert firstSpi.err == null; @@ -157,9 +170,102 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov } /** + * Test tries to provoke scenario when client sends reconnect message before router failure detected. + * + * @throws Exception If failed. + */ +public void _testClientReconnectOnCoordinatorRouterFail() throws Exception { +startServerNodes(1); + +Ignite srv = G.ignite("server-0"); + +final TcpDiscoveryNode srvNode = (TcpDiscoveryNode)srv.cluster().localNode(); + +final UUID srvNodeId = srvNode.id(); + +clientIpFinder = new TcpDiscoveryVmIpFinder(); + +clientIpFinder.setAddresses( +Collections.singleton("localhost:" + srvNode.discoveryPort() + ".." + (srvNode.discoveryPort() + 1))); + +failureThreshold = 1000L; +netTimeout = 500L; + +startClientNodes(1); // Client should connect to coordinator. + +failureThreshold = 10_000L; +netTimeout = 5000L; + +for
ignite git commit: IGNITE-1537 - Disallow near optimistic TX future to complete early.
Repository: ignite Updated Branches: refs/heads/ignite-1537 [created] b6f5b311a IGNITE-1537 - Disallow near optimistic TX future to complete early. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6f5b311 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6f5b311 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6f5b311 Branch: refs/heads/ignite-1537 Commit: b6f5b311ac20e932fbc7773a519c38b1aed6fa41 Parents: 6f3ef6a Author: Alexey Goncharuk Authored: Wed Sep 23 15:23:00 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Sep 23 15:23:00 2015 -0700 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +++-- .../cache/local/GridLocalCacheEntry.java| 6 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 150 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 5 files changed, 249 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 81cc272..1ed7fd9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -423,7 +423,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 25028c4..aa5e1cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -51,6 +51,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; @@ -71,9 +72,8 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING; */ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAdapter implements GridCacheMvccFuture { -/** */ -@GridToStringInclude -private Collection lockKeys = new GridConcurrentHashSet<>(); + +private KeyLockFuture keyLockFut = new KeyLockFuture(); /** * @param cctx Context. @@ -91,10 +91,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd log.debug("Transaction future received owner changed callback: " + entry); if ((entry.context().isNear() || entry.context().isLocal()) && owner != null && tx.hasWriteKey(entry.txKey())) { -lockKeys.remove(entry.txKey()); - -// This will check for locks. -onDone(); +keyLockFut.onKeyLocked(entry.txKey()); return true; } @@ -178,24 +175,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd } } -/** - * @return {@code True} if all locks are owned. - */ -private boolean checkLocks() { -boolean locked = lockKeys.isEmpty(); - -if (locked) { -if (log.isDebugEnabled()) -log.debug("All locks are acquired for near prepare future: " + this); -} -else { -if (log.isDebugEnabled()) -log.debug("Still waiting for locks [fut=" + this + ", keys=" + lockKeys + ']'); -} - -return locked; -} - /** {@inheritDoc} */ @Override public void onResult(UUID nodeId, GridNearTxPrep
ignite git commit: Exposed IgniteKernal.dumpDebugInfo() to MX bean
Repository: ignite Updated Branches: refs/heads/ignite-1.4 6f3ef6a84 -> 70a8a92da Exposed IgniteKernal.dumpDebugInfo() to MX bean Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a8a92d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a8a92d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a8a92d Branch: refs/heads/ignite-1.4 Commit: 70a8a92da3cf39b0ed1cf18effd8fae1478cb2bd Parents: 6f3ef6a Author: Valentin Kulichenko Authored: Wed Sep 23 17:23:31 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 17:23:31 2015 -0700 -- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +--- .../src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 8 +++- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 82db059..60725e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -3153,9 +3153,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { return ctx.isDaemon() && U.hasAnnotation(comp.getClass(), SkipDaemon.class); } -/** - * - */ +/** {@inheritDoc} */ public void dumpDebugInfo() { U.warn(log, "Dumping debug info for node [id=" + ctx.localNodeId() + ", name=" + ctx.gridName() + http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 4755bf2..c30e0e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -366,4 +366,10 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} \ No newline at end of file + +/** + * Dumps debug information for the current node. + */ +@MXBeanDescription("Dumps debug information for the current node.") +public void dumpDebugInfo(); +}
[3/3] ignite git commit: IGNITE-1016 - Exclude neighbors flag for fair affinity. Fixes #80.
IGNITE-1016 - Exclude neighbors flag for fair affinity. Fixes #80. Signed-off-by: Alexey Goncharuk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f5a4c9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f5a4c9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f5a4c9d Branch: refs/heads/ignite-1016 Commit: 8f5a4c9de05a98d2927c602273c967b3655c646d Parents: 6f3ef6a Author: Andrey Gura Authored: Wed Sep 23 18:12:19 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Sep 23 18:12:19 2015 -0700 -- .../ClientAbstractMultiThreadedSelfTest.java| 3 +- .../affinity/fair/FairAffinityFunction.java | 497 ++- .../rendezvous/RendezvousAffinityFunction.java | 140 ++ .../processors/cache/GridCacheProcessor.java| 13 - .../processors/cache/GridCacheUtils.java| 52 +- .../AbstractAffinityFunctionSelfTest.java | 293 +++ .../affinity/AffinityClientNodeSelfTest.java| 194 ...ityFunctionBackupFilterAbstractSelfTest.java | 138 + ...unctionExcludeNeighborsAbstractSelfTest.java | 182 +++ .../affinity/IgniteClientNodeAffinityTest.java | 194 .../fair/FairAffinityDynamicCacheSelfTest.java | 97 ...airAffinityFunctionBackupFilterSelfTest.java | 35 ++ ...ffinityFunctionExcludeNeighborsSelfTest.java | 31 ++ .../fair/FairAffinityFunctionNodesSelfTest.java | 245 + .../fair/FairAffinityFunctionSelfTest.java | 31 ++ .../GridFairAffinityFunctionNodesSelfTest.java | 245 - .../fair/GridFairAffinityFunctionSelfTest.java | 270 -- .../IgniteFairAffinityDynamicCacheSelfTest.java | 97 ...ousAffinityFunctionBackupFilterSelfTest.java | 35 ++ ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 ++ .../RendezvousAffinityFunctionSelfTest.java | 50 ++ .../cache/CrossCacheTxRandomOperationsTest.java | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java| 5 + ...idCacheConfigurationConsistencySelfTest.java | 17 - ...dCachePartitionedAffinityFilterSelfTest.java | 143 -- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 + ...unctionExcludeNeighborsAbstractSelfTest.java | 184 --- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 -- ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 ++ ...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 ++ ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 ++ ...dezvousAffinityMultiNodeFullApiSelfTest.java | 36 ++ .../IgniteCacheFullApiSelfTestSuite.java| 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 16 +- .../testsuites/IgniteCacheTestSuite2.java | 12 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 4 + 36 files changed, 2022 insertions(+), 1421 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index 9dd4d83..9f6bf2b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -254,8 +254,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst final ConcurrentLinkedQueue execQueue = new ConcurrentLinkedQueue<>(); IgniteInternalFuture fut = multithreadedAsync(new Runnable() { -@Override -public void run() { +@Override public void run() { long processed; while ((processed = cnt.getAndIncrement()) < taskExecutionCount()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java index cc04875..b42b683 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Queue; import java.util.RandomAccess; import java.util.UUID; +import org.apache.ignite.IgniteLogger; import org.apache.ignite.ca
[1/3] ignite git commit: IGNITE-1016 - Exclude neighbors flag for fair affinity. Fixes #80.
Repository: ignite Updated Branches: refs/heads/ignite-1016 [created] 8f5a4c9de http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 1deb3bc..df657e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -22,10 +22,10 @@ import junit.framework.TestSuite; import org.apache.ignite.GridCacheAffinityBackupsSelfTest; import org.apache.ignite.IgniteCacheAffinitySelfTest; import org.apache.ignite.cache.IgniteWarmupClosureSelfTest; -import org.apache.ignite.cache.affinity.IgniteClientNodeAffinityTest; -import org.apache.ignite.cache.affinity.fair.GridFairAffinityFunctionNodesSelfTest; -import org.apache.ignite.cache.affinity.fair.GridFairAffinityFunctionSelfTest; -import org.apache.ignite.cache.affinity.fair.IgniteFairAffinityDynamicCacheSelfTest; +import org.apache.ignite.cache.affinity.AffinityClientNodeSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityDynamicCacheSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionNodesSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionSelfTest; import org.apache.ignite.cache.store.GridCacheBalancingStoreSelfTest; import org.apache.ignite.cache.store.GridCacheLoadOnlyStoreAdapterSelfTest; import org.apache.ignite.cache.store.StoreResourceInjectionSelfTest; @@ -183,12 +183,12 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteWarmupClosureSelfTest.class); // Affinity tests. -suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class); -suite.addTestSuite(GridFairAffinityFunctionSelfTest.class); -suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class); +suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class); +suite.addTestSuite(FairAffinityFunctionSelfTest.class); +suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class); suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); suite.addTestSuite(IgniteCacheAffinitySelfTest.class); -suite.addTestSuite(IgniteClientNodeAffinityTest.class); +suite.addTestSuite(AffinityClientNodeSelfTest.class); // Swap tests. suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index bd24e51..93bd26c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -18,6 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionExcludeNeighborsSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionExcludeNeighborsSelfTest; import org.apache.ignite.internal.processors.cache.CacheDhtLocalPartitionAfterRemoveSelfTest; import org.apache.ignite.internal.processors.cache.CrossCacheTxRandomOperationsTest; import org.apache.ignite.internal.processors.cache.GridCacheAtomicMessageCountSelfTest; @@ -32,7 +36,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdate import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop; import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionNotLoadedEventSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedAffinityFilterSelfTest; import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; @@ -101,7 +104,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
[2/3] ignite git commit: IGNITE-1016 - Exclude neighbors flag for fair affinity. Fixes #80.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java deleted file mode 100644 index 888904b..000 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.affinity; - -import java.util.Collection; -import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.affinity.fair.FairAffinityFunction; -import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.IgniteNodeAttributes; -import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -import static org.apache.ignite.cache.CacheMode.REPLICATED; - -/** - * - */ -public class IgniteClientNodeAffinityTest extends GridCommonAbstractTest { -/** */ -protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - -/** */ -private static final int NODE_CNT = 4; - -/** */ -private static final String CACHE1 = "cache1"; - -/** */ -private static final String CACHE2 = "cache2"; - -/** */ -private static final String CACHE3 = "cache3"; - -/** */ -private static final String CACHE4 = "cache4"; - -/** {@inheritDoc} */ -@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { -IgniteConfiguration cfg = super.getConfiguration(gridName); - -((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); - -if (gridName.equals(getTestGridName(NODE_CNT - 1))) -cfg.setClientMode(true); - -CacheConfiguration ccfg1 = new CacheConfiguration(); - -ccfg1.setBackups(1); -ccfg1.setName(CACHE1); -ccfg1.setAffinity(new RendezvousAffinityFunction()); -ccfg1.setNodeFilter(new TestNodesFilter()); - -CacheConfiguration ccfg2 = new CacheConfiguration(); - -ccfg2.setBackups(1); -ccfg2.setName(CACHE2); -ccfg2.setAffinity(new RendezvousAffinityFunction()); - -CacheConfiguration ccfg3 = new CacheConfiguration(); - -ccfg3.setBackups(1); -ccfg3.setName(CACHE3); -ccfg3.setAffinity(new FairAffinityFunction()); -ccfg3.setNodeFilter(new TestNodesFilter()); - -CacheConfiguration ccfg4 = new CacheConfiguration(); - -ccfg4.setCacheMode(REPLICATED); -ccfg4.setName(CACHE4); -ccfg4.setNodeFilter(new TestNodesFilter()); - -cfg.setCacheConfiguration(ccfg1, ccfg2, ccfg3, ccfg4); - -return cfg; -} - -/** {@inheritDoc} */ -@Override protected void beforeTestsStarted() throws Exception { -super.beforeTestsStarted(); - -startGrids(NODE_CNT); -} - -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** - * @throws Exception If failed. - */ -public void testClientNodeNotInAffinity() throws Exception { -checkCache(CACHE1, 2); - -checkCache(CACHE2, 2); - -checkCache(CACHE3, 2); - -checkCache(CACHE4, 3); - -Ignite client = ignite(NODE_CNT - 1); - -CacheConfiguration ccfg = new CacheConfiguration(); - -ccfg.setBackups(0); - -ccfg.setNodeFilt
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-264 [deleted] 179336999
ignite git commit: IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache
Repository: ignite Updated Branches: refs/heads/ignite-1.4 70a8a92da -> 7db44f11f IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db44f11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db44f11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db44f11 Branch: refs/heads/ignite-1.4 Commit: 7db44f11f7925b5a29a0a3e017baa93b52fb2982 Parents: 70a8a92 Author: Valentin Kulichenko Authored: Wed Sep 23 18:53:06 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 18:53:06 2015 -0700 -- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 5 files changed, 144 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cc6c19a..ae96f23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -556,7 +556,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur = qry.getInitialQuery() != null ? query(qry.getInitialQuery()) : null; @@ -1896,4 +1896,4 @@ public class IgniteCacheProxy extends AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index c719f1e..6a151a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -43,10 +43,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -55,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jsr166.ConcurrentHashMap8; @@ -271,7 +271,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param bufSize Buffer size. * @param timeInterval Time interval. * @param autoUnsubscribe Auto unsubscribe flag. - * @param grp Cluster group. + * @param loc Local flag. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -280,7 +280,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { int bufSize, long timeInterval, boolean autoUnsubscribe, -ClusterGroup grp) throws IgniteCheckedException +boolean loc) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -293,7 +293,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, false, true, -grp); +loc)
ignite git commit: # IGNITE-843 Changed agent version.
Repository: ignite Updated Branches: refs/heads/ignite-843 34b373e1f -> b442690c7 # IGNITE-843 Changed agent version. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b442690c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b442690c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b442690c Branch: refs/heads/ignite-843 Commit: b442690c75a0dd500e469b48d263008c4fdaeda7 Parents: 34b373e Author: Andrey Authored: Thu Sep 24 09:41:13 2015 +0700 Committer: Andrey Committed: Thu Sep 24 09:41:13 2015 +0700 -- .../control-center-web/src/main/js/controllers/common-module.js| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b442690c/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 6df4c7f..e051739 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1895,7 +1895,7 @@ controlCenterModule.controller('agent-download', [ var lnk = document.createElement('a'); -lnk.setAttribute('href', '/agent/ignite-web-agent-1.4.0-SNAPSHOT.zip'); +lnk.setAttribute('href', '/agent/ignite-web-agent-1.5.0-SNAPSHOT.zip'); lnk.style.display = 'none'; document.body.appendChild(lnk);
ignite git commit: # IGNITE-843 Fixed cache metadata popover.
Repository: ignite Updated Branches: refs/heads/ignite-843 b442690c7 -> e5b7d5a30 # IGNITE-843 Fixed cache metadata popover. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5b7d5a3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5b7d5a3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5b7d5a3 Branch: refs/heads/ignite-843 Commit: e5b7d5a30c5d980729661b00ddc0840a971d2e6c Parents: b442690 Author: Andrey Authored: Thu Sep 24 11:01:13 2015 +0700 Committer: Andrey Committed: Thu Sep 24 11:01:13 2015 +0700 -- .../src/main/js/controllers/sql-controller.js | 2 +- .../src/main/js/public/stylesheets/style.scss | 26 .../src/main/js/views/sql/cache-metadata.jade | 7 +++--- 3 files changed, 31 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5b7d5a3/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index d6b56d1..26d77a0 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -50,7 +50,7 @@ controlCenterModule.controller('sqlController', $scope.treeOptions = { nodeChildren: "children", -dirSelectable: true, +dirSelectable: false, injectClasses: { iExpanded: "fa fa-minus-square-o", iCollapsed: "fa fa-plus-square-o" http://git-wip-us.apache.org/repos/asf/ignite/blob/e5b7d5a3/modules/control-center-web/src/main/js/public/stylesheets/style.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index b317408..bdec0d9 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -954,6 +954,11 @@ button.form-control { padding: 5px; } +.popover:focus { +outline: none; +border: 1px solid $btn-default-border; +} + .theme-line .popover.settings { .close { position: absolute; @@ -967,6 +972,19 @@ button.form-control { min-width: 305px; +.popover-title { +color: black; + +line-height: $line-height-base; + +padding: 8px 20px 8px 10px; + +white-space: nowrap; +overflow: hidden; +-o-text-overflow: ellipsis; +text-overflow: ellipsis; +} + > .popover-content { overflow: scroll; @@ -975,6 +993,14 @@ button.form-control { min-width: 300px; max-width: 300px; + +.content-empty { +display: block; +text-align: center; +line-height: 380px; + +color: $input-color-placeholder; +} } label.clickable { http://git-wip-us.apache.org/repos/asf/ignite/blob/e5b7d5a3/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade -- diff --git a/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade index e82b507..9d1bbe2 100644 --- a/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade +++ b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade @@ -12,14 +12,15 @@ See the License for the specific language governing permissions and limitations under the License. .popover.cache-metadata(tabindex='-1' dw-loading='loadingCacheMetadata' dw-loading-options='{text: ""}' ng-init='tryLoadMetadata(cache)') -.arrow -h3.popover-title(style='color: black') Cache metadata +h3.popover-title Metadata for: {{cache.name}}Cache mode: {{cache.mode}} button.close(id='cache-metadata-close' type='button' ng-click='$hide()') × -.popover-content +.popover-content(ng-if='cache.metadata && cache.metadata.length > 0') treecontrol.tree-classic(tree-model='cache.metadata' options='treeOptions') label.clickable(ng-if='node.type == "type"' ng-dblclick='dblclickMetadata(paragraph, node)') {{node.name}} label.clickable(ng-if='node.type == "field"' ng-dblclick='dblclickMetadata(paragraph, node)') {{node.name}} [{{node.clazz}}] label(ng-if='node.type == "indexes"') {{node.name}} label(ng-if='node.type == "index"') {{node.name}} label(ng-if='node.type == "index-field"') {{node.name}} [{{node.
ignite git commit: # IGNITE-843 Fixed active cache on sql.
Repository: ignite Updated Branches: refs/heads/ignite-843 e5b7d5a30 -> 7405b125a # IGNITE-843 Fixed active cache on sql. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7405b125 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7405b125 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7405b125 Branch: refs/heads/ignite-843 Commit: 7405b125a6636ab070461731a997d91bc64e25a1 Parents: e5b7d5a Author: Andrey Authored: Thu Sep 24 11:16:59 2015 +0700 Committer: Andrey Committed: Thu Sep 24 11:16:59 2015 +0700 -- .../src/main/js/controllers/sql-controller.js | 20 +--- modules/control-center-web/src/main/js/db.js| 5 + 2 files changed, 14 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7405b125/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 26d77a0..aad0eb0 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -96,6 +96,14 @@ controlCenterModule.controller('sqlController', } }; +var _setActiveCache = function () { +if ($scope.caches.length > 0) +_.forEach($scope.notebook.paragraphs, function (paragraph) { +if (!paragraph.cacheName || !_.find($scope.caches, {name: paragraph.cacheName})) +paragraph.cacheName = $scope.caches[0].name; +}); +}; + var loadNotebook = function () { $http.post('/notebooks/get', {noteId: $scope.noteId}) .success(function (notebook) { @@ -111,6 +119,8 @@ controlCenterModule.controller('sqlController', if (!notebook.paragraphs || notebook.paragraphs.length == 0) $scope.addParagraph(); + +_setActiveCache(); }) .error(function (errMsg) { $common.showError(errMsg); @@ -213,7 +223,7 @@ controlCenterModule.controller('sqlController', enhanceParagraph(paragraph); if ($scope.caches && $scope.caches.length > 0) -paragraph.cache = $scope.caches[0]; +paragraph.cacheName = $scope.caches[0].name; $scope.notebook.expandedParagraphs.push($scope.notebook.paragraphs.length); @@ -255,11 +265,7 @@ controlCenterModule.controller('sqlController', .success(function (caches) { $scope.caches = _.sortBy(caches, 'name'); -if ($scope.caches.length > 0) -_.forEach($scope.notebook.paragraphs, function (paragraph) { -if (!paragraph.cacheName || !_.find($scope.caches, {name: paragraph.cacheName})) -paragraph.cacheName = $scope.caches[0].name; -}); +_setActiveCache(); }) .error(function (err, status) { if (status == 503) @@ -702,7 +708,7 @@ controlCenterModule.controller('sqlController', } $scope.actionAvailable = function (paragraph, needQuery) { -return $scope.caches.length > 0 && paragraph.cache && (!needQuery || paragraph.query); +return $scope.caches.length > 0 && paragraph.cacheName && (!needQuery || paragraph.query); }; $scope.actionTooltip = function (paragraph, action, needQuery) { http://git-wip-us.apache.org/repos/asf/ignite/blob/7405b125/modules/control-center-web/src/main/js/db.js -- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index 321637b..8d86bc7 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -352,10 +352,7 @@ var NotebookSchema = new Schema({ result: {type: String, enum: ['none', 'table', 'bar', 'pie', 'line', 'area']}, pageSize: Number, hideSystemColumns: Boolean, -cache: { -name: String, -mode: {type: String, enum: ['PARTITIONED', 'REPLICATED', 'LOCAL']} -}, +cacheName: String, rate: { value: Number, unit: Number
[1/2] ignite git commit: IGNITE-843: More info.
Repository: ignite Updated Branches: refs/heads/ignite-843 7405b125a -> ccda6644e IGNITE-843: More info. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9277519d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9277519d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9277519d Branch: refs/heads/ignite-843 Commit: 9277519def742d08f83847e1c877aae58919ae74 Parents: e5b7d5a Author: Alexey Kuznetsov Authored: Thu Sep 24 11:19:55 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 24 11:19:55 2015 +0700 -- .../main/js/controllers/caches-controller.js| 14 +++ .../main/js/controllers/clusters-controller.js | 9 +++ .../src/main/js/controllers/common-module.js| 16 .../main/js/controllers/metadata-controller.js | 11 + .../src/main/js/controllers/models/caches.json | 6 + .../main/js/controllers/models/clusters.json| 5 .../main/js/controllers/models/metadata.json| 6 + .../src/main/js/controllers/models/summary.json | 9 +++ .../main/js/controllers/summary-controller.js | 9 --- .../src/main/js/routes/public.js| 5 .../src/main/js/views/includes/controls.jade| 2 +- .../src/main/js/views/templates/message.jade| 26 12 files changed, 98 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/caches-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index d732755..5fbb03d 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -17,8 +17,8 @@ // Controller for Caches screen. controlCenterModule.controller('cachesController', [ -'$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', -function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { +'$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$message', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', +function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $message, $clone, $table, $preview, $loading, $unsavedChangesGuard) { $unsavedChangesGuard.install($scope); // Initialize the super class and extend it. @@ -26,9 +26,7 @@ controlCenterModule.controller('cachesController', [ $scope.ui = $common.formUI(); -$scope.showMoreInfo = function () { -$common.showInfo('TODO: show modal with more info'); -}; +$scope.showMoreInfo = $message.message; $scope.joinTip = $common.joinTip; $scope.getModel = $common.getModel; @@ -246,6 +244,7 @@ controlCenterModule.controller('cachesController', [ $http.get('/models/caches.json') .success(function (data) { $scope.screenTip = data.screenTip; +$scope.moreInfo = data.moreInfo; $scope.general = data.general; $scope.advanced = data.advanced; @@ -413,6 +412,11 @@ controlCenterModule.controller('cachesController', [ return showPopoverMessage($scope.panels, 'memory', 'offHeapMaxMemory', 'Off-heap max memory should be specified'); +if (item.memoryMode == 'ONHEAP_TIERED' && item.offHeapMaxMemory > 0 && +!$common.isDefined(item.evictionPolicy.kind)) { +return showPopoverMessage($scope.panels, 'memory', 'evictionPolicy', 'Eviction policy should not be configured'); +} + var cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind; if (cacheStoreFactorySelected) { http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/clusters-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 2b3b584..0c141b9 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-ce
[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ccda6644 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ccda6644 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ccda6644 Branch: refs/heads/ignite-843 Commit: ccda6644e5546b32ed81d2c660cde9b1beaabf54 Parents: 9277519 7405b12 Author: Alexey Kuznetsov Authored: Thu Sep 24 11:20:17 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 24 11:20:17 2015 +0700 -- .../src/main/js/controllers/sql-controller.js | 20 +--- modules/control-center-web/src/main/js/db.js| 5 + 2 files changed, 14 insertions(+), 11 deletions(-) --
[1/3] ignite git commit: Exposed IgniteKernal.dumpDebugInfo() to MX bean
Repository: ignite Updated Branches: refs/heads/ignite-1272 9166dfb2b -> 89cf57967 Exposed IgniteKernal.dumpDebugInfo() to MX bean Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a8a92d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a8a92d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a8a92d Branch: refs/heads/ignite-1272 Commit: 70a8a92da3cf39b0ed1cf18effd8fae1478cb2bd Parents: 6f3ef6a Author: Valentin Kulichenko Authored: Wed Sep 23 17:23:31 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 17:23:31 2015 -0700 -- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +--- .../src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 8 +++- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 82db059..60725e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -3153,9 +3153,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { return ctx.isDaemon() && U.hasAnnotation(comp.getClass(), SkipDaemon.class); } -/** - * - */ +/** {@inheritDoc} */ public void dumpDebugInfo() { U.warn(log, "Dumping debug info for node [id=" + ctx.localNodeId() + ", name=" + ctx.gridName() + http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 4755bf2..c30e0e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -366,4 +366,10 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} \ No newline at end of file + +/** + * Dumps debug information for the current node. + */ +@MXBeanDescription("Dumps debug information for the current node.") +public void dumpDebugInfo(); +}
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272
Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89cf5796 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89cf5796 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89cf5796 Branch: refs/heads/ignite-1272 Commit: 89cf579671ca31cc3065aef41d0fb77b175e20d7 Parents: 9166dfb 7db44f1 Author: Denis Magda Authored: Thu Sep 24 08:28:43 2015 +0300 Committer: Denis Magda Committed: Thu Sep 24 08:28:43 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 7 files changed, 152 insertions(+), 49 deletions(-) --
[2/3] ignite git commit: IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache
IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db44f11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db44f11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db44f11 Branch: refs/heads/ignite-1272 Commit: 7db44f11f7925b5a29a0a3e017baa93b52fb2982 Parents: 70a8a92 Author: Valentin Kulichenko Authored: Wed Sep 23 18:53:06 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 18:53:06 2015 -0700 -- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 5 files changed, 144 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cc6c19a..ae96f23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -556,7 +556,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur = qry.getInitialQuery() != null ? query(qry.getInitialQuery()) : null; @@ -1896,4 +1896,4 @@ public class IgniteCacheProxy extends AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index c719f1e..6a151a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -43,10 +43,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -55,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jsr166.ConcurrentHashMap8; @@ -271,7 +271,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param bufSize Buffer size. * @param timeInterval Time interval. * @param autoUnsubscribe Auto unsubscribe flag. - * @param grp Cluster group. + * @param loc Local flag. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -280,7 +280,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { int bufSize, long timeInterval, boolean autoUnsubscribe, -ClusterGroup grp) throws IgniteCheckedException +boolean loc) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -293,7 +293,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, false, true, -grp); +loc); } /** @@ -321,7 +321,7 @@ public class CacheContinuousQueryManager exte
[1/6] ignite git commit: ignite-1524 Fixed processing of ClientReconnectMessage
Repository: ignite Updated Branches: refs/heads/master b3bcf4aee -> b56b15cda ignite-1524 Fixed processing of ClientReconnectMessage Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04f4f54a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04f4f54a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04f4f54a Branch: refs/heads/master Commit: 04f4f54a7ff1d43fa3baf4fa07865a8163796a82 Parents: 1942d75 Author: sboikov Authored: Wed Sep 23 09:31:59 2015 +0300 Committer: sboikov Committed: Wed Sep 23 09:31:59 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 97 +++- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +-- 2 files changed, 81 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/04f4f54a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 4ce46e8..8a205d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2958,70 +2958,81 @@ class ServerImpl extends TcpDiscoveryImpl { * @param msg Client reconnect message. */ private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg) { +UUID nodeId = msg.creatorNodeId(); + UUID locNodeId = getLocalNodeId(); boolean isLocNodeRouter = locNodeId.equals(msg.routerNodeId()); if (!msg.verified()) { -assert isLocNodeRouter; - -msg.verify(locNodeId); +TcpDiscoveryNode node = ring.node(nodeId); -if (ring.hasRemoteNodes()) { -sendMessageAcrossRing(msg); +assert node == null || node.isClient(); -return; +if (node != null) { +node.clientRouterNodeId(msg.routerNodeId()); +node.aliveCheck(spi.maxMissedClientHbs); } -} - -UUID nodeId = msg.creatorNodeId(); -TcpDiscoveryNode node = ring.node(nodeId); +if (isLocalNodeCoordinator()) { +msg.verify(locNodeId); -assert node == null || node.isClient(); +if (node != null) { +Collection pending = msgHist.messages(msg.lastMessageId(), node); -if (node != null) { -assert node.isClient(); +if (pending != null) { +msg.pendingMessages(pending); +msg.success(true); -node.clientRouterNodeId(msg.routerNodeId()); -node.aliveCheck(spi.maxMissedClientHbs); +if (log.isDebugEnabled()) +log.debug("Accept client reconnect, restored pending messages " + +"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +} +else { +if (log.isDebugEnabled()) +log.debug("Failing reconnecting client node because failed to restore pending " + +"messages [locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); -if (isLocalNodeCoordinator()) { -Collection pending = msgHist.messages(msg.lastMessageId(), node); +processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, +node.id(), node.internalOrder())); +} +} +else if (log.isDebugEnabled()) +log.debug("Reconnecting client node is already failed [nodeId=" + nodeId + ']'); -if (pending != null) { -msg.pendingMessages(pending); -msg.success(true); +if (isLocNodeRouter) { +ClientMessageWorker wrk = clientMsgWorkers.get(nodeId); -if (log.isDebugEnabled()) -log.debug("Accept client reconnect, restored pending messages " + -"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +if (wrk != null) +wrk.addMessage(msg); +else if (
[2/6] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/517d0f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/517d0f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/517d0f58 Branch: refs/heads/master Commit: 517d0f584f67e9291b7f6f2efe3f42b7131f6a25 Parents: 04f4f54 Author: sboikov Authored: Wed Sep 23 15:43:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 15:43:13 2015 +0300 -- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/517d0f58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 647746e..a3d9948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -365,13 +365,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr U.sleep(random(START_DELAY.get1(), START_DELAY.get2())); -if (stop.get()) -return; - log.info("Restarting node " + idx); startGrid(idx); +if (stop.get()) +return; + U.sleep(1000); }
[6/6] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.4'
Merge remote-tracking branch 'remotes/origin/ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b56b15cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b56b15cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b56b15cd Branch: refs/heads/master Commit: b56b15cda7fc94b25400b1334b365053f0017f7f Parents: b3bcf4a 7db44f1 Author: sboikov Authored: Thu Sep 24 09:09:46 2015 +0300 Committer: sboikov Committed: Thu Sep 24 09:09:46 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../continuous/GridContinuousProcessor.java | 3 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 398 +-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++--- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++ ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- 28 files changed, 1099 insertions(+), 525 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b56b15cd/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java --
[3/6] ignite git commit: Merging IGNITE-1171 - fixed problems with custom events in discovery
Merging IGNITE-1171 - fixed problems with custom events in discovery Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f3ef6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f3ef6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f3ef6a8 Branch: refs/heads/master Commit: 6f3ef6a84ee1c3e77d32ca9930835d1720918e20 Parents: 517d0f5 Author: Yakov Zhdanov Authored: Wed Sep 23 16:36:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:36:15 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 20 files changed, 864 insertions(+), 425 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index f3c3be9..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; @@ -156,6 +153,13 @@ public class DynamicCacheDescriptor { } /** + * @return Started flag. + */ +public boolean started() { +return started; +} + +/** * @return Cache configuration. */ public CacheConfiguration cacheConfiguration() { http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 34c571c..eb76233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1435,6 +1435,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private static final long serialVersionUID = 0L; /** */ +@GridToStringInclude private AffinityTopologyVersion topVer; /** @@ -1455,5 +1456,10 @@ public class GridCache
[5/6] ignite git commit: IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache
IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db44f11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db44f11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db44f11 Branch: refs/heads/master Commit: 7db44f11f7925b5a29a0a3e017baa93b52fb2982 Parents: 70a8a92 Author: Valentin Kulichenko Authored: Wed Sep 23 18:53:06 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 18:53:06 2015 -0700 -- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 5 files changed, 144 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cc6c19a..ae96f23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -556,7 +556,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur = qry.getInitialQuery() != null ? query(qry.getInitialQuery()) : null; @@ -1896,4 +1896,4 @@ public class IgniteCacheProxy extends AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index c719f1e..6a151a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -43,10 +43,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -55,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jsr166.ConcurrentHashMap8; @@ -271,7 +271,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param bufSize Buffer size. * @param timeInterval Time interval. * @param autoUnsubscribe Auto unsubscribe flag. - * @param grp Cluster group. + * @param loc Local flag. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -280,7 +280,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { int bufSize, long timeInterval, boolean autoUnsubscribe, -ClusterGroup grp) throws IgniteCheckedException +boolean loc) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -293,7 +293,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, false, true, -grp); +loc); } /** @@ -321,7 +321,7 @@ public class CacheContinuousQueryManager extends
[4/6] ignite git commit: Exposed IgniteKernal.dumpDebugInfo() to MX bean
Exposed IgniteKernal.dumpDebugInfo() to MX bean Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a8a92d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a8a92d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a8a92d Branch: refs/heads/master Commit: 70a8a92da3cf39b0ed1cf18effd8fae1478cb2bd Parents: 6f3ef6a Author: Valentin Kulichenko Authored: Wed Sep 23 17:23:31 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 17:23:31 2015 -0700 -- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +--- .../src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 8 +++- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 82db059..60725e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -3153,9 +3153,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { return ctx.isDaemon() && U.hasAnnotation(comp.getClass(), SkipDaemon.class); } -/** - * - */ +/** {@inheritDoc} */ public void dumpDebugInfo() { U.warn(log, "Dumping debug info for node [id=" + ctx.localNodeId() + ", name=" + ctx.gridName() + http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 4755bf2..c30e0e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -366,4 +366,10 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} \ No newline at end of file + +/** + * Dumps debug information for the current node. + */ +@MXBeanDescription("Dumps debug information for the current node.") +public void dumpDebugInfo(); +}
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-993 [deleted] 332164539
ignite git commit: ignite-1329 Removed unnecessary waiting in GridCacheIoManager
Repository: ignite Updated Branches: refs/heads/ignite-1329 [created] ad47328da ignite-1329 Removed unnecessary waiting in GridCacheIoManager Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad47328d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad47328d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad47328d Branch: refs/heads/ignite-1329 Commit: ad47328dadfe5894ae1da17dcfcfeb96e1106c32 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 09:35:45 2015 +0300 Committer: sboikov Committed: Thu Sep 24 09:35:45 2015 +0300 -- .../processors/cache/GridCacheIoManager.java| 76 +--- .../processors/cache/GridCacheMessage.java | 7 -- .../cache/GridCacheSharedContext.java | 32 - .../processors/cache/GridCacheUtils.java| 8 --- .../dht/GridDhtAffinityAssignmentRequest.java | 5 -- .../dht/GridDhtAffinityAssignmentResponse.java | 5 -- .../distributed/dht/GridDhtLockRequest.java | 5 -- .../distributed/dht/GridDhtTxFinishRequest.java | 5 -- .../dht/GridDhtTxPrepareRequest.java| 7 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 -- .../dht/preloader/GridDhtForceKeysResponse.java | 5 -- .../GridDhtPartitionDemandMessage.java | 5 -- .../GridDhtPartitionSupplyMessage.java | 5 -- .../GridDhtPartitionsAbstractMessage.java | 5 -- 14 files changed, 4 insertions(+), 171 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ad47328d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 421ec82..c81dae5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -270,62 +270,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { if (cacheMsg.classError() != null) processFailedMessage(nodeId, cacheMsg); -else { -if (cacheMsg.allowForStartup()) -processMessage(nodeId, cacheMsg, c); -else { -IgniteInternalFuture startFut = startFuture(cacheMsg); - -if (startFut.isDone()) -processMessage(nodeId, cacheMsg, c); -else { -if (log.isDebugEnabled()) -log.debug("Waiting for start future to complete for message [nodeId=" + nodeId + -", locId=" + cctx.localNodeId() + ", msg=" + cacheMsg + ']'); - -// Don't hold this thread waiting for preloading to complete. -startFut.listen(new CI1>() { -@Override public void apply(final IgniteInternalFuture f) { -cctx.kernalContext().closure().runLocalSafe( -new GridPlainRunnable() { -@Override public void run() { -rw.readLock(); - -try { -if (stopping) { -if (log.isDebugEnabled()) -log.debug("Received cache communication message while stopping " + -"(will ignore) [nodeId=" + nodeId + ", msg=" + cacheMsg + ']'); - -return; -} - -f.get(); - -if (log.isDebugEnabled()) -log.debug("Start future completed for message [nodeId=" + nodeId + -", locId=" + cctx.localNodeId() + ", msg=" + cacheMsg + ']'); - -processMessage(nodeId, cacheMsg, c); -} -catch (IgniteCheckedException e) { -// Log once. -if (startErr.compareAndSet(false, true)) -
ignite git commit: Minor fix in examples.
Repository: ignite Updated Branches: refs/heads/ignite-1282 f16c73639 -> ecc60aae0 Minor fix in examples. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecc60aae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecc60aae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecc60aae Branch: refs/heads/ignite-1282 Commit: ecc60aae042a7e5768f3142e1e3fe29dad247801 Parents: f16c736 Author: vozerov-gridgain Authored: Thu Sep 24 09:48:02 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 09:48:02 2015 +0300 -- .../dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs| 5 + .../Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ecc60aae/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs index eb119f9..055edcb 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/PathUtil.cs @@ -38,6 +38,11 @@ namespace Apache.Ignite.Core.Tests.Examples public static readonly string ExamplesSourcePath = Path.Combine(IgniteHome, @"platforms\dotnet\examples"); /// +/// Examples source code path. +/// +public static readonly string ExamplesDevSourcePath = Path.Combine(IgniteHome, @"examples"); + +/// /// Gets the full configuration path. /// public static string GetFullConfigPath(string springConfigUrl) http://git-wip-us.apache.org/repos/asf/ignite/blob/ecc60aae/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs index 24bd663..4f2577a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/ProjectFilesTest.cs @@ -33,11 +33,11 @@ namespace Apache.Ignite.Core.Tests.Examples [Test] public void CheckConfigFilesExist() { -Directory.GetFiles(PathUtil.ExamplesSourcePath, "*.cs", SearchOption.AllDirectories) +Directory.GetFiles(PathUtil.ExamplesDevSourcePath, "*.cs", SearchOption.AllDirectories) .Select(File.ReadAllText) .SelectMany(src => Regex.Matches(src, @"modules\\platform[^\s]+.xml").OfType()) .Where(match => match.Success) -.Select(match => Path.Combine(PathUtil.IgniteHome, match.Value)) +.Select(match => Path.Combine(PathUtil.ExamplesDevSourcePath, match.Value)) .ToList() .ForEach(path => Assert.IsTrue(File.Exists(path), "Config file does not exist: " + path)); }