ignite git commit: ignite-1272: storing user portable class descriptors only for classes that are loaded by default class loader

[dmagda]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1272 787347a98 -> 9c93f8bc7


ignite-1272: storing user portable class descriptors only for classes that are 
loaded by default class loader


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

Branch: refs/heads/ignite-1272
Commit: 9c93f8bc747ab73acd6e8fad75ba2e0ed56cc217
Parents: 787347a
Author: Denis Magda 
Authored: Wed Oct 7 10:54:46 2015 +0300
Committer: Denis Magda 
Committed: Wed Oct 7 10:54:46 2015 +0300

--
 .../internal/portable/PortableContext.java  | 90 +---
 1 file changed, 23 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c93f8bc/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 d5a3c5d..0c762dd 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
@@ -112,9 +112,8 @@ public class PortableContext implements Externalizable {
 /** */
 private final ConcurrentMap descByCls = 
new ConcurrentHashMap8<>();
 
-/** */
-private final ConcurrentMap> userTypes
-= new ConcurrentHashMap8<>(0);
+/** Holds classes loaded by default class loader only. */
+private final ConcurrentMap userTypes = 
new ConcurrentHashMap8<>();
 
 /** */
 private final Map predefinedTypes = new 
HashMap<>();
@@ -129,7 +128,7 @@ public class PortableContext implements Externalizable {
 private final Map mapTypes = new HashMap<>();
 
 /** */
-private final Map mappers = new 
ConcurrentHashMap8<>(0);
+private final ConcurrentMap mappers = new 
ConcurrentHashMap8<>(0);
 
 /** */
 private final Map typeMappers = new 
ConcurrentHashMap8<>(0);
@@ -468,12 +467,12 @@ public class PortableContext implements Externalizable {
 if (ldr == null)
 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 (userType && ldr.equals(dfltLdr)) {
+desc = userTypes.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(dfltLdr))
+if (desc != null)
 return desc;
 }
 
@@ -485,13 +484,15 @@ public class PortableContext implements Externalizable {
 desc = descByCls.get(cls);
 }
 catch (ClassNotFoundException e) {
-if (userType && !ldr.equals(dfltLdr) && (desc = 
descriptorLoadingFailover(typeId, ldr)) != null)
+// Class might have been loaded by default class loader.
+if (userType && !ldr.equals(dfltLdr) && (desc = 
descriptorForTypeId(true, typeId, dfltLdr)) != null)
 return desc;
 
 throw new PortableInvalidClassException(e);
 }
 catch (IgniteCheckedException e) {
-if (userType && !ldr.equals(dfltLdr) && (desc = 
descriptorLoadingFailover(typeId, ldr)) != null)
+// Class might have been loaded by default class loader.
+if (userType && !ldr.equals(dfltLdr) && (desc = 
descriptorForTypeId(true, typeId, dfltLdr)) != null)
 return desc;
 
 throw new PortableException("Failed resolve class for ID: " + 
typeId, e);
@@ -507,29 +508,6 @@ 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.
- *
-  

ignite git commit: ignite-1257 Agent monitoring

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 37d127a3b -> 0c24bfc13


ignite-1257 Agent monitoring


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

Branch: refs/heads/ignite-843
Commit: 0c24bfc13025fb33ed93af9793c4b72670340f1f
Parents: 37d127a
Author: Andrey 
Authored: Thu Oct 8 09:20:03 2015 +0700
Committer: Andrey 
Committed: Thu Oct 8 09:20:03 2015 +0700

--
 .../src/main/js/controllers/common-module.js| 56 +---
 .../src/main/js/controllers/sql-controller.js   | 11 +++-
 .../main/js/views/templates/agent-download.jade |  4 +-
 3 files changed, 50 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c24bfc1/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 c977dbc..720ac3c 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
@@ -110,7 +110,7 @@ consoleModule.service('$common', [
 return 'Internal server error.';
 }
 
-function showError(msg, placement, container) {
+function showError(msg, placement, container, persistent) {
 if (msgModal)
 msgModal.hide();
 
@@ -120,6 +120,9 @@ consoleModule.service('$common', [
 container: container ? container : 'body'
 });
 
+if (persistent)
+msgModal.$options.duration = false;
+
 return false;
 }
 
@@ -618,6 +621,10 @@ consoleModule.service('$common', [
 isEmptyArray: isEmptyArray,
 isEmptyString: isEmptyString,
 errorMessage: errorMessage,
+hideAlert: function () {
+if (msgModal)
+msgModal.hide();
+},
 showError: showError,
 showInfo: function (msg) {
 if (msgModal)
@@ -1878,21 +1885,25 @@ consoleModule.controller('auth', [
 
 // Download agent controller.
 consoleModule.controller('agent-download', [
-'$common', '$scope', '$timeout', '$modal', '$window', function ($common, 
$scope, $timeout, $modal, $window) {
+'$common', '$scope', '$interval', '$modal', '$window', function ($common, 
$scope, $interval, $modal, $window) {
 // Pre-fetch modal dialogs.
 var _agentDownloadModal = $modal({scope: $scope, templateUrl: 
'/agent/download', show: false});
 
 var _agentDownloadHide = _agentDownloadModal.hide;
 
 _agentDownloadModal.hide = function () {
-$timeout.cancel(_agentDownloadModal.checker);
+if (_agentDownloadModal.$isShown)
+$common.hideAlert();
+
+if (!$scope.checkConnection)
+$interval.cancel(_agentDownloadModal.updatePromise);
 
 _agentDownloadHide();
 };
 
-$scope.goBackAndHide = function () {
-if ($scope.backLink)
-$window.location = $scope.backLink;
+$scope.goHome = function () {
+if ($scope.checkConnection)
+$window.location = '/';
 
 _agentDownloadModal.hide()
 };
@@ -1911,24 +1922,33 @@ consoleModule.controller('agent-download', [
 };
 
 var _handleException = function (errMsg, status) {
-if (status == 503) {
-if (!_agentDownloadModal.$isShown)
-
_agentDownloadModal.$promise.then(_agentDownloadModal.show);
+if (!_agentDownloadModal.$isShown)
+_agentDownloadModal.$promise.then(_agentDownloadModal.show);
 
-_agentDownloadModal.checker = $timeout(function () {
-_agentDownloadModal.checkFn(_agentDownloadModal.hide, 
_handleException);
-}, 3000);
-}
-else
-$common.showError(errMsg);
+if (status != 503)
+$common.showError(errMsg, 'top-right', 'body', true);
 };
 
-$scope.awaitAgent = function (checkFn, backLink) {
+$scope.awaitAgent = function (checkFn) {
 _agentDownloadModal.checkFn = checkFn;
 
-$scope.backLink = backLink;
+_agentDownloadModal.updatePromise = $interval(function () {
+checkFn(_agentDownloadModal.hide, _handleException);
+}, 5000, 0, false);
+
+

ignite git commit: ignite-1633 Fixed readme

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 0c24bfc13 -> 4b054fa8b


ignite-1633 Fixed readme


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

Branch: refs/heads/ignite-843
Commit: 4b054fa8bad3d6d1dad88a9323420fb55b114367
Parents: 0c24bfc
Author: Andrey 
Authored: Thu Oct 8 09:40:19 2015 +0700
Committer: Andrey 
Committed: Thu Oct 8 09:40:19 2015 +0700

--
 modules/control-center-agent/README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4b054fa8/modules/control-center-agent/README.txt
--
diff --git a/modules/control-center-agent/README.txt 
b/modules/control-center-agent/README.txt
index 2c90020..4c155b7 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -11,7 +11,7 @@ Two main functions of Ignite Web Agent:
 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://console.example.com
+ignite-web-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:

ignite git commit: ignite-843 Start sql test drive before agent start.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 4b054fa8b -> 7693eed05


ignite-843 Start sql test drive before agent start.


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

Branch: refs/heads/ignite-843
Commit: 7693eed051ef5d2b0fa9e24280abfdf151682e3c
Parents: 4b054fa
Author: Andrey 
Authored: Thu Oct 8 10:49:32 2015 +0700
Committer: Andrey 
Committed: Thu Oct 8 10:49:32 2015 +0700

--
 .../org/apache/ignite/agent/AgentLauncher.java|  8 
 .../java/org/apache/ignite/agent/AgentSocket.java |  6 --
 .../ignite/agent/testdrive/AgentSqlTestDrive.java | 18 +-
 3 files changed, 17 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7693eed0/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
--
diff --git 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
index 32f45e9..a698b19 100644
--- 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
+++ 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
@@ -24,6 +24,8 @@ import java.net.URI;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.ignite.agent.handlers.RestExecutor;
+import org.apache.ignite.agent.testdrive.AgentMetadataTestDrive;
+import org.apache.ignite.agent.testdrive.AgentSqlTestDrive;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 
@@ -91,6 +93,12 @@ public class AgentLauncher {
 cfg.token(new String(System.console().readPassword()));
 }
 
+if (cfg.testDriveMetadata())
+AgentMetadataTestDrive.testDrive();
+
+if (cfg.testDriveSql())
+AgentSqlTestDrive.testDrive(cfg);
+
 RestExecutor restExecutor = new RestExecutor(cfg);
 
 restExecutor.start();

http://git-wip-us.apache.org/repos/asf/ignite/blob/7693eed0/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java
--
diff --git 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java
 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java
index 6576dbf..7ab6b06 100644
--- 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java
+++ 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java
@@ -174,12 +174,6 @@ public class AgentSocket implements WebSocketSender {
 }
 
 log.info("Authentication success.");
-
-if (cfg.testDriveMetadata())
-AgentMetadataTestDrive.testDrive();
-
-if (cfg.testDriveSql())
-AgentSqlTestDrive.testDrive(cfg);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/7693eed0/modules/control-center-agent/src/main/java/org/apache/ignite/agent/testdrive/AgentSqlTestDrive.java
--
diff --git 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/testdrive/AgentSqlTestDrive.java
 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/testdrive/AgentSqlTestDrive.java
index 34dcc46..5e7c57c 100644
--- 
a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/testdrive/AgentSqlTestDrive.java
+++ 
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/testdrive/AgentSqlTestDrive.java
@@ -276,7 +276,7 @@ public class AgentSqlTestDrive {
  * @param name Cache name.
  */
 private static void populateCacheEmployee(Ignite ignite, String name) {
-log.log(Level.FINE, "TEST-DRIVE: Start population cache: '" + name + 
"' with data...");
+log.log(Level.FINE, "TEST-DRIVE-SQL: Start population cache: '" + name 
+ "' with data...");
 
 IgniteCache cacheCountry = ignite.cache(name);
 
@@ -311,7 +311,7 @@ public class AgentSqlTestDrive {
 round(r * 5000, 2) , mgrId, rnd.nextInt(DEP_CNT)));
 }
 
-log.log(Level.FINE, "TEST-DRIVE: Finished population cache: '" + name 
+ "' with data.");
+log.log(Level.FINE, "TEST-DRIVE-SQL: Finished population cache: '" + 
name + "' with data.");
 }
 
 /**
@@ -319,7 +319,7 @@ public class AgentSqlTestDrive {
  * @param name 

ignite git commit: ignite-1607 WIP

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1607-read 9f8fbd6ed -> e05a7f8c0


ignite-1607 WIP


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

Branch: refs/heads/ignite-1607-read
Commit: e05a7f8c0f3140a0813eb2f175bd3c419ef0f33e
Parents: 9f8fbd6
Author: sboikov 
Authored: Thu Oct 8 06:51:11 2015 +0300
Committer: sboikov 
Committed: Thu Oct 8 06:51:11 2015 +0300

--
 .../processors/cache/distributed/near/GridNearGetFuture.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e05a7f8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 9ed63ce..7877df5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -463,7 +463,7 @@ public final class GridNearGetFuture extends 
CacheDistributedGetFutureAdap
 boolean isNew = dhtEntry.isNewLocked() || 
!dhtEntry.valid(topVer);
 
 if (needVer) {
-T2 res = 
entry.innerGetVersioned(
+T2 res = 
dhtEntry.innerGetVersioned(
 null,
 /*swap*/true,
 /*unmarshal*/true,

[26/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1584

[anovikov]

https://issues.apache.org/jira/browse/IGNITE-1584


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

Branch: refs/heads/ignite-843
Commit: 3de0e475ce7d889fd565f9be2c18a72cafc86430
Parents: bada5c7
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:25:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:25:46 2015 +0300

--
 .../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3de0e475/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
index 1feafe4..b3464b8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
@@ -29,4 +29,8 @@ public class IgniteCacheAtomicPutAllFailoverSelfTest extends 
GridCachePutAllFail
 @Override protected CacheAtomicityMode atomicityMode() {
 return ATOMIC;
 }
+
+@Override public void 
testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1584;);
+}
 }
\ No newline at end of file

[35/50] ignite git commit: Merge branch 'ignite-1.4'

[anovikov]

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/fd091c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd091c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd091c82

Branch: refs/heads/ignite-843
Commit: fd091c82892040df8da935527ce72da996fa7718
Parents: 0309f96 7752aa9
Author: Anton Vinogradov 
Authored: Thu Oct 1 16:26:28 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 16:26:28 2015 +0300

--
 RELEASE_NOTES.txt   |  2 +
 assembly/dependencies-fabric.xml|  2 +-
 assembly/release-fabric.xml | 10 ++-
 examples/schema-import/pom-standalone.xml   | 90 
 examples/schema-import/pom.xml  | 13 ++-
 .../discovery/GridDiscoveryManager.java |  2 +-
 pom.xml |  9 +-
 7 files changed, 119 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/examples/schema-import/pom.xml
--

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/pom.xml
--

[01/50] ignite git commit: ignite-80 Fixed dynamic cache start future completion

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 7693eed05 -> 514e61e66


ignite-80 Fixed dynamic cache start future completion


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

Branch: refs/heads/ignite-843
Commit: 13629ce89c71e5a1e1c447885ce0be9d3efb5a6c
Parents: c001d47
Author: sboikov 
Authored: Mon Sep 28 15:17:15 2015 +0300
Committer: sboikov 
Committed: Mon Sep 28 15:17:15 2015 +0300

--
 .../managers/discovery/CustomEventListener.java |  4 +++-
 .../discovery/GridDiscoveryManager.java |  2 +-
 .../cache/DynamicCacheChangeRequest.java| 19 +++
 .../cache/DynamicCacheDescriptor.java   | 19 +++
 .../GridCachePartitionExchangeManager.java  | 20 +---
 .../processors/cache/GridCacheProcessor.java| 15 +++
 .../continuous/CacheContinuousQueryHandler.java | 10 +++---
 .../continuous/GridContinuousProcessor.java | 17 +
 .../datastructures/DataStructuresProcessor.java |  6 +-
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |  5 -
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |  5 -
 ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 ++--
 12 files changed, 101 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
index ab143fb..8db4e67 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.managers.discovery;
 
 import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 
 /**
  * Listener interface.
@@ -26,6 +27,7 @@ public interface CustomEventListener {
 /**
  * @param snd Sender.
  * @param msg Message.
+ * @param topVer Current topology version.
  */
-public void onCustomEvent(ClusterNode snd, T msg);
+public void onCustomEvent(ClusterNode snd, T msg, AffinityTopologyVersion 
topVer);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 3a09b2c..785613d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -527,7 +527,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 if (list != null) {
 for (CustomEventListener 
lsnr : list) {
 try {
-lsnr.onCustomEvent(node, customMsg);
+lsnr.onCustomEvent(node, customMsg, 
nextTopVer);
 }
 catch (Exception e) {
 U.error(log, "Failed to notify direct 
custom event listener: " + customMsg, e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 583e346..b23be41 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -21,9 +21,11 @@ import java.io.Serializable;
 import 

[24/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1583

[anovikov]

https://issues.apache.org/jira/browse/IGNITE-1583


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

Branch: refs/heads/ignite-843
Commit: 67d027e518ea4bb64b7a2bc51f1327fe204a2b50
Parents: 52600f3
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:19:49 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:19:49 2015 +0300

--
 .../managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/67d027e5/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index e35333b..50bcc41 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -176,6 +176,8 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends 
GridCommonAbstractTe
  * @throws Exception If failed.
  */
 public void testAlivesClient() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1583;);
+
 clientMode = true;
 
 doTestAlive();

[29/29] ignite git commit: Merge master into ignite-1168

[anovikov]

Merge master into ignite-1168


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

Branch: refs/heads/ignite-1168
Commit: 5ef7c38f1ca6b8e075b59000dc48731c260a2a41
Parents: 6e0f415 f025714
Author: Andrey 
Authored: Thu Oct 8 10:01:27 2015 +0700
Committer: Andrey 
Committed: Thu Oct 8 10:01:27 2015 +0700

--
 RELEASE_NOTES.txt   |   2 +
 assembly/dependencies-fabric.xml|   2 +-
 assembly/release-fabric.xml |  10 +-
 examples/schema-import/pom-standalone.xml   |  90 +
 examples/schema-import/pom.xml  |  13 +-
 modules/apache-license-gen/README.txt   |  33 ++
 .../JettyRestProcessorAbstractSelfTest.java |  25 +-
 .../org/apache/ignite/IgniteFileSystem.java |   2 +
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../discovery/GridDiscoveryManager.java |   4 +-
 .../cache/DynamicCacheDescriptor.java   |  17 +
 .../processors/cache/GridCacheContext.java  |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  20 +-
 .../GridCachePartitionExchangeManager.java  |  72 +---
 .../processors/cache/GridCacheProcessor.java|  26 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../distributed/dht/GridDhtLockRequest.java |   5 +-
 .../dht/GridPartitionedGetFuture.java   |   5 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../distributed/near/GridNearGetFuture.java |   2 +
 .../internal/processors/igfs/IgfsFileInfo.java  |  13 +-
 .../internal/processors/igfs/IgfsImpl.java  |  64 +---
 .../processors/igfs/IgfsMetaManager.java| 180 +-
 .../processors/rest/GridRestProcessor.java  | 354 +--
 .../ignite/internal/util/IgniteUtils.java   |   2 +-
 .../GridCacheDeploymentOffHeapSelfTest.java |  15 +
 .../cache/IgniteCacheEntryListenerTxTest.java   |   4 +
 .../cache/IgniteCachePutAllRestartTest.java |   4 +-
 .../CacheGetFutureHangsSelfTest.java| 156 
 .../distributed/IgniteCacheCreatePutTest.java   | 125 +++
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   4 +
 .../near/GridCacheNearTxExceptionSelfTest.java  |   4 +
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   5 +
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |   5 +
 .../DataStreamerMultiThreadedSelfTest.java  |   4 +-
 .../DataStreamerMultinodeCreateCacheTest.java   |   2 +
 .../processors/igfs/IgfsAbstractSelfTest.java   | 185 ++
 .../tcp/TcpClientDiscoverySpiSelfTest.java  |   2 +
 .../testsuites/IgniteCacheTestSuite4.java   |   5 +
 .../ignite/igfs/Hadoop1DualAbstractTest.java|   5 +
 modules/yardstick/pom.xml   |  10 +-
 pom.xml |   9 +-
 42 files changed, 1134 insertions(+), 369 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--

[03/29] ignite git commit: schema-import examples fix

[anovikov]

schema-import examples fix


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

Branch: refs/heads/ignite-1168
Commit: 169066b98ae89cf9e5eba8872817f466947c5919
Parents: 59bc35a
Author: Anton Vinogradov 
Authored: Thu Sep 24 14:33:26 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Sep 24 14:33:26 2015 +0300

--
 examples/schema-import/pom.xml | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/169066b9/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index d302606..fdbd631 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -26,13 +26,19 @@
 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
+
+
 
 UTF-8
 
 
-org.apache.ignite
 ignite-schema-import-demo
-${project.version}
+1.0.0-SNAPSHOT
 
 
 

[10/29] ignite git commit: skip deployment of schema-import demo

[anovikov]

skip deployment of schema-import demo


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

Branch: refs/heads/ignite-1168
Commit: 656b11847c413689db8e7f7a85baef9f1de223c7
Parents: 008c273
Author: Anton Vinogradov 
Authored: Fri Sep 25 10:54:22 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Sep 25 10:54:22 2015 +0300

--
 examples/schema-import/pom.xml | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/656b1184/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index f51007a..5358e71 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -20,7 +20,8 @@
 
-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;>
+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
 
 
@@ -88,6 +89,14 @@
 1.7
 
 
+
+
+org.apache.maven.plugins
+maven-deploy-plugin
+
+true
+
+
 
 
 

[06/29] ignite git commit: 1.4.0-SNAPSHOT

[anovikov]

1.4.0-SNAPSHOT


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

Branch: refs/heads/ignite-1168
Commit: de12e9ab1f6d2525a12867e6c3eb540d648edf94
Parents: b054fdc
Author: Ignite Teamcity 
Authored: Thu Sep 24 14:55:33 2015 +0300
Committer: Ignite Teamcity 
Committed: Thu Sep 24 14:55:33 2015 +0300

--
 examples/schema-import/pom.xml | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/de12e9ab/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index fce6f47..f51007a 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -20,10 +20,7 @@
 
-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;>
+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
 
 
@@ -38,7 +35,7 @@
 
 
 ignite-schema-import-demo
-1.3.3-p7-SNAPSHOT
+1.4.0-SNAPSHOT
 
 
 

[21/29] ignite git commit: ignite-1618 Tests muted

[anovikov]

ignite-1618 Tests muted

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/35fa5e63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35fa5e63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35fa5e63

Branch: refs/heads/ignite-1168
Commit: 35fa5e630be2840eec2f9c9500e6f79bbc841597
Parents: 8616889
Author: agura 
Authored: Mon Oct 5 22:03:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Oct 6 11:11:13 2015 +0300

--
 .../cache/GridCacheDeploymentOffHeapSelfTest.java| 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/35fa5e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index fda054f..c51d72b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -38,4 +38,19 @@ public class GridCacheDeploymentOffHeapSelfTest extends 
GridCacheDeploymentSelfT
 
 return cacheCfg;
 }
+
+/** {@inheritDoc} */
+@Override public void testDeployment() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment6() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment7() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
 }
\ No newline at end of file

[24/29] ignite git commit: Minor fixes

[anovikov]

Minor fixes


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

Branch: refs/heads/ignite-1168
Commit: 833405e355a10e86db8054497d92f0b459c6e399
Parents: 6fce2c5
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:37:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:37:25 2015 +0300

--
 modules/yardstick/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/833405e3/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index d18e1a9..c87ecbc 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -20,7 +20,9 @@
 
-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;>
+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
 
 

[17/29] ignite git commit: IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.

[anovikov]

IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.


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

Branch: refs/heads/ignite-1168
Commit: a411f94d29b9073457ae2b31f89dd9f702e6bf53
Parents: fd091c8
Author: iveselovskiy 
Authored: Fri Oct 2 10:54:33 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Oct 2 10:54:33 2015 +0300

--
 .../org/apache/ignite/IgniteFileSystem.java |   2 +
 .../internal/processors/igfs/IgfsFileInfo.java  |  13 +-
 .../internal/processors/igfs/IgfsImpl.java  |  64 +--
 .../processors/igfs/IgfsMetaManager.java| 180 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 185 +++
 5 files changed, 300 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 a187a90..def2965 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
@@ -417,6 +417,8 @@ public interface IgniteFileSystem extends 
IgniteAsyncSupport {
 
 /**
  * Creates directories under specified path with the specified properties.
+ * Note that the properties are applied only to created directories, but 
never
+ * updated for existing ones.
  *
  * @param path Path of directories chain to create.
  * @param props Metadata properties to set on created directories.

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 8564500..fa79d80 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -124,6 +124,16 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /**
+ * Consturcts directory with random ID, provided listing and properties.
+ *
+ * @param listing Listing.
+ * @param props The properties to set for the new directory.
+ */
+IgfsFileInfo(@Nullable Map listing, @Nullable 
Map props) {
+this(true/*dir*/, null, 0, 0, null, listing, props, null, false, 
System.currentTimeMillis(), false);
+}
+
+/**
  * Constructs file info.
  *
  * @param blockSize Block size.
@@ -194,7 +204,7 @@ public final class IgfsFileInfo implements Externalizable {
  * @param evictExclude Evict exclude flag.
  */
 IgfsFileInfo(int blockSize, long len, boolean evictExclude, @Nullable 
Map props) {
-this(blockSize == 0, // NB The contract is: (blockSize == null) <=> 
isDirectory()
+this(blockSize == 0, // NB The contract is: (blockSize == 0) <=> 
isDirectory()
 null, blockSize, len, null, null, props, null, true, 
System.currentTimeMillis(), evictExclude);
 }
 
@@ -495,6 +505,7 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /** {@inheritDoc} */
+@SuppressWarnings("unchecked")
 @Override public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 id = U.readGridUuid(in);
 blockSize = in.readInt();

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 d5ba95f..fa3a955 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
@@ -23,6 +23,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import 

[19/29] ignite git commit: Apache Ignite License Generator Module Readme

[anovikov]

Apache Ignite License Generator Module Readme


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

Branch: refs/heads/ignite-1168
Commit: 9702b52f8ade6f2ee970d8cd77a71911106f3f21
Parents: 7b54cbd
Author: Anton Vinogradov 
Authored: Fri Oct 2 17:05:31 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Oct 2 17:05:31 2015 +0300

--
 modules/apache-license-gen/README.txt | 33 ++
 1 file changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9702b52f/modules/apache-license-gen/README.txt
--
diff --git a/modules/apache-license-gen/README.txt 
b/modules/apache-license-gen/README.txt
new file mode 100644
index 000..a0c027e
--- /dev/null
+++ b/modules/apache-license-gen/README.txt
@@ -0,0 +1,33 @@
+Apache Ignite License Generator Module
+--
+
+Apache Ignite License Generator module is a custom maven resource plugin.
+It generates /license/{module name}-licenses.txt file contains list of 
module's non transitive dependencies.
+Apache Ignite binary distribution contains all non transitive dependencies of 
it's modules.
+Set of modules included to binary distribution may vary as well as their 
dependencies list, versions and licenses.
+Automatic generation of /license/{module name}-licenses.txt file guarantee 
that binary distribution gives user
+actual information about licenses used by Apache Ignite's modules.
+
+Note that in case dependency provided under Apache License 2.0 only in will 
not appear inside generated file.
+
+To use Apache Ignite License Generator Module in your project please add 
following to pom.xml:
+
+
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ 
+ 
+ ignite-dependencies
+ 
+ process
+ 
+ 
+ 
+ 
org.apache.ignite:ignite-apache-license-gen:${project.version}
+ 
+ true
+ 
+ 
+ 
+ 
+

[05/29] ignite git commit: schema-import examples fix

[anovikov]

schema-import examples fix


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

Branch: refs/heads/ignite-1168
Commit: b054fdc86c574e6ba50708cbbec6dce9265cadf3
Parents: fb9b14d
Author: Anton Vinogradov 
Authored: Thu Sep 24 14:52:09 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Sep 24 14:52:09 2015 +0300

--
 examples/schema-import/pom.xml | 2 +-
 pom.xml| 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index fdbd631..fce6f47 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -38,7 +38,7 @@
 
 
 ignite-schema-import-demo
-1.0.0-SNAPSHOT
+1.3.3-p7-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6d10b42..a5b47d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,6 +466,7 @@
 examples
 
 examples
+examples/schema-import
 
 
 

[13/29] ignite git commit: fixed sha1 & md5, again

[anovikov]

fixed sha1 & md5, again


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

Branch: refs/heads/ignite-1168
Commit: 7752aa9b796068cbc51cc4ad8d7fc4b59dfa1c2b
Parents: 87ff90c
Author: Anton Vinogradov 
Authored: Fri Sep 25 16:01:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Sep 25 16:01:40 2015 +0300

--
 pom.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7752aa9b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ddc443..606bb0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,7 +626,15 @@
 
 
 
-
+
+
+
+
+
+
+
+
+
 
 
 

[28/29] ignite git commit: Fix REST authentication.

[anovikov]

Fix REST authentication.


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

Branch: refs/heads/ignite-1168
Commit: f025714ef0d217ebf6088c254f26dd9aa3fc
Parents: f60cba7
Author: ashutak 
Authored: Wed Oct 7 16:11:18 2015 +0300
Committer: ashutak 
Committed: Wed Oct 7 16:11:18 2015 +0300

--
 .../JettyRestProcessorAbstractSelfTest.java |  27 +-
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../processors/rest/GridRestProcessor.java  | 356 +--
 .../handlers/cache/GridCacheCommandHandler.java |   2 +-
 .../ignite/internal/util/IgniteUtils.java   |   2 +-
 5 files changed, 341 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f025714e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 8db4cd7..ac0edff 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -84,6 +84,13 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 protected abstract int restPort();
 
 /**
+ * @return Security enabled flag. Should be the same with {@code 
ctx.security().enabled()}.
+ */
+protected boolean securityEnabled() {
+return false;
+}
+
+/**
  * @param params Command parameters.
  * @return Returned content.
  * @throws Exception If failed.
@@ -133,7 +140,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return 
"\\{\\\"affinityNodeId\\\":\\\"\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":\\\"" + res + "\\\"\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -157,7 +164,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 private String integerPattern(int res, boolean success) {
 return "\\{\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -170,7 +177,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -183,7 +190,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -196,7 +203,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return 
"\\{\\\"affinityNodeId\\\":\\\"\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -209,7 +216,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-

[07/29] ignite git commit: schema-import examples fix

[anovikov]

schema-import examples fix


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

Branch: refs/heads/ignite-1168
Commit: 15d2f7625a0822167ea969dc289c10385092b5d0
Parents: de12e9a
Author: Anton Vinogradov 
Authored: Thu Sep 24 16:55:00 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Sep 24 16:55:00 2015 +0300

--
 assembly/release-fabric.xml   |  9 +++
 examples/schema-import/pom-standalone.xml | 90 ++
 pom.xml   |  5 ++
 3 files changed, 104 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/assembly/release-fabric.xml
--
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index a8c4541..308853c 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -51,6 +51,12 @@
 /examples
 pom.xml
 
+
+
+examples/schema-import/pom-standalone.xml
+/examples/schema-import
+pom.xml
+
 
 
 
@@ -85,6 +91,9 @@
 schema-import/**
 README.txt
 
+
+schema-import/pom*.xml
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/examples/schema-import/pom-standalone.xml
--
diff --git a/examples/schema-import/pom-standalone.xml 
b/examples/schema-import/pom-standalone.xml
new file mode 100644
index 000..e443728
--- /dev/null
+++ b/examples/schema-import/pom-standalone.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+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
+
+
+UTF-8
+
+
+org.apache.ignite
+ignite-schema-import-demo
+to_be_replaced_by_ignite_version
+
+
+
+javax.cache
+cache-api
+1.0.0
+
+
+
+org.apache.ignite
+ignite-core
+to_be_replaced_by_ignite_version
+
+
+
+org.apache.ignite
+ignite-spring
+to_be_replaced_by_ignite_version
+
+
+
+org.apache.ignite
+ignite-log4j
+to_be_replaced_by_ignite_version
+
+
+
+org.apache.ignite
+ignite-indexing
+to_be_replaced_by_ignite_version
+
+
+
+
+
+
+src/main/java
+
+**/*.java
+
+
+
+
+
+
+maven-compiler-plugin
+3.1
+
+1.7
+1.7
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a5b47d5..6ddc443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,11 @@
 
 
 
+
+
+
+
+
 
 
 

[08/29] ignite git commit: schema-import examples fix

[anovikov]

schema-import examples fix


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

Branch: refs/heads/ignite-1168
Commit: a2c972bf5ef59ffd13d65eacc4356ea1ac65383c
Parents: 15d2f76
Author: Anton Vinogradov 
Authored: Thu Sep 24 18:11:17 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Sep 24 18:11:17 2015 +0300

--
 assembly/release-fabric.xml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a2c972bf/assembly/release-fabric.xml
--
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index 308853c..9f9fbb2 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -88,12 +88,11 @@
 
 rest/**
 memcached/**
-schema-import/**
+schema-import/src/**
+schema-import/bin/**
+schema-import/README.txt
 README.txt
 
-
-schema-import/pom*.xml
-
 
 
 

[11/29] ignite git commit: fixed sha1 & md5, again

[anovikov]

fixed sha1 & md5, again


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

Branch: refs/heads/ignite-1168
Commit: 8e21daa8ea1cbfc5dbb1f84e9ccaf7101152b5a6
Parents: 656b118
Author: Anton Vinogradov 
Authored: Fri Sep 25 15:50:00 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Sep 25 15:50:00 2015 +0300

--
 pom.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8e21daa8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ddc443..b1a9f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,12 +627,12 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 

[15/29] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-1168
Commit: 0309f9688872e0c0fc7ff74514f06f47aef388b7
Parents: 150a644
Author: Anton Vinogradov 
Authored: Thu Oct 1 15:44:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 15:44:25 2015 +0300

--
 .../cache/distributed/near/GridCacheNearTxExceptionSelfTest.java | 4 
 .../datastreamer/DataStreamerMultiThreadedSelfTest.java  | 4 +++-
 .../datastreamer/DataStreamerMultinodeCreateCacheTest.java   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
index d6e3804..9546d61 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
@@ -30,4 +30,8 @@ public class GridCacheNearTxExceptionSelfTest extends 
IgniteTxExceptionAbstractS
 @Override protected CacheMode cacheMode() {
 return PARTITIONED;
 }
+
+@Override public void testTransformBackup(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1601;);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index bfeebf2..c1251ae 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -92,6 +92,8 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testStartStopIgnitesDynamicCache() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1602;);
+
 dynamicCache = true;
 
 startStopIgnites();
@@ -103,7 +105,7 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
 private void startStopIgnites() throws Exception {
 for (int attempt = 0; attempt < 3; ++attempt) {
 log.info("Iteration: " + attempt);
-
+
 final Ignite ignite = startGrid(0);
 
 Set futs = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
index ca0ff21..6bde83a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
@@ -58,6 +58,8 @@ public class DataStreamerMultinodeCreateCacheTest extends 
GridCommonAbstractTest
  * @throws Exception If failed.
  */
 public void testCreateCacheAndStream() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1603;);
+
 final int THREADS = 5;
 
 startGrids(THREADS);

[16/29] ignite git commit: Merge branch 'ignite-1.4'

[anovikov]

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/fd091c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd091c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd091c82

Branch: refs/heads/ignite-1168
Commit: fd091c82892040df8da935527ce72da996fa7718
Parents: 0309f96 7752aa9
Author: Anton Vinogradov 
Authored: Thu Oct 1 16:26:28 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 16:26:28 2015 +0300

--
 RELEASE_NOTES.txt   |  2 +
 assembly/dependencies-fabric.xml|  2 +-
 assembly/release-fabric.xml | 10 ++-
 examples/schema-import/pom-standalone.xml   | 90 
 examples/schema-import/pom.xml  | 13 ++-
 .../discovery/GridDiscoveryManager.java |  2 +-
 pom.xml |  9 +-
 7 files changed, 119 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/examples/schema-import/pom.xml
--

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/pom.xml
--

[26/29] ignite git commit: ignite-1112 Tests muted.

[anovikov]

ignite-1112 Tests muted.


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

Branch: refs/heads/ignite-1168
Commit: b3d347e35a254928fd1c4a0473f1b17d642c72f3
Parents: 2580994
Author: agura 
Authored: Tue Oct 6 15:38:04 2015 +0300
Committer: agura 
Committed: Tue Oct 6 15:38:04 2015 +0300

--
 ...cheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java | 5 +
 .../GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java  | 5 +
 2 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b3d347e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java
index 8edf8b4..0948a1d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java
@@ -28,4 +28,9 @@ public class 
GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest exten
 protected boolean isMultiJvm() {
 return true;
 }
+
+/** {@inheritDoc} */
+@Override public void testPutAllPutAll() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1112;);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b3d347e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
index d11c679..8623de1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
@@ -28,4 +28,9 @@ public class 
GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends
 protected boolean isMultiJvm() {
 return true;
 }
+
+/** {@inheritDoc} */
+@Override public void testPutAllPutAll() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1112;);
+}
 }
\ No newline at end of file

[14/29] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-1168
Commit: 150a644e9b939ccf921cac5c34af97358a16c50a
Parents: b08e0b2
Author: Anton Vinogradov 
Authored: Thu Oct 1 14:58:20 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 14:58:20 2015 +0300

--
 .../processors/cache/IgniteCacheEntryListenerTxTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/150a644e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
index cad57f0..a9e43d4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
@@ -47,4 +47,8 @@ public class IgniteCacheEntryListenerTxTest extends 
IgniteCacheEntryListenerAbst
 @Override protected NearCacheConfiguration nearConfiguration() {
 return null;
 }
+
+@Override public void testEvents(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1600;);
+}
 }
\ No newline at end of file

[22/29] ignite git commit: Minor fixes

[anovikov]

Minor fixes


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

Branch: refs/heads/ignite-1168
Commit: 8fc14ec004cc87d731f4d089f5b5c44c91831e40
Parents: 8616889
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:36:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:36:25 2015 +0300

--
 .../processors/cache/distributed/dht/GridDhtLockRequest.java   | 5 ++---
 modules/yardstick/pom.xml  | 6 ++
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 87aa256..99c1b86 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -299,8 +299,7 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 return accessTtl;
 }
 
-/** {@inheritDoc}
- * @param ctx*/
+/** {@inheritDoc} */
 @Override public void prepareMarshal(GridCacheSharedContext ctx) throws 
IgniteCheckedException {
 super.prepareMarshal(ctx);
 
@@ -529,4 +528,4 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 @Override public String toString() {
 return S.toString(GridDhtLockRequest.class, this, "super", 
super.toString());
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 2f0c5fe..d18e1a9 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -59,6 +59,12 @@
   
 
 
+org.apache.ignite
+ignite-log4j
+${project.version}
+
+
+
 org.yardstickframework
 yardstick
 ${yardstick.version}

[09/29] ignite git commit: ignite-1.4 Added schema-import-demo to exclude.

[anovikov]

ignite-1.4 Added schema-import-demo to exclude.


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

Branch: refs/heads/ignite-1168
Commit: 008c27341fe9b2996b01d0b55a4e7eb488180ed0
Parents: a2c972b
Author: Andrey 
Authored: Fri Sep 25 10:29:51 2015 +0700
Committer: Andrey 
Committed: Fri Sep 25 10:29:51 2015 +0700

--
 assembly/dependencies-fabric.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/008c2734/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index f69ffde..f50847e 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -120,11 +120,11 @@
 org.apache.ignite:ignite-extdata-uri
 org.apache.ignite:ignite-extdata-uri-dep
 org.apache.ignite:ignite-examples
+org.apache.ignite:ignite-schema-import-demo
 org.apache.ignite:ignite-indexing
 org.apache.ignite:ignite-visor-console
 org.apache.ignite:ignite-visor-console_2.10
 org.apache.ignite:ignite-visor-plugins
-org.apache.ignite:ignite-visor-trial
 org.apache.ignite:ignite-hadoop
 org.apache.ignite:ignite-schema-import
 org.apache.ignite:ignite-codegen

[01/29] ignite git commit: Release notes

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1168 6e0f41593 -> 5ef7c38f1


Release notes


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

Branch: refs/heads/ignite-1168
Commit: 603493169e66e9bc6a9f9129b2a7709fab1a6419
Parents: 7db44f1
Author: Yakov Zhdanov 
Authored: Thu Sep 24 13:33:24 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Sep 24 13:33:24 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60349316/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index d7097fd..cd0c2a2 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -7,6 +7,8 @@ Apache Ignite In-Memory Data Fabric 1.4
 * Added support for log4j2.
 * Added versioned entry to cache API.
 * Added client node based JDBC driver implementation.
+* Fixed consistency issue for custom events processing within discovery.
+* Fixed race in cache swap/unswap logic.
 * Fixed IGNITE_HOME resolution with JBoss.
 * Fixed configuration file resolution on classpath.
 * Fixed MBean registration for caches.

[27/29] ignite git commit: ignite-1624 Tests muted

[anovikov]

ignite-1624 Tests muted


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

Branch: refs/heads/ignite-1168
Commit: f60cba7986bcde8578e4e0dc4a065fb834514373
Parents: b3d347e
Author: agura 
Authored: Wed Oct 7 13:34:33 2015 +0300
Committer: agura 
Committed: Wed Oct 7 13:34:33 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f60cba79/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 9fbf5b1..0bb9a42 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -1074,6 +1074,8 @@ public class TcpClientDiscoverySpiSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testJoinError() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1624;);
+
 startServerNodes(1);
 
 Ignite ignite = G.ignite("server-0");

[25/29] ignite git commit: ignite-1620 Tests muted

[anovikov]

ignite-1620 Tests muted


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

Branch: refs/heads/ignite-1168
Commit: 25809947a7715d57092d8bb009ef6e48afa79b62
Parents: 833405e
Author: agura 
Authored: Tue Oct 6 15:19:21 2015 +0300
Committer: agura 
Committed: Tue Oct 6 15:19:21 2015 +0300

--
 .../java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/25809947/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
--
diff --git 
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
 
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
index ea65464..efe95be 100644
--- 
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
+++ 
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
@@ -64,6 +64,11 @@ public abstract class Hadoop1DualAbstractTest extends 
IgfsDualAbstractSelfTest {
 super(mode);
 }
 
+/** {@inheritDoc} */
+@Override public void testMkdirs() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1620;);
+}
+
 /**
  * Creates secondary filesystems.
  * @return IgfsSecondaryFileSystem

[20/29] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-1168
Commit: 8616889556edf4aef532389c2639555facfc710d
Parents: 9702b52
Author: Anton Vinogradov 
Authored: Fri Oct 2 17:35:20 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Oct 2 17:35:20 2015 +0300

--
 .../distributed/dht/GridNearCacheTxNodeFailureSelfTest.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86168895/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
index 5735182..ca23646 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
@@ -28,4 +28,8 @@ public class GridNearCacheTxNodeFailureSelfTest extends 
GridCacheTxNodeFailureSe
 @Override protected CacheConfiguration cacheConfiguration(String gridName) 
{
 return super.cacheConfiguration(gridName).setNearConfiguration(new 
NearCacheConfiguration());
 }
+
+@Override public void testPrimaryNodeFailureBackupCommitImplicit(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1611;);
+}
 }

[34/50] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-843
Commit: 0309f9688872e0c0fc7ff74514f06f47aef388b7
Parents: 150a644
Author: Anton Vinogradov 
Authored: Thu Oct 1 15:44:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 15:44:25 2015 +0300

--
 .../cache/distributed/near/GridCacheNearTxExceptionSelfTest.java | 4 
 .../datastreamer/DataStreamerMultiThreadedSelfTest.java  | 4 +++-
 .../datastreamer/DataStreamerMultinodeCreateCacheTest.java   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
index d6e3804..9546d61 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
@@ -30,4 +30,8 @@ public class GridCacheNearTxExceptionSelfTest extends 
IgniteTxExceptionAbstractS
 @Override protected CacheMode cacheMode() {
 return PARTITIONED;
 }
+
+@Override public void testTransformBackup(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1601;);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index bfeebf2..c1251ae 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -92,6 +92,8 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testStartStopIgnitesDynamicCache() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1602;);
+
 dynamicCache = true;
 
 startStopIgnites();
@@ -103,7 +105,7 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
 private void startStopIgnites() throws Exception {
 for (int attempt = 0; attempt < 3; ++attempt) {
 log.info("Iteration: " + attempt);
-
+
 final Ignite ignite = startGrid(0);
 
 Set futs = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
index ca0ff21..6bde83a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
@@ -58,6 +58,8 @@ public class DataStreamerMultinodeCreateCacheTest extends 
GridCommonAbstractTest
  * @throws Exception If failed.
  */
 public void testCreateCacheAndStream() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1603;);
+
 final int THREADS = 5;
 
 startGrids(THREADS);

[48/50] ignite git commit: Merge master into ignite-1168

[anovikov]

Merge master into ignite-1168


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

Branch: refs/heads/ignite-843
Commit: 5ef7c38f1ca6b8e075b59000dc48731c260a2a41
Parents: 6e0f415 f025714
Author: Andrey 
Authored: Thu Oct 8 10:01:27 2015 +0700
Committer: Andrey 
Committed: Thu Oct 8 10:01:27 2015 +0700

--
 RELEASE_NOTES.txt   |   2 +
 assembly/dependencies-fabric.xml|   2 +-
 assembly/release-fabric.xml |  10 +-
 examples/schema-import/pom-standalone.xml   |  90 +
 examples/schema-import/pom.xml  |  13 +-
 modules/apache-license-gen/README.txt   |  33 ++
 .../JettyRestProcessorAbstractSelfTest.java |  25 +-
 .../org/apache/ignite/IgniteFileSystem.java |   2 +
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../discovery/GridDiscoveryManager.java |   4 +-
 .../cache/DynamicCacheDescriptor.java   |  17 +
 .../processors/cache/GridCacheContext.java  |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  20 +-
 .../GridCachePartitionExchangeManager.java  |  72 +---
 .../processors/cache/GridCacheProcessor.java|  26 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../distributed/dht/GridDhtLockRequest.java |   5 +-
 .../dht/GridPartitionedGetFuture.java   |   5 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../distributed/near/GridNearGetFuture.java |   2 +
 .../internal/processors/igfs/IgfsFileInfo.java  |  13 +-
 .../internal/processors/igfs/IgfsImpl.java  |  64 +---
 .../processors/igfs/IgfsMetaManager.java| 180 +-
 .../processors/rest/GridRestProcessor.java  | 354 +--
 .../ignite/internal/util/IgniteUtils.java   |   2 +-
 .../GridCacheDeploymentOffHeapSelfTest.java |  15 +
 .../cache/IgniteCacheEntryListenerTxTest.java   |   4 +
 .../cache/IgniteCachePutAllRestartTest.java |   4 +-
 .../CacheGetFutureHangsSelfTest.java| 156 
 .../distributed/IgniteCacheCreatePutTest.java   | 125 +++
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   4 +
 .../near/GridCacheNearTxExceptionSelfTest.java  |   4 +
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   5 +
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |   5 +
 .../DataStreamerMultiThreadedSelfTest.java  |   4 +-
 .../DataStreamerMultinodeCreateCacheTest.java   |   2 +
 .../processors/igfs/IgfsAbstractSelfTest.java   | 185 ++
 .../tcp/TcpClientDiscoverySpiSelfTest.java  |   2 +
 .../testsuites/IgniteCacheTestSuite4.java   |   5 +
 .../ignite/igfs/Hadoop1DualAbstractTest.java|   5 +
 modules/yardstick/pom.xml   |  10 +-
 pom.xml |   9 +-
 42 files changed, 1134 insertions(+), 369 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--

[30/50] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-843
Commit: b962a91582f6d6459fad24a9529bbe692eba20ca
Parents: aa9d23e
Author: Anton Vinogradov 
Authored: Wed Sep 30 18:58:33 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 18:58:33 2015 +0300

--
 .../GridCachePartitionedOffHeapValuesQueueApiSelfTest.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b962a915/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
index 78e0214..d46f684 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
@@ -28,4 +28,8 @@ public class 
GridCachePartitionedOffHeapValuesQueueApiSelfTest extends GridCache
 @Override protected CacheMemoryMode collectionMemoryMode() {
 return OFFHEAP_VALUES;
 }
+
+@Override public void testQueueRemoveMultithreadBounded(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1592;);
+}
 }
\ No newline at end of file

[15/50] ignite git commit: IGNITE-1515: Fixed delete.

[anovikov]

IGNITE-1515: Fixed delete.


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

Branch: refs/heads/ignite-843
Commit: 54bb7d760d9c1261a64fcf3d0be858be7b1e
Parents: be906e3
Author: iveselovskiy 
Authored: Wed Sep 30 10:05:19 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Sep 30 10:05:19 2015 +0300

--
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   2 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |   2 +-
 .../internal/processors/igfs/IgfsImpl.java  |  57 +
 .../processors/igfs/IgfsMetaManager.java| 251 +++
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  80 --
 .../igfs/IgfsMetaManagerSelfTest.java   |   6 -
 .../processors/igfs/IgfsMetricsSelfTest.java|   2 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  29 +--
 .../igfs/UniversalFileSystemAdapter.java|   1 -
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |  36 +++
 ...oopFileSystemUniversalFileSystemAdapter.java |   4 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   7 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   5 +-
 14 files changed, 345 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/54bb7d76/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java 
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
index a99c1ee..fb0621c 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
@@ -50,7 +50,7 @@ public final class IgfsPath implements Comparable, 
Externalizable {
 private static final char SLASH_CHAR = '/';
 
 /** The directory separator. */
-private static final String SLASH = "/";
+public static final String SLASH = "/";
 
 /** URI representing this path. Should never change after object creation 
or de-serialization. */
 private String path;

http://git-wip-us.apache.org/repos/asf/ignite/blob/54bb7d76/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 116d585..8564500 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -216,7 +216,7 @@ public final class IgfsFileInfo implements Externalizable {
  * @param listing New directory listing.
  * @param old Old file info.
  */
-IgfsFileInfo(Map listing, IgfsFileInfo old) {
+IgfsFileInfo(@Nullable Map listing, IgfsFileInfo 
old) {
 this(old.isDirectory(), old.id, old.blockSize, old.len, old.affKey, 
listing, old.props, old.fileMap(),
 old.lockId, false, old.accessTime, old.modificationTime, 
old.evictExclude());
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/54bb7d76/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 0dd0307..d5ba95f 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
@@ -53,7 +53,6 @@ import org.apache.ignite.events.DiscoveryEvent;
 import org.apache.ignite.events.Event;
 import org.apache.ignite.events.IgfsEvent;
 import org.apache.ignite.igfs.IgfsBlockLocation;
-import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException;
 import org.apache.ignite.igfs.IgfsFile;
 import org.apache.ignite.igfs.IgfsInvalidPathException;
 import org.apache.ignite.igfs.IgfsMetrics;
@@ -712,6 +711,9 @@ public final class IgfsImpl implements IgfsEx {
 if (log.isDebugEnabled())
 log.debug("Deleting file [path=" + path + ", recursive=" + 
recursive + ']');
 
+if (IgfsPath.SLASH.equals(path.toString()))
+

[17/50] ignite git commit: ignite-1329 Removed outdated code from GridCacheIoManager

[anovikov]

ignite-1329 Removed outdated code from GridCacheIoManager


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

Branch: refs/heads/ignite-843
Commit: cd439672847d764838075b7eafae504ce27d0563
Parents: c6ec7e1
Author: sboikov 
Authored: Wed Sep 30 13:43:41 2015 +0300
Committer: sboikov 
Committed: Wed Sep 30 13:43:41 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/cd439672/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))
-U.error(log, 

[43/50] ignite git commit: Minor fixes

[anovikov]

Minor fixes


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

Branch: refs/heads/ignite-843
Commit: 833405e355a10e86db8054497d92f0b459c6e399
Parents: 6fce2c5
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:37:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:37:25 2015 +0300

--
 modules/yardstick/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/833405e3/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index d18e1a9..c87ecbc 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -20,7 +20,9 @@
 
-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;>
+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
 
 

[39/50] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-843
Commit: 8616889556edf4aef532389c2639555facfc710d
Parents: 9702b52
Author: Anton Vinogradov 
Authored: Fri Oct 2 17:35:20 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Oct 2 17:35:20 2015 +0300

--
 .../distributed/dht/GridNearCacheTxNodeFailureSelfTest.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86168895/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
index 5735182..ca23646 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
@@ -28,4 +28,8 @@ public class GridNearCacheTxNodeFailureSelfTest extends 
GridCacheTxNodeFailureSe
 @Override protected CacheConfiguration cacheConfiguration(String gridName) 
{
 return super.cacheConfiguration(gridName).setNearConfiguration(new 
NearCacheConfiguration());
 }
+
+@Override public void testPrimaryNodeFailureBackupCommitImplicit(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1611;);
+}
 }

[16/50] ignite git commit: # master - changed "communication encryption" to "ssl"

[anovikov]

# master - changed "communication encryption" to "ssl"


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

Branch: refs/heads/ignite-843
Commit: c6ec7e1165017d4331199bdf667b81a6f2ed91c8
Parents: 54bb7d7
Author: Dmitiry Setrakyan 
Authored: Wed Sep 30 10:52:15 2015 +0200
Committer: Dmitiry Setrakyan 
Committed: Wed Sep 30 10:52:15 2015 +0200

--
 .../apache/ignite/internal/IgniteKernal.java| 70 ++--
 1 file changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c6ec7e11/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 60725e4..68a0383 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
@@ -17,38 +17,6 @@
 
 package org.apache.ignite.internal;
 
-import java.io.Externalizable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.JMException;
-import javax.management.ObjectName;
 import org.apache.ignite.IgniteAtomicLong;
 import org.apache.ignite.IgniteAtomicReference;
 import org.apache.ignite.IgniteAtomicSequence;
@@ -64,7 +32,6 @@ import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.internal.portable.api.IgnitePortables;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteScheduler;
 import org.apache.ignite.IgniteServices;
@@ -94,6 +61,7 @@ import 
org.apache.ignite.internal.managers.failover.GridFailoverManager;
 import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
 import 
org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
 import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.portable.api.IgnitePortables;
 import org.apache.ignite.internal.processors.GridProcessor;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -157,7 +125,6 @@ import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
 import org.apache.ignite.marshaller.MarshallerExclusions;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.internal.portable.api.PortableMarshaller;
 import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
 import org.apache.ignite.mxbean.IgniteMXBean;
 import org.apache.ignite.mxbean.ThreadPoolMXBean;
@@ -168,6 +135,39 @@ import org.apache.ignite.spi.IgniteSpi;
 import org.apache.ignite.spi.IgniteSpiVersionCheckException;
 import org.jetbrains.annotations.Nullable;
 
+import javax.management.JMException;
+import javax.management.ObjectName;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import 

[18/50] ignite git commit: ignite-1564 Fixed client cache reconnect issues

[anovikov]

ignite-1564 Fixed client cache reconnect issues


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

Branch: refs/heads/ignite-843
Commit: 273f291d9fac0919d57b9ed732564b323a956f90
Parents: cd43967
Author: sboikov 
Authored: Wed Sep 30 13:48:48 2015 +0300
Committer: sboikov 
Committed: Wed Sep 30 13:48:48 2015 +0300

--
 .../discovery/GridDiscoveryManager.java |  22 +--
 .../processors/cache/GridCacheEventManager.java |  12 +-
 .../processors/cache/GridCacheProcessor.java|  68 +---
 .../dht/preloader/GridDhtPreloader.java |   6 +
 .../IgniteClientReconnectAbstractTest.java  |  35 -
 .../IgniteClientReconnectCacheTest.java | 154 +++
 6 files changed, 249 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 785613d..aec36a2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -78,7 +78,7 @@ import 
org.apache.ignite.internal.processors.jobmetrics.GridJobMetrics;
 import org.apache.ignite.internal.processors.security.SecurityContext;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
 import org.apache.ignite.internal.util.F0;
-import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
 import org.apache.ignite.internal.util.GridSpinBusyLock;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -208,7 +208,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 
 /** Topology cache history. */
 private final Map discoCacheHist =
-new GridBoundedConcurrentLinkedHashMap<>(DISCOVERY_HISTORY_SIZE, 
DISCOVERY_HISTORY_SIZE, 0.7f, 1);
+new GridBoundedConcurrentOrderedMap<>(DISCOVERY_HISTORY_SIZE);
 
 /** Topology snapshots history. */
 private volatile Map topHist = new 
HashMap<>();
@@ -465,14 +465,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 final Map snapshots,
 @Nullable DiscoverySpiCustomMessage spiCustomMsg
 ) {
-if (type == EVT_NODE_JOINED && node.isLocal() && 
ctx.clientDisconnected()) {
-discoCacheHist.clear();
-
-topHist.clear();
-
-topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, 
null));
-}
-
 DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null
 : ((CustomMessageWrapper)spiCustomMsg).delegate();
 
@@ -593,6 +585,13 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 locJoinEvt = new GridFutureAdapter<>();
 
 registeredCaches.clear();
+
+discoCacheHist.clear();
+
+topHist.clear();
+
+topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO,
+new DiscoCache(locNode, 
Collections.emptySet(;
 }
 else if (type == EVT_CLIENT_NODE_RECONNECTED) {
 assert locNode.isClient() : locNode;
@@ -620,7 +619,8 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 return;
 }
 
-discoWrk.addEvent(type, nextTopVer, node, topSnapshot, 
customMsg);
+if (type == EVT_CLIENT_NODE_DISCONNECTED || type == 
EVT_NODE_SEGMENTED || !ctx.clientDisconnected())
+discoWrk.addEvent(type, nextTopVer, node, topSnapshot, 
customMsg);
 }
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
 

[44/50] ignite git commit: ignite-1620 Tests muted

[anovikov]

ignite-1620 Tests muted


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

Branch: refs/heads/ignite-843
Commit: 25809947a7715d57092d8bb009ef6e48afa79b62
Parents: 833405e
Author: agura 
Authored: Tue Oct 6 15:19:21 2015 +0300
Committer: agura 
Committed: Tue Oct 6 15:19:21 2015 +0300

--
 .../java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/25809947/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
--
diff --git 
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
 
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
index ea65464..efe95be 100644
--- 
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
+++ 
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
@@ -64,6 +64,11 @@ public abstract class Hadoop1DualAbstractTest extends 
IgfsDualAbstractSelfTest {
 super(mode);
 }
 
+/** {@inheritDoc} */
+@Override public void testMkdirs() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1620;);
+}
+
 /**
  * Creates secondary filesystems.
  * @return IgfsSecondaryFileSystem

[07/50] ignite git commit: Added tests.

[anovikov]

Added tests.


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

Branch: refs/heads/ignite-843
Commit: ce3f20be6d1950fa182f1622b92984b465ae27cd
Parents: c6bb01b
Author: sboikov 
Authored: Tue Sep 29 09:52:46 2015 +0300
Committer: sboikov 
Committed: Tue Sep 29 09:52:46 2015 +0300

--
 .../IgniteCrossCacheTxNearEnabledSelfTest.java  |  28 +++
 .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   2 +
 3 files changed, 243 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
new file mode 100644
index 000..f70cedf
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.internal.processors.cache.distributed.dht;
+
+/**
+ *
+ */
+public class IgniteCrossCacheTxNearEnabledSelfTest extends 
IgniteCrossCacheTxSelfTest {
+/** {@inheritDoc} */
+@Override protected boolean nearEnabled() {
+return true;
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
new file mode 100644
index 000..bf9b1c6
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -0,0 +1,213 @@
+/*
+ * 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.internal.processors.cache.distributed.dht;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCache;
+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.IgniteEx;
+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 

[05/50] ignite git commit: Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168

[anovikov]

Merge branches 'ignite-1168' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168


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

Branch: refs/heads/ignite-843
Commit: 66b91b9af6fcfe04a6de2874b375d8f7c51ec693
Parents: 124c492 e5c3ca3
Author: Andrey 
Authored: Tue Sep 29 09:23:49 2015 +0700
Committer: Andrey 
Committed: Tue Sep 29 09:23:49 2015 +0700

--
 bin/igniterouter.bat|   2 +-
 bin/igniterouter.sh |   2 +-
 examples/schema-import/pom.xml  |  10 +-
 .../computegrid/ComputeClosureExample.java  |   2 +-
 .../org/apache/ignite/IgniteAtomicLong.java |   2 +-
 .../org/apache/ignite/IgniteFileSystem.java |   2 +-
 .../configuration/CacheConfiguration.java   |   2 +-
 .../apache/ignite/internal/IgniteKernal.java|   4 +-
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/GridDiscoveryManager.java |   2 +-
 .../cache/DynamicCacheChangeRequest.java|  19 +
 .../cache/DynamicCacheDescriptor.java   |  29 +-
 .../GridCachePartitionExchangeManager.java  |  26 +-
 .../processors/cache/GridCacheProcessor.java|  33 +-
 .../processors/cache/IgniteCacheProxy.java  |   4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   6 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   5 +
 .../near/GridNearTxFinishFuture.java|   4 +-
 .../cache/distributed/near/GridNearTxLocal.java |  19 +-
 .../continuous/CacheContinuousQueryHandler.java |  10 +-
 .../continuous/CacheContinuousQueryManager.java |  66 ++-
 .../transactions/IgniteTxLocalAdapter.java  |  35 +-
 .../continuous/GridContinuousProcessor.java |  20 +-
 .../datastructures/DataStructuresProcessor.java |   6 +-
 .../internal/processors/igfs/IgfsImpl.java  |  87 +---
 .../processors/igfs/IgfsMetaManager.java| 193 -
 .../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 +-
 .../internal/GridUpdateNotifierSelfTest.java|   1 +
 .../GridCacheAbstractRemoveFailureTest.java |   6 +-
 .../GridCacheVariableTopologySelfTest.java  |   3 +-
 .../cache/IgniteDynamicCacheFilterTest.java | 150 +++
 .../IgniteTxExceptionAbstractSelfTest.java  |   3 +
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |   5 -
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   5 -
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  16 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |   5 -
 .../distributed/CacheAffEarlySelfTest.java  | 245 
 .../distributed/CacheAffinityEarlyTest.java | 168 
 .../IgniteTxPreloadAbstractTest.java|  43 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |   5 -
 ...GridCacheValueConsistencyAtomicSelfTest.java |   2 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |   5 -
 .../near/NearCacheMultithreadedUpdateTest.java  | 217 ++
 .../GridCacheReplicatedInvalidateSelfTest.java  | 249 
 .../GridCacheReplicatedTxExceptionSelfTest.java |   5 -
 .../replicated/GridReplicatedTxPreloadTest.java |   2 -
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |   5 +-
 .../GridCacheLocalTxExceptionSelfTest.java  |   5 -
 ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++
 .../processors/igfs/IgfsAbstractSelfTest.java   | 201 +++---
 .../igfs/IgfsClientCacheSelfTest.java   |  15 +-
 .../igfs/IgfsMetaManagerSelfTest.java   | 106 ++---
 ...lientDiscoverySpiFailureTimeoutSelfTest.java |  33 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java  |  53 ++-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++-
 .../multijvm/IgniteCacheProcessProxy.java   |   3 +-
 .../IgniteCacheFailoverTestSuite.java   |   4 -
 .../IgniteCacheFailoverTestSuite3.java  |  28 +-
 .../testsuites/IgniteCacheTestSuite3.java   |   2 -
 .../testsuites/IgniteCacheTestSuite4.java   |  12 +
 .../testsuites/IgniteHadoopTestSuite.java   |  19 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +-
 pom.xml |  27 +-
 72 files changed, 2121 

[08/50] ignite git commit: Added test.

[anovikov]

Added test.


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

Branch: refs/heads/ignite-843
Commit: c517fcf5a7c9444e27e5f4d261702aaa2dfe726d
Parents: ce3f20b
Author: sboikov 
Authored: Tue Sep 29 12:15:37 2015 +0300
Committer: sboikov 
Committed: Tue Sep 29 12:15:37 2015 +0300

--
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  | 151 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   2 +
 2 files changed, 153 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c517fcf5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
new file mode 100644
index 000..cf0e0d3
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.internal.processors.cache.distributed;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+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.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class IgniteCacheCreatePutMultiNodeSelfTest extends 
GridCommonAbstractTest {
+/** Grid count. */
+private static final int GRID_CNT = 4;
+
+/** */
+private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setIpFinder(ipFinder);
+
+cfg.setDiscoverySpi(discoSpi);
+
+OptimizedMarshaller marsh = new OptimizedMarshaller();
+marsh.setRequireSerializable(false);
+
+cfg.setMarshaller(marsh);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 6 * 60 * 1000L;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testStartNodes() throws Exception {
+try {
+Collection futs = new 
ArrayList<>(GRID_CNT);
+int scale = 3;
+
+final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT * scale);
+final AtomicReferenceArray err = new 
AtomicReferenceArray<>(GRID_CNT * scale);
+
+for (int i = 0; i < GRID_CNT * scale; i++) {
+if (i < GRID_CNT)
+startGrid(i);
+
+final int idx = i;
+
+IgniteInternalFuture fut = GridTestUtils.runAsync(new 

[37/50] ignite git commit: ignite-1534 Fixed races in dynamic cache start exchange ordering.

[anovikov]

ignite-1534 Fixed races in dynamic cache start exchange ordering.


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

Branch: refs/heads/ignite-843
Commit: 7b54cbd7499cd498b04e821dfa3b572bd94debec
Parents: a411f94
Author: sboikov 
Authored: Fri Oct 2 11:19:06 2015 +0300
Committer: sboikov 
Committed: Fri Oct 2 11:19:06 2015 +0300

--
 .../discovery/GridDiscoveryManager.java |   2 +-
 .../cache/DynamicCacheDescriptor.java   |  17 ++
 .../processors/cache/GridCacheContext.java  |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  20 ++-
 .../GridCachePartitionExchangeManager.java  |  72 ++---
 .../processors/cache/GridCacheProcessor.java|  26 ++--
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../dht/GridPartitionedGetFuture.java   |   5 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../distributed/near/GridNearGetFuture.java |   2 +
 .../cache/IgniteCachePutAllRestartTest.java |   4 +-
 .../CacheGetFutureHangsSelfTest.java| 156 +--
 .../distributed/IgniteCacheCreatePutTest.java   | 125 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   5 +
 14 files changed, 284 insertions(+), 165 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index b694523..a6f5f08 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -550,7 +550,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 gridStartTime = getSpi().getGridStartTime();
 
 updateTopologyVersionIfGreater(new 
AffinityTopologyVersion(locNode.order()),
-new DiscoCache(localNode(), 
getSpi().getRemoteNodes()));
+new DiscoCache(localNode(), F.view(topSnapshot, 
F.remoteNodes(locNode.id();
 
 startLatch.countDown();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/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 24df7e4..b100a31 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
@@ -68,6 +68,9 @@ public class DynamicCacheDescriptor {
 /** */
 private AffinityTopologyVersion startTopVer;
 
+/** */
+private boolean rcvdOnDiscovery;
+
 /**
  * @param ctx Context.
  * @param cacheCfg Cache configuration.
@@ -236,6 +239,20 @@ public class DynamicCacheDescriptor {
 this.updatesAllowed = updatesAllowed;
 }
 
+/**
+ * @return {@code True} if received in discovery data.
+ */
+public boolean receivedOnDiscovery() {
+return rcvdOnDiscovery;
+}
+
+/**
+ * @param rcvdOnDiscovery {@code True} if received in discovery data.
+ */
+public void receivedOnDiscovery(boolean rcvdOnDiscovery) {
+this.rcvdOnDiscovery = rcvdOnDiscovery;
+}
+
 /** {@inheritDoc} */
 @Override public String toString() {
 return S.toString(DynamicCacheDescriptor.class, this, "cacheName", 
U.maskName(cacheCfg.getName()));

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 5385dec..3a1cee6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 

[41/50] ignite git commit: Minor fixes

[anovikov]

Minor fixes


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

Branch: refs/heads/ignite-843
Commit: 8fc14ec004cc87d731f4d089f5b5c44c91831e40
Parents: 8616889
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:36:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:36:25 2015 +0300

--
 .../processors/cache/distributed/dht/GridDhtLockRequest.java   | 5 ++---
 modules/yardstick/pom.xml  | 6 ++
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 87aa256..99c1b86 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -299,8 +299,7 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 return accessTtl;
 }
 
-/** {@inheritDoc}
- * @param ctx*/
+/** {@inheritDoc} */
 @Override public void prepareMarshal(GridCacheSharedContext ctx) throws 
IgniteCheckedException {
 super.prepareMarshal(ctx);
 
@@ -529,4 +528,4 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 @Override public String toString() {
 return S.toString(GridDhtLockRequest.class, this, "super", 
super.toString());
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 2f0c5fe..d18e1a9 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -59,6 +59,12 @@
   
 
 
+org.apache.ignite
+ignite-log4j
+${project.version}
+
+
+
 org.yardstickframework
 yardstick
 ${yardstick.version}

[36/50] ignite git commit: IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.

[anovikov]

IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.


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

Branch: refs/heads/ignite-843
Commit: a411f94d29b9073457ae2b31f89dd9f702e6bf53
Parents: fd091c8
Author: iveselovskiy 
Authored: Fri Oct 2 10:54:33 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Oct 2 10:54:33 2015 +0300

--
 .../org/apache/ignite/IgniteFileSystem.java |   2 +
 .../internal/processors/igfs/IgfsFileInfo.java  |  13 +-
 .../internal/processors/igfs/IgfsImpl.java  |  64 +--
 .../processors/igfs/IgfsMetaManager.java| 180 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 185 +++
 5 files changed, 300 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 a187a90..def2965 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
@@ -417,6 +417,8 @@ public interface IgniteFileSystem extends 
IgniteAsyncSupport {
 
 /**
  * Creates directories under specified path with the specified properties.
+ * Note that the properties are applied only to created directories, but 
never
+ * updated for existing ones.
  *
  * @param path Path of directories chain to create.
  * @param props Metadata properties to set on created directories.

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 8564500..fa79d80 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -124,6 +124,16 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /**
+ * Consturcts directory with random ID, provided listing and properties.
+ *
+ * @param listing Listing.
+ * @param props The properties to set for the new directory.
+ */
+IgfsFileInfo(@Nullable Map listing, @Nullable 
Map props) {
+this(true/*dir*/, null, 0, 0, null, listing, props, null, false, 
System.currentTimeMillis(), false);
+}
+
+/**
  * Constructs file info.
  *
  * @param blockSize Block size.
@@ -194,7 +204,7 @@ public final class IgfsFileInfo implements Externalizable {
  * @param evictExclude Evict exclude flag.
  */
 IgfsFileInfo(int blockSize, long len, boolean evictExclude, @Nullable 
Map props) {
-this(blockSize == 0, // NB The contract is: (blockSize == null) <=> 
isDirectory()
+this(blockSize == 0, // NB The contract is: (blockSize == 0) <=> 
isDirectory()
 null, blockSize, len, null, null, props, null, true, 
System.currentTimeMillis(), evictExclude);
 }
 
@@ -495,6 +505,7 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /** {@inheritDoc} */
+@SuppressWarnings("unchecked")
 @Override public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 id = U.readGridUuid(in);
 blockSize = in.readInt();

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 d5ba95f..fa3a955 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
@@ -23,6 +23,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import 

[03/50] ignite git commit: Merge remote-tracking branch 'origin/master'

[anovikov]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-843
Commit: 04930caa238ae974e037d9705e7b329fbde9ae52
Parents: 040f0f3 13629ce
Author: Yakov Zhdanov 
Authored: Mon Sep 28 15:31:03 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Sep 28 15:31:03 2015 +0300

--
 .../managers/discovery/CustomEventListener.java |  4 +++-
 .../discovery/GridDiscoveryManager.java |  2 +-
 .../cache/DynamicCacheChangeRequest.java| 19 +++
 .../cache/DynamicCacheDescriptor.java   | 19 +++
 .../GridCachePartitionExchangeManager.java  | 20 +---
 .../processors/cache/GridCacheProcessor.java| 15 +++
 .../continuous/CacheContinuousQueryHandler.java | 10 +++---
 .../continuous/GridContinuousProcessor.java | 17 +
 .../datastructures/DataStructuresProcessor.java |  6 +-
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |  5 -
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |  5 -
 ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 ++--
 12 files changed, 101 insertions(+), 37 deletions(-)
--

[21/50] ignite git commit: Merge remote-tracking branch 'origin/master'

[anovikov]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-843
Commit: de39fbf269ad6f834ab01444558ea2dced1c2035
Parents: f380883 1282f8b
Author: Dmitiry Setrakyan 
Authored: Wed Sep 30 14:19:28 2015 +0200
Committer: Dmitiry Setrakyan 
Committed: Wed Sep 30 14:19:28 2015 +0200

--
 .../discovery/GridDiscoveryManager.java |  22 +--
 .../processors/cache/GridCacheEventManager.java |  12 +-
 .../processors/cache/GridCacheIoManager.java|  76 +
 .../processors/cache/GridCacheMessage.java  |   7 -
 .../processors/cache/GridCacheProcessor.java|  68 +---
 .../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 -
 .../dht/preloader/GridDhtPreloader.java |   6 +
 .../IgniteClientReconnectAbstractTest.java  |  35 -
 .../IgniteClientReconnectCacheTest.java | 154 +++
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   7 +
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |  12 +-
 22 files changed, 266 insertions(+), 225 deletions(-)
--

[38/50] ignite git commit: Apache Ignite License Generator Module Readme

[anovikov]

Apache Ignite License Generator Module Readme


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

Branch: refs/heads/ignite-843
Commit: 9702b52f8ade6f2ee970d8cd77a71911106f3f21
Parents: 7b54cbd
Author: Anton Vinogradov 
Authored: Fri Oct 2 17:05:31 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Oct 2 17:05:31 2015 +0300

--
 modules/apache-license-gen/README.txt | 33 ++
 1 file changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9702b52f/modules/apache-license-gen/README.txt
--
diff --git a/modules/apache-license-gen/README.txt 
b/modules/apache-license-gen/README.txt
new file mode 100644
index 000..a0c027e
--- /dev/null
+++ b/modules/apache-license-gen/README.txt
@@ -0,0 +1,33 @@
+Apache Ignite License Generator Module
+--
+
+Apache Ignite License Generator module is a custom maven resource plugin.
+It generates /license/{module name}-licenses.txt file contains list of 
module's non transitive dependencies.
+Apache Ignite binary distribution contains all non transitive dependencies of 
it's modules.
+Set of modules included to binary distribution may vary as well as their 
dependencies list, versions and licenses.
+Automatic generation of /license/{module name}-licenses.txt file guarantee 
that binary distribution gives user
+actual information about licenses used by Apache Ignite's modules.
+
+Note that in case dependency provided under Apache License 2.0 only in will 
not appear inside generated file.
+
+To use Apache Ignite License Generator Module in your project please add 
following to pom.xml:
+
+
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ 
+ 
+ ignite-dependencies
+ 
+ process
+ 
+ 
+ 
+ 
org.apache.ignite:ignite-apache-license-gen:${project.version}
+ 
+ true
+ 
+ 
+ 
+ 
+

[47/50] ignite git commit: Fix REST authentication.

[anovikov]

Fix REST authentication.


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

Branch: refs/heads/ignite-843
Commit: f025714ef0d217ebf6088c254f26dd9aa3fc
Parents: f60cba7
Author: ashutak 
Authored: Wed Oct 7 16:11:18 2015 +0300
Committer: ashutak 
Committed: Wed Oct 7 16:11:18 2015 +0300

--
 .../JettyRestProcessorAbstractSelfTest.java |  27 +-
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../processors/rest/GridRestProcessor.java  | 356 +--
 .../handlers/cache/GridCacheCommandHandler.java |   2 +-
 .../ignite/internal/util/IgniteUtils.java   |   2 +-
 5 files changed, 341 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f025714e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 8db4cd7..ac0edff 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -84,6 +84,13 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 protected abstract int restPort();
 
 /**
+ * @return Security enabled flag. Should be the same with {@code 
ctx.security().enabled()}.
+ */
+protected boolean securityEnabled() {
+return false;
+}
+
+/**
  * @param params Command parameters.
  * @return Returned content.
  * @throws Exception If failed.
@@ -133,7 +140,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return 
"\\{\\\"affinityNodeId\\\":\\\"\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":\\\"" + res + "\\\"\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -157,7 +164,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 private String integerPattern(int res, boolean success) {
 return "\\{\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -170,7 +177,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -183,7 +190,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -196,7 +203,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return 
"\\{\\\"affinityNodeId\\\":\\\"\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-"\\\"sessionToken\\\":\\\"\\\"," +
+"\\\"sessionToken\\\":\\\"" + (securityEnabled() && success ? ".+" 
: "") + "\\\"," +
 "\\\"successStatus\\\":" + (success ? 0 : 1) + "\\}";
 }
 
@@ -209,7 +216,7 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 return "\\{\\\"affinityNodeId\\\":\\\"\\\"\\," +
 "\\\"error\\\":\\\"\\\"\\," +
 "\\\"response\\\":" + res + "\\," +
-

[06/50] ignite git commit: ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject

[anovikov]

ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject


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

Branch: refs/heads/ignite-843
Commit: c6bb01b49cfef14310355148c4937aab8489da13
Parents: e5c3ca3
Author: sboikov 
Authored: Tue Sep 29 09:20:25 2015 +0300
Committer: sboikov 
Committed: Tue Sep 29 09:20:25 2015 +0300

--
 .../cache/GridCacheExplicitLockSpan.java|  13 +-
 .../cache/GridCacheMvccCandidate.java   |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  47 +++---
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java|  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 ++-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../cache/local/GridLocalCacheEntry.java|   2 +-
 .../processors/cache/CrossCacheLockTest.java| 142 +++
 .../GridCacheFinishPartitionsSelfTest.java  |   5 +-
 .../testsuites/IgniteCacheTestSuite4.java   |   3 +
 12 files changed, 201 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c6bb01b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index 2261c7d..df32e77 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@ -46,7 +47,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
 
 /** Pending candidates. */
 @GridToStringInclude
-private final Map cands = 
new HashMap<>();
+private final Map cands = new 
HashMap<>();
 
 /** Span lock release future. */
 @GridToStringExclude
@@ -77,7 +78,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
 if (cands.isEmpty())
 return false;
 
-assert this.topVer.equals(this.topVer);
+assert this.topVer.equals(topVer);
 
 Deque deque = ensureDeque(cand.key());
 
@@ -137,7 +138,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param ver Version (or {@code null} if any candidate should be removed.)
  * @return Removed candidate if matches given parameters.
  */
-public GridCacheMvccCandidate removeCandidate(KeyCacheObject key, 
@Nullable GridCacheVersion ver) {
+public GridCacheMvccCandidate removeCandidate(IgniteTxKey key, @Nullable 
GridCacheVersion ver) {
 lock();
 
 try {
@@ -187,7 +188,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  *
  * @param key Key.
  */
-public void markOwned(KeyCacheObject key) {
+public void markOwned(IgniteTxKey key) {
 lock();
 
 try {
@@ -210,7 +211,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param ver Version to lookup (if {@code null} - return any).
  * @return Last added explicit lock candidate, if any, or {@code null}.
  */
-@Nullable public GridCacheMvccCandidate candidate(KeyCacheObject key, 
@Nullable final GridCacheVersion ver) {
+@Nullable public GridCacheMvccCandidate candidate(IgniteTxKey key, 
@Nullable final GridCacheVersion ver) {
 lock();
 
 try {
@@ -257,7 +258,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param key Key to look up.
  * @return Deque.
  */
-private Deque ensureDeque(KeyCacheObject key) {
+private Deque ensureDeque(IgniteTxKey key) {
 Deque deque = cands.get(key);
 
 if (deque == null) {

[46/50] ignite git commit: ignite-1624 Tests muted

[anovikov]

ignite-1624 Tests muted


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

Branch: refs/heads/ignite-843
Commit: f60cba7986bcde8578e4e0dc4a065fb834514373
Parents: b3d347e
Author: agura 
Authored: Wed Oct 7 13:34:33 2015 +0300
Committer: agura 
Committed: Wed Oct 7 13:34:33 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f60cba79/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 9fbf5b1..0bb9a42 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -1074,6 +1074,8 @@ public class TcpClientDiscoverySpiSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testJoinError() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1624;);
+
 startServerNodes(1);
 
 Ignite ignite = G.ignite("server-0");

[33/50] ignite git commit: Test Failed

[anovikov]

Test Failed


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

Branch: refs/heads/ignite-843
Commit: 150a644e9b939ccf921cac5c34af97358a16c50a
Parents: b08e0b2
Author: Anton Vinogradov 
Authored: Thu Oct 1 14:58:20 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 14:58:20 2015 +0300

--
 .../processors/cache/IgniteCacheEntryListenerTxTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/150a644e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
index cad57f0..a9e43d4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
@@ -47,4 +47,8 @@ public class IgniteCacheEntryListenerTxTest extends 
IgniteCacheEntryListenerAbst
 @Override protected NearCacheConfiguration nearConfiguration() {
 return null;
 }
+
+@Override public void testEvents(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1600;);
+}
 }
\ No newline at end of file

[20/50] ignite git commit: # master - changed "ssl" to "tls/ssl"

[anovikov]

# master - changed "ssl" to "tls/ssl"


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

Branch: refs/heads/ignite-843
Commit: f3808831a8df1b67b81a92f50cd2b23c3358e604
Parents: c6ec7e1
Author: Dmitiry Setrakyan 
Authored: Wed Sep 30 14:19:13 2015 +0200
Committer: Dmitiry Setrakyan 
Committed: Wed Sep 30 14:19:13 2015 +0200

--
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f3808831/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 68a0383..c02dc59 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
@@ -2177,7 +2177,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 assert log != null;
 
 U.quietAndInfo(log, "Security status [authentication=" + 
onOff(ctx.security().enabled())
-+ ", ssl=" + onOff(ctx.config().getSslContextFactory() != null) + 
']');
++ ", tls/ssl=" + onOff(ctx.config().getSslContextFactory() != 
null) + ']');
 }
 
 /**

[10/50] ignite git commit: IGNITE-1552 - Fixed parsing for SQL table function

[anovikov]

IGNITE-1552 - Fixed parsing for SQL table function


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

Branch: refs/heads/ignite-843
Commit: 740291871013bef818edf3faf19c8d4c6eab1ba5
Parents: c2cedb0
Author: S.Vladykin 
Authored: Tue Sep 29 17:04:52 2015 -0700
Committer: Valentin Kulichenko 
Committed: Tue Sep 29 17:04:52 2015 -0700

--
 .../processors/query/h2/sql/GridSqlArray.java   | 52 
 .../processors/query/h2/sql/GridSqlElement.java |  2 +-
 .../query/h2/sql/GridSqlFunction.java   | 60 --
 .../query/h2/sql/GridSqlFunctionType.java   |  3 +
 .../query/h2/sql/GridSqlPlaceholder.java|  7 +-
 .../query/h2/sql/GridSqlQueryParser.java| 84 
 .../processors/query/h2/sql/GridSqlType.java| 29 ++-
 .../query/h2/sql/GridQueryParsingTest.java  | 27 +++
 8 files changed, 199 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
new file mode 100644
index 000..69e98bf
--- /dev/null
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
@@ -0,0 +1,52 @@
+/*
+ * 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.internal.processors.query.h2.sql;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import org.h2.util.StatementBuilder;
+
+/**
+ * SQL Array: (1, 2, ?, 'abc')
+ */
+public class GridSqlArray extends GridSqlElement {
+/**
+ * @param size Array size.
+ */
+public GridSqlArray(int size) {
+super(size == 0 ? Collections.emptyList() : new 
ArrayList(size));
+}
+
+/** {@inheritDoc} */
+@Override public String getSQL() {
+if (size() == 0)
+return "()";
+
+StatementBuilder buff = new StatementBuilder("(");
+
+for (GridSqlElement e : children) {
+buff.appendExceptFirst(", ");
+buff.append(e.getSQL());
+}
+
+if (size() == 1)
+buff.append(',');
+
+return buff.append(')').toString();
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index 41b7ba4..57d3c57 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -25,7 +25,7 @@ import java.util.List;
  */
 public abstract class GridSqlElement implements Iterable {
 /** */
-protected List children;
+protected final List children;
 
 /** */
 private GridSqlType resultType;

http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
 

[28/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1584

[anovikov]

https://issues.apache.org/jira/browse/IGNITE-1584


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

Branch: refs/heads/ignite-843
Commit: cdcaf9aa760581c80732c75311c2e0a57d29ccb4
Parents: d3f04ff
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:40:19 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:40:19 2015 +0300

--
 .../tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cdcaf9aa/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
--
diff --git 
a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
 
b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
index f5e77e5..bf0cbd5 100644
--- 
a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
+++ 
b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
@@ -68,6 +68,8 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
  * @throws Exception If any error occurs.
  */
 public void testGoogleComputeEngine() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1585;);
+
 testCloudProvider("google-compute-engine");
 }
 

[12/50] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168

[anovikov]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into 
ignite-1168


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

Branch: refs/heads/ignite-843
Commit: 3a322c0556c054a291ee5c28e6e853e700587f3a
Parents: 6acba08 7402918
Author: Andrey 
Authored: Wed Sep 30 10:01:28 2015 +0700
Committer: Andrey 
Committed: Wed Sep 30 10:01:28 2015 +0700

--
 .../cache/GridCacheExplicitLockSpan.java|  13 +-
 .../cache/GridCacheMvccCandidate.java   |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  47 ++--
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java|  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 +-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../cache/local/GridLocalCacheEntry.java|   2 +-
 .../ignite/internal/util/GridArgumentCheck.java |   5 +-
 .../processors/cache/CrossCacheLockTest.java| 142 +
 .../GridCacheFinishPartitionsSelfTest.java  |   5 +-
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  | 151 +
 .../IgniteCrossCacheTxNearEnabledSelfTest.java  |  28 +++
 .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   7 +
 .../processors/query/h2/sql/GridSqlArray.java   |  52 +
 .../processors/query/h2/sql/GridSqlElement.java |   2 +-
 .../query/h2/sql/GridSqlFunction.java   |  60 --
 .../query/h2/sql/GridSqlFunctionType.java   |   3 +
 .../query/h2/sql/GridSqlPlaceholder.java|   7 +-
 .../query/h2/sql/GridSqlQueryParser.java|  84 +---
 .../processors/query/h2/sql/GridSqlType.java|  29 ++-
 .../query/h2/sql/GridQueryParsingTest.java  |  27 +++
 24 files changed, 798 insertions(+), 118 deletions(-)
--

[40/50] ignite git commit: ignite-1618 Tests muted

[anovikov]

ignite-1618 Tests muted

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/35fa5e63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35fa5e63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35fa5e63

Branch: refs/heads/ignite-843
Commit: 35fa5e630be2840eec2f9c9500e6f79bbc841597
Parents: 8616889
Author: agura 
Authored: Mon Oct 5 22:03:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Oct 6 11:11:13 2015 +0300

--
 .../cache/GridCacheDeploymentOffHeapSelfTest.java| 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/35fa5e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index fda054f..c51d72b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -38,4 +38,19 @@ public class GridCacheDeploymentOffHeapSelfTest extends 
GridCacheDeploymentSelfT
 
 return cacheCfg;
 }
+
+/** {@inheritDoc} */
+@Override public void testDeployment() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment6() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment7() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
 }
\ No newline at end of file

[09/50] ignite git commit: minor (style)

[anovikov]

minor (style)


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

Branch: refs/heads/ignite-843
Commit: c2cedb0ed5f54cdbdc60635043555c7c47c04bea
Parents: c517fcf
Author: Yakov Zhdanov 
Authored: Tue Sep 29 16:20:26 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Sep 29 16:20:26 2015 +0300

--
 .../java/org/apache/ignite/internal/util/GridArgumentCheck.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c2cedb0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
index 8be3610..f96773e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
@@ -157,8 +157,7 @@ public class GridArgumentCheck {
 public static void notNullOrEmpty(String value, String name) {
 notNull(value, name);
 
-if (value.trim().length() == 0) {
+if (value.trim().length() == 0)
 throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + 
NOT_NULL_OR_EMPTY_SUFFIX);
-}
 }
-}
\ No newline at end of file
+}

[42/50] ignite git commit: Merge remote-tracking branch 'origin/master'

[anovikov]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-843
Commit: 6fce2c52fd08da232659ff5b90bf15ad60c9dced
Parents: 8fc14ec 35fa5e6
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:36:41 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:36:41 2015 +0300

--
 .../cache/GridCacheDeploymentOffHeapSelfTest.java| 15 +++
 1 file changed, 15 insertions(+)
--

ignite git commit: ignite-1272: added 'depEnabled' flag to GridCacheMessage. Used in cases when 'cacheId' is not set for a GridCacheMessage for some reason

[dmagda]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1272 9c93f8bc7 -> 8635693f7


ignite-1272: added 'depEnabled' flag to GridCacheMessage. Used in cases when 
'cacheId' is not set for a GridCacheMessage for some reason


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

Branch: refs/heads/ignite-1272
Commit: 8635693f701f16b19090d97cf5bd9376a9518f5c
Parents: 9c93f8b
Author: Denis Magda 
Authored: Wed Oct 7 14:18:56 2015 +0300
Committer: Denis Magda 
Committed: Wed Oct 7 14:18:56 2015 +0300

--
 .../processors/cache/GridCacheIoManager.java| 26 
 .../processors/cache/GridCacheMessage.java  | 19 ++
 .../cache/GridCacheSharedContext.java   |  3 +++
 .../distributed/GridCacheTxRecoveryRequest.java |  3 ++-
 .../GridCacheTxRecoveryResponse.java|  4 ++-
 .../GridDistributedTxRemoteAdapter.java |  5 
 .../distributed/dht/GridDhtTxFinishFuture.java  |  9 ---
 .../distributed/dht/GridDhtTxFinishRequest.java |  5 +++-
 .../dht/GridDhtTxFinishResponse.java|  6 +++--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  9 ---
 .../dht/GridDhtTxPrepareRequest.java|  4 ++-
 .../dht/GridDhtTxPrepareResponse.java   |  6 +++--
 .../GridDhtPartitionsAbstractMessage.java   |  5 +++-
 .../near/GridNearTxFinishFuture.java|  8 +++---
 .../near/GridNearTxFinishRequest.java   |  5 +++-
 .../near/GridNearTxFinishResponse.java  |  4 ++-
 .../near/GridNearTxPrepareRequest.java  |  3 ++-
 .../near/GridNearTxPrepareResponse.java |  7 --
 .../cache/transactions/IgniteInternalTx.java|  8 +-
 .../cache/transactions/IgniteTxAdapter.java |  5 
 .../cache/transactions/IgniteTxHandler.java | 13 ++
 .../transactions/IgniteTxLocalAdapter.java  | 11 +
 22 files changed, 134 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8635693f/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 3a5c0c1..dda01af 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
@@ -404,7 +404,8 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 GridDhtTxPrepareResponse res = new GridDhtTxPrepareResponse(
 req.version(),
 req.futureId(),
-req.miniId());
+req.miniId(),
+req.deployInfo() != null);
 
 res.error(req.classError());
 
@@ -533,7 +534,8 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 req.version(),
 null,
 null,
-null);
+null,
+req.deployInfo() != null);
 
 res.error(req.classError());
 
@@ -617,10 +619,24 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 if (destNodeId == null || !cctx.localNodeId().equals(destNodeId)) {
 msg.prepareMarshal(cctx);
 
-GridCacheContext ctx = cctx.cacheContext(msg.cacheId());
+if (depEnabled) {
+boolean depEnabled0;
+
+if (msg.deploymentEnabled() != null)
+depEnabled0 = msg.deploymentEnabled();
+else {
+GridCacheContext ctx = cctx.cacheContext(msg.cacheId());
 
-if (depEnabled && ctx.deploymentEnabled() && msg instanceof 
GridCacheDeployable)
-cctx.deploy().prepare((GridCacheDeployable)msg);
+if (ctx == null)
+throw new IgniteCheckedException("Deployment related 
info is missing in message: [msg=" +
+msg +']');
+
+depEnabled0 = ctx.deploymentEnabled();
+}
+
+if (depEnabled0 && msg instanceof GridCacheDeployable)
+cctx.deploy().prepare((GridCacheDeployable)msg);
+}
 }
 
 return true;

ignite git commit: ignite-1624 Tests muted

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master b3d347e35 -> f60cba798


ignite-1624 Tests muted


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

Branch: refs/heads/master
Commit: f60cba7986bcde8578e4e0dc4a065fb834514373
Parents: b3d347e
Author: agura 
Authored: Wed Oct 7 13:34:33 2015 +0300
Committer: agura 
Committed: Wed Oct 7 13:34:33 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f60cba79/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 9fbf5b1..0bb9a42 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -1074,6 +1074,8 @@ public class TcpClientDiscoverySpiSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testJoinError() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1624;);
+
 startServerNodes(1);
 
 Ignite ignite = G.ignite("server-0");

[3/4] ignite git commit: IGNITE-1282: Refactoring.

[vozerov]

IGNITE-1282: Refactoring.


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

Branch: refs/heads/ignite-1282-opto
Commit: b34084eb053f4f2bd249bf5a51f487988e3030ac
Parents: 11f7d09
Author: vozerov-gridgain 
Authored: Wed Oct 7 11:44:24 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Oct 7 11:44:24 2015 +0300

--
 .../Apache.Ignite.Core.csproj   |   8 +-
 .../Impl/Portable/IPortableTypeDescriptor.cs|   6 +-
 .../Metadata/Opto/PortableTypeStructure.cs  | 317 ---
 .../Metadata/Opto/PortableTypeStructureEntry.cs | 127 
 .../Opto/PortableTypeStructureJumpTable.cs  | 115 ---
 .../Opto/PortableTypeStructureUpdate.cs |  84 -
 .../Impl/Portable/PortableFullTypeDescriptor.cs |  10 +-
 .../Portable/PortableSurrogateTypeDescriptor.cs |  10 +-
 .../Impl/Portable/PortableWriterImpl.cs |  70 ++--
 .../Portable/Structure/PortableStructure.cs | 317 +++
 .../Structure/PortableStructureEntry.cs | 128 
 .../Structure/PortableStructureJumpTable.cs | 115 +++
 .../Structure/PortableStructureUpdate.cs|  84 +
 13 files changed, 701 insertions(+), 690 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b34084eb/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index d412181..e8ec7ed 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -250,10 +250,6 @@
 
 
 
-
-
-
-
 
 
 
@@ -279,6 +275,10 @@
 
 
 
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b34084eb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs
index 389238c..8a84daf 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs
@@ -19,7 +19,7 @@ namespace Apache.Ignite.Core.Impl.Portable
 {
 using System;
 using System.Collections.Generic;
-using Apache.Ignite.Core.Impl.Portable.Metadata.Opto;
+using Apache.Ignite.Core.Impl.Portable.Structure;
 using Apache.Ignite.Core.Portable;
 
 /// 
@@ -110,7 +110,7 @@ namespace Apache.Ignite.Core.Impl.Portable
 /// 
 /// Type structure.
 /// 
-PortableTypeStructure TypeStructure { get; }
+PortableStructure TypeStructure { get; }
 
 /// 
 /// Update type structure.
@@ -118,6 +118,6 @@ namespace Apache.Ignite.Core.Impl.Portable
 /// Expected type structure.
 /// Path index.
 /// Recorded updates.
-void UpdateStrcuture(PortableTypeStructure exp, int pathIdx, 
IList updates);
+void UpdateStrcuture(PortableStructure exp, int pathIdx, 
IList updates);
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/b34084eb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/Metadata/Opto/PortableTypeStructure.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/Metadata/Opto/PortableTypeStructure.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/Metadata/Opto/PortableTypeStructure.cs
deleted file mode 100644
index cdc0859..000
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/Metadata/Opto/PortableTypeStructure.cs
+++ /dev/null
@@ -1,317 +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, 

[1/4] ignite git commit: IGNITE-1282: WIP on optos.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1282-opto [created] 3548457c2


IGNITE-1282: WIP on optos.


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

Branch: refs/heads/ignite-1282-opto
Commit: 9da45ed3e6f7c79a47bbd71fa3db64094cb96e68
Parents: 49c495b
Author: vozerov-gridgain 
Authored: Wed Oct 7 10:36:29 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Oct 7 10:36:29 2015 +0300

--
 .../Apache.Ignite.Core.csproj   |   5 +
 .../Impl/Portable/IPortableTypeDescriptor.cs|  15 +
 .../Metadata/Opto/PortableTypeStructure.cs  | 317 +++
 .../Metadata/Opto/PortableTypeStructureEntry.cs | 127 
 .../Opto/PortableTypeStructureJumpTable.cs  | 115 +++
 .../Opto/PortableTypeStructureUpdate.cs |  84 +
 .../Impl/Portable/PortableFullTypeDescriptor.cs |  21 ++
 .../Portable/PortableSurrogateTypeDescriptor.cs |  24 +-
 .../Impl/Portable/PortableUtils.cs  |   4 +
 .../Impl/Portable/PortableWriterImpl.cs |  61 +++-
 10 files changed, 770 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9da45ed3/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 855dda8..d412181 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -250,6 +250,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -367,6 +371,7 @@
   resources\release\x86\ignite.common.dll
 
   
+  
   
   

[2/4] ignite git commit: IGNITE-1282: WIP on optos.

[vozerov]

IGNITE-1282: WIP on optos.


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

Branch: refs/heads/ignite-1282-opto
Commit: 11f7d097da6c83b1dac8427e8294b098d98db898
Parents: 9da45ed
Author: vozerov-gridgain 
Authored: Wed Oct 7 11:31:38 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Oct 7 11:31:38 2015 +0300

--
 .../Portable/PortableWriteBenchmark.cs  |  2 +-
 .../Impl/Portable/PortableMarshaller.cs |  1 +
 .../Impl/Portable/PortableWriterImpl.cs | 73 +---
 3 files changed, 35 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/11f7d097/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
index 9fcfa46..5638195 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
@@ -46,7 +46,7 @@ namespace Apache.Ignite.Benchmarks.Portable
 {
 TypeConfigurations = new List
 {
-new PortableTypeConfiguration(typeof (Address)) 
{MetadataEnabled = false}
+new PortableTypeConfiguration(typeof (Address)) 
{MetadataEnabled = true}
 }
 });
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/11f7d097/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs
index c7a0b7b..c7262e1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs
@@ -309,6 +309,7 @@ namespace Apache.Ignite.Core.Impl.Portable
 
 return new PortableHashsetMetadataHandler(ids, newType);
 }
+
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/11f7d097/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs
index 6a0917a..9727377 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs
@@ -57,9 +57,6 @@ namespace Apache.Ignite.Core.Impl.Portable
 
 /** Current mapper. */
 private IPortableIdMapper _curMapper;
-
-/** Current metadata handler. */
-private IPortableMetadataHandler _curMetaHnd;
 
 /** Current raw position. */
 private long _curRawPos;
@@ -67,7 +64,6 @@ namespace Apache.Ignite.Core.Impl.Portable
 private PortableTypeStructure _curTypeStruct;
 private int _curPathIdx;
 private int _curActionIdx;
-private bool _curNewStruct;
 private List _curUpdates; 
 
 /** Whether we are currently detaching an object. */
@@ -1308,26 +1304,22 @@ namespace Apache.Ignite.Core.Impl.Portable
 int oldTypeId = _curTypeId;
 IPortableNameMapper oldConverter = _curConverter;
 IPortableIdMapper oldMapper = _curMapper;
-IPortableMetadataHandler oldMetaHnd = _curMetaHnd;
 long oldRawPos = _curRawPos;
 
 PortableTypeStructure oldTypeStruct = _curTypeStruct;
 int oldPathIdx = _curPathIdx;
 int oldActionIdx = _curActionIdx;
-bool oldNewStruct = _curNewStruct;
 var oldUpdates = _curUpdates;
 
 // Push new frame.
 _curTypeId = desc.TypeId;
 _curConverter = desc.NameConverter;
 _curMapper = desc.Mapper;
-_curMetaHnd = desc.MetadataEnabled ? 
_marsh.MetadataHandler(desc) : null;
 _curRawPos = 0;
 
 _curTypeStruct = desc.TypeStructure;

[4/4] ignite git commit: IGNITE-1282: Refactoring.

[vozerov]

IGNITE-1282: Refactoring.


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

Branch: refs/heads/ignite-1282-opto
Commit: 3548457c234456f1a3695dac497ceb452c4971ed
Parents: b34084e
Author: vozerov-gridgain 
Authored: Wed Oct 7 13:00:05 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Oct 7 13:00:05 2015 +0300

--
 .../Apache.Ignite.Core.Tests.csproj |   1 +
 .../Portable/PortableStructureTest.cs   | 260 +++
 .../Impl/Portable/IPortableTypeDescriptor.cs|   2 +-
 .../Impl/Portable/PortableFullTypeDescriptor.cs |   2 +-
 .../Portable/PortableSurrogateTypeDescriptor.cs |   2 +-
 .../Impl/Portable/PortableWriterImpl.cs |   2 +-
 .../Portable/Structure/PortableStructure.cs |  30 ++-
 .../Structure/PortableStructureEntry.cs |   8 +-
 .../Structure/PortableStructureJumpTable.cs |   4 +-
 9 files changed, 295 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3548457c/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 90f3481..7cbe784 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
@@ -111,6 +111,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3548457c/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
new file mode 100644
index 000..46c9539
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
@@ -0,0 +1,260 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Tests.Portable
+{
+using System;
+using System.Collections.Generic;
+using Apache.Ignite.Core.Impl;
+using Apache.Ignite.Core.Impl.Portable;
+using Apache.Ignite.Core.Impl.Portable.Structure;
+using Apache.Ignite.Core.Portable;
+using NUnit.Framework;
+
+/// 
+/// Contains tests for portable type structure.
+/// 
+[TestFixture]
+public class PortableStructureTest
+{
+/** Repeat count. */
+public static readonly int RepeatCnt = 10;
+
+public static readonly int ObjectsPerMode = 5;
+
+/// 
+/// Test object write with different structures.
+/// 
+[Test]
+public void TestStructure()
+{
+for (int i = 1; i <= RepeatCnt; i++)
+{
+Console.WriteLine(">>> Iteration started: " + i);
+
+// 1. Generate and shuffle objects.
+IList objs = new List();
+
+for (int j = 0; j < 6 * ObjectsPerMode; j++)
+objs.Add(new BranchedType((j%6) + 1));
+
+objs = IgniteUtils.Shuffle(objs);
+
+// 2. Create new marshaller.
+PortableTypeConfiguration typeCfg = new 
PortableTypeConfiguration(typeof(BranchedType));
+
+PortableConfiguration cfg = new PortableConfiguration
+{
+TypeConfigurations = new List { 
typeCfg }
+};
+
+PortableMarshaller marsh = new PortableMarshaller(cfg);
+
+// 3. Marshal all data and ensure deserialized object is 

ignite git commit: IGNITE-1420: Optimized fields calculation and metadata handling.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1282 49c495b9c -> 4e053e45d


IGNITE-1420: Optimized fields calculation and metadata handling.


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

Branch: refs/heads/ignite-1282
Commit: 4e053e45dceab7b700ef0b83498219018c0d33e9
Parents: 49c495b
Author: vozerov-gridgain 
Authored: Wed Oct 7 15:00:46 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Oct 7 15:00:46 2015 +0300

--
 .../Portable/PortableWriteBenchmark.cs  |   2 +-
 .../Apache.Ignite.Core.Tests.csproj |   1 +
 .../Portable/PortableStructureTest.cs   | 261 +++
 .../Apache.Ignite.Core.csproj   |   4 +
 .../Impl/Portable/IPortableTypeDescriptor.cs|  16 +
 .../Impl/Portable/PortableFullTypeDescriptor.cs |  22 ++
 .../Impl/Portable/PortableMarshaller.cs |   1 +
 .../Portable/PortableSurrogateTypeDescriptor.cs |  24 +-
 .../Impl/Portable/PortableUtils.cs  |   4 +
 .../Impl/Portable/PortableWriterImpl.cs |  88 -
 .../Portable/Structure/PortableStructure.cs | 333 +++
 .../Structure/PortableStructureEntry.cs | 129 +++
 .../Structure/PortableStructureJumpTable.cs | 118 +++
 .../Structure/PortableStructureUpdate.cs|  84 +
 14 files changed, 1071 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4e053e45/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
index 9fcfa46..5638195 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Portable/PortableWriteBenchmark.cs
@@ -46,7 +46,7 @@ namespace Apache.Ignite.Benchmarks.Portable
 {
 TypeConfigurations = new List
 {
-new PortableTypeConfiguration(typeof (Address)) 
{MetadataEnabled = false}
+new PortableTypeConfiguration(typeof (Address)) 
{MetadataEnabled = true}
 }
 });
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/4e053e45/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 90f3481..7cbe784 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
@@ -111,6 +111,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4e053e45/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
new file mode 100644
index 000..1212ea0
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs
@@ -0,0 +1,261 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Tests.Portable
+{
+using System;
+using System.Collections.Generic;
+using Apache.Ignite.Core.Impl;
+using Apache.Ignite.Core.Impl.Portable;
+

Git Push Summary

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1282-opto [deleted] 3548457c2

[20/50] ignite git commit: # master - changed "communication encryption" to "ssl"

[dmagda]

# master - changed "communication encryption" to "ssl"


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

Branch: refs/heads/ignite-1272
Commit: c6ec7e1165017d4331199bdf667b81a6f2ed91c8
Parents: 54bb7d7
Author: Dmitiry Setrakyan 
Authored: Wed Sep 30 10:52:15 2015 +0200
Committer: Dmitiry Setrakyan 
Committed: Wed Sep 30 10:52:15 2015 +0200

--
 .../apache/ignite/internal/IgniteKernal.java| 70 ++--
 1 file changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c6ec7e11/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 60725e4..68a0383 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
@@ -17,38 +17,6 @@
 
 package org.apache.ignite.internal;
 
-import java.io.Externalizable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.JMException;
-import javax.management.ObjectName;
 import org.apache.ignite.IgniteAtomicLong;
 import org.apache.ignite.IgniteAtomicReference;
 import org.apache.ignite.IgniteAtomicSequence;
@@ -64,7 +32,6 @@ import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.internal.portable.api.IgnitePortables;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteScheduler;
 import org.apache.ignite.IgniteServices;
@@ -94,6 +61,7 @@ import 
org.apache.ignite.internal.managers.failover.GridFailoverManager;
 import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
 import 
org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
 import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.portable.api.IgnitePortables;
 import org.apache.ignite.internal.processors.GridProcessor;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -157,7 +125,6 @@ import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
 import org.apache.ignite.marshaller.MarshallerExclusions;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.internal.portable.api.PortableMarshaller;
 import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
 import org.apache.ignite.mxbean.IgniteMXBean;
 import org.apache.ignite.mxbean.ThreadPoolMXBean;
@@ -168,6 +135,39 @@ import org.apache.ignite.spi.IgniteSpi;
 import org.apache.ignite.spi.IgniteSpiVersionCheckException;
 import org.jetbrains.annotations.Nullable;
 
+import javax.management.JMException;
+import javax.management.ObjectName;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import 

[23/50] ignite git commit: Test fix

[dmagda]

Test fix


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

Branch: refs/heads/ignite-1272
Commit: 1282f8b1ddc248e562ecb937bce84acabb8198f7
Parents: 273f291
Author: Anton Vinogradov 
Authored: Wed Sep 30 15:16:31 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 15:16:31 2015 +0300

--
 .../cache/IgniteCacheP2pUnmarshallingErrorTest.java |  7 +++
 .../IgniteCacheP2pUnmarshallingRebalanceErrorTest.java  | 12 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index b62cc48..1b2b84d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.util.typedef.X;
@@ -76,6 +77,12 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends 
IgniteCacheAbstractTes
 cfg.setCacheConfiguration();
 }
 
+if (getTestGridName(10).equals(gridName)) {
+
+CacheConfiguration cc = cfg.getCacheConfiguration()[0];
+cc.setRebalanceDelay(-1);
+}
+
 return cfg;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
index 9faeac8..73388fb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
@@ -52,20 +52,20 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest 
extends IgniteCacheP2
 
 readCnt.set(Integer.MAX_VALUE);
 
-for (int i = 0; i <= 1000; i++)
+for (int i = 0; i <= 100; i++)
 jcache(0).put(new TestKey(String.valueOf(++key)), "");
 
-startGrid(3);
+startGrid(10); //custom rebalanceDelay set at cfg.
 
-Affinity aff = affinity(grid(3).cache(null));
+Affinity aff = affinity(grid(10).cache(null));
 
-while (!aff.isPrimary(grid(3).localNode(), new 
TestKey(String.valueOf(key
+while (!aff.isPrimary(grid(10).localNode(), new 
TestKey(String.valueOf(key
 --key;
 
 readCnt.set(1);
 
 try {
-jcache(3).get(new TestKey(String.valueOf(key)));
+jcache(10).get(new TestKey(String.valueOf(key)));
 
 assert false : "p2p marshalling failed, but error response was not 
sent";
 }
@@ -73,4 +73,4 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest 
extends IgniteCacheP2
 assert X.hasCause(e, IOException.class);
 }
 }
-}
\ No newline at end of file
+}

[41/50] ignite git commit: Apache Ignite License Generator Module Readme

[dmagda]

Apache Ignite License Generator Module Readme


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

Branch: refs/heads/ignite-1272
Commit: 9702b52f8ade6f2ee970d8cd77a71911106f3f21
Parents: 7b54cbd
Author: Anton Vinogradov 
Authored: Fri Oct 2 17:05:31 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Oct 2 17:05:31 2015 +0300

--
 modules/apache-license-gen/README.txt | 33 ++
 1 file changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9702b52f/modules/apache-license-gen/README.txt
--
diff --git a/modules/apache-license-gen/README.txt 
b/modules/apache-license-gen/README.txt
new file mode 100644
index 000..a0c027e
--- /dev/null
+++ b/modules/apache-license-gen/README.txt
@@ -0,0 +1,33 @@
+Apache Ignite License Generator Module
+--
+
+Apache Ignite License Generator module is a custom maven resource plugin.
+It generates /license/{module name}-licenses.txt file contains list of 
module's non transitive dependencies.
+Apache Ignite binary distribution contains all non transitive dependencies of 
it's modules.
+Set of modules included to binary distribution may vary as well as their 
dependencies list, versions and licenses.
+Automatic generation of /license/{module name}-licenses.txt file guarantee 
that binary distribution gives user
+actual information about licenses used by Apache Ignite's modules.
+
+Note that in case dependency provided under Apache License 2.0 only in will 
not appear inside generated file.
+
+To use Apache Ignite License Generator Module in your project please add 
following to pom.xml:
+
+
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ 
+ 
+ ignite-dependencies
+ 
+ process
+ 
+ 
+ 
+ 
org.apache.ignite:ignite-apache-license-gen:${project.version}
+ 
+ true
+ 
+ 
+ 
+ 
+

[16/50] ignite git commit: IGNITE-1552 - Fixed parsing for SQL table function

[dmagda]

IGNITE-1552 - Fixed parsing for SQL table function


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

Branch: refs/heads/ignite-1272
Commit: 740291871013bef818edf3faf19c8d4c6eab1ba5
Parents: c2cedb0
Author: S.Vladykin 
Authored: Tue Sep 29 17:04:52 2015 -0700
Committer: Valentin Kulichenko 
Committed: Tue Sep 29 17:04:52 2015 -0700

--
 .../processors/query/h2/sql/GridSqlArray.java   | 52 
 .../processors/query/h2/sql/GridSqlElement.java |  2 +-
 .../query/h2/sql/GridSqlFunction.java   | 60 --
 .../query/h2/sql/GridSqlFunctionType.java   |  3 +
 .../query/h2/sql/GridSqlPlaceholder.java|  7 +-
 .../query/h2/sql/GridSqlQueryParser.java| 84 
 .../processors/query/h2/sql/GridSqlType.java| 29 ++-
 .../query/h2/sql/GridQueryParsingTest.java  | 27 +++
 8 files changed, 199 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
new file mode 100644
index 000..69e98bf
--- /dev/null
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java
@@ -0,0 +1,52 @@
+/*
+ * 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.internal.processors.query.h2.sql;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import org.h2.util.StatementBuilder;
+
+/**
+ * SQL Array: (1, 2, ?, 'abc')
+ */
+public class GridSqlArray extends GridSqlElement {
+/**
+ * @param size Array size.
+ */
+public GridSqlArray(int size) {
+super(size == 0 ? Collections.emptyList() : new 
ArrayList(size));
+}
+
+/** {@inheritDoc} */
+@Override public String getSQL() {
+if (size() == 0)
+return "()";
+
+StatementBuilder buff = new StatementBuilder("(");
+
+for (GridSqlElement e : children) {
+buff.appendExceptFirst(", ");
+buff.append(e.getSQL());
+}
+
+if (size() == 1)
+buff.append(',');
+
+return buff.append(')').toString();
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index 41b7ba4..57d3c57 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -25,7 +25,7 @@ import java.util.List;
  */
 public abstract class GridSqlElement implements Iterable {
 /** */
-protected List children;
+protected final List children;
 
 /** */
 private GridSqlType resultType;

http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
 

[18/50] ignite git commit: More info in assert.

[dmagda]

More info in assert.


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

Branch: refs/heads/ignite-1272
Commit: be906e32f68d35e01f0b0e5f610937a27277f71a
Parents: bfabab2
Author: sboikov 
Authored: Wed Sep 30 09:29:38 2015 +0300
Committer: sboikov 
Committed: Wed Sep 30 09:29:38 2015 +0300

--
 .../ignite/internal/util/nio/GridNioRecoveryDescriptor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/be906e32/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
index 42656c4..88837de 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
@@ -259,8 +259,8 @@ public class GridNioRecoveryDescriptor {
  */
 public void connected() {
 synchronized (this) {
-assert reserved;
-assert !connected;
+assert reserved : this;
+assert !connected : this;
 
 connected = true;
 

[37/50] ignite git commit: Test Failed

[dmagda]

Test Failed


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

Branch: refs/heads/ignite-1272
Commit: 0309f9688872e0c0fc7ff74514f06f47aef388b7
Parents: 150a644
Author: Anton Vinogradov 
Authored: Thu Oct 1 15:44:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Oct 1 15:44:25 2015 +0300

--
 .../cache/distributed/near/GridCacheNearTxExceptionSelfTest.java | 4 
 .../datastreamer/DataStreamerMultiThreadedSelfTest.java  | 4 +++-
 .../datastreamer/DataStreamerMultinodeCreateCacheTest.java   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
index d6e3804..9546d61 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
@@ -30,4 +30,8 @@ public class GridCacheNearTxExceptionSelfTest extends 
IgniteTxExceptionAbstractS
 @Override protected CacheMode cacheMode() {
 return PARTITIONED;
 }
+
+@Override public void testTransformBackup(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1601;);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index bfeebf2..c1251ae 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -92,6 +92,8 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testStartStopIgnitesDynamicCache() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1602;);
+
 dynamicCache = true;
 
 startStopIgnites();
@@ -103,7 +105,7 @@ public class DataStreamerMultiThreadedSelfTest extends 
GridCommonAbstractTest {
 private void startStopIgnites() throws Exception {
 for (int attempt = 0; attempt < 3; ++attempt) {
 log.info("Iteration: " + attempt);
-
+
 final Ignite ignite = startGrid(0);
 
 Set futs = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
index ca0ff21..6bde83a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
@@ -58,6 +58,8 @@ public class DataStreamerMultinodeCreateCacheTest extends 
GridCommonAbstractTest
  * @throws Exception If failed.
  */
 public void testCreateCacheAndStream() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1603;);
+
 final int THREADS = 5;
 
 startGrids(THREADS);

[21/50] ignite git commit: ignite-1329 Removed outdated code from GridCacheIoManager

[dmagda]

ignite-1329 Removed outdated code from GridCacheIoManager


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

Branch: refs/heads/ignite-1272
Commit: cd439672847d764838075b7eafae504ce27d0563
Parents: c6ec7e1
Author: sboikov 
Authored: Wed Sep 30 13:43:41 2015 +0300
Committer: sboikov 
Committed: Wed Sep 30 13:43:41 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/cd439672/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))
-U.error(log, 

[49/50] ignite git commit: ignite-1624 Tests muted

[dmagda]

ignite-1624 Tests muted


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

Branch: refs/heads/ignite-1272
Commit: f60cba7986bcde8578e4e0dc4a065fb834514373
Parents: b3d347e
Author: agura 
Authored: Wed Oct 7 13:34:33 2015 +0300
Committer: agura 
Committed: Wed Oct 7 13:34:33 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f60cba79/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 9fbf5b1..0bb9a42 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -1074,6 +1074,8 @@ public class TcpClientDiscoverySpiSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testJoinError() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1624;);
+
 startServerNodes(1);
 
 Ignite ignite = G.ignite("server-0");

[14/50] ignite git commit: Added test.

[dmagda]

Added test.


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

Branch: refs/heads/ignite-1272
Commit: c517fcf5a7c9444e27e5f4d261702aaa2dfe726d
Parents: ce3f20b
Author: sboikov 
Authored: Tue Sep 29 12:15:37 2015 +0300
Committer: sboikov 
Committed: Tue Sep 29 12:15:37 2015 +0300

--
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  | 151 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   2 +
 2 files changed, 153 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c517fcf5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
new file mode 100644
index 000..cf0e0d3
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.internal.processors.cache.distributed;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+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.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class IgniteCacheCreatePutMultiNodeSelfTest extends 
GridCommonAbstractTest {
+/** Grid count. */
+private static final int GRID_CNT = 4;
+
+/** */
+private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setIpFinder(ipFinder);
+
+cfg.setDiscoverySpi(discoSpi);
+
+OptimizedMarshaller marsh = new OptimizedMarshaller();
+marsh.setRequireSerializable(false);
+
+cfg.setMarshaller(marsh);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 6 * 60 * 1000L;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testStartNodes() throws Exception {
+try {
+Collection futs = new 
ArrayList<>(GRID_CNT);
+int scale = 3;
+
+final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT * scale);
+final AtomicReferenceArray err = new 
AtomicReferenceArray<>(GRID_CNT * scale);
+
+for (int i = 0; i < GRID_CNT * scale; i++) {
+if (i < GRID_CNT)
+startGrid(i);
+
+final int idx = i;
+
+IgniteInternalFuture fut = GridTestUtils.runAsync(new 

[32/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1584

[dmagda]

https://issues.apache.org/jira/browse/IGNITE-1584


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

Branch: refs/heads/ignite-1272
Commit: cdcaf9aa760581c80732c75311c2e0a57d29ccb4
Parents: d3f04ff
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:40:19 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:40:19 2015 +0300

--
 .../tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cdcaf9aa/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
--
diff --git 
a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
 
b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
index f5e77e5..bf0cbd5 100644
--- 
a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
+++ 
b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
@@ -68,6 +68,8 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
  * @throws Exception If any error occurs.
  */
 public void testGoogleComputeEngine() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1585;);
+
 testCloudProvider("google-compute-engine");
 }
 

[44/50] ignite git commit: Minor fixes

[dmagda]

Minor fixes


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

Branch: refs/heads/ignite-1272
Commit: 8fc14ec004cc87d731f4d089f5b5c44c91831e40
Parents: 8616889
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:36:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:36:25 2015 +0300

--
 .../processors/cache/distributed/dht/GridDhtLockRequest.java   | 5 ++---
 modules/yardstick/pom.xml  | 6 ++
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 87aa256..99c1b86 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -299,8 +299,7 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 return accessTtl;
 }
 
-/** {@inheritDoc}
- * @param ctx*/
+/** {@inheritDoc} */
 @Override public void prepareMarshal(GridCacheSharedContext ctx) throws 
IgniteCheckedException {
 super.prepareMarshal(ctx);
 
@@ -529,4 +528,4 @@ public class GridDhtLockRequest extends 
GridDistributedLockRequest {
 @Override public String toString() {
 return S.toString(GridDhtLockRequest.class, this, "super", 
super.toString());
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 2f0c5fe..d18e1a9 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -59,6 +59,12 @@
   
 
 
+org.apache.ignite
+ignite-log4j
+${project.version}
+
+
+
 org.yardstickframework
 yardstick
 ${yardstick.version}

[35/50] ignite git commit: Test Failed

[dmagda]

Test Failed


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

Branch: refs/heads/ignite-1272
Commit: b08e0b20f46fdfb4bb86b6c495e407d77873e077
Parents: b962a91
Author: Anton Vinogradov 
Authored: Wed Sep 30 19:02:05 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 19:02:05 2015 +0300

--
 .../partitioned/GridCachePartitionedSetFailoverSelfTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b08e0b20/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index ea1bb9b..755ac91 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -37,4 +37,8 @@ public class GridCachePartitionedSetFailoverSelfTest extends 
GridCacheSetFailove
 @Override protected CacheMemoryMode collectionMemoryMode() {
 return ONHEAP_TIERED;
 }
+
+@Override public void testNodeRestart(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1593;);
+}
 }
\ No newline at end of file

[31/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1584

[dmagda]

https://issues.apache.org/jira/browse/IGNITE-1584


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

Branch: refs/heads/ignite-1272
Commit: d3f04ff8a20949125d907fbc781c539bc81c924c
Parents: 3de0e47
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:28:28 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:28:28 2015 +0300

--
 .../cache/distributed/IgniteCacheAtomicNodeRestartTest.java  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d3f04ff8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index dc83ab9..327db0e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -30,4 +30,12 @@ public class IgniteCacheAtomicNodeRestartTest extends 
GridCachePartitionedNodeRe
 @Override protected CacheAtomicityMode atomicityMode() {
 return ATOMIC;
 }
+
+@Override public void testRestartWithPutFourNodesNoBackups() {
+fail("https://issues.apache.org/jira/browse/IGNITE-1587;);
+}
+
+@Override public void testRestartWithPutFourNodesOneBackupsOffheapTiered() 
{
+fail("https://issues.apache.org/jira/browse/IGNITE-1587;);
+}
 }
\ No newline at end of file

[39/50] ignite git commit: IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.

[dmagda]

IGNITE-1573: Fixed IGFS "mkdirs" concurrency problem.


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

Branch: refs/heads/ignite-1272
Commit: a411f94d29b9073457ae2b31f89dd9f702e6bf53
Parents: fd091c8
Author: iveselovskiy 
Authored: Fri Oct 2 10:54:33 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Oct 2 10:54:33 2015 +0300

--
 .../org/apache/ignite/IgniteFileSystem.java |   2 +
 .../internal/processors/igfs/IgfsFileInfo.java  |  13 +-
 .../internal/processors/igfs/IgfsImpl.java  |  64 +--
 .../processors/igfs/IgfsMetaManager.java| 180 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 185 +++
 5 files changed, 300 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 a187a90..def2965 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
@@ -417,6 +417,8 @@ public interface IgniteFileSystem extends 
IgniteAsyncSupport {
 
 /**
  * Creates directories under specified path with the specified properties.
+ * Note that the properties are applied only to created directories, but 
never
+ * updated for existing ones.
  *
  * @param path Path of directories chain to create.
  * @param props Metadata properties to set on created directories.

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 8564500..fa79d80 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -124,6 +124,16 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /**
+ * Consturcts directory with random ID, provided listing and properties.
+ *
+ * @param listing Listing.
+ * @param props The properties to set for the new directory.
+ */
+IgfsFileInfo(@Nullable Map listing, @Nullable 
Map props) {
+this(true/*dir*/, null, 0, 0, null, listing, props, null, false, 
System.currentTimeMillis(), false);
+}
+
+/**
  * Constructs file info.
  *
  * @param blockSize Block size.
@@ -194,7 +204,7 @@ public final class IgfsFileInfo implements Externalizable {
  * @param evictExclude Evict exclude flag.
  */
 IgfsFileInfo(int blockSize, long len, boolean evictExclude, @Nullable 
Map props) {
-this(blockSize == 0, // NB The contract is: (blockSize == null) <=> 
isDirectory()
+this(blockSize == 0, // NB The contract is: (blockSize == 0) <=> 
isDirectory()
 null, blockSize, len, null, null, props, null, true, 
System.currentTimeMillis(), evictExclude);
 }
 
@@ -495,6 +505,7 @@ public final class IgfsFileInfo implements Externalizable {
 }
 
 /** {@inheritDoc} */
+@SuppressWarnings("unchecked")
 @Override public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 id = U.readGridUuid(in);
 blockSize = in.readInt();

http://git-wip-us.apache.org/repos/asf/ignite/blob/a411f94d/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 d5ba95f..fa3a955 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
@@ -23,6 +23,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import 

[43/50] ignite git commit: ignite-1618 Tests muted

[dmagda]

ignite-1618 Tests muted

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/35fa5e63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35fa5e63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35fa5e63

Branch: refs/heads/ignite-1272
Commit: 35fa5e630be2840eec2f9c9500e6f79bbc841597
Parents: 8616889
Author: agura 
Authored: Mon Oct 5 22:03:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Oct 6 11:11:13 2015 +0300

--
 .../cache/GridCacheDeploymentOffHeapSelfTest.java| 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/35fa5e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index fda054f..c51d72b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -38,4 +38,19 @@ public class GridCacheDeploymentOffHeapSelfTest extends 
GridCacheDeploymentSelfT
 
 return cacheCfg;
 }
+
+/** {@inheritDoc} */
+@Override public void testDeployment() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment6() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
+
+/** {@inheritDoc} */
+@Override public void testDeployment7() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-1618;);
+}
 }
\ No newline at end of file

[09/50] ignite git commit: minor (blank line)

[dmagda]

minor (blank line)


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

Branch: refs/heads/ignite-1272
Commit: 040f0f33994533b8acdaad5c41a6fa37c105e658
Parents: c001d47
Author: Yakov Zhdanov 
Authored: Mon Sep 28 15:30:37 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Sep 28 15:30:37 2015 +0300

--
 .../apache/ignite/examples/computegrid/ComputeClosureExample.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/040f0f33/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
index eaa54a4..43a18e2 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
@@ -76,4 +76,4 @@ public class ComputeClosureExample {
 System.out.println(">>> Check all nodes for output (this node is 
also part of the cluster).");
 }
 }
-}
\ No newline at end of file
+}

[30/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1584

[dmagda]

https://issues.apache.org/jira/browse/IGNITE-1584


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

Branch: refs/heads/ignite-1272
Commit: 3de0e475ce7d889fd565f9be2c18a72cafc86430
Parents: bada5c7
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:25:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:25:46 2015 +0300

--
 .../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3de0e475/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
index 1feafe4..b3464b8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
@@ -29,4 +29,8 @@ public class IgniteCacheAtomicPutAllFailoverSelfTest extends 
GridCachePutAllFail
 @Override protected CacheAtomicityMode atomicityMode() {
 return ATOMIC;
 }
+
+@Override public void 
testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1584;);
+}
 }
\ No newline at end of file

[29/50] ignite git commit: https://issues.apache.org/jira/browse/IGNITE-1582

[dmagda]

https://issues.apache.org/jira/browse/IGNITE-1582


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

Branch: refs/heads/ignite-1272
Commit: bada5c78c16c1ee7b48fa04198e4266b72392311
Parents: 67d027e
Author: Anton Vinogradov 
Authored: Wed Sep 30 17:23:12 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 17:23:12 2015 +0300

--
 ...cheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bada5c78/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
index 484de6e..8e47134 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
@@ -33,4 +33,8 @@ public class 
GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest
 
 return cfg;
 }
+
+@Override public void testWithSkipStore(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1582;);
+}
 }
\ No newline at end of file

[01/50] ignite git commit: Merge remote-tracking branch 'origin/master'

[dmagda]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1272 8635693f7 -> ece9b5ad8


Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-1272
Commit: 343191bce46f9d745c1c0151ba86ac6032e76f16
Parents: a6306a5 a42750a
Author: Anton Vinogradov 
Authored: Fri Sep 25 16:21:42 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Sep 25 16:21:42 2015 +0300

--
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   5 +
 .../internal/GridUpdateNotifierSelfTest.java|   1 +
 ...nedQueueFailoverDataConsistencySelfTest.java |   5 -
 .../GridCacheReplicatedInvalidateSelfTest.java  | 249 ---
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |   5 +-
 .../multijvm/IgniteCacheProcessProxy.java   |   3 +-
 .../testsuites/IgniteCacheTestSuite3.java   |   2 -
 7 files changed, 12 insertions(+), 258 deletions(-)
--

[33/50] ignite git commit: Test Failed

[dmagda]

Test Failed


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

Branch: refs/heads/ignite-1272
Commit: aa9d23e80a08d0cfb4c3fc13cb7c59bc2ceb3bee
Parents: cdcaf9a
Author: Anton Vinogradov 
Authored: Wed Sep 30 18:52:33 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 18:52:33 2015 +0300

--
 .../GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa9d23e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index caeb9b6..cc24d7f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -37,4 +37,8 @@ public class 
GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest
 @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
 return ATOMIC;
 }
+
+@Override public void testTx(){
+fail("https://issues.apache.org/jira/browse/IGNITE-1591;);
+}
 }
\ No newline at end of file

[17/50] ignite git commit: Disable shmem in failover tests to avoid ignite-1578.

[dmagda]

Disable shmem in failover tests to avoid ignite-1578.


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

Branch: refs/heads/ignite-1272
Commit: bfabab2d0ee22808eef8a597b4b82dd84e5a2c87
Parents: 7402918
Author: sboikov 
Authored: Wed Sep 30 09:19:28 2015 +0300
Committer: sboikov 
Committed: Wed Sep 30 09:26:21 2015 +0300

--
 .../GridCacheAbstractFailoverSelfTest.java  |  3 ++
 .../GridCacheAbstractRemoveFailureTest.java |  3 ++
 .../cache/IgniteCacheCreateRestartSelfTest.java |  3 ++
 ...acheAsyncOperationsFailoverAbstractTest.java | 11 
 .../CachePutAllFailoverAbstractTest.java| 11 
 .../IgniteCachePutGetRestartAbstractTest.java   |  3 ++
 .../IgniteCacheSizeFailoverTest.java|  3 ++
 ...gniteAtomicLongChangingTopologySelfTest.java | 29 +++-
 .../IgniteCacheCrossCacheTxFailoverTest.java|  3 ++
 9 files changed, 50 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index e55803a..f4813ff 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.util.typedef.CIX1;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.TransactionConcurrency;
@@ -86,6 +87,8 @@ public abstract class GridCacheAbstractFailoverSelfTest 
extends GridCacheAbstrac
 discoSpi.setHeartbeatFrequency(30_000);
 discoSpi.setReconnectCount(2);
 
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
 return cfg;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/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 a3d9948..122910e 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
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.util.lang.GridTuple;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 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;
@@ -92,6 +93,8 @@ public abstract class GridCacheAbstractRemoveFailureTest 
extends GridCommonAbstr
 
 cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
 
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
 return cfg;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java
index 0a2d778..6f32d36 100644
--- 

[25/50] ignite git commit: Merge remote-tracking branch 'origin/master'

[dmagda]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-1272
Commit: de39fbf269ad6f834ab01444558ea2dced1c2035
Parents: f380883 1282f8b
Author: Dmitiry Setrakyan 
Authored: Wed Sep 30 14:19:28 2015 +0200
Committer: Dmitiry Setrakyan 
Committed: Wed Sep 30 14:19:28 2015 +0200

--
 .../discovery/GridDiscoveryManager.java |  22 +--
 .../processors/cache/GridCacheEventManager.java |  12 +-
 .../processors/cache/GridCacheIoManager.java|  76 +
 .../processors/cache/GridCacheMessage.java  |   7 -
 .../processors/cache/GridCacheProcessor.java|  68 +---
 .../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 -
 .../dht/preloader/GridDhtPreloader.java |   6 +
 .../IgniteClientReconnectAbstractTest.java  |  35 -
 .../IgniteClientReconnectCacheTest.java | 154 +++
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   7 +
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |  12 +-
 22 files changed, 266 insertions(+), 225 deletions(-)
--

[11/50] ignite git commit: Disabled SSL test for old JDKs.

[dmagda]

Disabled SSL test for old JDKs.


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

Branch: refs/heads/ignite-1272
Commit: e5c3ca3a952c3595bf240bf0adea8117dd4db116
Parents: 04930ca
Author: sboikov 
Authored: Mon Sep 28 16:35:59 2015 +0300
Committer: sboikov 
Committed: Mon Sep 28 16:35:59 2015 +0300

--
 .../apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3ca3a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
index 0bde89a..1f94f9e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
@@ -21,6 +21,7 @@ import junit.framework.TestSuite;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest;
+import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest;
 
 /**
@@ -38,7 +39,9 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite {
 
suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
 suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
 
-suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+// Disable SSL test with old JDK because of 
https://bugs.openjdk.java.net/browse/JDK-8013809.
+if (!IgniteUtils.isHotSpot() || 
IgniteUtils.isJavaVersionAtLeast("1.7.0_65"))
+suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
 
 return suite;
 }

[40/50] ignite git commit: ignite-1534 Fixed races in dynamic cache start exchange ordering.

[dmagda]

ignite-1534 Fixed races in dynamic cache start exchange ordering.


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

Branch: refs/heads/ignite-1272
Commit: 7b54cbd7499cd498b04e821dfa3b572bd94debec
Parents: a411f94
Author: sboikov 
Authored: Fri Oct 2 11:19:06 2015 +0300
Committer: sboikov 
Committed: Fri Oct 2 11:19:06 2015 +0300

--
 .../discovery/GridDiscoveryManager.java |   2 +-
 .../cache/DynamicCacheDescriptor.java   |  17 ++
 .../processors/cache/GridCacheContext.java  |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  20 ++-
 .../GridCachePartitionExchangeManager.java  |  72 ++---
 .../processors/cache/GridCacheProcessor.java|  26 ++--
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../dht/GridPartitionedGetFuture.java   |   5 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../distributed/near/GridNearGetFuture.java |   2 +
 .../cache/IgniteCachePutAllRestartTest.java |   4 +-
 .../CacheGetFutureHangsSelfTest.java| 156 +--
 .../distributed/IgniteCacheCreatePutTest.java   | 125 +++
 .../testsuites/IgniteCacheTestSuite4.java   |   5 +
 14 files changed, 284 insertions(+), 165 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index b694523..a6f5f08 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -550,7 +550,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 gridStartTime = getSpi().getGridStartTime();
 
 updateTopologyVersionIfGreater(new 
AffinityTopologyVersion(locNode.order()),
-new DiscoCache(localNode(), 
getSpi().getRemoteNodes()));
+new DiscoCache(localNode(), F.view(topSnapshot, 
F.remoteNodes(locNode.id();
 
 startLatch.countDown();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/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 24df7e4..b100a31 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
@@ -68,6 +68,9 @@ public class DynamicCacheDescriptor {
 /** */
 private AffinityTopologyVersion startTopVer;
 
+/** */
+private boolean rcvdOnDiscovery;
+
 /**
  * @param ctx Context.
  * @param cacheCfg Cache configuration.
@@ -236,6 +239,20 @@ public class DynamicCacheDescriptor {
 this.updatesAllowed = updatesAllowed;
 }
 
+/**
+ * @return {@code True} if received in discovery data.
+ */
+public boolean receivedOnDiscovery() {
+return rcvdOnDiscovery;
+}
+
+/**
+ * @param rcvdOnDiscovery {@code True} if received in discovery data.
+ */
+public void receivedOnDiscovery(boolean rcvdOnDiscovery) {
+this.rcvdOnDiscovery = rcvdOnDiscovery;
+}
+
 /** {@inheritDoc} */
 @Override public String toString() {
 return S.toString(DynamicCacheDescriptor.class, this, "cacheName", 
U.maskName(cacheCfg.getName()));

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b54cbd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 5385dec..3a1cee6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 

[26/50] ignite git commit: Test fix

[dmagda]

Test fix


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

Branch: refs/heads/ignite-1272
Commit: 7571f211ea85854854f08b9d2cecaff9850e126d
Parents: 1282f8b
Author: Anton Vinogradov 
Authored: Wed Sep 30 15:43:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Sep 30 15:43:40 2015 +0300

--
 .../cache/distributed/dht/IgniteCrossCacheTxSelfTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7571f211/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
index bf9b1c6..dc0293e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -148,11 +148,11 @@ public class IgniteCrossCacheTxSelfTest extends 
GridCommonAbstractTest {
 for (int i = 0; i < TX_CNT; i++) {
 int grid = ThreadLocalRandom8.current().nextInt(nodeCount());
 
+IgniteCache first = grid(grid).cache(FIRST_CACHE);
+IgniteCache second = 
grid(grid).cache(SECOND_CACHE);
+
 try (Transaction tx = 
grid(grid).transactions().txStart(concurrency, isolation)) {
 try {
-IgniteCache first = 
grid(grid).cache(FIRST_CACHE);
-IgniteCache second = 
grid(grid).cache(SECOND_CACHE);
-
 int size = ThreadLocalRandom8.current().nextInt(24) + 1;
 
 for (int k = 0; k < size; k++) {

[46/50] ignite git commit: Minor fixes

[dmagda]

Minor fixes


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

Branch: refs/heads/ignite-1272
Commit: 833405e355a10e86db8054497d92f0b459c6e399
Parents: 6fce2c5
Author: Yakov Zhdanov 
Authored: Tue Oct 6 13:37:25 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Oct 6 13:37:25 2015 +0300

--
 modules/yardstick/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/833405e3/modules/yardstick/pom.xml
--
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index d18e1a9..c87ecbc 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -20,7 +20,9 @@
 
-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;>
+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
 
 

[50/50] ignite git commit: ignite-1272: merge from master

[dmagda]

ignite-1272: merge from master


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

Branch: refs/heads/ignite-1272
Commit: ece9b5ad8771534ef6778216aff9a0dfff42e4b1
Parents: 8635693 f60cba7
Author: Denis Magda 
Authored: Wed Oct 7 15:52:48 2015 +0300
Committer: Denis Magda 
Committed: Wed Oct 7 15:52:48 2015 +0300

--
 RELEASE_NOTES.txt   |   2 +
 assembly/dependencies-fabric.xml|   2 +-
 assembly/release-fabric.xml |  10 +-
 bin/igniterouter.bat|   2 +-
 bin/igniterouter.sh |   2 +-
 examples/pom.xml|   2 +-
 examples/schema-import/pom-standalone.xml   |  90 +++
 examples/schema-import/pom.xml  |  23 +-
 .../computegrid/ComputeClosureExample.java  |   2 +-
 .../socket/WordsSocketStreamerServer.java   |   5 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/README.txt   |  33 +
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 .../TcpDiscoveryCloudIpFinderSelfTest.java  |   2 +
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../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 |   4 +-
 .../configuration/CacheConfiguration.java   |   2 +-
 .../ignite/configuration/TopologyValidator.java |  38 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   2 +-
 .../apache/ignite/internal/IgniteKernal.java|  70 +--
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/GridDiscoveryManager.java |  28 +-
 .../cache/DynamicCacheChangeRequest.java|  19 +
 .../cache/DynamicCacheDescriptor.java   |  36 ++
 .../processors/cache/GridCacheContext.java  |   2 +-
 .../processors/cache/GridCacheEventManager.java |  12 +-
 .../cache/GridCacheExplicitLockSpan.java|  13 +-
 .../processors/cache/GridCacheIoManager.java|  76 +--
 .../processors/cache/GridCacheMessage.java  |   7 -
 .../cache/GridCacheMvccCandidate.java   |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  67 +-
 .../GridCachePartitionExchangeManager.java  |  92 +--
 .../processors/cache/GridCacheProcessor.java| 109 ++--
 .../cache/GridCacheSharedContext.java   |  32 -
 .../processors/cache/GridCacheSwapManager.java  |   4 +-
 .../processors/cache/GridCacheUtils.java|   8 -
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   5 -
 .../dht/GridDhtAffinityAssignmentResponse.java  |   5 -
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../distributed/dht/GridDhtLockRequest.java |  10 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   5 -
 .../distributed/dht/GridDhtTxPrepareFuture.java |   6 +-
 .../dht/GridDhtTxPrepareRequest.java|   7 +-
 .../dht/GridPartitionedGetFuture.java   |   5 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   5 +
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../dht/colocated/GridDhtColocatedCache.java|  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   5 -
 .../dht/preloader/GridDhtForceKeysResponse.java |   5 -
 .../GridDhtPartitionDemandMessage.java  |   5 -
 .../GridDhtPartitionSupplyMessage.java  |   5 -
 .../GridDhtPartitionsAbstractMessage.java   |   5 -
 .../dht/preloader/GridDhtPreloader.java |   8 +-
 .../distributed/near/GridNearGetFuture.java |   2 +
 .../near/GridNearTxFinishFuture.java|   4 +-
 .../cache/distributed/near/GridNearTxLocal.java |  21 +-
 .../cache/local/GridLocalCacheEntry.java|   2 +-
 .../continuous/CacheContinuousQueryHandler.java |   7 +-
 .../transactions/IgniteTxLocalAdapter.java  |  35 +-
 .../continuous/GridContinuousProcessor.java |  17 +-
 .../datastructures/DataStructuresProcessor.java |   6 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |  15 +-
 .../internal/processors/igfs/IgfsImpl.java  | 208 +--
 .../processors/igfs/IgfsMetaManager.java| 594 --
 .../ignite/internal/util/GridArgumentCheck.java |   5 

[06/50] ignite git commit: IGNITE-1557

[dmagda]

IGNITE-1557


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

Branch: refs/heads/ignite-1272
Commit: 00e61e52678aefc2fcad0179fb3e05b46265b102
Parents: 8fea96e
Author: Anton Vinogradov 
Authored: Mon Sep 28 14:00:23 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Sep 28 14:00:23 2015 +0300

--
 pom.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/00e61e52/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fad8807..5194a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -897,6 +897,22 @@
 
 
 
+
+
+org.apache.maven.plugins
+maven-remote-resources-plugin
+
+
+ignite-dependencies
+
+process
+
+
+   true
+
+
+
+
 
 
 

[12/50] ignite git commit: ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject

[dmagda]

ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject


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

Branch: refs/heads/ignite-1272
Commit: c6bb01b49cfef14310355148c4937aab8489da13
Parents: e5c3ca3
Author: sboikov 
Authored: Tue Sep 29 09:20:25 2015 +0300
Committer: sboikov 
Committed: Tue Sep 29 09:20:25 2015 +0300

--
 .../cache/GridCacheExplicitLockSpan.java|  13 +-
 .../cache/GridCacheMvccCandidate.java   |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  47 +++---
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java|  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 ++-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../cache/local/GridLocalCacheEntry.java|   2 +-
 .../processors/cache/CrossCacheLockTest.java| 142 +++
 .../GridCacheFinishPartitionsSelfTest.java  |   5 +-
 .../testsuites/IgniteCacheTestSuite4.java   |   3 +
 12 files changed, 201 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c6bb01b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index 2261c7d..df32e77 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@ -46,7 +47,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
 
 /** Pending candidates. */
 @GridToStringInclude
-private final Map cands = 
new HashMap<>();
+private final Map cands = new 
HashMap<>();
 
 /** Span lock release future. */
 @GridToStringExclude
@@ -77,7 +78,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
 if (cands.isEmpty())
 return false;
 
-assert this.topVer.equals(this.topVer);
+assert this.topVer.equals(topVer);
 
 Deque deque = ensureDeque(cand.key());
 
@@ -137,7 +138,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param ver Version (or {@code null} if any candidate should be removed.)
  * @return Removed candidate if matches given parameters.
  */
-public GridCacheMvccCandidate removeCandidate(KeyCacheObject key, 
@Nullable GridCacheVersion ver) {
+public GridCacheMvccCandidate removeCandidate(IgniteTxKey key, @Nullable 
GridCacheVersion ver) {
 lock();
 
 try {
@@ -187,7 +188,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  *
  * @param key Key.
  */
-public void markOwned(KeyCacheObject key) {
+public void markOwned(IgniteTxKey key) {
 lock();
 
 try {
@@ -210,7 +211,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param ver Version to lookup (if {@code null} - return any).
  * @return Last added explicit lock candidate, if any, or {@code null}.
  */
-@Nullable public GridCacheMvccCandidate candidate(KeyCacheObject key, 
@Nullable final GridCacheVersion ver) {
+@Nullable public GridCacheMvccCandidate candidate(IgniteTxKey key, 
@Nullable final GridCacheVersion ver) {
 lock();
 
 try {
@@ -257,7 +258,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
  * @param key Key to look up.
  * @return Deque.
  */
-private Deque ensureDeque(KeyCacheObject key) {
+private Deque ensureDeque(IgniteTxKey key) {
 Deque deque = cands.get(key);
 
 if (deque == null) {