ignite git commit: IGNITE-1270 Change order in which OSGi modules are built.

[raulk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1270 593440a5a -> 07078b086


IGNITE-1270 Change order in which OSGi modules are built.


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

Branch: refs/heads/ignite-1270
Commit: 07078b0860604fd1cf983a16a7c6069e35cc81cf
Parents: 593440a
Author: Raul Kripalani 
Authored: Fri Nov 27 17:07:03 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 17:07:03 2015 +

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/07078b08/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 72004f8..aa31f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,9 +80,9 @@
 modules/mqtt
 modules/zookeeper
 modules/camel
-modules/osgi
-modules/osgi-karaf
 modules/osgi-paxlogging
+modules/osgi-karaf
+modules/osgi
 
 
 

ignite git commit: Fixed GridCacheBinaryObjects*Test's.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 a2cdc73af -> 8a822d81a


Fixed GridCacheBinaryObjects*Test's.


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

Branch: refs/heads/ignite-1.5
Commit: 8a822d81adf3a903b84daf17a11e642309576528
Parents: a2cdc73
Author: Tikhonov Nikolay 
Authored: Fri Nov 27 22:30:06 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Nov 27 22:51:04 2015 +0300

--
 .../ignite/internal/processors/cache/CacheObjectContext.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8a822d81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index b99c99f..fe650f3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -220,6 +220,8 @@ import org.apache.ignite.internal.util.typedef.F;
 private Collection unwrapPortables(ArrayList col, boolean 
keepPortable, boolean cpy) {
 int size = col.size();
 
+col = new ArrayList<>(col);
+
 for (int i = 0; i < size; i++) {
 Object o = col.get(i);
 

ignite git commit: typo fix

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 292de51c7 -> fb5d54a6b


typo fix


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

Branch: refs/heads/ignite-1.5
Commit: fb5d54a6b7b737b9dbf93651a478ed3d7a21e340
Parents: 292de51
Author: Anton Vinogradov 
Authored: Fri Nov 27 19:51:11 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 19:51:11 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb5d54a6/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 42258f7..4985edb 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -10,7 +10,7 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
 * Fixed failover for continuous queries.
-* Fixed compilation and runtime errors under OpnJDK and IBM JDK.
+* Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.
 * Fixed and improved cache types configuration.
 * Fixed cache rebalancing.

ignite git commit: Fixed GridSessionCheckpointSelfTest.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5-test [created] 8cbbfd6ba


Fixed GridSessionCheckpointSelfTest.


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

Branch: refs/heads/ignite-1.5-test
Commit: 8cbbfd6ba3c6d3cf93aae9e39b2282c9156d03b8
Parents: fb5d54a
Author: Tikhonov Nikolay 
Authored: Fri Nov 27 20:07:59 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Nov 27 20:07:59 2015 +0300

--
 .../testframework/junits/IgniteTestResources.java   | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8cbbfd6b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 406318f..decf7d4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -26,7 +26,13 @@ import java.util.concurrent.ThreadPoolExecutor;
 import javax.management.MBeanServer;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.portable.BinaryCachingMetadataHandler;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
+import org.apache.ignite.internal.portable.PortableContext;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
@@ -258,6 +264,12 @@ public class IgniteTestResources {
 
 marsh.setContext(new MarshallerContextTestImpl());
 
+if (marsh instanceof BinaryMarshaller) {
+PortableContext ctx = new 
PortableContext(BinaryCachingMetadataHandler.create(), new 
IgniteConfiguration());
+
+IgniteUtils.invoke(BinaryMarshaller.class, marsh, 
"setPortableContext", ctx, new IgniteConfiguration());
+}
+
 return marsh;
 }
 }
\ No newline at end of file

ignite git commit: Fixing tests

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 0c03b916a -> 6a95f88d4


Fixing tests


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

Branch: refs/heads/ignite-1.5
Commit: 6a95f88d4cea59d70dd02628b23be976dcb9f6d9
Parents: 0c03b91
Author: Yakov Zhdanov 
Authored: Fri Nov 27 20:40:05 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 20:40:05 2015 +0300

--
 .../cache/eviction/random/RandomEvictionPolicySelfTest.java  | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a95f88d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
index 9d781eb..af04cdc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
@@ -92,7 +92,11 @@ public class RandomEvictionPolicySelfTest extends
 info("Stats [cntr=" + i + ", total=" + runs + ']');
 }
 
-assert g.cache(null).size() <= max;
+int size = g.cache(null).size();
+
+info("Cache size: " + size);
+
+assert size <= (max * 1.2) : size; // Add 20% room for random 
evictions.
 
 info(policy(0));
 }
@@ -354,4 +358,4 @@ public class RandomEvictionPolicySelfTest extends
 @Override protected void checkPolicies() {
 // No-op.
 }
-}
\ No newline at end of file
+}

ignite git commit: Fixed GridSessionCheckpointSelfTest.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 6a95f88d4 -> a2cdc73af


Fixed GridSessionCheckpointSelfTest.


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

Branch: refs/heads/ignite-1.5
Commit: a2cdc73afd54e02c86ede0d6e81ed280d4b0aff0
Parents: 6a95f88
Author: Tikhonov Nikolay 
Authored: Fri Nov 27 20:07:59 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Nov 27 22:33:02 2015 +0300

--
 .../ignite/testframework/junits/IgniteTestResources.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a2cdc73a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 406318f..970002d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -26,7 +26,12 @@ import java.util.concurrent.ThreadPoolExecutor;
 import javax.management.MBeanServer;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.portable.BinaryCachingMetadataHandler;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
+import org.apache.ignite.internal.portable.PortableContext;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
@@ -258,6 +263,12 @@ public class IgniteTestResources {
 
 marsh.setContext(new MarshallerContextTestImpl());
 
+if (marsh instanceof BinaryMarshaller) {
+PortableContext ctx = new 
PortableContext(BinaryCachingMetadataHandler.create(), new 
IgniteConfiguration());
+
+IgniteUtils.invoke(BinaryMarshaller.class, marsh, 
"setPortableContext", ctx, new IgniteConfiguration());
+}
+
 return marsh;
 }
 }
\ No newline at end of file

ignite git commit: marshaller perf suggestion fixed

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 fb5d54a6b -> 0c03b916a


marshaller perf suggestion fixed


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

Branch: refs/heads/ignite-1.5
Commit: 0c03b916a4608e35993eeff276e2e12638930d52
Parents: fb5d54a
Author: Yakov Zhdanov 
Authored: Fri Nov 27 20:27:29 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 20:27:29 2015 +0300

--
 .../java/org/apache/ignite/internal/IgniteKernal.java | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c03b916/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 305769b..68d48c9 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
@@ -53,21 +53,21 @@ import org.apache.ignite.IgniteAtomicLong;
 import org.apache.ignite.IgniteAtomicReference;
 import org.apache.ignite.IgniteAtomicSequence;
 import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteClientDisconnectedException;
 import org.apache.ignite.IgniteCompute;
 import org.apache.ignite.IgniteCountDownLatch;
-import org.apache.ignite.IgniteSemaphore;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.IgniteEvents;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.IgniteSemaphore;
 import org.apache.ignite.IgniteServices;
 import org.apache.ignite.IgniteSet;
 import org.apache.ignite.IgniteSystemProperties;
@@ -96,6 +96,8 @@ 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.BinaryEnumCache;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.processors.GridProcessor;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -133,7 +135,6 @@ import 
org.apache.ignite.internal.processors.service.GridServiceProcessor;
 import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
 import org.apache.ignite.internal.processors.task.GridTaskProcessor;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
-import org.apache.ignite.internal.portable.BinaryEnumCache;
 import org.apache.ignite.internal.util.GridTimerTask;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -158,7 +159,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.BinaryMarshaller;
 import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
 import org.apache.ignite.mxbean.IgniteMXBean;
 import org.apache.ignite.mxbean.ThreadPoolMXBean;
@@ -1192,9 +1192,9 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (OptimizedMarshaller.available() && !(cfg.getMarshaller() 
instanceof OptimizedMarshaller))
-perf.add("Enable optimized marshaller (set 'marshaller' to " +
-OptimizedMarshaller.class.getSimpleName() + ')');
+if (BinaryMarshaller.available() && !(cfg.getMarshaller() instanceof 
BinaryMarshaller))
+perf.add("Enable binary marshaller (set 'marshaller' to " +
+

ignite git commit: ignite-2010 IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap test fixed

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 9c46fa961 -> 1727df6a3


ignite-2010 
IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap
 test fixed


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

Branch: refs/heads/ignite-1.5
Commit: 1727df6a334b3cc879ca7bc9dd76e6f52f1e027a
Parents: 9c46fa9
Author: agura 
Authored: Thu Nov 26 17:36:12 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:44:05 2015 +0300

--
 .../distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1727df6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index e46761b..0294dea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -37,6 +37,7 @@ import 
org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -391,6 +392,11 @@ public class IgniteCacheCrossCacheTxFailoverTest extends 
GridCommonAbstractTest
 ignite0.destroyCache(CACHE1);
 ignite0.destroyCache(CACHE2);
 
+AffinityTopologyVersion topVer = 
ignite0.context().cache().context().exchange().lastTopologyFuture().get();
+
+for (Ignite ignite : G.allGrids())
+
((IgniteKernal)ignite).context().cache().context().exchange().affinityReadyFuture(topVer).get();
+
 awaitPartitionMapExchange();
 }
 }

ignite git commit: IGNITE-2018 Refactoring examples.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2018 [created] 83d6691ec


IGNITE-2018 Refactoring examples.


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

Branch: refs/heads/ignite-2018
Commit: 83d6691ec49347e8c15c6520b53d5efbfd627de0
Parents: e4f6224
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 18:22:18 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 18:22:18 2015 +0700

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 166 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 -
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +-
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 ++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  60 ++-
 30 files changed, 649 insertions(+), 778 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/83d6691e/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index d040b88..ade5d18 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -24,7 +24,7 @@ import javax.cache.integration.CacheWriterException;
 import org.apache.ignite.cache.store.CacheStore;
 import org.apache.ignite.cache.store.CacheStoreAdapter;
 import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.examples.model.Person;
 import org.apache.ignite.lang.IgniteBiInClosure;
 import org.apache.ignite.resources.CacheStoreSessionResource;
 import org.hibernate.HibernateException;
@@ -107,7 +107,7 @@ public class CacheHibernatePersonStore extends 
CacheStoreAdapter {
 for (Object obj : list) {
 Person person = (Person)obj;
 
-clo.apply(person.getId(), person);
+clo.apply(person.id, person);
 
 cnt++;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/83d6691e/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index f993d81..71c4f68 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ 

ignite git commit: ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 1727df6a3 -> 95ab2310d


ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed


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

Branch: refs/heads/ignite-1.5
Commit: 95ab2310d2db49baadceefe3e667a3e1c930c926
Parents: 1727df6
Author: agura 
Authored: Thu Nov 26 21:54:34 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:45:19 2015 +0300

--
 .../cache/eviction/GridCacheEvictionLockUnlockSelfTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95ab2310/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 11faca3..75f5c8f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -142,7 +142,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends 
GridCommonAbstractTest
 assertEquals(gridCnt, touchCnt.get());
 
 for (int j = 0; j < gridCnt; j++)
-assertFalse(jcache(j).containsKey("key"));
+assertEquals(0, jcache(j).size());
 }
 }
 finally {

ignite git commit: Add README.txt for jms11, mqtt and zookeeper modules.

[raulk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 95ab2310d -> 722fe14a6


Add README.txt for jms11, mqtt and zookeeper modules.


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

Branch: refs/heads/ignite-1.5
Commit: 722fe14a6814a9cdbfea1cbfe53598ba5ed8ea8f
Parents: 95ab231
Author: Raul Kripalani 
Authored: Fri Nov 27 11:54:32 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 11:54:32 2015 +

--
 modules/jms11/README.txt | 29 +
 modules/mqtt/README.txt  | 29 +
 modules/zookeeper/README.txt | 29 +
 3 files changed, 87 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/jms11/README.txt
--
diff --git a/modules/jms11/README.txt b/modules/jms11/README.txt
new file mode 100644
index 000..3f0d213
--- /dev/null
+++ b/modules/jms11/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite JMS 1.1 Module
+
+
+Apache Ignite JMS 1.1 module provides a streamer to consume JMS queue and 
topic messages into
+Apache Ignite caches.
+
+Importing Apache Ignite JMS 1.1 Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
JMS 1.1 module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-jms11
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/mqtt/README.txt
--
diff --git a/modules/mqtt/README.txt b/modules/mqtt/README.txt
new file mode 100644
index 000..62a1589
--- /dev/null
+++ b/modules/mqtt/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite MQTT Module
+-
+
+Apache Ignite MQTT module provides a streamer to consume MQTT topic messages 
into
+Apache Ignite caches.
+
+Importing Apache Ignite MQTT Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
MQTT module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-mqtt
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/zookeeper/README.txt
--
diff --git a/modules/zookeeper/README.txt b/modules/zookeeper/README.txt
new file mode 100644
index 000..6d400ad
--- /dev/null
+++ b/modules/zookeeper/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite ZooKeeper Module
+--
+
+Apache Ignite ZooKeeper module provides a TCP Discovery IP Finder that uses a 
ZooKeeper
+directory to locate other Ignite nodes to connect to.
+
+Importing Apache Ignite ZooKeeper Module In Maven Project
+-
+
+If you are using Maven to manage dependencies of your project, you can add the 
ZooKeeper
+module dependency like this (replace '${ignite.version}' with actual Ignite 
version you
+are interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-zookeeper
+${ignite.version}
+
+...
+
+...
+

ignite git commit: Fixed IgniteTxRemoteState to properly process invalid partitions.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 722fe14a6 -> 3080f61ae


Fixed IgniteTxRemoteState to properly process invalid partitions.


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

Branch: refs/heads/ignite-1.5
Commit: 3080f61ae9ca1481d65f18f7a84f8bbc9d682f79
Parents: 722fe14
Author: sboikov 
Authored: Fri Nov 27 15:24:32 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 15:24:32 2015 +0300

--
 .../cache/distributed/dht/GridDhtTxRemote.java  | 15 +---
 .../IgniteTxRemoteSingleStateImpl.java  | 16 ++---
 .../cache/transactions/IgniteTxRemoteState.java |  5 
 .../transactions/IgniteTxRemoteStateImpl.java   | 24 
 4 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index e0929ad..85a5759 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -279,20 +279,7 @@ public class GridDhtTxRemote extends 
GridDistributedTxRemoteAdapter {
 @Override public void addInvalidPartition(GridCacheContext cacheCtx, int 
part) {
 super.addInvalidPartition(cacheCtx, part);
 
-Map writeMap = txState.writeMap();
-
-for (Iterator it = writeMap.values().iterator(); 
it.hasNext();) {
-IgniteTxEntry e = it.next();
-
-GridCacheEntryEx cached = e.cached();
-
-if (cached != null) {
-if (cached.partition() == part)
-it.remove();
-}
-else if (cacheCtx.affinity().partition(e.key()) == part)
-it.remove();
-}
+txState.invalidPartition(part);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
index 90af517..a68006b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
@@ -65,15 +65,7 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 
 /** {@inheritDoc} */
 @Override public Set writeSet() {
-if (entry != null) {
-HashSet set = new HashSet<>(3, 0.75f);
-
-set.add(entry.txKey());
-
-return set;
-}
-else
-return Collections.emptySet();
+return entry != null ? Collections.singleton(entry.txKey()) : 
Collections.emptySet();
 }
 
 /** {@inheritDoc} */
@@ -113,6 +105,12 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 }
 
 /** {@inheritDoc} */
+@Override public void invalidPartition(int part) {
+if (entry != null && entry.context().affinity().partition(entry.key()) 
== part)
+entry = null;
+}
+
+/** {@inheritDoc} */
 public String toString() {
 return S.toString(IgniteTxRemoteSingleStateImpl.class, this);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
index b8290a1..77fc97e 100644
--- 

[03/12] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-2018
Commit: 857c63e79ef5aa34c8213d4c1ecb298866724727
Parents: 712e62b fa8e478
Author: sboikov 
Authored: Fri Nov 27 13:13:17 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 13:13:17 2015 +0300

--
 .../java/org/apache/ignite/IgniteBinary.java|   9 +
 .../org/apache/ignite/binary/BinaryObject.java  |   8 +
 .../org/apache/ignite/binary/BinaryType.java|   7 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  21 +
 .../communication/GridIoMessageFactory.java |   8 +-
 .../internal/portable/BinaryEnumObjectImpl.java | 311 +
 .../internal/portable/BinaryMetadata.java   |  16 +-
 .../internal/portable/BinaryObjectExImpl.java   |   5 +
 .../internal/portable/BinaryObjectImpl.java |   3 -
 .../internal/portable/BinaryTypeImpl.java   |   9 +-
 .../internal/portable/BinaryWriteMode.java  |   3 +
 .../internal/portable/BinaryWriterExImpl.java   |  19 +
 .../portable/PortableClassDescriptor.java   |  23 +-
 .../internal/portable/PortableContext.java  |  39 +-
 .../ignite/internal/portable/PortableUtils.java | 147 +-
 .../builder/BinaryObjectBuilderImpl.java|   2 +-
 .../builder/PortableBuilderSerializer.java  |  10 +-
 .../internal/processors/cache/CacheObject.java  |   3 +
 .../processors/cache/CacheObjectContext.java|  19 +
 .../portable/CacheObjectBinaryProcessor.java|  11 +-
 .../CacheObjectBinaryProcessorImpl.java |  18 +-
 .../cache/portable/IgniteBinaryImpl.java|  12 +
 .../processors/cacheobject/NoOpBinary.java  |   5 +
 .../platform/PlatformContextImpl.java   |  53 ++-
 .../transactions/PlatformTransactions.java  |   4 +-
 .../platform/utils/PlatformUtils.java   |   1 +
 .../PlatformDotNetBinaryTypeConfiguration.java  |  23 +
 .../internal/portable/BinaryEnumsSelfTest.java  | 446 +++
 .../portable/BinaryMarshallerSelfTest.java  |  37 +-
 .../platform/PlatformComputeEchoTask.java   |   4 +-
 .../IgnitePortableObjectsTestSuite.java |   2 +
 modules/jms11/licenses/apache-2.0.txt   | 202 +
 modules/kafka/README.txt|  32 ++
 modules/mqtt/licenses/apache-2.0.txt| 202 +
 .../impl/binary/binary_type_updater_impl.cpp|   4 +-
 .../Binary/BinaryBuilderSelfTest.cs |  97 ++--
 .../Binary/BinarySelfTest.cs|  48 +-
 .../Cache/CacheAbstractTest.cs  |  17 +-
 .../Compute/ComputeApiTest.cs   |   6 +
 .../Config/Compute/compute-grid1.xml|   3 +-
 .../Config/native-client-test-cache-store.xml   |   1 +
 .../Services/ServiceProxyTest.cs|  22 +-
 .../Apache.Ignite.Core.csproj   |   5 +-
 .../Binary/BinaryTypeConfiguration.cs   |  16 +-
 .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 136 ++
 .../Apache.Ignite.Core/Binary/IBinaryObject.cs  |  23 +-
 .../Apache.Ignite.Core/Binary/IBinaryType.cs|  13 +
 .../Apache.Ignite.Core/Binary/IIgniteBinary.cs  | 120 -
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|   6 +-
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 216 +
 .../Impl/Binary/BinaryEnum.cs   | 134 ++
 .../Impl/Binary/BinaryFullTypeDescriptor.cs |  14 +-
 .../Impl/Binary/BinaryObject.cs |  29 ++
 .../Impl/Binary/BinaryObjectBuilder.cs  |  44 +-
 .../Impl/Binary/BinaryReader.cs |  51 ++-
 .../Binary/BinarySurrogateTypeDescriptor.cs |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs |  34 +-
 .../Impl/Binary/BinaryUtils.cs  |  96 ++--
 .../Impl/Binary/BinaryWriter.cs | 104 +++--
 .../Impl/Binary/IBinaryTypeDescriptor.cs|  50 +--
 .../Impl/Binary/IgniteBinary.cs | 192 
 .../Impl/Binary/Marshaller.cs   |  88 ++--
 .../Impl/Binary/Metadata/BinaryType.cs  | 184 
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|  34 +-
 .../Binary/Structure/BinaryStructureTracker.cs  |   2 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs|  11 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs  |   2 +-
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |  11 +-
 .../Impl/Transactions/TransactionsImpl.cs   |   4 +-
 .../examples/Config/example-cache-query.xml |   9 +-
 .../dotnet/examples/Config/example-cache.xml|   9 +-
 modules/zookeeper/licenses/apache-2.0.txt   | 202 +
 72 files changed, 2992 insertions(+), 765 deletions(-)

[01/12] ignite git commit: Missed README & licenses

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2018 83d6691ec -> d76de309e


Missed README & licenses


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

Branch: refs/heads/ignite-2018
Commit: fa8e478d930b9ecb2c1534874f9993c1ae45c103
Parents: e4f6224
Author: Anton Vinogradov 
Authored: Fri Nov 27 13:10:27 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 13:10:27 2015 +0300

--
 modules/jms11/licenses/apache-2.0.txt | 202 +
 modules/kafka/README.txt  |  32 
 modules/mqtt/licenses/apache-2.0.txt  | 202 +
 modules/zookeeper/licenses/apache-2.0.txt | 202 +
 4 files changed, 638 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa8e478d/modules/jms11/licenses/apache-2.0.txt
--
diff --git a/modules/jms11/licenses/apache-2.0.txt 
b/modules/jms11/licenses/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/jms11/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by 

[06/12] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-2018
Commit: 91f3f87524acb278726e6d6f1e27d4cfdc56a15a
Parents: 2806393 857c63e
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:21:59 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:21:59 2015 +0300

--
 ...gniteAtomicLongChangingTopologySelfTest.java |   8 +-
 modules/jms11/licenses/apache-2.0.txt   | 202 +++
 modules/kafka/README.txt|  32 +++
 modules/mqtt/licenses/apache-2.0.txt| 202 +++
 modules/zookeeper/licenses/apache-2.0.txt   | 202 +++
 5 files changed, 645 insertions(+), 1 deletion(-)
--

[10/12] ignite git commit: Add README.txt for jms11, mqtt and zookeeper modules.

[akuznetsov]

Add README.txt for jms11, mqtt and zookeeper modules.


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

Branch: refs/heads/ignite-2018
Commit: 722fe14a6814a9cdbfea1cbfe53598ba5ed8ea8f
Parents: 95ab231
Author: Raul Kripalani 
Authored: Fri Nov 27 11:54:32 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 11:54:32 2015 +

--
 modules/jms11/README.txt | 29 +
 modules/mqtt/README.txt  | 29 +
 modules/zookeeper/README.txt | 29 +
 3 files changed, 87 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/jms11/README.txt
--
diff --git a/modules/jms11/README.txt b/modules/jms11/README.txt
new file mode 100644
index 000..3f0d213
--- /dev/null
+++ b/modules/jms11/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite JMS 1.1 Module
+
+
+Apache Ignite JMS 1.1 module provides a streamer to consume JMS queue and 
topic messages into
+Apache Ignite caches.
+
+Importing Apache Ignite JMS 1.1 Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
JMS 1.1 module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-jms11
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/mqtt/README.txt
--
diff --git a/modules/mqtt/README.txt b/modules/mqtt/README.txt
new file mode 100644
index 000..62a1589
--- /dev/null
+++ b/modules/mqtt/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite MQTT Module
+-
+
+Apache Ignite MQTT module provides a streamer to consume MQTT topic messages 
into
+Apache Ignite caches.
+
+Importing Apache Ignite MQTT Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
MQTT module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-mqtt
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/zookeeper/README.txt
--
diff --git a/modules/zookeeper/README.txt b/modules/zookeeper/README.txt
new file mode 100644
index 000..6d400ad
--- /dev/null
+++ b/modules/zookeeper/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite ZooKeeper Module
+--
+
+Apache Ignite ZooKeeper module provides a TCP Discovery IP Finder that uses a 
ZooKeeper
+directory to locate other Ignite nodes to connect to.
+
+Importing Apache Ignite ZooKeeper Module In Maven Project
+-
+
+If you are using Maven to manage dependencies of your project, you can add the 
ZooKeeper
+module dependency like this (replace '${ignite.version}' with actual Ignite 
version you
+are interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-zookeeper
+${ignite.version}
+
+...
+
+...
+

[07/12] ignite git commit: Fixed scalar examples

[akuznetsov]

Fixed scalar examples


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

Branch: refs/heads/ignite-2018
Commit: 9c46fa961bb88524fcd6c8ccb85c28f8688758b8
Parents: 91f3f87
Author: Alexey Goncharuk 
Authored: Fri Nov 27 14:12:43 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 14:12:43 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |  2 +-
 .../ignite/internal/portable/PortableUtils.java |  6 +--
 .../processors/cache/CacheInvokeResult.java | 14 ++
 .../dht/atomic/GridDhtAtomicCache.java  | 50 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 5 files changed, 66 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index 872d7a3..3cc2fbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -1616,7 +1616,7 @@ public class BinaryReaderExImpl implements BinaryReader, 
BinaryRawReaderEx, Bina
 break;
 
 case OPTM_MARSH:
-obj = PortableUtils.doReadOptimized(in, ctx);
+obj = PortableUtils.doReadOptimized(in, ctx, ldr);
 
 break;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index e543c41..1a8f156 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -1498,13 +1498,13 @@ public class PortableUtils {
  *
  * @return Result.
  */
-public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx) {
+public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx, @Nullable ClassLoader clsLdr) {
 int len = in.readInt();
 
 ByteArrayInputStream input = new ByteArrayInputStream(in.array(), 
in.position(), len);
 
 try {
-return ctx.optimizedMarsh().unmarshal(input, null);
+return ctx.optimizedMarsh().unmarshal(input, clsLdr);
 }
 catch (IgniteCheckedException e) {
 throw new BinaryObjectException("Failed to unmarshal object with 
optimized marshaller", e);
@@ -1706,7 +1706,7 @@ public class PortableUtils {
 return doReadClass(in, ctx, ldr);
 
 case OPTM_MARSH:
-return doReadOptimized(in, ctx);
+return doReadOptimized(in, ctx, ldr);
 
 default:
 throw new BinaryObjectException("Invalid flag value: " + flag);

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 8d6d905..48dabb9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -64,6 +64,20 @@ public class CacheInvokeResult implements 
EntryProcessorResult, Externaliz
 }
 
 /**
+ * @return Result.
+ */
+public T result() {
+return res;
+}
+
+/**
+ * Entry processor error;
+ */
+public Exception error() {
+return err;
+}
+
+/**
  * Static constructor.
  *
  * @param err Exception thrown by {@link 
EntryProcessor#process(MutableEntry, Object...)}.

[09/12] ignite git commit: ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed

[akuznetsov]

ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed


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

Branch: refs/heads/ignite-2018
Commit: 95ab2310d2db49baadceefe3e667a3e1c930c926
Parents: 1727df6
Author: agura 
Authored: Thu Nov 26 21:54:34 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:45:19 2015 +0300

--
 .../cache/eviction/GridCacheEvictionLockUnlockSelfTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95ab2310/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 11faca3..75f5c8f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -142,7 +142,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends 
GridCommonAbstractTest
 assertEquals(gridCnt, touchCnt.get());
 
 for (int j = 0; j < gridCnt; j++)
-assertFalse(jcache(j).containsKey("key"));
+assertEquals(0, jcache(j).size());
 }
 }
 finally {

ignite git commit: ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 6312737a7 -> f3cb64e37


ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed


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

Branch: refs/heads/ignite-1.5
Commit: f3cb64e375ff97a35b25ec0687b7d599f212afbd
Parents: 6312737
Author: agura 
Authored: Fri Nov 27 17:26:20 2015 +0300
Committer: agura 
Committed: Fri Nov 27 17:39:46 2015 +0300

--
 .../GridProjectionLocalJobMultipleArgumentsSelfTest.java | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f3cb64e3/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 58ff1fb..356e002 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -43,7 +43,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest 
extends GridCommonA
 private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
 
 /** */
-private static Collection ids;
+private static Collection ids;
 
 /** */
 private static AtomicInteger res;
@@ -90,7 +90,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest 
extends GridCommonA
 for (int i : F.asList(1, 2, 3)) {
 res.add(grid().compute().affinityCall(null, i, new 
IgniteCallable() {
 @Override public Integer call() {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10;
 }
@@ -108,7 +108,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 for (int i : F.asList(1, 2, 3)) {
 grid().compute().affinityRun(null, i, new IgniteRunnable() {
 @Override public void run() {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 res.addAndGet(10);
 }
@@ -125,8 +125,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 public void testCall() throws Exception {
 Collection res = grid().compute().apply(new C1() {
 @Override public Integer apply(Integer arg) {
-
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10 + arg;
 }
@@ -144,7 +143,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 
 Collection res = grid().compute().apply(new C1() {
 @Override public Integer apply(Integer arg) {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10 + arg;
 }

ignite git commit: Fixed scalar examples

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 91f3f8752 -> 9c46fa961


Fixed scalar examples


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

Branch: refs/heads/ignite-1.5
Commit: 9c46fa961bb88524fcd6c8ccb85c28f8688758b8
Parents: 91f3f87
Author: Alexey Goncharuk 
Authored: Fri Nov 27 14:12:43 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 14:12:43 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |  2 +-
 .../ignite/internal/portable/PortableUtils.java |  6 +--
 .../processors/cache/CacheInvokeResult.java | 14 ++
 .../dht/atomic/GridDhtAtomicCache.java  | 50 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 5 files changed, 66 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index 872d7a3..3cc2fbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -1616,7 +1616,7 @@ public class BinaryReaderExImpl implements BinaryReader, 
BinaryRawReaderEx, Bina
 break;
 
 case OPTM_MARSH:
-obj = PortableUtils.doReadOptimized(in, ctx);
+obj = PortableUtils.doReadOptimized(in, ctx, ldr);
 
 break;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index e543c41..1a8f156 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -1498,13 +1498,13 @@ public class PortableUtils {
  *
  * @return Result.
  */
-public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx) {
+public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx, @Nullable ClassLoader clsLdr) {
 int len = in.readInt();
 
 ByteArrayInputStream input = new ByteArrayInputStream(in.array(), 
in.position(), len);
 
 try {
-return ctx.optimizedMarsh().unmarshal(input, null);
+return ctx.optimizedMarsh().unmarshal(input, clsLdr);
 }
 catch (IgniteCheckedException e) {
 throw new BinaryObjectException("Failed to unmarshal object with 
optimized marshaller", e);
@@ -1706,7 +1706,7 @@ public class PortableUtils {
 return doReadClass(in, ctx, ldr);
 
 case OPTM_MARSH:
-return doReadOptimized(in, ctx);
+return doReadOptimized(in, ctx, ldr);
 
 default:
 throw new BinaryObjectException("Invalid flag value: " + flag);

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 8d6d905..48dabb9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -64,6 +64,20 @@ public class CacheInvokeResult implements 
EntryProcessorResult, Externaliz
 }
 
 /**
+ * @return Result.
+ */
+public T result() {
+return res;
+}
+
+/**
+ * Entry processor error;
+ */
+public Exception error() {
+return err;
+}
+
+/**
  * Static constructor.
  *
  * @param err Exception thrown by {@link 
EntryProcessor#process(MutableEntry, Object...)}.

[04/12] ignite git commit: BinaryTypeImpl: Minor JavaDoc fix.

[akuznetsov]

BinaryTypeImpl: Minor JavaDoc fix.


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

Branch: refs/heads/ignite-2018
Commit: e1db30a986aaecb823ed49505e55b376d2d08d2a
Parents: e4f6224
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:20:53 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:20:53 2015 +0300

--
 .../java/org/apache/ignite/internal/portable/BinaryTypeImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1db30a9/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
index 9512cdb..f471af2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
@@ -77,7 +77,9 @@ public class BinaryTypeImpl implements BinaryType {
 return meta.isEnum();
 }
 
-/** {@inheritDoc} */
+/**
+ * @return Context.
+ */
 public PortableContext context() {
 return ctx;
 }

[12/12] ignite git commit: IGNITE-2018 Fix examples.

[akuznetsov]

IGNITE-2018 Fix examples.


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

Branch: refs/heads/ignite-2018
Commit: d76de309e105328e2291de1ce9517815652a410e
Parents: 686964c
Author: AKuznetsov 
Authored: Fri Nov 27 19:37:38 2015 +0700
Committer: AKuznetsov 
Committed: Fri Nov 27 19:37:38 2015 +0700

--
 .../ignite/scalar/examples/ScalarCacheQueryExample.scala   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d76de309/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
--
diff --git 
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
 
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
index a8e93ba..6d6c8c3 100644
--- 
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
+++ 
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
@@ -50,7 +50,7 @@ object ScalarCacheQueryExample {
  */
 def main(args: Array[String]) {
 scalar(CONFIG) {
-val cache = createCache$(NAME, indexedTypes = Seq(classOf[UUID], 
classOf[Organization],
+val cache = createCache$(NAME, indexedTypes = Seq(classOf[JLong], 
classOf[Organization],
 classOf[AffinityKey[_]], classOf[Person]))
 
 try {
@@ -72,12 +72,12 @@ object ScalarCacheQueryExample {
 initialize()
 
 // Cache instance shortcut.
-val cache = mkCache[AffinityKey[UUID], Person]
+val cache = mkCache[AffinityKey[JLong], Person]
 
 // Using distributed queries for partitioned cache and local queries 
for replicated cache.
 // Since in replicated caches data is available on all nodes, 
including local one,
 // it is enough to just query the local node.
-val prj = if 
(cache.getConfiguration(classOf[CacheConfiguration[AffinityKey[UUID], 
Person]]).getCacheMode == PARTITIONED)
+val prj = if 
(cache.getConfiguration(classOf[CacheConfiguration[AffinityKey[JLong], 
Person]]).getCacheMode == PARTITIONED)
 ignite.cluster().forRemotes()
 else
 ignite.cluster().forLocal()

[02/12] ignite git commit: ignite-1732 Fixed test to catch IgniteClientDisconnectedException.

[akuznetsov]

ignite-1732 Fixed test to catch IgniteClientDisconnectedException.


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

Branch: refs/heads/ignite-2018
Commit: 712e62bd241cecac969d022461fc048453b3db6b
Parents: c2d4d1d
Author: sboikov 
Authored: Fri Nov 27 13:12:55 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 13:12:55 2015 +0300

--
 .../dht/IgniteAtomicLongChangingTopologySelfTest.java| 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/712e62bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
index a8d5801..56bc760 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteClientDisconnectedException;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteSet;
 import org.apache.ignite.configuration.AtomicConfiguration;
@@ -214,7 +215,12 @@ public class IgniteAtomicLongChangingTopologySelfTest 
extends GridCommonAbstract
 while (System.currentTimeMillis() < stop) {
 log.info("Iteration: " + iter++);
 
-c.apply(ignite);
+try {
+c.apply(ignite);
+}
+catch (IgniteClientDisconnectedException e) {
+e.reconnectFuture().get();
+}
 }
 
 finished.set(true);

[08/12] ignite git commit: ignite-2010 IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap test fixed

[akuznetsov]

ignite-2010 
IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap
 test fixed


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

Branch: refs/heads/ignite-2018
Commit: 1727df6a334b3cc879ca7bc9dd76e6f52f1e027a
Parents: 9c46fa9
Author: agura 
Authored: Thu Nov 26 17:36:12 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:44:05 2015 +0300

--
 .../distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1727df6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index e46761b..0294dea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -37,6 +37,7 @@ import 
org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -391,6 +392,11 @@ public class IgniteCacheCrossCacheTxFailoverTest extends 
GridCommonAbstractTest
 ignite0.destroyCache(CACHE1);
 ignite0.destroyCache(CACHE2);
 
+AffinityTopologyVersion topVer = 
ignite0.context().cache().context().exchange().lastTopologyFuture().get();
+
+for (Ignite ignite : G.allGrids())
+
((IgniteKernal)ignite).context().cache().context().exchange().affinityReadyFuture(topVer).get();
+
 awaitPartitionMapExchange();
 }
 }

[05/12] ignite git commit: IGNITE-2017: Added top-level platforms readme.

[akuznetsov]

IGNITE-2017: Added top-level platforms readme.


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

Branch: refs/heads/ignite-2018
Commit: 280639319757723bf9f273546b7c0d2b79575d40
Parents: e1db30a
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:21:40 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:21:40 2015 +0300

--
 assembly/release-fabric-base.xml | 9 +
 modules/platforms/README.txt | 6 ++
 2 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index d3e75ba..65903ee 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -69,6 +69,15 @@
 
 
 
+
+
+modules/platforms
+/platforms
+
+README.txt
+
+
+
 
 
 modules/platforms/dotnet

http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/modules/platforms/README.txt
--
diff --git a/modules/platforms/README.txt b/modules/platforms/README.txt
new file mode 100644
index 000..6268a88
--- /dev/null
+++ b/modules/platforms/README.txt
@@ -0,0 +1,6 @@
+Apache Ignite Platforms
+==
+
+Contains integrations with other platforms, most notably:
+ * Apache Ignite.NET
+ * Apache Ignite C++
\ No newline at end of file

[11/12] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-2018' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2018

[akuznetsov]

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


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

Branch: refs/heads/ignite-2018
Commit: 686964c9f4d629d2c983f34f59766e577ac96649
Parents: 83d6691 722fe14
Author: AKuznetsov 
Authored: Fri Nov 27 19:26:28 2015 +0700
Committer: AKuznetsov 
Committed: Fri Nov 27 19:26:28 2015 +0700

--
 assembly/release-fabric-base.xml|   9 +
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/BinaryTypeImpl.java   |   4 +-
 .../ignite/internal/portable/PortableUtils.java |   6 +-
 .../processors/cache/CacheInvokeResult.java |  14 ++
 .../dht/atomic/GridDhtAtomicCache.java  |  50 -
 .../cache/GridCacheAbstractFullApiSelfTest.java |   2 +-
 ...gniteAtomicLongChangingTopologySelfTest.java |   8 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java|   6 +
 .../GridCacheEvictionLockUnlockSelfTest.java|   2 +-
 modules/jms11/README.txt|  29 +++
 modules/jms11/licenses/apache-2.0.txt   | 202 +++
 modules/kafka/README.txt|  32 +++
 modules/mqtt/README.txt |  29 +++
 modules/mqtt/licenses/apache-2.0.txt| 202 +++
 modules/platforms/README.txt|   6 +
 modules/zookeeper/README.txt|  29 +++
 modules/zookeeper/licenses/apache-2.0.txt   | 202 +++
 18 files changed, 823 insertions(+), 11 deletions(-)
--

[5/7] ignite git commit: Merge branch 'ignite-1.5' into ignite-2009

[vozerov]

Merge branch 'ignite-1.5' into ignite-2009


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

Branch: refs/heads/ignite-2009
Commit: 47db26dac7a6a9f618daef44d538da6e2e14decc
Parents: 4945604 722fe14
Author: vozerov-gridgain 
Authored: Fri Nov 27 15:07:35 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 15:07:35 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |  2 +-
 .../ignite/internal/portable/PortableUtils.java |  6 +--
 .../processors/cache/CacheInvokeResult.java | 14 ++
 .../dht/atomic/GridDhtAtomicCache.java  | 50 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java|  6 +++
 .../GridCacheEvictionLockUnlockSelfTest.java|  2 +-
 modules/jms11/README.txt| 29 
 modules/mqtt/README.txt | 29 
 modules/zookeeper/README.txt| 29 
 10 files changed, 160 insertions(+), 9 deletions(-)
--

[6/7] ignite git commit: Fixed IgniteTxRemoteState to properly process invalid partitions.

[vozerov]

Fixed IgniteTxRemoteState to properly process invalid partitions.


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

Branch: refs/heads/ignite-2009
Commit: 3080f61ae9ca1481d65f18f7a84f8bbc9d682f79
Parents: 722fe14
Author: sboikov 
Authored: Fri Nov 27 15:24:32 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 15:24:32 2015 +0300

--
 .../cache/distributed/dht/GridDhtTxRemote.java  | 15 +---
 .../IgniteTxRemoteSingleStateImpl.java  | 16 ++---
 .../cache/transactions/IgniteTxRemoteState.java |  5 
 .../transactions/IgniteTxRemoteStateImpl.java   | 24 
 4 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index e0929ad..85a5759 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -279,20 +279,7 @@ public class GridDhtTxRemote extends 
GridDistributedTxRemoteAdapter {
 @Override public void addInvalidPartition(GridCacheContext cacheCtx, int 
part) {
 super.addInvalidPartition(cacheCtx, part);
 
-Map writeMap = txState.writeMap();
-
-for (Iterator it = writeMap.values().iterator(); 
it.hasNext();) {
-IgniteTxEntry e = it.next();
-
-GridCacheEntryEx cached = e.cached();
-
-if (cached != null) {
-if (cached.partition() == part)
-it.remove();
-}
-else if (cacheCtx.affinity().partition(e.key()) == part)
-it.remove();
-}
+txState.invalidPartition(part);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
index 90af517..a68006b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
@@ -65,15 +65,7 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 
 /** {@inheritDoc} */
 @Override public Set writeSet() {
-if (entry != null) {
-HashSet set = new HashSet<>(3, 0.75f);
-
-set.add(entry.txKey());
-
-return set;
-}
-else
-return Collections.emptySet();
+return entry != null ? Collections.singleton(entry.txKey()) : 
Collections.emptySet();
 }
 
 /** {@inheritDoc} */
@@ -113,6 +105,12 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 }
 
 /** {@inheritDoc} */
+@Override public void invalidPartition(int part) {
+if (entry != null && entry.context().affinity().partition(entry.key()) 
== part)
+entry = null;
+}
+
+/** {@inheritDoc} */
 public String toString() {
 return S.toString(IgniteTxRemoteSingleStateImpl.class, this);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
index b8290a1..77fc97e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
+++ 

[1/2] ignite git commit: IGNITE-2009: Fixed leak in cached SQL queries.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 e519c2f5b -> 56aeea3d1


IGNITE-2009: Fixed leak in cached SQL queries.


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

Branch: refs/heads/ignite-1.5
Commit: fc10b3e40fadd7ad792aaea63fe270c6413c5068
Parents: 3080f61
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:01 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:01 2015 +0300

--
 .../processors/query/h2/IgniteH2Indexing.java   | 24 +---
 1 file changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc10b3e4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index cc452c1..1437a16 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -49,6 +49,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import javax.cache.Cache;
 import javax.cache.CacheException;
@@ -255,7 +256,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 set(c);
 
 // Reset statement cache when new connection is created.
-stmtCache.get().clear();
+stmtCache.remove(Thread.currentThread());
 }
 
 return c;
@@ -280,12 +281,8 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
 /** */
 private volatile GridKernalContext ctx;
 
-/** */
-private final ThreadLocal stmtCache = new 
ThreadLocal() {
-@Override protected StatementCache initialValue() {
-return new StatementCache(PREPARED_STMT_CACHE_SIZE);
-}
-};
+/** Statement cache. */
+private final ConcurrentHashMap stmtCache = new 
ConcurrentHashMap<>();
 
 /** */
 private final GridBoundedConcurrentLinkedHashMap, TwoStepCachedQuery> twoStepCache =
@@ -313,7 +310,18 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
  */
 private PreparedStatement prepareStatement(Connection c, String sql, 
boolean useStmtCache) throws SQLException {
 if (useStmtCache) {
-StatementCache cache = stmtCache.get();
+Thread curThread = Thread.currentThread();
+
+StatementCache cache = stmtCache.get(curThread);
+
+if (cache == null) {
+StatementCache cache0 = new 
StatementCache(PREPARED_STMT_CACHE_SIZE);
+
+cache = stmtCache.putIfAbsent(curThread, cache0);
+
+if (cache == null)
+cache = cache0;
+}
 
 PreparedStatement stmt = cache.get(sql);
 

[1/7] ignite git commit: Fixed scalar examples

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2009 4945604bd -> fab041ab3


Fixed scalar examples


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

Branch: refs/heads/ignite-2009
Commit: 9c46fa961bb88524fcd6c8ccb85c28f8688758b8
Parents: 91f3f87
Author: Alexey Goncharuk 
Authored: Fri Nov 27 14:12:43 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 14:12:43 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |  2 +-
 .../ignite/internal/portable/PortableUtils.java |  6 +--
 .../processors/cache/CacheInvokeResult.java | 14 ++
 .../dht/atomic/GridDhtAtomicCache.java  | 50 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 5 files changed, 66 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index 872d7a3..3cc2fbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -1616,7 +1616,7 @@ public class BinaryReaderExImpl implements BinaryReader, 
BinaryRawReaderEx, Bina
 break;
 
 case OPTM_MARSH:
-obj = PortableUtils.doReadOptimized(in, ctx);
+obj = PortableUtils.doReadOptimized(in, ctx, ldr);
 
 break;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index e543c41..1a8f156 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -1498,13 +1498,13 @@ public class PortableUtils {
  *
  * @return Result.
  */
-public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx) {
+public static Object doReadOptimized(PortableInputStream in, 
PortableContext ctx, @Nullable ClassLoader clsLdr) {
 int len = in.readInt();
 
 ByteArrayInputStream input = new ByteArrayInputStream(in.array(), 
in.position(), len);
 
 try {
-return ctx.optimizedMarsh().unmarshal(input, null);
+return ctx.optimizedMarsh().unmarshal(input, clsLdr);
 }
 catch (IgniteCheckedException e) {
 throw new BinaryObjectException("Failed to unmarshal object with 
optimized marshaller", e);
@@ -1706,7 +1706,7 @@ public class PortableUtils {
 return doReadClass(in, ctx, ldr);
 
 case OPTM_MARSH:
-return doReadOptimized(in, ctx);
+return doReadOptimized(in, ctx, ldr);
 
 default:
 throw new BinaryObjectException("Invalid flag value: " + flag);

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c46fa96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 8d6d905..48dabb9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -64,6 +64,20 @@ public class CacheInvokeResult implements 
EntryProcessorResult, Externaliz
 }
 
 /**
+ * @return Result.
+ */
+public T result() {
+return res;
+}
+
+/**
+ * Entry processor error;
+ */
+public Exception error() {
+return err;
+}
+
+/**
  * Static constructor.
  *
  * @param err Exception thrown by {@link 
EntryProcessor#process(MutableEntry, Object...)}.

[3/7] ignite git commit: ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed

[vozerov]

ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed


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

Branch: refs/heads/ignite-2009
Commit: 95ab2310d2db49baadceefe3e667a3e1c930c926
Parents: 1727df6
Author: agura 
Authored: Thu Nov 26 21:54:34 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:45:19 2015 +0300

--
 .../cache/eviction/GridCacheEvictionLockUnlockSelfTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95ab2310/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 11faca3..75f5c8f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -142,7 +142,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends 
GridCommonAbstractTest
 assertEquals(gridCnt, touchCnt.get());
 
 for (int j = 0; j < gridCnt; j++)
-assertFalse(jcache(j).containsKey("key"));
+assertEquals(0, jcache(j).size());
 }
 }
 finally {

[7/7] ignite git commit: Merge branch 'ignite-1.5' into ignite-2009

[vozerov]

Merge branch 'ignite-1.5' into ignite-2009


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

Branch: refs/heads/ignite-2009
Commit: fab041ab325a3d74695219fe55d938cd1a57fa53
Parents: 47db26d 3080f61
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:19:41 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:19:41 2015 +0300

--
 .../cache/distributed/dht/GridDhtTxRemote.java  | 15 +---
 .../IgniteTxRemoteSingleStateImpl.java  | 16 ++---
 .../cache/transactions/IgniteTxRemoteState.java |  5 
 .../transactions/IgniteTxRemoteStateImpl.java   | 24 
 4 files changed, 37 insertions(+), 23 deletions(-)
--

[4/7] ignite git commit: Add README.txt for jms11, mqtt and zookeeper modules.

[vozerov]

Add README.txt for jms11, mqtt and zookeeper modules.


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

Branch: refs/heads/ignite-2009
Commit: 722fe14a6814a9cdbfea1cbfe53598ba5ed8ea8f
Parents: 95ab231
Author: Raul Kripalani 
Authored: Fri Nov 27 11:54:32 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 11:54:32 2015 +

--
 modules/jms11/README.txt | 29 +
 modules/mqtt/README.txt  | 29 +
 modules/zookeeper/README.txt | 29 +
 3 files changed, 87 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/jms11/README.txt
--
diff --git a/modules/jms11/README.txt b/modules/jms11/README.txt
new file mode 100644
index 000..3f0d213
--- /dev/null
+++ b/modules/jms11/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite JMS 1.1 Module
+
+
+Apache Ignite JMS 1.1 module provides a streamer to consume JMS queue and 
topic messages into
+Apache Ignite caches.
+
+Importing Apache Ignite JMS 1.1 Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
JMS 1.1 module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-jms11
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/mqtt/README.txt
--
diff --git a/modules/mqtt/README.txt b/modules/mqtt/README.txt
new file mode 100644
index 000..62a1589
--- /dev/null
+++ b/modules/mqtt/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite MQTT Module
+-
+
+Apache Ignite MQTT module provides a streamer to consume MQTT topic messages 
into
+Apache Ignite caches.
+
+Importing Apache Ignite MQTT Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
MQTT module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-mqtt
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/zookeeper/README.txt
--
diff --git a/modules/zookeeper/README.txt b/modules/zookeeper/README.txt
new file mode 100644
index 000..6d400ad
--- /dev/null
+++ b/modules/zookeeper/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite ZooKeeper Module
+--
+
+Apache Ignite ZooKeeper module provides a TCP Discovery IP Finder that uses a 
ZooKeeper
+directory to locate other Ignite nodes to connect to.
+
+Importing Apache Ignite ZooKeeper Module In Maven Project
+-
+
+If you are using Maven to manage dependencies of your project, you can add the 
ZooKeeper
+module dependency like this (replace '${ignite.version}' with actual Ignite 
version you
+are interested in):
+
+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;>
+...
+
+...
+
+org.apache.ignite
+ignite-zookeeper
+${ignite.version}
+
+...
+
+...
+

[2/7] ignite git commit: ignite-2010 IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap test fixed

[vozerov]

ignite-2010 
IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap
 test fixed


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

Branch: refs/heads/ignite-2009
Commit: 1727df6a334b3cc879ca7bc9dd76e6f52f1e027a
Parents: 9c46fa9
Author: agura 
Authored: Thu Nov 26 17:36:12 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:44:05 2015 +0300

--
 .../distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1727df6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index e46761b..0294dea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -37,6 +37,7 @@ import 
org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -391,6 +392,11 @@ public class IgniteCacheCrossCacheTxFailoverTest extends 
GridCommonAbstractTest
 ignite0.destroyCache(CACHE1);
 ignite0.destroyCache(CACHE2);
 
+AffinityTopologyVersion topVer = 
ignite0.context().cache().context().exchange().lastTopologyFuture().get();
+
+for (Ignite ignite : G.allGrids())
+
((IgniteKernal)ignite).context().cache().context().exchange().affinityReadyFuture(topVer).get();
+
 awaitPartitionMapExchange();
 }
 }

ignite git commit: IGNITE-2018 Refactored examples to use common model classes.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 3080f61ae -> e519c2f5b


IGNITE-2018 Refactored examples to use common model classes.


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

Branch: refs/heads/ignite-1.5
Commit: e519c2f5b1e05f886c861eb2bd05aec7cffa5bbc
Parents: 3080f61
Author: AKuznetsov 
Authored: Fri Nov 27 20:30:46 2015 +0700
Committer: AKuznetsov 
Committed: Fri Nov 27 20:30:46 2015 +0700

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e519c2f5/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index d040b88..ade5d18 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -24,7 +24,7 @@ import javax.cache.integration.CacheWriterException;
 import org.apache.ignite.cache.store.CacheStore;
 import org.apache.ignite.cache.store.CacheStoreAdapter;
 import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.examples.model.Person;
 import org.apache.ignite.lang.IgniteBiInClosure;
 import org.apache.ignite.resources.CacheStoreSessionResource;
 import org.hibernate.HibernateException;
@@ -107,7 +107,7 @@ public class CacheHibernatePersonStore extends 
CacheStoreAdapter {
 for (Object obj : list) {
 Person person = (Person)obj;
 
-clo.apply(person.getId(), person);
+clo.apply(person.id, person);
 
 cnt++;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e519c2f5/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index f993d81..71c4f68 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ 

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 56aeea3d1f519229ad7ce80992a23bf367ef72c1
Parents: fc10b3e e519c2f
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:28 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:28 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--

[1/2] ignite git commit: Disabled peer class loading in test.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 56aeea3d1 -> 6312737a7


Disabled peer class loading in test.


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

Branch: refs/heads/ignite-1.5
Commit: 9b01be3ae237befe94574cfe32f3375ee45ff1ec
Parents: 3080f61
Author: sboikov 
Authored: Fri Nov 27 16:49:07 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 16:49:07 2015 +0300

--
 .../distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9b01be3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
index 56bc760..74cb9ef 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
@@ -93,6 +93,8 @@ public class IgniteAtomicLongChangingTopologySelfTest extends 
GridCommonAbstract
 
 cfg.setClientMode(client);
 
+cfg.setPeerClassLoadingEnabled(false);
+
 return cfg;
 }
 

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 6312737a72b95efb417019ea13f9a811b9f3adf4
Parents: 9b01be3 56aeea3
Author: sboikov 
Authored: Fri Nov 27 16:54:42 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 16:54:42 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 .../processors/query/h2/IgniteH2Indexing.java   |  24 ++-
 31 files changed, 667 insertions(+), 785 deletions(-)
--

ignite git commit: IGNITE-1270 Add a test suite for Ignite OSGi.

[raulk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1270 b8597f7ba -> 593440a5a


IGNITE-1270 Add a test suite for Ignite OSGi.


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

Branch: refs/heads/ignite-1270
Commit: 593440a5a0702cd021c07a1989cd77471a2925c5
Parents: b8597f7
Author: Raul Kripalani 
Authored: Fri Nov 27 14:59:35 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 14:59:35 2015 +

--
 .../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/593440a5/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
--
diff --git 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
new file mode 100644
index 000..7c8b852
--- /dev/null
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
@@ -0,0 +1,32 @@
+/*
+ * 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.osgi;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Test suite for OSGi-related test cases.
+ * 
+ * NOTE: Have to use JUnit 4 annotations because Pax Exam is built on JUnit 4.
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({IgniteOsgiServiceTest.class, 
IgniteKarafFeaturesInstallationTest.class})
+public class IgniteOsgiTestSuite {
+
+}

ignite git commit: Fixing binary objects tests.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 f3cb64e37 -> 292de51c7


Fixing binary objects tests.


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

Branch: refs/heads/ignite-1.5
Commit: 292de51c75dfd696459ef6569ee49beb8e7b10ec
Parents: f3cb64e
Author: Alexey Goncharuk 
Authored: Fri Nov 27 18:34:56 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 18:34:56 2015 +0300

--
 .../ignite/cache/CacheKeyConfiguration.java |  19 ++
 .../internal/portable/BinaryObjectExImpl.java   |   5 +-
 .../portable/PortableClassDescriptor.java   |   3 +-
 .../processors/cache/CacheLazyEntry.java|   2 +-
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../processors/cache/GridCacheContext.java  |  12 +-
 .../dht/atomic/GridDhtAtomicCache.java  |   4 +-
 .../distributed/near/GridNearGetFuture.java |   4 +-
 .../GridCacheInternalKeyImpl.java   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java  |  64 ++
 ...niteCacheCopyOnReadDisabledAbstractTest.java |   2 +
 .../dht/GridCacheDhtInternalEntrySelfTest.java  | 203 ---
 .../near/GridCacheNearTxForceKeyTest.java   |   2 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  71 ---
 .../testsuites/IgniteCacheTestSuite2.java   |   2 -
 15 files changed, 147 insertions(+), 250 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
index 767b44c..f117847 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.cache;
 
 import java.io.Serializable;
+import java.lang.reflect.Field;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
@@ -41,6 +43,23 @@ public class CacheKeyConfiguration implements Serializable {
 }
 
 /**
+ * @param keyCls Key class.
+ */
+public CacheKeyConfiguration(Class keyCls) {
+typeName = keyCls.getName();
+
+for (; keyCls != Object.class && keyCls != null; keyCls = 
keyCls.getSuperclass()) {
+for (Field f : keyCls.getDeclaredFields()) {
+if (f.getAnnotation(AffinityKeyMapped.class) != null) {
+affKeyFieldName = f.getName();
+
+return;
+}
+}
+}
+}
+
+/**
  * Creates cache key configuration with given type name and affinity field 
name.
  *
  * @param typeName Type name.

http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
index 2ea71ec..a32329a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
@@ -164,6 +164,7 @@ public abstract class BinaryObjectExImpl implements 
BinaryObjectEx {
  */
 private String toString(BinaryReaderHandles ctx, 
IdentityHashMap handles) {
 int idHash = System.identityHashCode(this);
+int hash = hashCode();
 
 BinaryType meta;
 
@@ -175,14 +176,14 @@ public abstract class BinaryObjectExImpl implements 
BinaryObjectEx {
 }
 
 if (meta == null)
-return BinaryObject.class.getSimpleName() +  " [hash=" + idHash + 
", typeId=" + typeId() + ']';
+return BinaryObject.class.getSimpleName() +  " [idHash=" + idHash 
+ ", hash=" + hash + ", typeId=" + typeId() + ']';
 
 handles.put(this, idHash);
 
 SB buf = new SB(meta.typeName());
 
 if (meta.fieldNames() != null) {
-buf.a(" [hash=").a(idHash);
+buf.a(" [idHash=").a(idHash).a(", hash=").a(hash);
 
 for (String name : meta.fieldNames()) {
 Object val = field(ctx, name);

[1/2] ignite git commit: Fixed hang in data structures failover tests.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 30c9b8dbd -> c2d4d1d2e


Fixed hang in data structures failover tests.


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

Branch: refs/heads/ignite-1.5
Commit: 41fe46953af80304e05c76007df3c30b8d681742
Parents: e9f22ab
Author: sboikov 
Authored: Fri Nov 27 12:33:14 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 12:33:14 2015 +0300

--
 .../CacheDataStructuresManager.java | 45 
 .../datastructures/DataStructuresProcessor.java | 20 +
 ...gniteAtomicLongChangingTopologySelfTest.java | 30 ++---
 3 files changed, 53 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/41fe4695/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 431be1e..ec787f8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -383,7 +383,7 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
 if (create) {
 hdr = new GridCacheSetHeader(IgniteUuid.randomUuid(), 
collocated);
 
-GridCacheSetHeader old = retryPutIfAbsent(cache, key, hdr);
+GridCacheSetHeader old = 
(GridCacheSetHeader)cache.getAndPutIfAbsent(key, hdr);
 
 if (old != null)
 hdr = old;
@@ -493,6 +493,12 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
 
 continue;
 }
+else if (!pingNodes(nodes)) {
+if (log.isDebugEnabled())
+log.debug("RemoveSetData job failed and set data 
node left, will retry: " + e);
+
+continue;
+}
 else
 throw e;
 }
@@ -510,6 +516,12 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
 
 continue;
 }
+else if (!pingNodes(nodes)) {
+if (log.isDebugEnabled())
+log.debug("RemoveSetData job failed and set data 
node left, will retry: " + e);
+
+continue;
+}
 else
 throw e;
 }
@@ -526,6 +538,20 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
 }
 
 /**
+ * @param nodes Nodes to ping.
+ * @return {@code True} if was able to ping all nodes.
+ * @throws IgniteCheckedException If failed/
+ */
+private boolean pingNodes(Collection nodes) throws 
IgniteCheckedException {
+for (ClusterNode node : nodes) {
+if (!cctx.discovery().pingNode(node.id()))
+return false;
+}
+
+return true;
+}
+
+/**
  * @param key Set item key.
  * @param rmv {@code True} if item was removed.
  */
@@ -562,23 +588,6 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
 
 /**
  * @param cache Cache.
- * @param key Key.
- * @param val Value.
- * @throws IgniteCheckedException If failed.
- * @return Previous value.
- */
-@SuppressWarnings("unchecked")
-@Nullable private  T retryPutIfAbsent(final IgniteInternalCache cache, 
final Object key, final T val)
-throws IgniteCheckedException {
-return DataStructuresProcessor.retry(log, new Callable() {
-@Nullable @Override public T call() throws Exception {
-return (T)cache.getAndPutIfAbsent(key, val);
-}
-});
-}
-
-/**
- * @param cache Cache.
  * @param keys Keys to remove.
  * @throws IgniteCheckedException If failed.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/41fe4695/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java

ignite git commit: IGNITE-843 Updated dependencies.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 ec89735b8 -> 585706f4e


IGNITE-843 Updated dependencies.


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

Branch: refs/heads/ignite-843-rc1
Commit: 585706f4eb1b0cbee59b79131a2d45e59b3dd485
Parents: ec89735
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:35:24 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:35:24 2015 +0700

--
 modules/control-center-web/src/main/js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/585706f4/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index b56078a..e9c6c8d 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -80,7 +80,6 @@
   "jquery": "github:components/jquery@^2.1.4",
   "jszip": "github:Stuk/jszip@^2.5.0",
   "lodash": "npm:lodash@^3.10.1",
-  "nvd3": "npm:nvd3@^1.8.1",
   "query-command-supported": 
"github:zenorocha/document.queryCommandSupported@^1.0.0",
   "sass": "github:mobilexag/plugin-sass@^0.0.10",
   "scss": "github:theefer/plugin-sass@master",
@@ -113,6 +112,7 @@
 }
   },
   "github:krispo/angular-nvd3@1.0.4": {
+"main": "dist/angular-nvd3",
 "dependencies": {
   "angular": "^1",
   "nvd3": "npm:nvd3@1.8.1",

[1/4] ignite git commit: IGNITE-1956: Added binary enums support.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 c2d4d1d2e -> e4f6224fa


http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs
index 99af56d..e50279c 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs
@@ -30,74 +30,52 @@ namespace Apache.Ignite.Core.Impl.Binary
 /// 
 /// Type.
 /// 
-Type Type
-{
-get;
-}
+Type Type { get; }
 
 /// 
 /// Type ID.
 /// 
-int TypeId
-{
-get;
-}
+int TypeId { get; }
 
 /// 
 /// Type name.
 /// 
-string TypeName
-{
-get;
-}
+string TypeName { get; }
 
 /// 
 /// User type flag.
 /// 
-bool UserType
-{
-get;
-}
+bool UserType { get; }
 
 /// 
 /// Whether to cache deserialized value in IBinaryObject
 /// 
-bool KeepDeserialized
-{
-get;
-}
+bool KeepDeserialized { get; }
 
 /// 
 /// Name converter.
 /// 
-IBinaryNameMapper NameMapper
-{
-get;
-}
+IBinaryNameMapper NameMapper { get; }
 
 /// 
 /// Mapper.
 /// 
-IBinaryIdMapper IdMapper
-{
-get;
-}
+IBinaryIdMapper IdMapper { get; }
 
 /// 
 /// Serializer.
 /// 
-IBinarySerializer Serializer
-{
-get;
-}
+IBinarySerializer Serializer { get; }
 
 /// 
 /// Affinity key field name.
 /// 
-string AffinityKeyFieldName
-{
-get;
-}
+string AffinityKeyFieldName { get; }
+
+/// 
+/// Gets a value indicating whether this descriptor represents an enum 
type.
+/// 
+bool IsEnum { get; }
 
 /// 
 /// Write type structure.

http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs
deleted file mode 100644
index ecc6807..000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.Impl.Binary
-{
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Apache.Ignite.Core.Binary;
-using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Binary.IO;
-using Apache.Ignite.Core.Impl.Common;
-
-/// 
-/// Binary implementation.
-/// 
-internal class IgniteBinary : IIgniteBinary
-{
-/** Owning grid. */
-private readonly Marshaller _marsh;
-
-/// 
-/// Constructor.
-/// 
-/// Marshaller.
-internal IgniteBinary(Marshaller marsh)
-{
-_marsh = marsh;
-}
-
-/**  */
-public T ToBinary(object obj)
-{
-if (obj is IBinaryObject)
-return (T)obj;
-
-IBinaryStream stream = new BinaryHeapStream(1024);
-
-// Serialize.
-BinaryWriter writer = _marsh.StartMarshal(stream);
-
-try
-{
-writer.Write(obj);
-}
-finally
-{
-// Save metadata.
-_marsh.FinishMarshal(writer);
-}
-
-// 

[4/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e4f6224fabc0561f6ff8de33a8a7721bca3370bc
Parents: 663e78d c2d4d1d
Author: vozerov-gridgain 
Authored: Fri Nov 27 12:37:50 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 12:37:50 2015 +0300

--
 .../CacheDataStructuresManager.java | 45 
 .../datastructures/DataStructuresProcessor.java | 20 +
 ...gniteAtomicLongChangingTopologySelfTest.java | 30 ++---
 3 files changed, 53 insertions(+), 42 deletions(-)
--

ignite git commit: Improve assert message

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1956 82d5ccc9a -> 00ab95bc1


Improve assert message


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

Branch: refs/heads/ignite-1956
Commit: 00ab95bc15f5f5614e3dcbba22452f1622527ac4
Parents: 82d5ccc
Author: Pavel Tupitsyn 
Authored: Fri Nov 27 11:58:45 2015 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Nov 27 11:58:45 2015 +0300

--
 .../dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/00ab95bc/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
index 11bf8f1..ce15739 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
@@ -354,7 +354,9 @@ namespace Apache.Ignite.Core.Tests.Cache
 entries.Aggregate((acc, val) => string.Format("{0}, 
{1}", acc, val)));
 
 var size = cache.GetSize();
-Assert.AreEqual(0, size, "Cache enumerator returned no 
entries, but cache size is " + size);
+Assert.AreEqual(0, size,
+"Cache enumerator returned no entries, but cache '{0}' 
size is {1} in grid [{2}]",
+CacheName(), size, i);
 }
 
 Console.WriteLine("Test finished: " + 
TestContext.CurrentContext.Test.Name);

[1/2] ignite git commit: IGNITE-843 Reworked for plugins support.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 b9fbc1e81 -> 8f4564c06


IGNITE-843 Reworked for plugins support.


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

Branch: refs/heads/ignite-843-rc1
Commit: 02a920a958bf6a4ecdac80274de4cf48e0800e54
Parents: b9fbc1e
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:05:47 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:05:47 2015 +0700

--
 .../main/js/helpers/generator/generator-pom.js  | 86 +---
 1 file changed, 58 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/02a920a9/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index 5a48808..c4e5e45 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -18,6 +18,45 @@
 // pom.xml generation entry point.
 $generatorPom = {};
 
+$generatorPom.addProperty = function (res, tag, val) {
+res.line('<' + tag + '>' + val + '');
+};
+
+$generatorPom.dependency = function (groupId, artifactId, version, jar) {
+return {
+groupId: groupId,
+artifactId: artifactId,
+version: version,
+jar: jar
+};
+};
+
+$generatorPom.dependencies = function (res, cluster, deps) {
+if (!res)
+res = $generatorCommon.builder();
+
+res.startBlock('');
+
+_.forEach(deps, function (dep) {
+res.startBlock('');
+
+$generatorPom.addProperty(res, 'groupId', dep.groupId);
+$generatorPom.addProperty(res, 'artifactId', dep.artifactId);
+$generatorPom.addProperty(res, 'version', dep.version);
+
+if (dep.jar) {
+$generatorPom.addProperty(res, 'scope', 'system');
+$generatorPom.addProperty(res, 'systemPath', 
'${project.basedir}/jdbc-drivers/' + dep.jar);
+}
+
+res.endBlock('');
+});
+
+res.endBlock('');
+
+return res;
+};
+
 /**
  * Generate pom.xml.
  *
@@ -42,32 +81,25 @@ $generatorPom.pom = function (cluster, igniteVersion, res) {
 }
 });
 
-function addProperty(tag, val) {
-res.line('<' + tag + '>' + val + '');
-}
+var dependencies = [];
 
 function addDependency(groupId, artifactId, version, jar) {
-res.startBlock('');
-addProperty('groupId', groupId);
-addProperty('artifactId', artifactId);
-addProperty('version', version);
-
-if (jar) {
-addProperty('scope', 'system');
-addProperty('systemPath', '${project.basedir}/jdbc-drivers/' + 
jar);
-}
-
-res.endBlock('');
+dependencies.push({
+groupId: groupId,
+artifactId: artifactId,
+version: version,
+jar: jar
+});
 }
 
 function addResource(dir, exclude) {
 res.startBlock('');
 if (dir)
-addProperty('directory', dir);
+$generatorPom.addProperty(res, 'directory', dir);
 
 if (exclude) {
 res.startBlock('');
-addProperty('exclude', exclude);
+$generatorPom.addProperty(res, 'exclude', exclude);
 res.endBlock('');
 }
 
@@ -88,23 +120,21 @@ $generatorPom.pom = function (cluster, igniteVersion, res) 
{
 
 res.needEmptyLine = true;
 
-addProperty('groupId', 'org.apache.ignite');
-addProperty('artifactId', 'ignite-generated-model');
-addProperty('version', igniteVersion);
+$generatorPom.addProperty(res, 'groupId', 'org.apache.ignite');
+$generatorPom.addProperty(res, 'artifactId', 'ignite-generated-model');
+$generatorPom.addProperty(res, 'version', igniteVersion);
 
 res.needEmptyLine = true;
 
 res.startBlock('');
 res.startBlock('');
-addProperty('id', 'GridGain External Repository');
-addProperty('url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1555');
+$generatorPom.addProperty(res, 'id', 'GridGain External Repository');
+$generatorPom.addProperty(res, 'url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1555');
 res.endBlock('');
 res.endBlock('');
 
 res.needEmptyLine = true;
 
-res.startBlock('');
-
 addDependency('org.apache.ignite', 'ignite-core', igniteVersion);
 

[2/2] ignite git commit: IGNITE-843 Updated dependencies.

[akuznetsov]

IGNITE-843 Updated dependencies.


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

Branch: refs/heads/ignite-843-rc1
Commit: 8f4564c0654f28ed69475ed6e24f10db8b7dfb9c
Parents: 02a920a
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:06:06 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:06:06 2015 +0700

--
 modules/control-center-web/src/main/js/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8f4564c0/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index b13618a..f580a98 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -63,13 +63,13 @@
   "Blob": "github:eligrey/Blob.js@master",
   "FileSaver": "github:eligrey/FileSaver.js@master",
   "ace": "github:ajaxorg/ace-builds@^1.2.2",
-  "angular": "github:angular/bower-angular@^1.4.7",
-  "angular-animate": "github:angular/bower-angular-animate@^1.4.7",
+  "angular": "github:angular/bower-angular@^1.4.8",
+  "angular-animate": "github:angular/bower-angular-animate@^1.4.8",
   "angular-drag-and-drop-lists": 
"github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
   "angular-grid": "github:ceolter/ag-grid@^2.3.5",
   "angular-loading": "github:darthwade/angular-loading@^0.1.4",
   "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-  "angular-nvd3": "github:krispo/angular-nvd3@^1.0.3",
+  "angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
   "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.7",
   "angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
   "angular-strap": 
"github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",

ignite git commit: IGNITE-843 Updated dependencies.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 8f4564c06 -> c66f211df


IGNITE-843 Updated dependencies.


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

Branch: refs/heads/ignite-843-rc1
Commit: c66f211df38315e29bff8ef0f2eae5cc1dda0b5f
Parents: 8f4564c
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:08:45 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:08:45 2015 +0700

--
 modules/control-center-web/src/main/js/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c66f211d/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index f580a98..c6de320 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -70,7 +70,7 @@
   "angular-loading": "github:darthwade/angular-loading@^0.1.4",
   "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
   "angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
-  "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.7",
+  "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.8",
   "angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
   "angular-strap": 
"github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
   "angular-tree-control": "github:wix/angular-tree-control@^0.2.22",
@@ -100,7 +100,7 @@
   "github:zenorocha/document.queryCommandSupported@1.0.0": {
 "format": "global"
   },
-  "github:angular/bower-angular@1.4.7": {
+  "github:angular/bower-angular@1.4.8": {
 "dependencies": {
   "jquery": "github:components/jquery@^2.1.4"
 },
@@ -112,7 +112,7 @@
   }
 }
   },
-  "github:krispo/angular-nvd3@1.0.3": {
+  "github:krispo/angular-nvd3@1.0.4": {
 "dependencies": {
   "angular": "^1",
   "nvd3": "npm:nvd3@1.8.1",

ignite git commit: IGNITE-843 Updated dependencies.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 c66f211df -> df88fe982


IGNITE-843 Updated dependencies.


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

Branch: refs/heads/ignite-843-rc1
Commit: df88fe982b29fa2c7240b1fcedebe76072beac4a
Parents: c66f211
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:11:36 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:11:36 2015 +0700

--
 .../control-center-web/src/main/js/config.js| 54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/df88fe98/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index 97a64ea..0e72b96 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -16,15 +16,15 @@ System.config({
 "Blob": "github:eligrey/Blob.js@master",
 "FileSaver": "github:eligrey/FileSaver.js@master",
 "ace": "github:ajaxorg/ace-builds@1.2.2",
-"angular": "github:angular/bower-angular@1.4.7",
-"angular-animate": "github:angular/bower-angular-animate@1.4.7",
+"angular": "github:angular/bower-angular@1.4.8",
+"angular-animate": "github:angular/bower-angular-animate@1.4.8",
 "angular-drag-and-drop-lists": 
"github:marceljuenemann/angular-drag-and-drop-lists@1.3.0",
 "angular-grid": "github:ceolter/ag-grid@2.3.5",
 "angular-loading": "github:darthwade/angular-loading@0.1.4",
 "angular-motion": "github:mgcrea/angular-motion@0.4.3",
-"angular-nvd3": "github:krispo/angular-nvd3@1.0.3",
-"angular-sanitize": "github:angular/bower-angular-sanitize@1.4.7",
-"angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.4",
+"angular-nvd3": "github:krispo/angular-nvd3@1.0.4",
+"angular-sanitize": "github:angular/bower-angular-sanitize@1.4.8",
+"angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.5",
 "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
 "angular-tree-control": "github:wix/angular-tree-control@0.2.22",
 "angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
@@ -43,15 +43,18 @@ System.config({
 "sass": "github:mobilexag/plugin-sass@0.0.10",
 "scss": "github:theefer/plugin-sass@master",
 "spinjs": "github:fgnass/spin.js@2.3.2",
-"github:angular/bower-angular-animate@1.4.7": {
-  "angular": "github:angular/bower-angular@1.4.7"
+"github:angular/bower-angular-animate@1.4.8": {
+  "angular": "github:angular/bower-angular@1.4.8"
 },
-"github:angular/bower-angular-sanitize@1.4.7": {
-  "angular": "github:angular/bower-angular@1.4.7"
+"github:angular/bower-angular-sanitize@1.4.8": {
+  "angular": "github:angular/bower-angular@1.4.8"
 },
 "github:angular/bower-angular@1.4.7": {
   "jquery": "github:components/jquery@2.1.4"
 },
+"github:angular/bower-angular@1.4.8": {
+  "jquery": "github:components/jquery@2.1.4"
+},
 "github:jspm/nodelibs-assert@0.1.0": {
   "assert": "npm:assert@1.3.0"
 },
@@ -105,19 +108,16 @@ System.config({
 "github:jspm/nodelibs-vm@0.1.0": {
   "vm-browserify": "npm:vm-browserify@0.0.4"
 },
-"github:krispo/angular-nvd3@1.0.3": {
-  "angular": "github:angular/bower-angular@1.4.7",
+"github:krispo/angular-nvd3@1.0.4": {
+  "angular": "github:angular/bower-angular@1.4.8",
   "d3": "npm:d3@3.5.8",
   "nvd3": "npm:nvd3@1.8.1"
 },
-"github:lorenzofox3/Smart-Table@2.1.4": {
-  "angular": "github:angular/bower-angular@1.4.7"
-},
 "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0": {
   "angular": "github:angular/bower-angular@1.4.7"
 },
 "github:mgcrea/angular-motion@0.4.3": {
-  "angular": "github:angular/bower-angular@1.4.7",
+  "angular": "github:angular/bower-angular@1.4.8",
   "css": "github:systemjs/plugin-css@0.1.19"
 },
 "github:mobilexag/plugin-sass@0.0.10": {
@@ -143,9 +143,9 @@ System.config({
   "path": "github:jspm/nodelibs-path@0.1.0",
   "process": "github:jspm/nodelibs-process@0.1.2"
 },
-"npm:asn1.js@4.0.0": {
+"npm:asn1.js@4.1.0": {
   "assert": "github:jspm/nodelibs-assert@0.1.0",
-  "bn.js": "npm:bn.js@4.1.1",
+  "bn.js": "npm:bn.js@4.3.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "inherits": "npm:inherits@2.0.1",
   "minimalistic-assert": 

ignite git commit: IGNITE-843 Updated dependencies.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 df88fe982 -> ec89735b8


IGNITE-843 Updated dependencies.


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

Branch: refs/heads/ignite-843-rc1
Commit: ec89735b8e761654d0e21e0cd11a837828cae660
Parents: df88fe9
Author: Alexey Kuznetsov 
Authored: Fri Nov 27 16:14:57 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Nov 27 16:14:57 2015 +0700

--
 modules/control-center-web/src/main/js/config.js| 4 ++--
 modules/control-center-web/src/main/js/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ec89735b/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index 0e72b96..495ab0a 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -110,7 +110,7 @@ System.config({
 },
 "github:krispo/angular-nvd3@1.0.4": {
   "angular": "github:angular/bower-angular@1.4.8",
-  "d3": "npm:d3@3.5.8",
+  "d3": "npm:d3@3.5.9",
   "nvd3": "npm:nvd3@1.8.1"
 },
 "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0": {
@@ -331,7 +331,7 @@ System.config({
   "brorand": "npm:brorand@1.0.5"
 },
 "npm:nvd3@1.8.1": {
-  "d3": "npm:d3@3.5.8"
+  "d3": "npm:d3@3.5.9"
 },
 "npm:os-browserify@0.1.2": {
   "os": "github:jspm/nodelibs-os@0.1.0"

http://git-wip-us.apache.org/repos/asf/ignite/blob/ec89735b/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index c6de320..b56078a 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -116,7 +116,7 @@
 "dependencies": {
   "angular": "^1",
   "nvd3": "npm:nvd3@1.8.1",
-  "d3": "npm:d3@3.5.8"
+  "d3": "npm:d3@3.5.9"
 },
 "shim": {
   "dist/angular-nvd3": {

ignite git commit: IGNITE-1195 Fixed hadoop build.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 e9f22aba2 -> bde1d1db3


IGNITE-1195 Fixed hadoop build.


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

Branch: refs/heads/ignite-1.5
Commit: bde1d1db3592f74e9e46ca6af57b55adc8b96c1f
Parents: e9f22ab
Author: nikolay_tikhonov 
Authored: Fri Nov 27 12:18:16 2015 +0300
Committer: nikolay_tikhonov 
Committed: Fri Nov 27 12:18:16 2015 +0300

--
 modules/yarn/pom.xml |  6 +++---
 .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +--
 2 files changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/pom.xml
--
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index 2b758dc..d1f6390 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -35,20 +35,20 @@
 http://ignite.apache.org
 
 
-2.7.0
+2.7.0
 
 
 
 
 org.apache.hadoop
 hadoop-yarn-client
-${hadoop.version}
+${hadoop-yarn.version}
 
 
 
 org.apache.hadoop
 hadoop-common
-${hadoop.version}
+${hadoop-yarn.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java
--
diff --git 
a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java
 
b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java
index 2173701..97f6a12 100644
--- 
a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java
+++ 
b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java
@@ -382,8 +382,15 @@ public class IgniteApplicationMasterSelfTest extends 
TestCase {
 return 0;
 }
 
-/** {@inheritDoc} */
-@Override public void updateBlacklist(List blacklistAdditions, List 
blacklistRemovals) {
+/**
+ * Update application's blacklist with addition or removal resources.
+ *
+ * @param blacklistAdditions list of resources which should be added 
to the
+ *application blacklist
+ * @param blacklistRemovals list of resources which should be removed 
from the
+ *application blacklist
+ */
+public void updateBlacklist(List blacklistAdditions, List 
blacklistRemovals) {
 // No-op.
 }
 }

[1/2] ignite git commit: IGNITE-529: Fixed README

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 bde1d1db3 -> 30c9b8dbd


IGNITE-529: Fixed README

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

Branch: refs/heads/ignite-1.5
Commit: 60d9ddc091d17fa2b246b0525b54d772345c3d11
Parents: e9f22ab
Author: shtykh_roman 
Authored: Thu Nov 26 11:40:48 2015 +0900
Committer: Anton Vinogradov 
Committed: Fri Nov 27 12:28:50 2015 +0300

--
 modules/flume/README.txt | 44 ++-
 1 file changed, 10 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d9ddc0/modules/flume/README.txt
--
diff --git a/modules/flume/README.txt b/modules/flume/README.txt
index 5b574e3..bf7e0ff 100644
--- a/modules/flume/README.txt
+++ b/modules/flume/README.txt
@@ -1,42 +1,18 @@
-Apache Ignite Flume Streamer Module
-
+Apache Ignite Flume Sink Module
+---
 
-Apache Ignite Flume Streamer module provides streaming from Flume to Ignite 
cache.
-
-To enable Flume Streamer module when starting a standalone node, move 
'optional/ignite-Flume' folder to
-'libs' folder before running 'ignite.{sh|bat}' script. The content of the 
module folder will
-be added to classpath in this case.
-
-Importing Ignite Flume Streamer Module In Maven Project
--
-
-If you are using Maven to manage dependencies of your project, you can add JCL 
module
-dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
-interested in):
-
-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;>
-...
-
-...
-
-org.apache.ignite
-ignite-Flume
-${ignite.version}
-
-...
-
-...
-
+IgniteSink is a Flume sink that extracts Events from an associated Flume 
channel and injects into an Ignite cache.
+Flume 1.6.0 is supported.
 
+IgniteSink, which can be found in 'optional/ignite-flume', and its 
dependencies have to be included in the agent's classpath,
+as described in the following subsection, before starting the Flume agent.
 
 ## Setting up and running
 
 1. Create a transformer by implementing EventTransformer interface.
-2. Build it and copy to ${FLUME_HOME}/plugins.d/ignite-sink/lib.
-3. Copy other Ignite-related jar files to 
${FLUME_HOME}/plugins.d/ignite-sink/libext to have them as shown below.
+2. Create 'ignite' directory inside plugins.d directory which is located in 
${FLUME_HOME}. If the plugins.d directory is not there, create it.
+3. Build it and copy to ${FLUME_HOME}/plugins.d/ignite-sink/lib.
+4. Copy other Ignite-related jar files from Apache Ignite distribution to 
${FLUME_HOME}/plugins.d/ignite-sink/libext to have them as shown below.
 
 ```
 plugins.d/
@@ -46,7 +22,7 @@ plugins.d/
 `-- libext
 |-- cache-api-1.0.0.jar
 |-- ignite-core-x.x.x.jar
-|-- ignite-flume-x.x.x.jar
+|-- ignite-flume-x.x.x.jar <-- IgniteSink
 |-- ignite-spring-x.x.x.jar
 |-- spring-aop-4.1.0.RELEASE.jar
 |-- spring-beans-4.1.0.RELEASE.jar

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 30c9b8dbdff3f635525c4d8a3d6442ef2e87b754
Parents: 60d9ddc bde1d1d
Author: Anton Vinogradov 
Authored: Fri Nov 27 12:29:42 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 12:29:42 2015 +0300

--
 modules/yarn/pom.xml |  6 +++---
 .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +--
 2 files changed, 12 insertions(+), 5 deletions(-)
--

ignite git commit: Fixed test to do not hang if some asserts fail.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 e706216a5 -> 2d62bbb96


Fixed test to do not hang if some asserts fail.


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

Branch: refs/heads/ignite-1.5
Commit: 2d62bbb96b568b0cf45f29540a2b440f1cbb0a34
Parents: e706216
Author: sboikov 
Authored: Fri Nov 27 11:07:49 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 11:07:49 2015 +0300

--
 .../IgniteClientReconnectCacheTest.java | 26 
 1 file changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2d62bbb9/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 3d8f601..14a770a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -723,15 +723,18 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 
 TestTcpDiscoverySpi srvSpi = spi(srv);
 
-assertTrue(joinLatch.await(5000, MILLISECONDS));
-
-U.sleep(1000);
+try {
+assertTrue(joinLatch.await(5000, MILLISECONDS));
 
-assertNotDone(fut);
+U.sleep(1000);
 
-srvSpi.failNode(clientId, null);
+assertNotDone(fut);
 
-srvCommSpi.stopBlock(false);
+srvSpi.failNode(clientId, null);
+}
+finally {
+srvCommSpi.stopBlock(false);
+}
 
 assertTrue(fut.get());
 }
@@ -1286,10 +1289,13 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 
 srvSpi.failNode(client.localNode().id(), null);
 
-fut.get();
-
-for (int i = 0; i < SRV_CNT; i++)
-
((TestCommunicationSpi)grid(i).configuration().getCommunicationSpi()).stopBlock(false);
+try {
+fut.get();
+}
+finally {
+for (int i = 0; i < SRV_CNT; i++)
+
((TestCommunicationSpi)grid(i).configuration().getCommunicationSpi()).stopBlock(false);
+}
 
 cache.put(1, 1);
 

[4/4] ignite git commit: Merge branch 'ignite-1.5' into ignite-1956

[vozerov]

Merge branch 'ignite-1.5' into ignite-1956


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

Branch: refs/heads/ignite-1956
Commit: 00eb4d85c87c468247650c91cf3125463301b1e6
Parents: 9ca8974 e9f22ab
Author: vozerov-gridgain 
Authored: Fri Nov 27 11:46:36 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 11:46:36 2015 +0300

--
 .../processors/cache/GridCacheAdapter.java  | 67 +---
 .../cache/GridCacheConcurrentMap.java   | 52 +--
 .../distributed/dht/GridNoStorageCacheMap.java  |  4 +-
 .../distributed/near/GridNearCacheAdapter.java  |  4 +-
 .../IgniteClientReconnectCacheTest.java | 26 +---
 .../cache/GridCacheConcurrentMapSelfTest.java   |  2 +-
 6 files changed, 53 insertions(+), 102 deletions(-)
--

[1/4] ignite git commit: Fixed test to do not hang if some asserts fail.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1956 9ca8974e1 -> 00eb4d85c


Fixed test to do not hang if some asserts fail.


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

Branch: refs/heads/ignite-1956
Commit: 2d62bbb96b568b0cf45f29540a2b440f1cbb0a34
Parents: e706216
Author: sboikov 
Authored: Fri Nov 27 11:07:49 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 11:07:49 2015 +0300

--
 .../IgniteClientReconnectCacheTest.java | 26 
 1 file changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2d62bbb9/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 3d8f601..14a770a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -723,15 +723,18 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 
 TestTcpDiscoverySpi srvSpi = spi(srv);
 
-assertTrue(joinLatch.await(5000, MILLISECONDS));
-
-U.sleep(1000);
+try {
+assertTrue(joinLatch.await(5000, MILLISECONDS));
 
-assertNotDone(fut);
+U.sleep(1000);
 
-srvSpi.failNode(clientId, null);
+assertNotDone(fut);
 
-srvCommSpi.stopBlock(false);
+srvSpi.failNode(clientId, null);
+}
+finally {
+srvCommSpi.stopBlock(false);
+}
 
 assertTrue(fut.get());
 }
@@ -1286,10 +1289,13 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 
 srvSpi.failNode(client.localNode().id(), null);
 
-fut.get();
-
-for (int i = 0; i < SRV_CNT; i++)
-
((TestCommunicationSpi)grid(i).configuration().getCommunicationSpi()).stopBlock(false);
+try {
+fut.get();
+}
+finally {
+for (int i = 0; i < SRV_CNT; i++)
+
((TestCommunicationSpi)grid(i).configuration().getCommunicationSpi()).stopBlock(false);
+}
 
 cache.put(1, 1);
 

[17/18] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1956
Commit: e706216a5b2540f9f258dd41e49e98b4fac575a0
Parents: 96efa38 19680d6
Author: sboikov 
Authored: Fri Nov 27 10:09:48 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 10:09:48 2015 +0300

--
 .../org/apache/ignite/internal/GridMultipleJobsSelfTest.java  | 7 +++
 1 file changed, 7 insertions(+)
--

[11/18] ignite git commit: Ssl suite

[vozerov]

Ssl suite


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

Branch: refs/heads/ignite-1956
Commit: 2f200400940c9ef1bec5b4490f2cb192fbc0fcfe
Parents: a0e414e
Author: Anton Vinogradov 
Authored: Thu Nov 26 19:23:35 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Nov 26 19:23:35 2015 +0300

--
 .../spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2f200400/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
index 3324fcc..fe84c67 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
@@ -27,6 +27,7 @@ import static 
org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 /**
  *
  */
+//Can fail as described at https://issues.apache.org/jira/browse/IGNITE-1924
 public class IgniteCacheSslStartStopSelfTest extends 
IgniteCachePutRetryAbstractSelfTest {
 /** {@inheritDoc} */
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {

[12/18] ignite git commit: Fixing examples.

[vozerov]

Fixing examples.


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

Branch: refs/heads/ignite-1956
Commit: df9658bf9e77427290e0f548532f5d7dc61c1e18
Parents: 2f20040
Author: Alexey Goncharuk 
Authored: Thu Nov 26 19:10:39 2015 +0300
Committer: Alexey Goncharuk 
Committed: Thu Nov 26 19:32:46 2015 +0300

--
 .../ComputeFibonacciContinuationExample.java|  15 ++-
 .../computegrid/ComputeTaskMapExample.java  |   6 +-
 .../computegrid/ComputeTaskSplitExample.java|   4 +-
 .../examples/messaging/MessagingExample.java|  18 +--
 .../examples/misc/springbean/spring-bean.xml|   7 --
 .../testsuites/IgniteExamplesSelfTestSuite.java |   4 +-
 .../portable/GridPortableMarshaller.java|   3 +
 .../internal/portable/PortableContext.java  |  10 +-
 .../ignite/internal/portable/PortableUtils.java |   7 ++
 .../processors/cache/GridCacheEventManager.java |   4 +-
 .../processors/query/GridQueryProcessor.java|   8 ++
 .../sharedfs/SharedFsCheckpointSpi.java |  14 ++-
 .../session/GridSessionCheckpointSelfTest.java  |  16 +++
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  33 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  34 ++
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite4.java |  33 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  33 +
 .../cache/IgniteCacheNoClassQuerySelfTest.java  | 122 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 21 files changed, 402 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/df9658bf/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
index 706ec18..6642e9d 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
@@ -42,7 +42,9 @@ import org.jetbrains.annotations.Nullable;
  * performing the distributed recursive calculation of {@code 'Fibonacci'}
  * numbers on the cluster. Continuations
  * functionality is exposed via {@link ComputeJobContext#holdcc()} and
- * {@link ComputeJobContext#callcc()} method calls in {@link 
ComputeFibonacciContinuationExample.FibonacciClosure} class.
+ * {@link ComputeJobContext#callcc()} method calls in
+ * {@link 
org.apache.ignite.examples.computegrid.ComputeFibonacciContinuationExample.ContinuationFibonacciClosure}
+ * class.
  * 
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: {@code 'ignite.{sh|bat} 
examples/config/example-ignite.xml'}.
@@ -76,7 +78,8 @@ public final class ComputeFibonacciContinuationExample {
 
 long start = System.currentTimeMillis();
 
-BigInteger fib = 
ignite.compute(ignite.cluster().forPredicate(nodeFilter)).apply(new 
FibonacciClosure(nodeFilter), N);
+BigInteger fib = 
ignite.compute(ignite.cluster().forPredicate(nodeFilter)).apply(
+new ContinuationFibonacciClosure(nodeFilter), N);
 
 long duration = System.currentTimeMillis() - start;
 
@@ -93,7 +96,7 @@ public final class ComputeFibonacciContinuationExample {
 /**
  * Closure to execute.
  */
-private static class FibonacciClosure implements IgniteClosure {
+private static class ContinuationFibonacciClosure implements 
IgniteClosure {
 /** Future for spawned task. */
 private IgniteFuture fut1;
 
@@ -114,7 +117,7 @@ public final class ComputeFibonacciContinuationExample {
 /**
  * @param nodeFilter Predicate to filter nodes.
  */
-FibonacciClosure(IgnitePredicate nodeFilter) {
+ContinuationFibonacciClosure(IgnitePredicate nodeFilter) {
 this.nodeFilter = nodeFilter;
 }
 
@@ -143,7 +146,7 @@ public final class ComputeFibonacciContinuationExample {
 
 // If future is not cached in node-local-map, cache it.
 if (fut1 == null) {
-compute.apply(new FibonacciClosure(nodeFilter), n - 1);
+

[08/18] ignite git commit: debugging slowdowns

[vozerov]

debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: f50f4094a037715af2d543d1a89101d05b0020f5
Parents: 722aacf
Author: Yakov Zhdanov 
Authored: Thu Nov 26 17:50:16 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 17:50:16 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/f50f4094/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index cd0c2a2..70adf28 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,23 @@
 Apache Ignite Release Notes
 ===
 
+Apache Ignite In-Memory Data Fabric 1.5
+---
+* Massive performance improvements for cache operations and SQL.
+* Added new binary cache object marshalling implementation.
+* Added Ignite.NET In-Memory Data Fabric.
+* Added Ignite.C++ In-Memory Data Fabric.
+* Added IgniteSemaphore data structure.
+* Added MQTT Streamer.
+* Fixed failover for continuous queries.
+* Fixed compilation and runtime errors under OpnJDK and IBM JDK.
+* Fixed Integer.size limitation for cache.
+* Fixed and improved cache types configuration.
+* Fixed cache rebalancing.
+* Many stability and fault-tolerance fixes.
+
+Complete list of closed issues: 
https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20fixVersion%20%3D%201.5%20AND%20status%20%3D%20closed
+
 Apache Ignite In-Memory Data Fabric 1.4
 ---
 * Added SSL support to communication and discovery.

[14/18] ignite git commit: IGNITE-1537 Fixed near optimistic TX future to avoid early completion.

[vozerov]

IGNITE-1537 Fixed near optimistic TX future to avoid early completion.


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

Branch: refs/heads/ignite-1956
Commit: de08cd554e75db0df06a5438da5012ebf6c7ad09
Parents: 895760e
Author: sboikov 
Authored: Fri Nov 27 08:40:16 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 08:40:16 2015 +0300

--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  2 +-
 ...arOptimisticSerializableTxPrepareFuture.java | 92 
 .../near/GridNearOptimisticTxPrepareFuture.java | 57 ++--
 ...ridNearOptimisticTxPrepareFutureAdapter.java | 70 +++
 .../cache/local/GridLocalCacheEntry.java|  6 ++
 .../transactions/IgniteTxLocalAdapter.java  |  2 +-
 .../util/future/GridCompoundFuture.java |  2 +-
 7 files changed, 123 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/de08cd55/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index c55bead..1d418ea 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -417,7 +417,7 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/de08cd55/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 144070c..916c7ab 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -39,12 +39,10 @@ import 
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTx
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
 import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
 import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import 
org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
 import 
org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
 import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -76,7 +74,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
 
 /** */
 @GridToStringExclude
-private KeyLockFuture keyLockFut = new KeyLockFuture();
+private KeyLockFuture keyLockFut;
 
 /** */
 @GridToStringExclude
@@ -134,7 +132,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
 }
 }
 
-keyLockFut.onKeyLocked(entry.txKey());
+if (keyLockFut != null)
+keyLockFut.onKeyLocked(entry.txKey());
 
 return true;
 }
@@ -189,7 +188,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
 
 err.compareAndSet(null, e);
 
-keyLockFut.onDone(e);
+if (keyLockFut != null)
+keyLockFut.onDone(e);
 }
 
 /** {@inheritDoc} */
@@ -210,7 +210,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends 

[01/18] ignite git commit: debugging slowdowns

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1956 f88f92e75 -> 9ca8974e1


debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: 3289cc1ff3a31f6c693007df6fa8920f05afeb6b
Parents: c23cda1
Author: Yakov Zhdanov 
Authored: Tue Nov 24 18:22:48 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Nov 24 18:22:48 2015 +0300

--
 .../apache/ignite/cache/CacheInterceptor.java   |  2 +-
 .../rendezvous/RendezvousAffinityFunction.java  |  2 +-
 .../processors/cache/GridCacheAdapter.java  | 65 +++-
 .../cache/GridCacheConcurrentMap.java   | 16 +
 .../processors/cache/GridCacheMapEntry.java |  4 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  4 +-
 .../cache/distributed/dht/GridDhtGetFuture.java | 28 ++---
 .../dht/GridPartitionedSingleGetFuture.java |  9 ++-
 .../util/future/GridCompoundFuture.java |  5 +-
 .../internal/util/future/GridFutureAdapter.java |  2 +-
 10 files changed, 87 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3289cc1f/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
index 436db6b..103fe57 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
@@ -120,4 +120,4 @@ public interface CacheInterceptor extends 
Serializable {
  *  entry is a copy.
  */
 public void onAfterRemove(Cache.Entry entry);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/3289cc1f/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 61a21d3..37258d4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -480,4 +480,4 @@ public class RendezvousAffinityFunction implements 
AffinityFunction, Externaliza
 o1.get2().id().compareTo(o2.get2().id());
 }
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/3289cc1f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 26a3acd..ca59629 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -924,25 +924,60 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

[16/18] ignite git commit: Relaxed assert for now to avoid hangs in tests, to be fixed properly later.

[vozerov]

Relaxed assert for now to avoid hangs in tests, to be fixed properly later.


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

Branch: refs/heads/ignite-1956
Commit: 96efa387e21b8d749800bb3e661faec630e10896
Parents: de08cd5
Author: sboikov 
Authored: Fri Nov 27 10:09:09 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 10:09:09 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/96efa387/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2c85b87..865f73f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4070,7 +4070,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 }
 
 if (node != null) {
-assert !node.isLocal() : msg;
+assert !node.isLocal() || !msg.verified() : msg;
 
 synchronized (mux) {
 failedNodes.add(node);

[07/18] ignite git commit: debugging slowdowns

[vozerov]

debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: 5407ea692ce1a74604f9314e70c6888c384e8ae9
Parents: 1eaa8c9
Author: Yakov Zhdanov 
Authored: Thu Nov 26 16:16:52 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 16:16:52 2015 +0300

--
 .../cache/distributed/dht/GridPartitionedSingleGetFuture.java   | 5 +
 .../processors/cache/distributed/near/GridNearGetRequest.java   | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5407ea69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index f6b99d1..99cf210 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -19,7 +19,6 @@ package 
org.apache.ignite.internal.processors.cache.distributed.dht;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -275,9 +274,7 @@ public class GridPartitionedSingleGetFuture extends 
GridFutureAdapter im
 cctx.deploymentEnabled());
 }
 else {
-LinkedHashMap map = 
U.newLinkedHashMap(1);
-
-map.put(key, false);
+Map map = 
Collections.singletonMap(key, false);
 
 req = new GridNearGetRequest(
 cctx.cacheId(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/5407ea69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 6d60298..0c2451e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.UUID;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.GridDirectCollection;
@@ -122,7 +123,7 @@ public class GridNearGetRequest extends GridCacheMessage 
implements GridCacheDep
 IgniteUuid futId,
 IgniteUuid miniId,
 GridCacheVersion ver,
-LinkedHashMap keys,
+Map keys,
 boolean readThrough,
 @NotNull AffinityTopologyVersion topVer,
 UUID subjId,

[09/18] ignite git commit: Minor change to release notes.

[vozerov]

Minor change to release notes.


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

Branch: refs/heads/ignite-1956
Commit: ec8169675b4f7360becca0d8abbd300371238f52
Parents: f50f409
Author: vozerov-gridgain 
Authored: Thu Nov 26 17:57:48 2015 +0300
Committer: vozerov-gridgain 
Committed: Thu Nov 26 17:57:48 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/ec816967/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 70adf28..42258f7 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -3,10 +3,10 @@ Apache Ignite Release Notes
 
 Apache Ignite In-Memory Data Fabric 1.5
 ---
+* Ignite.NET: Initial Release.
+* Ignite C++: Initial Release.
 * Massive performance improvements for cache operations and SQL.
 * Added new binary cache object marshalling implementation.
-* Added Ignite.NET In-Memory Data Fabric.
-* Added Ignite.C++ In-Memory Data Fabric.
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
 * Fixed failover for continuous queries.

[10/18] ignite git commit: Ssl suite

[vozerov]

Ssl suite


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

Branch: refs/heads/ignite-1956
Commit: a0e414eb1695e2c43d6f4f782ba4bee64682789c
Parents: ec81696
Author: Anton Vinogradov 
Authored: Thu Nov 26 19:01:14 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Nov 26 19:01:14 2015 +0300

--
 .../IgniteCacheFailoverTestSuite3.java  |  6 ---
 .../IgniteCacheFailoverTestSuiteSsl.java| 41 
 2 files changed, 41 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/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 1f94f9e..4b04c05 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,8 +21,6 @@ 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;
 
 /**
  * Test suite.
@@ -39,10 +37,6 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite 
{
 
suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
 suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.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;
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java
new file mode 100644
index 000..99a1463
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java
@@ -0,0 +1,41 @@
+/*
+ *  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.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest;
+
+/**
+ * Test suite.
+ */
+public class IgniteCacheFailoverTestSuiteSsl extends TestSuite {
+/**
+ * @return Ignite Cache Failover test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+public static TestSuite suite() throws Exception {
+TestSuite suite = new TestSuite("Cache Failover Test Suite SSL");
+
+// 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;
+}
+}

[04/18] ignite git commit: debugging slowdowns

[vozerov]

debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: 45c235e87959724ba2101c3b4d969a0b67595b7f
Parents: 0be5dea
Author: Yakov Zhdanov 
Authored: Thu Nov 26 00:35:35 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 00:35:35 2015 +0300

--
 .../internal/processors/cache/GridCacheIoManager.java  |  4 +++-
 .../cache/distributed/dht/GridDhtCacheAdapter.java |  3 ++-
 .../dht/GridPartitionedSingleGetFuture.java|  2 +-
 .../distributed/near/GridNearSingleGetRequest.java | 12 +---
 .../distributed/near/GridNearSingleGetResponse.java| 13 +
 5 files changed, 16 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/45c235e8/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 9afbca8..54f8ca0 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
@@ -67,6 +67,7 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiInClosure;
 import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 
@@ -541,7 +542,8 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 case 117: {
 GridNearSingleGetResponse res = (GridNearSingleGetResponse)msg;
 
-GridPartitionedSingleGetFuture fut = 
(GridPartitionedSingleGetFuture)ctx.mvcc().future(res.futureId());
+GridPartitionedSingleGetFuture fut = 
(GridPartitionedSingleGetFuture)ctx.mvcc()
+.future(new IgniteUuid(IgniteUuid.VM_ID, res.futureId()));
 
 if (fut == null) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/45c235e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 50fabe9..7648f10 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -140,7 +140,8 @@ public abstract class GridDhtCacheAdapter extends 
GridDistributedCacheAdap
 if (log.isDebugEnabled())
 log.debug("Processing near get response [nodeId=" + nodeId + ", 
res=" + res + ']');
 
-GridPartitionedSingleGetFuture fut = 
(GridPartitionedSingleGetFuture)ctx.mvcc().future(res.futureId());
+GridPartitionedSingleGetFuture fut = 
(GridPartitionedSingleGetFuture)ctx.mvcc()
+.future(new IgniteUuid(IgniteUuid.VM_ID, res.futureId()));
 
 if (fut == null) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/45c235e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 5923517..84fe150 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -262,7 +262,7 @@ public class GridPartitionedSingleGetFuture extends 
GridFutureAdapter im
 
 if 

[18/18] ignite git commit: Merge branch 'ignite-1.5' into ignite-1956

[vozerov]

Merge branch 'ignite-1.5' into ignite-1956


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

Branch: refs/heads/ignite-1956
Commit: 9ca8974e15b0afaa6d5b69b888e089950a943ce3
Parents: f88f92e e706216
Author: vozerov-gridgain 
Authored: Fri Nov 27 11:03:39 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 11:03:39 2015 +0300

--
 RELEASE_NOTES.txt   |  17 +++
 .../ComputeFibonacciContinuationExample.java|  15 ++-
 .../computegrid/ComputeTaskMapExample.java  |   6 +-
 .../computegrid/ComputeTaskSplitExample.java|   4 +-
 .../examples/messaging/MessagingExample.java|  18 +--
 .../examples/misc/springbean/spring-bean.xml|   7 --
 .../testsuites/IgniteExamplesSelfTestSuite.java |   4 +-
 .../apache/ignite/cache/CacheInterceptor.java   |   2 +-
 .../rendezvous/RendezvousAffinityFunction.java  |   2 +-
 .../portable/GridPortableMarshaller.java|   3 +
 .../internal/portable/PortableContext.java  |  10 +-
 .../ignite/internal/portable/PortableUtils.java |   7 ++
 .../processors/cache/GridCacheAdapter.java  |  65 +++---
 .../cache/GridCacheConcurrentMap.java   |  16 +--
 .../processors/cache/GridCacheEventManager.java |   4 +-
 .../processors/cache/GridCacheIoManager.java|   4 +-
 .../processors/cache/GridCacheMapEntry.java |   4 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  15 ++-
 .../cache/distributed/dht/GridDhtGetFuture.java |  28 +++--
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../dht/GridPartitionedSingleGetFuture.java |  16 +--
 .../distributed/near/GridNearGetRequest.java|   3 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  92 +++---
 .../near/GridNearOptimisticTxPrepareFuture.java |  57 -
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  70 +++
 .../near/GridNearSingleGetRequest.java  |  12 +-
 .../near/GridNearSingleGetResponse.java |  13 +-
 .../cache/local/GridLocalCacheEntry.java|   6 +
 .../transactions/IgniteTxLocalAdapter.java  |   2 +-
 .../processors/query/GridQueryProcessor.java|   8 ++
 .../util/future/GridCompoundFuture.java |   9 +-
 .../internal/util/future/GridFutureAdapter.java |   2 +-
 .../sharedfs/SharedFsCheckpointSpi.java |  14 ++-
 .../ignite/spi/discovery/tcp/ServerImpl.java|   2 +-
 .../internal/GridMultipleJobsSelfTest.java  |   7 ++
 .../session/GridSessionCheckpointSelfTest.java  |  16 +++
 .../tcp/IgniteCacheSslStartStopSelfTest.java|   1 +
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  33 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  34 ++
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite4.java |  33 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  33 +
 .../IgniteCacheFailoverTestSuite3.java  |   6 -
 .../IgniteCacheFailoverTestSuiteSsl.java|  41 +++
 .../cache/IgniteCacheNoClassQuerySelfTest.java  | 122 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 47 files changed, 703 insertions(+), 230 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9ca8974e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/9ca8974e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
--

[06/18] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1956
Commit: 1eaa8c92d2db395279fb33cdd8e914bd2f2f9f3d
Parents: 54ae690 c584cca
Author: Yakov Zhdanov 
Authored: Thu Nov 26 15:12:49 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 15:12:49 2015 +0300

--
 .../config/binary/example-ignite-binary.xml |  44 
 examples/config/example-ignite.xml  |  10 +-
 .../ignite/examples/binary/EmployeeKey.java |   3 +
 .../binary/ExampleBinaryNodeStartup.java|  36 ---
 ...ComputeClientBinaryTaskExecutionExample.java |   6 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |   6 +-
 .../scalar/examples/ScalarCacheExample.scala|  19 +-
 .../ignite/codegen/MessageCodeGenerator.java|   1 +
 .../java/org/apache/ignite/IgniteBinary.java|  15 +-
 .../java/org/apache/ignite/IgniteCache.java |   3 +-
 .../apache/ignite/binary/BinaryIdMapper.java|   3 +-
 .../org/apache/ignite/binary/BinaryObject.java  |   9 +-
 .../org/apache/ignite/binary/BinaryType.java|   9 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   2 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |   2 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   3 +-
 .../configuration/CacheConfiguration.java   |  36 ++-
 .../internal/GridEventConsumeHandler.java   |   5 +
 .../internal/GridMessageListenHandler.java  |   5 +
 .../apache/ignite/internal/IgniteKernal.java|   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   6 +-
 .../ignite/internal/NodeStoppingException.java  |  35 +++
 .../discovery/GridDiscoveryManager.java |  19 +-
 .../internal/portable/BinaryFieldImpl.java  |   6 +-
 .../internal/portable/BinaryMarshaller.java | 144 +++
 .../internal/portable/BinaryObjectEx.java   | 225 +
 .../internal/portable/BinaryObjectExImpl.java   | 245 +++
 .../internal/portable/BinaryObjectImpl.java |   2 +-
 .../portable/BinaryObjectOffheapImpl.java   |   2 +-
 .../internal/portable/BinaryTypeImpl.java   |   5 +
 .../portable/PortableClassDescriptor.java   |   2 +-
 .../internal/portable/PortableContext.java  |  35 ++-
 .../ignite/internal/portable/PortableUtils.java |   2 +-
 .../builder/BinaryObjectBuilderImpl.java|   9 +-
 .../builder/PortableBuilderSerializer.java  |   4 +-
 .../processors/cache/CacheObjectContext.java|   2 +-
 .../cache/GridCacheDeploymentManager.java   |   6 +-
 .../processors/cache/GridCacheEventManager.java |  38 ++-
 .../processors/cache/GridCacheIoManager.java|   4 +
 .../processors/cache/GridCacheMessage.java  |   3 +-
 .../processors/cache/GridCacheMvccManager.java  |   3 +-
 .../processors/cache/GridCacheProcessor.java|   4 +-
 .../processors/cache/IgniteCacheProxy.java  |  14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   3 +-
 .../distributed/dht/GridDhtLockFuture.java  |  19 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   1 +
 .../dht/GridPartitionedSingleGetFuture.java |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   3 +-
 .../CacheObjectBinaryProcessorImpl.java |  33 ++-
 .../cache/portable/IgniteBinaryImpl.java|   9 +-
 .../cache/query/GridCacheSqlQuery.java  |  42 
 .../cache/query/GridCacheTwoStepQuery.java  |  35 ++-
 .../continuous/CacheContinuousQueryEntry.java   |  50 +++-
 .../continuous/CacheContinuousQueryEvent.java   |   6 +-
 .../continuous/CacheContinuousQueryHandler.java |  32 ++-
 .../CacheContinuousQueryListener.java   |   5 +
 .../continuous/CacheContinuousQueryManager.java |  57 +++--
 .../cache/store/CacheOsStoreManager.java|   2 +-
 .../transactions/IgniteTxLocalAdapter.java  |  29 ++-
 .../processors/cacheobject/NoOpBinary.java  |   8 +-
 .../continuous/GridContinuousHandler.java   |   5 +
 .../continuous/GridContinuousProcessor.java |  10 +-
 .../StartRoutineDiscoveryMessage.java   |  13 +-
 .../cpp/PlatformCppConfigurationClosure.java|   2 +-
 .../PlatformDotNetConfigurationClosure.java |   2 +-
 .../processors/query/GridQueryProcessor.java|  68 +++--
 .../processors/query/GridQueryProperty.java |  45 
 .../query/GridQueryTypeDescriptor.java  |   6 +
 .../visor/cache/VisorCacheConfiguration.java|   4 +-
 .../cache/VisorCacheTypeFieldMetadata.java  |  30 ++-
 .../visor/cache/VisorCacheTypeMetadata.java | 133 +-
 

[15/18] ignite git commit: Disable shared memory for the hung test.

[vozerov]

Disable shared memory for the hung test.


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

Branch: refs/heads/ignite-1956
Commit: 19680d6dbabe843f4db009c0aa5380178e62d5ef
Parents: de08cd5
Author: Alexey Goncharuk 
Authored: Fri Nov 27 09:27:32 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 09:27:32 2015 +0300

--
 .../org/apache/ignite/internal/GridMultipleJobsSelfTest.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/19680d6d/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index d5f6287..a975e2c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.lang.IgniteFuture;
+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;
@@ -97,6 +98,12 @@ public class GridMultipleJobsSelfTest extends 
GridCommonAbstractTest {
 c.setCacheConfiguration(cc);
 }
 
+TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
+
+commSpi.setSharedMemoryPort(-1);
+
+c.setCommunicationSpi(commSpi);
+
 return c;
 }
 

[02/18] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1956
Commit: f2258cc805fa25a37802bad4defe529eff3021be
Parents: 3289cc1 97270bf
Author: Yakov Zhdanov 
Authored: Wed Nov 25 23:53:58 2015 +0300
Committer: Yakov Zhdanov 
Committed: Wed Nov 25 23:53:58 2015 +0300

--
 examples/pom.xml|   2 +-
 .../client/router/RouterFactorySelfTest.java|   2 +
 .../java/org/apache/ignite/IgniteCache.java |  23 +++
 .../org/apache/ignite/internal/IgnitionEx.java  |   9 +-
 .../internal/portable/BinaryReaderExImpl.java   |  18 ++-
 .../processors/cache/CacheLockImpl.java |  18 ++-
 .../processors/cache/GridCacheAdapter.java  | 156 ++-
 .../processors/cache/GridCacheProxyImpl.java|  61 
 .../processors/cache/IgniteCacheProxy.java  |  42 +
 .../processors/cache/IgniteInternalCache.java   |  47 +-
 .../distributed/dht/GridDhtCacheAdapter.java|   7 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   8 +-
 .../distributed/near/GridNearCacheAdapter.java  |  10 ++
 .../platform/PlatformContextImpl.java   |   2 +-
 .../ignite/resources/MBeanServerResource.java   |  69 
 .../CacheDeferredDeleteSanitySelfTest.java  |  98 
 .../cache/CacheStopAndDestroySelfTest.java  |   8 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  42 -
 .../multijvm/IgniteCacheProcessProxy.java   |  38 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   7 +-
 .../Services/ServicesExample.cs |   4 +
 modules/scalar/pom.xml  |   4 +-
 modules/spark/pom.xml   |   4 +-
 modules/visor-console/pom.xml   |   2 +-
 .../ignite-int-max-values-offheap-config.xml|  89 +++
 .../ignite-int-max-values-onheap-config.xml |  84 ++
 .../ignite-int-max-values-swap-config.xml   |  93 +++
 .../test-max-int-values-offheap.properties  |  70 +
 .../test-max-int-values-onheap.properties   |  70 +
 .../config/test-max-int-values-swap.properties  |  69 
 .../yardstick/cache/IntMaxValueEntriesTest.java | 135 
 parent/pom.xml  |   2 +-
 33 files changed, 1194 insertions(+), 101 deletions(-)
--


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

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

[13/18] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-cache-get-opts

[vozerov]

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-1.5-cache-get-opts


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

Branch: refs/heads/ignite-1956
Commit: 895760eed90651d618ec1450ead9d16246b851a4
Parents: 5407ea6 df9658b
Author: Alexey Goncharuk 
Authored: Thu Nov 26 19:33:51 2015 +0300
Committer: Alexey Goncharuk 
Committed: Thu Nov 26 19:33:51 2015 +0300

--
 RELEASE_NOTES.txt   |  17 +++
 .../ComputeFibonacciContinuationExample.java|  15 +-
 .../computegrid/ComputeTaskMapExample.java  |   6 +-
 .../computegrid/ComputeTaskSplitExample.java|   4 +-
 .../examples/messaging/MessagingExample.java|  18 +--
 .../examples/misc/springbean/spring-bean.xml|   7 -
 .../testsuites/IgniteExamplesSelfTestSuite.java |   4 +-
 .../portable/GridPortableMarshaller.java|   3 +
 .../internal/portable/PortableContext.java  |  10 +-
 .../ignite/internal/portable/PortableUtils.java |   7 +
 .../processors/cache/GridCacheEventManager.java |   4 +-
 .../distributed/dht/GridDhtLockFuture.java  |   1 +
 .../near/GridNearTxFinishFuture.java|  14 +-
 .../processors/query/GridQueryProcessor.java|   8 ++
 .../sharedfs/SharedFsCheckpointSpi.java |  14 +-
 .../processors/cache/GridCacheStopSelfTest.java | 143 +--
 .../session/GridSessionCheckpointSelfTest.java  |  16 +++
 .../tcp/IgniteCacheSslStartStopSelfTest.java|   1 +
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  33 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  34 +
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |  33 +
 .../IgniteBinaryObjectsCacheTestSuite4.java |  33 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  33 +
 .../IgniteCacheFailoverTestSuite3.java  |   6 -
 .../IgniteCacheFailoverTestSuiteSsl.java|  41 ++
 .../cache/IgniteCacheNoClassQuerySelfTest.java  | 122 
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 28 files changed, 601 insertions(+), 61 deletions(-)
--

[03/18] ignite git commit: debugging slowdowns

[vozerov]

debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: 0be5deaa14ec81af29437702b9f468d8d5f5a891
Parents: f2258cc
Author: Yakov Zhdanov 
Authored: Thu Nov 26 00:22:46 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 00:22:46 2015 +0300

--
 .../cache/distributed/dht/GridDhtCacheAdapter.java   | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0be5deaa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 8a293d7..50fabe9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -23,7 +23,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -725,9 +724,7 @@ public abstract class GridDhtCacheAdapter extends 
GridDistributedCacheAdap
 
 final CacheExpiryPolicy expiryPlc = CacheExpiryPolicy.forAccess(ttl);
 
-LinkedHashMap map = U.newLinkedHashMap(1);
-
-map.put(req.key(), req.addReader());
+Map map = Collections.singletonMap(req.key(), 
req.addReader());
 
 IgniteInternalFuture fut =
 getDhtAsync(nodeId,
@@ -760,7 +757,8 @@ public abstract class GridDhtCacheAdapter extends 
GridDistributedCacheAdap
 info.key(null);
 
 res0 = info;
-} else if (req.needVersion())
+}
+else if (req.needVersion())
 res0 = new CacheVersionedValue(info.value(), 
info.version());
 else
 res0 = info.value();

[05/18] ignite git commit: debugging slowdowns

[vozerov]

debugging slowdowns


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

Branch: refs/heads/ignite-1956
Commit: 54ae69021b48fac6b04ab3ddb544e95f702283fc
Parents: 45c235e
Author: Yakov Zhdanov 
Authored: Thu Nov 26 11:44:53 2015 +0300
Committer: Yakov Zhdanov 
Committed: Thu Nov 26 11:44:53 2015 +0300

--
 .../org/apache/ignite/internal/util/future/GridCompoundFuture.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/54ae6902/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 31dbbba..cc296e6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -25,6 +25,7 @@ import 
org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
 import 
org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.F;
@@ -56,6 +57,7 @@ public class GridCompoundFuture extends 
GridFutureAdapter {
 protected final ArrayList futs = new 
ArrayList<>();
 
 /** */
+@GridToStringExclude
 private final Listener lsnr = new Listener();
 
 /** Reducer. */

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_

[yzhdanov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_


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

Branch: refs/heads/ignite-1.5
Commit: e9f22aba2801636a3c8747dde143b9ceefeb669a
Parents: a8edb1e 2d62bbb
Author: Yakov Zhdanov 
Authored: Fri Nov 27 11:34:04 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 11:34:04 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java|  2 +-
 .../internal/GridMultipleJobsSelfTest.java  |  7 ++
 .../IgniteClientReconnectCacheTest.java | 26 
 3 files changed, 24 insertions(+), 11 deletions(-)
--

[3/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_


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

Branch: refs/heads/ignite-1956
Commit: e9f22aba2801636a3c8747dde143b9ceefeb669a
Parents: a8edb1e 2d62bbb
Author: Yakov Zhdanov 
Authored: Fri Nov 27 11:34:04 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 11:34:04 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java|  2 +-
 .../internal/GridMultipleJobsSelfTest.java  |  7 ++
 .../IgniteClientReconnectCacheTest.java | 26 
 3 files changed, 24 insertions(+), 11 deletions(-)
--

[2/4] ignite git commit: fixing cache iteration small refactoring

[vozerov]

fixing cache iteration
small refactoring


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

Branch: refs/heads/ignite-1956
Commit: a8edb1ed042b62fc160b497d2f4febb28abc686d
Parents: de08cd5
Author: Yakov Zhdanov 
Authored: Fri Nov 27 11:33:51 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 11:33:51 2015 +0300

--
 .../processors/cache/GridCacheAdapter.java  | 67 +---
 .../cache/GridCacheConcurrentMap.java   | 52 +--
 .../distributed/dht/GridNoStorageCacheMap.java  |  4 +-
 .../distributed/near/GridNearCacheAdapter.java  |  4 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  2 +-
 5 files changed, 37 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8edb1ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c7467b2..00f65f9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -296,7 +296,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache ctx, int startSize) {
-this(ctx, new GridCacheConcurrentMap(ctx, startSize, 0.75F, null));
+this(ctx, new GridCacheConcurrentMap(ctx, startSize, null));
 }
 
 /**
@@ -925,60 +925,25 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

ignite git commit: Fix AfterTest to use enumerator.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1956 00eb4d85c -> 82d5ccc9a


Fix AfterTest to use enumerator.


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

Branch: refs/heads/ignite-1956
Commit: 82d5ccc9aa557bf835fde6f14a42bd81a3dbf2b1
Parents: 00eb4d8
Author: Pavel Tupitsyn 
Authored: Fri Nov 27 11:48:37 2015 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Nov 27 11:48:37 2015 +0300

--
 .../Cache/CacheAbstractTest.cs   | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/82d5ccc9/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
index 64124d7..11bf8f1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
@@ -347,17 +347,14 @@ namespace Apache.Ignite.Core.Tests.Cache
 for (int i = 0; i < GridCount(); i++)
 {
 var cache = Cache(i);
+var entries = cache.Select(pair => pair.ToString() + 
GetKeyAffinity(cache, pair.Key)).ToArray();
 
-if (!cache.IsEmpty())
-{
-var entries = Enumerable.Range(0, 2000)
-.Select(x => new KeyValuePair(x, 
cache.LocalPeek(x)))
-.Where(x => x.Value != 0)
-.Select(pair => pair.ToString() + 
GetKeyAffinity(cache, pair.Key))
-.Aggregate((acc, val) => string.Format("{0}, {1}", 
acc, val));
+if (entries.Any())
+Assert.Fail("Cache '{0}' is not empty in grid [{1}]: 
({2})", CacheName(), i,
+entries.Aggregate((acc, val) => string.Format("{0}, 
{1}", acc, val)));
 
-Assert.Fail("Cache '{0}' is not empty in grid [{1}]: 
({2})", CacheName(), i, entries);
-}
+var size = cache.GetSize();
+Assert.AreEqual(0, size, "Cache enumerator returned no 
entries, but cache size is " + size);
 }
 
 Console.WriteLine("Test finished: " + 
TestContext.CurrentContext.Test.Name);

ignite git commit: Missed README & licenses

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 e4f6224fa -> fa8e478d9


Missed README & licenses


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

Branch: refs/heads/ignite-1.5
Commit: fa8e478d930b9ecb2c1534874f9993c1ae45c103
Parents: e4f6224
Author: Anton Vinogradov 
Authored: Fri Nov 27 13:10:27 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 13:10:27 2015 +0300

--
 modules/jms11/licenses/apache-2.0.txt | 202 +
 modules/kafka/README.txt  |  32 
 modules/mqtt/licenses/apache-2.0.txt  | 202 +
 modules/zookeeper/licenses/apache-2.0.txt | 202 +
 4 files changed, 638 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa8e478d/modules/jms11/licenses/apache-2.0.txt
--
diff --git a/modules/jms11/licenses/apache-2.0.txt 
b/modules/jms11/licenses/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/jms11/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor 

ignite git commit: IGNITE-2009: Attempt to resolve IgniteKernal TLS leak.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2009 [created] 1e9afcd19


IGNITE-2009: Attempt to resolve IgniteKernal TLS leak.


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

Branch: refs/heads/ignite-2009
Commit: 1e9afcd1961b1945b7957c60668eea7a582f76c8
Parents: e4f6224
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:13:37 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:13:37 2015 +0300

--
 .../processors/query/h2/IgniteH2Indexing.java   | 24 +---
 1 file changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9afcd1/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index cc452c1..1437a16 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -49,6 +49,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import javax.cache.Cache;
 import javax.cache.CacheException;
@@ -255,7 +256,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 set(c);
 
 // Reset statement cache when new connection is created.
-stmtCache.get().clear();
+stmtCache.remove(Thread.currentThread());
 }
 
 return c;
@@ -280,12 +281,8 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
 /** */
 private volatile GridKernalContext ctx;
 
-/** */
-private final ThreadLocal stmtCache = new 
ThreadLocal() {
-@Override protected StatementCache initialValue() {
-return new StatementCache(PREPARED_STMT_CACHE_SIZE);
-}
-};
+/** Statement cache. */
+private final ConcurrentHashMap stmtCache = new 
ConcurrentHashMap<>();
 
 /** */
 private final GridBoundedConcurrentLinkedHashMap, TwoStepCachedQuery> twoStepCache =
@@ -313,7 +310,18 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
  */
 private PreparedStatement prepareStatement(Connection c, String sql, 
boolean useStmtCache) throws SQLException {
 if (useStmtCache) {
-StatementCache cache = stmtCache.get();
+Thread curThread = Thread.currentThread();
+
+StatementCache cache = stmtCache.get(curThread);
+
+if (cache == null) {
+StatementCache cache0 = new 
StatementCache(PREPARED_STMT_CACHE_SIZE);
+
+cache = stmtCache.putIfAbsent(curThread, cache0);
+
+if (cache == null)
+cache = cache0;
+}
 
 PreparedStatement stmt = cache.get(sql);
 

[2/7] ignite git commit: ignite-1732 Fixed test to catch IgniteClientDisconnectedException.

[vozerov]

ignite-1732 Fixed test to catch IgniteClientDisconnectedException.


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

Branch: refs/heads/ignite-2009
Commit: 712e62bd241cecac969d022461fc048453b3db6b
Parents: c2d4d1d
Author: sboikov 
Authored: Fri Nov 27 13:12:55 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 13:12:55 2015 +0300

--
 .../dht/IgniteAtomicLongChangingTopologySelfTest.java| 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/712e62bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
index a8d5801..56bc760 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteClientDisconnectedException;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteSet;
 import org.apache.ignite.configuration.AtomicConfiguration;
@@ -214,7 +215,12 @@ public class IgniteAtomicLongChangingTopologySelfTest 
extends GridCommonAbstract
 while (System.currentTimeMillis() < stop) {
 log.info("Iteration: " + iter++);
 
-c.apply(ignite);
+try {
+c.apply(ignite);
+}
+catch (IgniteClientDisconnectedException e) {
+e.reconnectFuture().get();
+}
 }
 
 finished.set(true);

[1/7] ignite git commit: Missed README & licenses

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2009 1e9afcd19 -> 4945604bd


Missed README & licenses


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

Branch: refs/heads/ignite-2009
Commit: fa8e478d930b9ecb2c1534874f9993c1ae45c103
Parents: e4f6224
Author: Anton Vinogradov 
Authored: Fri Nov 27 13:10:27 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 13:10:27 2015 +0300

--
 modules/jms11/licenses/apache-2.0.txt | 202 +
 modules/kafka/README.txt  |  32 
 modules/mqtt/licenses/apache-2.0.txt  | 202 +
 modules/zookeeper/licenses/apache-2.0.txt | 202 +
 4 files changed, 638 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa8e478d/modules/jms11/licenses/apache-2.0.txt
--
diff --git a/modules/jms11/licenses/apache-2.0.txt 
b/modules/jms11/licenses/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/jms11/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by 

[3/7] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-2009
Commit: 857c63e79ef5aa34c8213d4c1ecb298866724727
Parents: 712e62b fa8e478
Author: sboikov 
Authored: Fri Nov 27 13:13:17 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 13:13:17 2015 +0300

--
 .../java/org/apache/ignite/IgniteBinary.java|   9 +
 .../org/apache/ignite/binary/BinaryObject.java  |   8 +
 .../org/apache/ignite/binary/BinaryType.java|   7 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  21 +
 .../communication/GridIoMessageFactory.java |   8 +-
 .../internal/portable/BinaryEnumObjectImpl.java | 311 +
 .../internal/portable/BinaryMetadata.java   |  16 +-
 .../internal/portable/BinaryObjectExImpl.java   |   5 +
 .../internal/portable/BinaryObjectImpl.java |   3 -
 .../internal/portable/BinaryTypeImpl.java   |   9 +-
 .../internal/portable/BinaryWriteMode.java  |   3 +
 .../internal/portable/BinaryWriterExImpl.java   |  19 +
 .../portable/PortableClassDescriptor.java   |  23 +-
 .../internal/portable/PortableContext.java  |  39 +-
 .../ignite/internal/portable/PortableUtils.java | 147 +-
 .../builder/BinaryObjectBuilderImpl.java|   2 +-
 .../builder/PortableBuilderSerializer.java  |  10 +-
 .../internal/processors/cache/CacheObject.java  |   3 +
 .../processors/cache/CacheObjectContext.java|  19 +
 .../portable/CacheObjectBinaryProcessor.java|  11 +-
 .../CacheObjectBinaryProcessorImpl.java |  18 +-
 .../cache/portable/IgniteBinaryImpl.java|  12 +
 .../processors/cacheobject/NoOpBinary.java  |   5 +
 .../platform/PlatformContextImpl.java   |  53 ++-
 .../transactions/PlatformTransactions.java  |   4 +-
 .../platform/utils/PlatformUtils.java   |   1 +
 .../PlatformDotNetBinaryTypeConfiguration.java  |  23 +
 .../internal/portable/BinaryEnumsSelfTest.java  | 446 +++
 .../portable/BinaryMarshallerSelfTest.java  |  37 +-
 .../platform/PlatformComputeEchoTask.java   |   4 +-
 .../IgnitePortableObjectsTestSuite.java |   2 +
 modules/jms11/licenses/apache-2.0.txt   | 202 +
 modules/kafka/README.txt|  32 ++
 modules/mqtt/licenses/apache-2.0.txt| 202 +
 .../impl/binary/binary_type_updater_impl.cpp|   4 +-
 .../Binary/BinaryBuilderSelfTest.cs |  97 ++--
 .../Binary/BinarySelfTest.cs|  48 +-
 .../Cache/CacheAbstractTest.cs  |  17 +-
 .../Compute/ComputeApiTest.cs   |   6 +
 .../Config/Compute/compute-grid1.xml|   3 +-
 .../Config/native-client-test-cache-store.xml   |   1 +
 .../Services/ServiceProxyTest.cs|  22 +-
 .../Apache.Ignite.Core.csproj   |   5 +-
 .../Binary/BinaryTypeConfiguration.cs   |  16 +-
 .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 136 ++
 .../Apache.Ignite.Core/Binary/IBinaryObject.cs  |  23 +-
 .../Apache.Ignite.Core/Binary/IBinaryType.cs|  13 +
 .../Apache.Ignite.Core/Binary/IIgniteBinary.cs  | 120 -
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|   6 +-
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 216 +
 .../Impl/Binary/BinaryEnum.cs   | 134 ++
 .../Impl/Binary/BinaryFullTypeDescriptor.cs |  14 +-
 .../Impl/Binary/BinaryObject.cs |  29 ++
 .../Impl/Binary/BinaryObjectBuilder.cs  |  44 +-
 .../Impl/Binary/BinaryReader.cs |  51 ++-
 .../Binary/BinarySurrogateTypeDescriptor.cs |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs |  34 +-
 .../Impl/Binary/BinaryUtils.cs  |  96 ++--
 .../Impl/Binary/BinaryWriter.cs | 104 +++--
 .../Impl/Binary/IBinaryTypeDescriptor.cs|  50 +--
 .../Impl/Binary/IgniteBinary.cs | 192 
 .../Impl/Binary/Marshaller.cs   |  88 ++--
 .../Impl/Binary/Metadata/BinaryType.cs  | 184 
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|  34 +-
 .../Binary/Structure/BinaryStructureTracker.cs  |   2 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs|  11 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs  |   2 +-
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |  11 +-
 .../Impl/Transactions/TransactionsImpl.cs   |   4 +-
 .../examples/Config/example-cache-query.xml |   9 +-
 .../dotnet/examples/Config/example-cache.xml|   9 +-
 modules/zookeeper/licenses/apache-2.0.txt   | 202 +
 72 files changed, 2992 insertions(+), 765 deletions(-)