[18/50] [abbrv] ignite git commit: Javadoc hotfix

[sboikov]

Javadoc hotfix


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

Branch: refs/heads/ignite-1.5.1
Commit: d5fa3c1b69cfa336e70087dded9ddfa099000235
Parents: e5de23e
Author: Anton Vinogradov 
Authored: Fri Dec 4 13:24:59 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Dec 4 13:24:59 2015 +0300

--
 .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5fa3c1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index ced0d10..998f7a2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -359,7 +359,7 @@ public class GridDhtPartitionDemander {
  * @param fut Future.
  * @param assigns Assignments.
  * @throws IgniteCheckedException If failed.
- * @return
+ * @return Partitions were requested.
  */
 private boolean requestPartitions(
 RebalanceFuture fut,

[36/50] [abbrv] ignite git commit: Ignite-1.5 - Added missing serialVersionUID to fix the build.

[sboikov]

Ignite-1.5 - Added missing serialVersionUID to fix the build.


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

Branch: refs/heads/ignite-1.5.1
Commit: 67ebd02c9a58ef2d835e55e4aa6efdcec6d53b8c
Parents: c292748
Author: Alexey Goncharuk 
Authored: Tue Dec 8 15:09:10 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Dec 8 15:09:10 2015 +0300

--
 .../org/apache/ignite/internal/util/GridMessageCollection.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/67ebd02c/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
index 09a5e96..6044bbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
@@ -34,6 +34,9 @@ import 
org.apache.ignite.plugin.extensions.communication.MessageWriter;
  */
 public final class GridMessageCollection implements Message 
{
 /** */
+private static final long serialVersionUID = 0L;
+
+/** */
 @GridDirectCollection(Message.class)
 private Collection msgs;
 

[07/50] [abbrv] ignite git commit: Hotfix IGNITE-2079

[sboikov]

Hotfix IGNITE-2079


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

Branch: refs/heads/ignite-1.5.1
Commit: dc0131da6582fb0f0d1ff25c62eb7462e5f460af
Parents: 86ec37e
Author: Anton Vinogradov 
Authored: Thu Dec 3 16:52:26 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 16:52:26 2015 +0300

--
 .../ignite/internal/processors/cache/GridCacheIoManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dc0131da/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 b06526e..9a391e5 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
@@ -562,7 +562,7 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 
 default:
 throw new IgniteCheckedException("Failed to send response to 
node. Unsupported direct type [message="
-+ msg + "]");
++ msg + "]", msg.classError());
 }
 }
 

[29/50] [abbrv] ignite git commit: IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.

[sboikov]

IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-1.5.1
Commit: ebddcb187231c08bcf53a7c567f10064393a8e60
Parents: 9a14d64
Author: Alexey Goncharuk 
Authored: Mon Dec 7 20:11:48 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 7 20:11:48 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  34 -
 ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 3 files changed, 159 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 034d20d..af3530a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1872,7 +1872,20 @@ public class CacheConfiguration extends 
MutableConfiguration {
 
 TypeDescriptor desc = processKeyAndValueClasses(keyCls, valCls);
 
-qryEntities.add(convert(desc));
+QueryEntity converted = convert(desc);
+
+boolean dup = false;
+
+for (QueryEntity entity : qryEntities) {
+if (F.eq(entity.getValueType(), converted.getValueType())) {
+dup = true;
+
+break;
+}
+}
+
+if (!dup)
+qryEntities.add(converted);
 }
 
 return this;
@@ -1968,10 +1981,21 @@ public class CacheConfiguration extends 
MutableConfiguration {
 public CacheConfiguration setQueryEntities(Collection 
qryEntities) {
 if (this.qryEntities == null)
 this.qryEntities = new ArrayList<>(qryEntities);
-else if (indexedTypes != null)
-this.qryEntities.addAll(qryEntities);
-else
-throw new CacheException("Query entities can be set only once.");
+
+for (QueryEntity entity : qryEntities) {
+boolean found = false;
+
+for (QueryEntity existing : this.qryEntities) {
+if (F.eq(entity.getValueType(), existing.getValueType())) {
+found = true;
+
+break;
+}
+}
+
+if (!found)
+this.qryEntities.add(entity);
+}
 
 return this;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
new file mode 100644
index 000..8311213
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apac

[19/50] [abbrv] ignite git commit: Javadoc hotfix

[sboikov]

Javadoc hotfix


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

Branch: refs/heads/ignite-1.5.1
Commit: 6a109ebd4c637b3ec6e298ae8cf785c422abebc1
Parents: d5fa3c1
Author: Anton Vinogradov 
Authored: Fri Dec 4 13:42:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Dec 4 13:42:25 2015 +0300

--
 parent/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a109ebd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4fd7156..68ba62b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -428,6 +428,10 @@
 Spark Integration
 
org.apache.ignite.spark.examples.java
 
+
+OSGi integration
+org.apache.ignite.osgi*
+
 
 
 

[01/50] [abbrv] ignite git commit: ignite-2008 Added test reproducing issue.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 250aa4f90 -> ebb4aa63b


ignite-2008 Added test reproducing issue.


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

Branch: refs/heads/ignite-1.5.1
Commit: f7709543c7e6652dc276e38629f2f1d1315fa84e
Parents: e7298ad
Author: sboikov 
Authored: Thu Dec 3 10:42:15 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:42:15 2015 +0300

--
 .../CacheLockReleaseNodeLeaveTest.java  | 51 
 1 file changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f7709543/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
index 956aaef..e84fd3f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
@@ -29,9 +29,12 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static 
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -107,4 +110,52 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
 
 fut2.get(5, SECONDS);
 }
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTxLockRelease() throws Exception {
+startGrids(2);
+
+final Ignite ignite0 = ignite(0);
+final Ignite ignite1 = ignite(1);
+
+final Integer key = primaryKey(ignite1.cache(null));
+
+IgniteInternalFuture fut1 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+Transaction tx = ignite0.transactions().txStart(PESSIMISTIC, 
REPEATABLE_READ);
+
+ignite0.cache(null).get(key);
+
+return null;
+}
+}, "lock-thread1");
+
+fut1.get();
+
+IgniteInternalFuture fut2 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+try (Transaction tx = 
ignite1.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
+log.info("Start tx lock.");
+
+ignite1.cache(null).get(key);
+
+log.info("Tx locked key.");
+
+tx.commit();
+}
+
+return null;
+}
+}, "lock-thread2");
+
+U.sleep(1000);
+
+log.info("Stop node.");
+
+ignite0.close();
+
+fut2.get(5, SECONDS);
+}
 }

[46/50] [abbrv] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.

[sboikov]

ignite-1.5 Cache map refactoring. This closes #279.


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

Branch: refs/heads/ignite-1.5.1
Commit: 3baf4d163c6edafa7367ece7901ad1efe695a8d4
Parents: c30def8
Author: sboikov 
Authored: Tue Dec 8 17:30:14 2015 +0300
Committer: sboikov 
Committed: Tue Dec 8 17:30:14 2015 +0300

--
 .../processors/cache/GridCacheAdapter.java  |  65 +-
 .../cache/GridCacheConcurrentMap.java   | 734 +--
 .../processors/cache/GridCacheMapEntry.java |  44 +-
 .../cache/GridCacheMapEntryFactory.java |  13 +-
 .../distributed/GridDistributedCacheEntry.java  |  14 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  13 +-
 .../distributed/dht/GridDhtCacheEntry.java  |  14 +-
 .../dht/GridDhtOffHeapCacheEntry.java   |  15 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  23 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java |  16 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java|  13 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |  14 +-
 .../GridDhtColocatedOffHeapCacheEntry.java  |  15 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../distributed/near/GridNearCacheAdapter.java  |   8 +-
 .../distributed/near/GridNearCacheEntry.java|  16 +-
 .../near/GridNearOffHeapCacheEntry.java |  15 +-
 .../processors/cache/local/GridLocalCache.java  |   8 +-
 .../cache/local/GridLocalCacheEntry.java|  15 +-
 .../local/atomic/GridLocalAtomicCache.java  |   8 +-
 .../ignite/internal/util/IgniteUtils.java   |  18 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java|   2 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  11 -
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   4 +-
 26 files changed, 357 insertions(+), 764 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/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 f96954e..034640f 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
@@ -925,25 +925,60 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache t = 
map.putEntryIfObsoleteOrAbsent(topVer, key, null, create);
+GridCacheMapEntry cur = map.getEntry(key);
 
-GridCacheEntryEx cur = t.get1();
-GridCacheEntryEx created = t.get2();
-GridCacheEntryEx doomed = t.get3();
+if (cur == null || cur.obsolete()) {
+GridTriple t = map.putEntryIfObsoleteOrAbsent(
+topVer,
+key,
+null,
+create);
 
-if (doomed != null && 
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
-// Event notification.
-ctx.events().addEvent(doomed.partition(), doomed.key(), locNodeId, 
(IgniteUuid)null, null,
-EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, 
null, null, true);
+cur = t.get1();
 
-if (created != null) {
-// Event notification.
-if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
-ctx.events().addEvent(created.partition(), created.key(), 
locNodeId, (IgniteUuid)null, null,
-EVT_CACHE_ENTRY_CREATED, null, false, null, false, null, 
null, null, true);
+GridCacheEntryEx created = t.get2();
+GridCacheEntryEx doomed = t.get3();
 
-if (touch)
-ctx.evicts().touch(cur, topVer);
+if (doomed != null && 
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
+// Event notification.
+ctx.events().addEvent(doomed.partition(),
+doomed.key(),
+locNodeId,
+(IgniteUuid)null,
+null,
+EVT_CACHE_ENTRY_DESTROYED,
+null,
+false,
+null,
+false,
+null,
+null,
+null,
+true);
+
+if (created != null) {
+// Event notifica

[15/50] [abbrv] ignite git commit: IGNITE-1947 More info about why query was not found in error message.

[sboikov]

IGNITE-1947 More info about why query was not found in error message.


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

Branch: refs/heads/ignite-1.5.1
Commit: e6f6f407ef4f0c3555fd80fe5ba328739d94e3f0
Parents: baab3d2
Author: Alexey Kuznetsov 
Authored: Fri Dec 4 15:14:49 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Dec 4 15:14:49 2015 +0700

--
 .../processors/rest/handlers/query/QueryCommandHandler.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e6f6f407/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
index bb929a4..0c44077 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
@@ -443,14 +443,16 @@ public class QueryCommandHandler extends 
GridRestCommandHandlerAdapter {
 
 if (qryCurIt == null)
 return new GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Failed to find query with ID: " + req.queryId());
+"Failed to find query with ID: " + req.queryId() + ". 
" +
+"Possible reasons: wrong query ID, no more data to 
fetch from query, query was closed by timeout" +
+" or node where query was executed is not found.");
 
 qryCurIt.lock();
 
 try {
 if (qryCurIt.timestamp() == -1)
 return new 
GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Query is closed by timeout. Restart query with 
ID: " + req.queryId());
+"Query with ID: " + req.queryId() + " was closed 
by timeout");
 
 qryCurIt.timestamp(U.currentTimeMillis());
 

[31/50] [abbrv] ignite git commit: 1.5.0-b2-SNAPSHOT

[sboikov]

1.5.0-b2-SNAPSHOT


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

Branch: refs/heads/ignite-1.5.1
Commit: 3b26859bd64b7ddbc9d0b8094663887784b4f2cf
Parents: c077522
Author: Ignite Teamcity 
Authored: Tue Dec 8 11:32:26 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 8 11:32:26 2015 +0300

--
 examples/pom.xml   | 2 +-
 examples/schema-import/pom.xml | 2 +-
 modules/aop/pom.xml| 2 +-
 modules/apache-license-gen/pom.xml | 2 +-
 modules/aws/pom.xml| 2 +-
 modules/camel/pom.xml  | 2 +-
 modules/clients/pom.xml| 2 +-
 modules/cloud/pom.xml  | 2 +-
 modules/codegen/pom.xml| 2 +-
 modules/core/pom.xml   | 2 +-
 modules/core/src/main/resources/ignite.properties  | 2 +-
 modules/extdata/p2p/pom.xml| 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
 modules/extdata/uri/pom.xml| 2 +-
 modules/flume/pom.xml  | 2 +-
 modules/gce/pom.xml| 2 +-
 modules/geospatial/pom.xml | 2 +-
 modules/hadoop/pom.xml | 2 +-
 modules/hibernate/pom.xml  | 2 +-
 modules/indexing/pom.xml   | 2 +-
 modules/jcl/pom.xml| 2 +-
 modules/jms11/pom.xml  | 2 +-
 modules/jta/pom.xml| 2 +-
 modules/kafka/pom.xml  | 2 +-
 modules/log4j/pom.xml  | 2 +-
 modules/log4j2/pom.xml | 2 +-
 modules/mesos/pom.xml  | 2 +-
 modules/mqtt/pom.xml   | 2 +-
 modules/osgi-karaf/pom.xml | 5 ++---
 modules/osgi-paxlogging/pom.xml| 6 ++
 modules/osgi/pom.xml   | 5 ++---
 modules/platforms/cpp/common/configure.ac  | 2 +-
 modules/platforms/cpp/core-test/configure.ac   | 2 +-
 modules/platforms/cpp/core/configure.ac| 2 +-
 modules/platforms/cpp/examples/configure.ac| 2 +-
 modules/platforms/cpp/ignite/configure.ac  | 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
 .../Properties/AssemblyInfo.cs | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs   | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs   | 4 ++--
 modules/rest-http/pom.xml  | 2 +-
 modules/scalar-2.10/pom.xml| 2 +-
 modules/scalar/pom.xml | 2 +-
 modules/schedule/pom.xml   | 2 +-
 modules/schema-import/pom.xml  | 2 +-
 modules/slf4j/pom.xml  | 2 +-
 modules/spark-2.10/pom.xml | 2 +-
 modules/spark/pom.xml  | 2 +-
 modules/spring/pom.xml | 2 +-
 modules/ssh/pom.xml| 2 +-
 modules/tools/pom.xml  | 2 +-
 modules/twitter/pom.xml| 2 +-
 modules/urideploy/pom.xml  | 2 +-
 modules/visor-console-2.10/pom.xml | 2 +-
 modules/visor-console/pom.xml  | 2 +-
 modules/visor-plugins/pom.xml  | 2 +-
 modules/web/pom.xml| 2 +-
 modules/yardstick/pom.xml  | 2 +-
 modules/yarn/pom.xml

[20/50] [abbrv] ignite git commit: IGNITE-2041 Fixed JDBC cache store example. Reworked from deprecated code to new API and refactored code, made it more simple. Fixed bug in store in case of cache co

[sboikov]

 IGNITE-2041 Fixed JDBC cache store example.
 Reworked from deprecated code to new API and refactored code, made it more 
simple.
 Fixed bug in store in case of cache configured keepBinaryInStore(true).
 Added one more auto cache store example: CacheBinaryAutoStoreExample.


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

Branch: refs/heads/ignite-1.5.1
Commit: 92ef7c7ce8229130762b64082cc9455579a05247
Parents: 6a109eb
Author: Alexey Kuznetsov 
Authored: Fri Dec 4 17:57:57 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Dec 4 17:57:57 2015 +0700

--
 examples/config/example-default.xml |   7 +
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 +++
 .../datagrid/store/auto/package-info.java   |  22 +++
 .../store/auto/CacheAutoStoreExample.java   |  93 +--
 .../auto/CacheAutoStoreLoadDataExample.java |  85 --
 .../datagrid/store/auto/CacheConfig.java|  81 --
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 --
 .../ignite/examples/util/DbH2ServerStartup.java |  79 ++
 .../ignite/examples/util/package-info.java  |  22 +++
 .../store/jdbc/CacheAbstractJdbcStore.java  |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 ++
 11 files changed, 390 insertions(+), 257 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/examples/config/example-default.xml
--
diff --git a/examples/config/example-default.xml 
b/examples/config/example-default.xml
index e6c359d..6bd6f16 100644
--- a/examples/config/example-default.xml
+++ b/examples/config/example-default.xml
@@ -28,6 +28,13 @@
 http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util
 http://www.springframework.org/schema/util/spring-util.xsd";>
+
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
new file mode 100644
index 000..9df9f79
--- /dev/null
+++ 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
@@ -0,0 +1,158 @@
+/*
+ * 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.examples.binary.datagrid.store.auto;
+
+import java.sql.Types;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
+import org.apache.ignite.cache.store.jdbc.JdbcType;
+import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
+import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
+import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ * Demonstrates usage of cache with underlying persistent store configured.
+ * 
+ * This example uses {@link CacheJdbcPojoStore} as a persistent store.
+ * 
+ * To start the example, you should:
+ * 
+ * Start H2 database TCP server using {@link DbH2S

[17/50] [abbrv] ignite git commit: Fixed IgniteTransactionalWriteInvokeBenchmark

[sboikov]

Fixed IgniteTransactionalWriteInvokeBenchmark


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

Branch: refs/heads/ignite-1.5.1
Commit: e5de23e9b61acc435ead4e70be9970a307906dbb
Parents: 11d668b
Author: ashutak 
Authored: Fri Dec 4 12:11:15 2015 +0300
Committer: ashutak 
Committed: Fri Dec 4 12:11:15 2015 +0300

--
 .../IgniteTransactionalWriteInvokeBenchmark.java| 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5de23e9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 9f9b5f7..35befad 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -68,17 +68,15 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 
 long start = System.nanoTime();
 
-if (cfg.memberId() == 0) {
-try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
 
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
 
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
-}
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
 }
 }
 

[39/50] [abbrv] ignite git commit: Fixed race in IgniteTransactionalWriteInvokeBenchmark test.

[sboikov]

Fixed race in IgniteTransactionalWriteInvokeBenchmark test.


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

Branch: refs/heads/ignite-1.5.1
Commit: 3a340034056f5da0ca00ed88e128b59cc28381d2
Parents: efe632b
Author: ashutak 
Authored: Tue Dec 8 16:02:36 2015 +0300
Committer: ashutak 
Committed: Tue Dec 8 16:02:36 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/config/benchmark-failover.properties
--
diff --git a/modules/yardstick/config/benchmark-failover.properties 
b/modules/yardstick/config/benchmark-failover.properties
index 7ed464c..352e2d4 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -60,7 +60,7 @@ RESTART_SERVERS=true
 SERVER_HOSTS=localhost,localhost
 
 # Comma-separated list of the hosts to run BenchmarkDrivers on.
-DRIVER_HOSTS=localhost
+DRIVER_HOSTS=localhost,localhost
 
 # Remote username.
 # REMOTE_USER=

http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 35befad..67044a1 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -25,9 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 import javax.cache.processor.EntryProcessorException;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cache.affinity.Affinity;
@@ -58,29 +60,49 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 /** */
 private static final Long INITIAL_VALUE = 1L;
 
+/** */
+public static final int TIMEOUT_SEC = 20 * 60;
+
 /** {@inheritDoc} */
 @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
 super.setUp(cfg);
 
 assert args.keysCount() > 0 : "Count of keys: " + args.keysCount();
 
-println(cfg, "Populating data...");
+IgniteCountDownLatch latch = 
ignite().countDownLatch("DATA-POPULATED-LATCH-" + cacheName(), 1, true, true);
+
+if (cfg.memberId() == 0) {
+println(cfg, "Populating data for cache: " + cacheName());
 
-long start = System.nanoTime();
+long start = System.nanoTime();
 
-try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
 
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
 
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
+}
 }
+
+println(cfg, "Finished populating data in " + ((System.nanoTime() 
- start) / 1_000_000)
++ " ms. for cache: " + cacheName());
+
+latch.countDown();
 }
+else {
+println(cfg, "Waiting for populating data in cache b

[33/50] [abbrv] ignite git commit: ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException

[sboikov]

ignite-1692 Changed test initialization logic to remove race confition that 
caused ClusterTopologyServerNotFoundException


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

Branch: refs/heads/ignite-1.5.1
Commit: 5cd0039a535b4c2ea7434d4b085c9e18f28c930d
Parents: d579183
Author: sboikov 
Authored: Tue Dec 8 13:12:24 2015 +0300
Committer: sboikov 
Committed: Tue Dec 8 13:12:24 2015 +0300

--
 .../DataStreamProcessorSelfTest.java| 25 
 1 file changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5cd0039a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 65dd690..9fedc35 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -206,14 +206,17 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 @SuppressWarnings("ErrorNotRethrown")
 private void checkDataStreamer() throws Exception {
 try {
-Ignite g1 = startGrid(1);
-
 useCache = true;
 
-Ignite g2 = startGrid(2);
+Ignite igniteWithCache = startGrid(2);
+
 startGrid(3);
 
-final IgniteDataStreamer ldr = 
g1.dataStreamer(null);
+useCache = false;
+
+Ignite igniteWithoutCache = startGrid(1);
+
+final IgniteDataStreamer ldr = 
igniteWithoutCache.dataStreamer(null);
 
 ldr.receiver(DataStreamerCacheUpdaters.batchedSorted());
 
@@ -255,7 +258,7 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 
 assertEquals(total, s2 + s3);
 
-final IgniteDataStreamer rmvLdr = 
g2.dataStreamer(null);
+final IgniteDataStreamer rmvLdr = 
igniteWithCache.dataStreamer(null);
 
 rmvLdr.receiver(DataStreamerCacheUpdaters.batchedSorted());
 
@@ -443,15 +446,17 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 // Start all required nodes.
 int idx = 1;
 
-for (int i = 0; i < nodesCntNoCache; i++)
-startGrid(idx++);
-
 useCache = true;
 
 for (int i = 0; i < nodesCntCache; i++)
 startGrid(idx++);
 
-Ignite g1 = grid(1);
+useCache = false;
+
+for (int i = 0; i < nodesCntNoCache; i++)
+startGrid(idx++);
+
+Ignite g1 = grid(idx - 1);
 
 // Get and configure loader.
 final IgniteDataStreamer ldr = 
g1.dataStreamer(null);
@@ -1019,4 +1024,4 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 }
 }
 }
-}
\ No newline at end of file
+}

[16/50] [abbrv] ignite git commit: IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.

[sboikov]

IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.

Signed-off-by: Andrey 


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

Branch: refs/heads/ignite-1.5.1
Commit: 11d668b2f77b12e7dc9bbc8ebdbfeb5e2ddad716
Parents: e6f6f40
Author: Andrey 
Authored: Fri Dec 4 15:52:14 2015 +0700
Committer: Andrey 
Committed: Fri Dec 4 15:52:14 2015 +0700

--
 .../org/apache/ignite/schema/ui/SchemaImportApp.java  | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/11d668b2/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
--
diff --git 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 495c316..6f9e05b 100644
--- 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++ 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.Connection;
@@ -1738,6 +1739,19 @@ public class SchemaImportApp extends Application {
 catch (Exception ignore) {
 // No-op.
 }
+
+// Workaround for JDK 7/JavaFX 2 application on Mac OSX El Capitan.
+try {
+Class fontFinderCls = 
Class.forName("com.sun.t2k.MacFontFinder");
+
+Field psNameToPathMap = 
fontFinderCls.getDeclaredField("psNameToPathMap");
+
+psNameToPathMap.setAccessible(true);
+psNameToPathMap.set(null, new HashMap());
+}
+catch (Exception ignore) {
+// No-op.
+}
 }
 
 launch(args);

[23/50] [abbrv] ignite git commit: Printing "Failed to register marshalled class" warning in the versbose mode only

[sboikov]

Printing "Failed to register marshalled class" warning in the versbose mode only


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

Branch: refs/heads/ignite-1.5.1
Commit: 8033bc46df9087971e72187ff75557749cee3f7b
Parents: 3d585d5
Author: Denis Magda 
Authored: Sun Dec 6 11:38:17 2015 +0300
Committer: Denis Magda 
Committed: Sun Dec 6 11:38:17 2015 +0300

--
 .../org/apache/ignite/internal/MarshallerContextImpl.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8033bc46/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 5c9b54f..276cdc3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -123,10 +123,9 @@ public class MarshallerContextImpl extends 
MarshallerContextAdapter {
 }
 catch (CachePartialUpdateCheckedException | 
GridCacheTryPutFailedException e) {
 if (++failedCnt > 10) {
-String msg = "Failed to register marshalled class for more 
than 10 times in a row " +
-"(may affect performance).";
-
-U.quietAndWarn(log, msg, msg);
+if (log.isQuiet())
+U.quiet(false, "Failed to register marshalled class for 
more than 10 times in a row " +
+"(may affect performance).");
 
 failedCnt = 0;
 }

[48/50] [abbrv] ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis

[sboikov]

ignite-2030  Fixed issue with JAVA_HOME containing parenthesis


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

Branch: refs/heads/ignite-1.5.1
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov 
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 09:27:23 2015 +0300

--
 bin/ignite.bat| 5 +++--
 bin/include/parseargs.bat | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 43cc58b..97c2e45 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -20,6 +20,7 @@
 ::
 
 @echo off
+Setlocal EnableDelayedExpansion
 
 if "%OS%" == "Windows_NT"  setlocal
 
@@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 (
 :: Process 'restart'.
 ::
 set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
-for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set 
RANDOM_NUMBER=%%i
+for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set 
RANDOM_NUMBER=%%i
 
 set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
 set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
@@ -132,7 +133,7 @@ set 
RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
 :: This is executed if -nojmx is not specified
 ::
 if not "%NO_JMX%" == "1" (
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
 set JMX_PORT=%%A
 )
 )

http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat
--
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index c4b35d2..86e5766 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -40,7 +40,7 @@
 :: in other scripts to parse common command lines parameters.
 
 set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineTransformer %*
-for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set 
reformattedArgs=%%i
+for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set 
reformattedArgs=%%i
 
 for %%i in (%reformattedArgs%) do (
 if "%%i" == "CommandLineTransformerError" exit /b 1

[37/50] [abbrv] ignite git commit: IGNITE-2064 More test fixes

[sboikov]

IGNITE-2064 More test fixes


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

Branch: refs/heads/ignite-1.5.1
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov 
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 15:46:10 2015 +0300

--
 .../GridCacheConditionalDeploymentSelfTest.java | 20 
 .../cache/GridCacheDeploymentSelfTest.java  | 11 ---
 2 files changed, 20 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.CO;
 import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest 
extends GridCommonAbstractTe
 public void testAddedDeploymentInfo2() throws Exception {
 GridCacheContext ctx = cacheContext();
 
-assertTrue(ctx.deploymentEnabled());
+if (grid(0).configuration().getMarshaller() instanceof 
BinaryMarshaller)
+assertFalse(ctx.deploymentEnabled());
+else {
+assertTrue(ctx.deploymentEnabled());
 
-GridCacheIoManager ioMgr = cacheIoManager();
+GridCacheIoManager ioMgr = cacheIoManager();
 
-TestMessage msg = new TestMessage();
+TestMessage msg = new TestMessage();
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
 
-msg.addDepInfo = false;
+msg.addDepInfo = false;
 
-IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
+IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
+}
 }
 
 protected GridCacheContext cacheContext() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 }
 
 assertEquals(0, g1.cache(null).localSize());
-assertEquals(0, g2.cache(null).localSize());
+
+assertEquals(g2.configuration().getMarshaller() instanceof 
BinaryM

[03/50] [abbrv] ignite git commit: ignite-1027 Fixed early rebalance sync future completion.

[sboikov]

ignite-1027 Fixed early rebalance sync future completion.


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

Branch: refs/heads/ignite-1.5.1
Commit: ad9e4db5b87b064d13db4f9251c25efd535fb9e8
Parents: 9b60c75
Author: sboikov 
Authored: Thu Dec 3 10:45:30 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:45:30 2015 +0300

--
 .../GridCachePartitionExchangeManager.java  | 17 ++--
 .../processors/cache/GridCachePreloader.java| 11 ++-
 .../dht/preloader/GridDhtPartitionDemander.java | 41 
 .../dht/preloader/GridDhtPreloader.java |  4 +-
 .../preloader/GridDhtPreloaderAssignments.java  | 19 +++-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 +---
 ...cingDelayedPartitionMapExchangeSelfTest.java |  9 +-
 .../GridCacheRebalancingAsyncSelfTest.java  |  3 +-
 .../GridCacheRebalancingSyncCheckDataTest.java  | 98 
 .../GridCacheRebalancingSyncSelfTest.java   | 55 +--
 ...eRebalancingUnmarshallingFailedSelfTest.java |  6 +-
 .../testsuites/IgniteCacheTestSuite3.java   |  2 +
 12 files changed, 223 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ad9e4db5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index b13a5af..a0f7f93 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1399,8 +1399,10 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
waitList.add(cctx.cacheContext(cId).name());
 }
 
-Callable r = 
cacheCtx.preloader().addAssignments(
-assignsMap.get(cacheId), forcePreload, 
waitList, cnt);
+Callable r = 
cacheCtx.preloader().addAssignments(assignsMap.get(cacheId),
+forcePreload,
+waitList,
+cnt);
 
 if (r != null) {
 U.log(log, "Cache rebalancing scheduled: 
[cache=" + cacheCtx.name() +
@@ -1425,7 +1427,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 "[top=" + exchFut.topologyVersion() + ", 
evt=" + exchFut.discoveryEvent().name() +
 ", node=" + 
exchFut.discoveryEvent().eventNode().id() + ']');
 
-if (marshR != null)
+if (marshR != null) {
 try {
 marshR.call(); //Marshaller cache 
rebalancing launches in sync way.
 }
@@ -1435,6 +1437,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
 continue;
 }
+}
 
 final GridFutureAdapter fut = new 
GridFutureAdapter();
 
@@ -1463,17 +1466,19 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 fut.onDone();
 }
 }
-}, /*system pool*/ true);
+}, /*system pool*/true);
 }
-else
+else {
 U.log(log, "Skipping rebalancing (obsolete 
exchange ID) " +
 "[top=" + exchFut.topologyVersion() + ", 
evt=" + exchFut.discoveryEvent().name() +
 ", node=" + 
exchFut.discoveryEvent().eventNode().id() + ']');
+}
 }
-else
+else {
 U.log(log, "Skipping rebalancing (nothing 
scheduled) " +
 "[top=" + exchFut.topologyVer

[47/50] [abbrv] ignite git commit: Fix OSGi test.

[sboikov]

Fix OSGi test.

(@ProbeBuilder applies to all test classes when run from a suite).


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

Branch: refs/heads/ignite-1.5.1
Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9
Parents: 3baf4d1
Author: Raul Kripalani 
Authored: Tue Dec 8 21:04:36 2015 +0100
Committer: Raul Kripalani 
Committed: Tue Dec 8 21:04:36 2015 +0100

--
 .../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
--
diff --git 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 9a2e92d..4f875ed 100644
--- 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++ 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends 
AbstractIgniteKarafTest {
  */
 @ProbeBuilder
 public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
-probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators");
+probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators;resolution:=\"optional\"");
 
 return probe;
 }

[44/50] [abbrv] ignite git commit: 2064 Issue url fix

[sboikov]

2064 Issue url fix


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

Branch: refs/heads/ignite-1.5.1
Commit: c30def8f049bddb4ec272528326f84bf90a1399b
Parents: 0e81a39
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:48:58 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 16:48:58 2015 +0300

--
 .../internal/processors/cache/GridCacheDeploymentSelfTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c30def8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index aa64959..bfa353b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -228,7 +228,7 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 Ignite g1 = startGrid(1);
 
 if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
-fail("http://atlassian.gridgain.com/jira/browse/GG-10791";);
+fail("https://issues.apache.org/jira/browse/IGNITE-2106";);
 
 Ignite g2 = startGrid(2);
 

[02/50] [abbrv] 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/9b60c75c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b60c75c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b60c75c

Branch: refs/heads/ignite-1.5.1
Commit: 9b60c75c62d2e352a4a65b7c5a0b17bc79499ba8
Parents: f770954 ae40e2d
Author: sboikov 
Authored: Thu Dec 3 10:42:50 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:42:50 2015 +0300

--
 .../org/apache/ignite/configuration/IgniteConfiguration.java| 4 ++--
 .../cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java  | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)
--

[28/50] [abbrv] ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache

[sboikov]

IGNITE-2083 EntryProcessor is called twice on primary node in transactional 
cache


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

Branch: refs/heads/ignite-1.5.1
Commit: 9a14d6432932fc1a1fdf2ddd77dea920382efe8c
Parents: c10b112
Author: sboikov 
Authored: Mon Dec 7 15:05:09 2015 +0300
Committer: sboikov 
Committed: Mon Dec 7 15:05:09 2015 +0300

--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  51 +-
 .../cache/transactions/IgniteTxAdapter.java |   5 +
 .../cache/transactions/IgniteTxEntry.java   |   8 +-
 .../IgniteCacheEntryProcessorCallTest.java  | 497 +++
 ...idCachePartitionedHitsAndMissesSelfTest.java |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   7 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 7 files changed, 558 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/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 9f1f8a1..3829e28 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
@@ -337,6 +337,13 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture, 
Object[]> t : txEntry.entryProcessors()) {
-try {
-CacheInvokeEntry 
invokeEntry = new CacheInvokeEntry<>(
-txEntry.context(), key, val, 
txEntry.cached().version(), txEntry.keepBinary());
+ CacheInvokeEntry invokeEntry 
= new CacheInvokeEntry<>(
+ txEntry.context(), key, val, 
txEntry.cached().version(), txEntry.keepBinary());
 
+ try {
 EntryProcessor 
processor = t.get1();
 
 procRes = processor.process(invokeEntry, 
t.get2());
@@ -380,9 +389,27 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture(op, 
op == NOOP ? null : val));
 
 if (retVal) {
 if (err != null || procRes != null)
@@ -1301,10 +1328,12 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture procVal = 
entry.entryProcessorCalculatedValue();
+
+assert procVal != null : entry;
 
-entry.op(procVal == null ? DELETE : UPDATE);
-entry.value(procVal, true, false);
+entry.op(procVal.get1());
+entry.value(procVal.get2(), true, false);
 entry.entryProcessors(null);
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 3065ac2..53f4f56 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1233,6 +1233,11 @@ public abstract class IgniteTxAdapter extends 
GridMetadataAwareAdapter
 if (F.isEmpty(txEntry.entryProcessors()))
 return F.t(txEntry.op(), txEntry.value());
 else {
+T2 calcVal = 
txEntry.entryProcessorCalculatedValue();
+
+if (calcVal != null)
+return calcVal;
+
 boolean recordEvt = 
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ);
 
 CacheObject cacheVal = txEntry.hasValue() ? txEntry.value() :

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
-

[32/50] [abbrv] ignite git commit: ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from reconnect callback)

[sboikov]

ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from 
reconnect callback)


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

Branch: refs/heads/ignite-1.5.1
Commit: d5791837890a70e1777b86aab281245701afe1eb
Parents: 3b26859
Author: sboikov 
Authored: Tue Dec 8 12:42:25 2015 +0300
Committer: sboikov 
Committed: Tue Dec 8 12:42:25 2015 +0300

--
 .../apache/ignite/internal/GridComponent.java   |  3 +-
 .../ignite/internal/GridPluginComponent.java|  4 +-
 .../apache/ignite/internal/IgniteKernal.java| 18 +++-
 .../internal/managers/GridManagerAdapter.java   |  5 +-
 .../deployment/GridDeploymentManager.java   |  5 +-
 .../processors/GridProcessorAdapter.java|  5 +-
 .../processors/cache/GridCacheContext.java  |  6 +-
 .../processors/cache/GridCacheProcessor.java| 26 +-
 .../datastructures/DataStructuresProcessor.java |  4 +-
 .../IgniteClientReconnectAbstractTest.java  | 95 +---
 .../IgniteClientReconnectAtomicsTest.java   | 57 
 .../IgniteClientReconnectCacheTest.java |  5 +-
 .../IgniteClientReconnectCollectionsTest.java   | 51 +++
 13 files changed, 254 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java 
b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 6078c5d..0e234cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -131,6 +131,7 @@ public interface GridComponent {
  *
  * @param clusterRestarted Cluster restarted flag.
  * @throws IgniteCheckedException If failed.
+ * @return Future to wait before completing reconnect future.
  */
-public void onReconnected(boolean clusterRestarted) throws 
IgniteCheckedException;
+@Nullable public IgniteInternalFuture onReconnected(boolean 
clusterRestarted) throws IgniteCheckedException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index ac2a3a7..89dc243 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -70,8 +70,8 @@ public class GridPluginComponent implements GridComponent {
 }
 
 /** {@inheritDoc} */
-@Override public void onReconnected(boolean clusterRestarted) {
-// No-op.
+@Override public IgniteInternalFuture onReconnected(boolean 
clusterRestarted) {
+return null;
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/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 87ccf93..ab62c13 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
@@ -136,6 +136,7 @@ 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.util.GridTimerTask;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.future.IgniteFutureImpl;
@@ -3083,16 +3084,27 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 /**
  * @param clusterRestarted {@code True} if all cluster nodes restarted 
while client was disconnected.
  */
+@SuppressWarnings("unchecked")
 public void onReconnected(final boolean clusterRestarted) {
 Throwable err =

[04/50] [abbrv] ignite git commit: IGNITE-2074 Platforms C++ files have 1.5.0-EA version

[sboikov]

IGNITE-2074 Platforms C++ files have 1.5.0-EA version

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

Branch: refs/heads/ignite-1.5.1
Commit: 86ec37e5e7bb6302ebff35fecb5576206adc1e1a
Parents: ad9e4db
Author: Pavel Tupitsyn 
Authored: Thu Dec 3 12:45:29 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 14:48:00 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/86ec37e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 109dc94..5f86648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -774,20 +774,37 @@
 
 

[09/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a7ae644..4fd7156 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,15 +35,87 @@
 
 
 fabric
-2.4.1
-1.5.2
-4.1.0.RELEASE
+
+
 UTF-8
  d 

 doxygen
 git
-9.2.11.v20150529
+2.5.4
 -XDenableSunApiLintControl
+
+
+5.12.0
+1.0_6
+4.2
+1.7.2_1
+1.7.2
+1.10.12_1
+1.10.29
+2.16.0
+
1.8.3_1
+1.8.3
+1.6
+3.2.1
+2.6
+2.2.5
+2.9.1
+1.0.6_1
+1.0.6
+1.6.0
+2.0.0
+18.0
+14.0.1
+16.0.1
+1.3.175
+2.4.1
+4.5.1
+4.4.3
+1.9.13
+1.0.0_1
+1.0.0
+9.2.11.v20150529
+1.1.1
+0.1.53_1
+0.1.53
+2.4_1
+2.4
+r938
+0.8.2.1_1
+0.8.2.0_1
+0.8.2.0
+0.8.2.1
+0.8.2.1
+4.0.2
+3.5.0_1
+3.5.0
+2.0.8_6
+5.0.0
+5.0.0
+1.0.2
+2.10.4
+2.10.4
+2.11.7
+1.7.7
+1.6.4
+1.5.2
+4.1.0.RELEASE
+
4.1.7.RELEASE_1
+8.0.23
+2.2.0
+
2.2.0
+2.2.0
+0.5
+3.4.6
+
+
+*
+{local-packages}
+
+
+false
+false
+
 
 
 org.apache.ignite
@@ -182,6 +254,15 @@
 
 
 
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+true
+
+
+
 
 org.apache.maven.plugins
 maven-javadoc-plugin
@@ -402,6 +483,52 @@
 
 
 
+
+
+org.apache.felix
+maven-bundle-plugin
+${maven.bundle.plugin.version}
+true
+
+
+true
+
+
+jar
+war
+
+
+
${project.groupId}.${project.artifactId}
+${project.version}
+
${project.organization.name}
+
${project.description}
+${project.url}
+
+${osgi.import.package}
+
+
+${osgi.export.package}
+
+
+${osgi.private.package}
+
+
${osgi.embed.dependency}
+lib
+
${osgi.embed.transitive}
+<_failok>${osgi.fail.ok}
+<_invalidfilenames />
+
+
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+
 
 
 
@@ -625,6 +752,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5f86648..993eab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,9 @@
 modules/mqtt
 modules/zookeeper
 modules/camel
+modules/osgi-paxlogging
+modules/osgi-karaf
+modules/osgi
 
 
 

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

[sboikov]

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

Conflicts:
benchmarks/cache-comparison/pom.xml
benchmarks/filesystem/hadoop1/pom.xml
benchmarks/filesystem/hadoop2/pom.xml
benchmarks/mongo/pom.xml
benchmarks/risk-analytics/pom.xml
benchmarks/serialization/pom.xml

benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs
examples/pom.xml
modules/clients/pom.xml
modules/codegen/pom.xml
modules/compatibility/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/gridgain.properties
modules/diagnostic/pom.xml
modules/dr-demo/pom.xml
modules/license-gen/pom.xml
modules/mongo-sniffer/pom.xml
modules/mongo-visor/pom.xml
modules/mongo/pom.xml
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac

modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs
modules/tools/pom.xml
modules/visor-console/pom.xml
modules/visor-demo/pom.xml
modules/visor-tester-plugin/pom.xml
modules/visor-tester/pom.xml
modules/visor/pom.xml
modules/yardstick/dotnet/Properties/AssemblyInfo.cs
modules/yardstick/pom.xml
parent/pom.xml
pilots/chronotrack/pom.xml
pilots/ctb/pom.xml
pilots/dsi/pom.xml
pilots/ionic/pom.xml
pilots/sb/pom.xml
pilots/sony/pom.xml
pilots/wellsfargo/pom.xml
pilots/worldpay/pom.xml
pom.xml

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

Conflicts:
examples/pom.xml
examples/schema-import/pom.xml
modules/aop/pom.xml
modules/apache-license-gen/pom.xml
modules/aws/pom.xml
modules/camel/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml

modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
modules/core/src/main/resources/ignite.properties
modules/extdata/p2p/pom.xml
modules/extdata/uri/modules/uri-dependency/pom.xml
modules/extdata/uri/pom.xml
modules/flume/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jms11/pom.xml
modules/jta/pom.xml
modules/kafka/pom.xml
modules/log4j/pom.xml
modules/log4j2/pom.xml
modules/mesos/pom.xml
modules/mqtt/pom.xml
modules/platforms/cpp/common/configure.ac
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac
modules/platforms/cpp/ignite/configure.ac

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
modules/rest-http/pom.xml
modules/scalar-2.10/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spark-2.10/pom.xml
modules/spark/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/twitter/pom.xml
modules/urideploy/pom.xml
modules/visor-console-2.10/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
modules/yarn/pom.xml
modules/zookeeper/pom.xml
pom.xml


Project: http://git

[10/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/modules/osgi/licenses/apache-2.0.txt
--
diff --git a/modules/osgi/licenses/apache-2.0.txt 
b/modules/osgi/licenses/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/osgi/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 and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) wa

[43/50] [abbrv] 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/0e81a397
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e81a397
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e81a397

Branch: refs/heads/ignite-1.5.1
Commit: 0e81a3973cccfe6d912e073cd9f44db5a5c46d79
Parents: 568f910 3a34003
Author: vozerov-gridgain 
Authored: Tue Dec 8 16:36:12 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:36:12 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--

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

Branch: refs/heads/ignite-1.5.1
Commit: c292748013acfcbf6b3752183a34bb26de16c1f4
Parents: 322a85a 5cd0039
Author: S.Vladykin 
Authored: Tue Dec 8 13:18:30 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 8 13:18:30 2015 +0300

--
 examples/pom.xml|  2 +-
 examples/schema-import/pom.xml  |  2 +-
 modules/aop/pom.xml |  2 +-
 modules/apache-license-gen/pom.xml  |  2 +-
 modules/aws/pom.xml |  2 +-
 modules/camel/pom.xml   |  2 +-
 modules/clients/pom.xml |  2 +-
 modules/cloud/pom.xml   |  2 +-
 modules/codegen/pom.xml |  2 +-
 modules/core/pom.xml|  2 +-
 .../apache/ignite/internal/GridComponent.java   |  3 +-
 .../ignite/internal/GridPluginComponent.java|  4 +-
 .../apache/ignite/internal/IgniteKernal.java| 18 +++-
 .../internal/managers/GridManagerAdapter.java   |  5 +-
 .../deployment/GridDeploymentManager.java   |  5 +-
 .../processors/GridProcessorAdapter.java|  5 +-
 .../processors/cache/GridCacheContext.java  |  6 +-
 .../processors/cache/GridCacheProcessor.java| 26 +-
 .../datastructures/DataStructuresProcessor.java |  4 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../IgniteClientReconnectAbstractTest.java  | 95 +---
 .../IgniteClientReconnectAtomicsTest.java   | 57 
 .../IgniteClientReconnectCacheTest.java |  5 +-
 .../IgniteClientReconnectCollectionsTest.java   | 51 +++
 .../DataStreamProcessorSelfTest.java| 25 +++---
 modules/extdata/p2p/pom.xml |  2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |  2 +-
 modules/extdata/uri/pom.xml |  2 +-
 modules/flume/pom.xml   |  2 +-
 modules/gce/pom.xml |  2 +-
 modules/geospatial/pom.xml  |  2 +-
 modules/hadoop/pom.xml  |  2 +-
 modules/hibernate/pom.xml   |  2 +-
 modules/indexing/pom.xml|  2 +-
 modules/jcl/pom.xml |  2 +-
 modules/jms11/pom.xml   |  2 +-
 modules/jta/pom.xml |  2 +-
 modules/kafka/pom.xml   |  2 +-
 modules/log4j/pom.xml   |  2 +-
 modules/log4j2/pom.xml  |  2 +-
 modules/mesos/pom.xml   |  2 +-
 modules/mqtt/pom.xml|  2 +-
 modules/osgi-karaf/pom.xml  |  5 +-
 modules/osgi-paxlogging/pom.xml |  6 +-
 modules/osgi/pom.xml|  5 +-
 modules/platforms/cpp/common/configure.ac   |  2 +-
 modules/platforms/cpp/core-test/configure.ac|  2 +-
 modules/platforms/cpp/core/configure.ac |  2 +-
 modules/platforms/cpp/examples/configure.ac |  2 +-
 modules/platforms/cpp/ignite/configure.ac   |  2 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 modules/rest-http/pom.xml   |  2 +-
 modules/scalar-2.10/pom.xml |  2 +-
 modules/scalar/pom.xml  |  2 +-
 modules/schedule/pom.xml|  2 +-
 modules/schema-import/pom.xml   |  2 +-
 modules/slf4j/pom.xml   |  2 +-
 modules/spark-2.10/pom.xml  |  2 +-
 modules/spark/pom.xml   |  2 +-
 modules/spring/pom.xml  |  2 +-
 modules/ssh/pom.xml |  2 +-
 modules/tools/pom.xml   |  2 +-
 modules/twitter/pom.xml |  2 +-
 modules/urideploy/pom.xml   |  2 +-
 modules/visor-console-2.10/pom.xml  |  2 +-
 modules/visor-console/pom.xml   |  2 +-
 modules/visor-plugins/pom.xml   |  2 +-
 modules/web/pom.xml |  2 +-
 modules/yardstick/pom.xml   |  2 +-
 modules/yarn/pom.xml

[14/50] [abbrv] ignite git commit: ignite-2008 Call removeExplicitNodeLocks before waiting for partitionReleaseFuture.

[sboikov]

ignite-2008 Call removeExplicitNodeLocks before waiting for 
partitionReleaseFuture.


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

Branch: refs/heads/ignite-1.5.1
Commit: baab3d2b6e047f32f33f1174474683096f2eb373
Parents: 171e9b1
Author: sboikov 
Authored: Fri Dec 4 09:04:00 2015 +0300
Committer: sboikov 
Committed: Fri Dec 4 09:04:00 2015 +0300

--
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java  | 9 -
 .../distributed/dht/GridCacheTxNodeFailureSelfTest.java | 2 ++
 .../distributed/dht/GridNearCacheTxNodeFailureSelfTest.java | 4 
 .../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 2 ++
 4 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index f7e6acc..31bfa79 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -754,6 +754,9 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapter locksFut = 
cctx.mvcc().finishLocks(exchId.topologyVersion());
 
 dumpedObjects = 0;
@@ -1015,9 +1015,8 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index fe0b84e..78e7672 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -295,6 +295,8 @@ public class GridCacheTxNodeFailureSelfTest extends 
GridCommonAbstractTest {
 // Check that thread successfully finished.
 fut.get();
 
+awaitPartitionMapExchange();
+
 // Check there are no hanging transactions.
 assertEquals(0, 
((IgniteEx)ignite(0)).context().cache().context().tm().idMapSize());
 assertEquals(0, 
((IgniteEx)ignite(2)).context().cache().context().tm().idMapSize());

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
--
diff --git 
a/modules/core/s

[42/50] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[sboikov]

IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.


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

Branch: refs/heads/ignite-1.5.1
Commit: 568f910f11472e6ab533c3f1cef6f197456e006f
Parents: efe632b
Author: Pavel Tupitsyn 
Authored: Tue Dec 8 16:35:51 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:35:51 2015 +0300

--
 .../Apache.Ignite.Core.csproj   |   1 +
 .../Apache.Ignite.Core/Impl/NativeMethods.cs|  10 -
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 358 +
 .../Impl/Unmanaged/UnmanagedUtils.cs| 788 +++
 modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++-
 5 files changed, 798 insertions(+), 681 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 2c7d787..831130c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -297,6 +297,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
 [DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
 ThrowOnUnmappableChar = true)]
 internal static extern IntPtr LoadLibrary(string path);
-
-/// 
-/// Get procedure address with WinAPI.
-/// 
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
new file mode 100644
index 000..860e703
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -0,0 +1,358 @@
+/*
+ * 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.Unmanaged
+{
+using System.Runtime.InteropServices;
+using System.Security;
+
+/// 
+/// Ignite JNI native methods.
+/// 
+[SuppressUnmanagedCodeSecurity]
+internal unsafe static class IgniteJniNativeMethods
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteReallocate")]
+public static extern int Reallocate(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath, 
sbyte* gridName, int factoryId, 
+long dataPtr);
+
+[DllImport(IgniteUtils.File

ignite git commit: 1.5.1-b2-SNAPSHOT

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 ebb4aa63b -> e450fbbd4


1.5.1-b2-SNAPSHOT


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

Branch: refs/heads/ignite-1.5.1
Commit: e450fbbd40137c3f29c13982f3ebb89b8b3888a2
Parents: ebb4aa6
Author: Ignite Teamcity 
Authored: Wed Dec 9 10:42:52 2015 +0300
Committer: Ignite Teamcity 
Committed: Wed Dec 9 10:42:52 2015 +0300

--
 examples/pom.xml | 2 +-
 examples/schema-import/pom.xml   | 2 +-
 modules/aop/pom.xml  | 2 +-
 modules/apache-license-gen/pom.xml   | 2 +-
 modules/aws/pom.xml  | 2 +-
 modules/camel/pom.xml| 2 +-
 modules/clients/pom.xml  | 2 +-
 modules/cloud/pom.xml| 2 +-
 modules/codegen/pom.xml  | 2 +-
 modules/core/pom.xml | 2 +-
 modules/core/src/main/resources/ignite.properties| 2 +-
 modules/extdata/p2p/pom.xml  | 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml   | 2 +-
 modules/extdata/uri/pom.xml  | 2 +-
 modules/flume/pom.xml| 2 +-
 modules/gce/pom.xml  | 2 +-
 modules/geospatial/pom.xml   | 2 +-
 modules/hadoop/pom.xml   | 2 +-
 modules/hibernate/pom.xml| 2 +-
 modules/indexing/pom.xml | 2 +-
 modules/jcl/pom.xml  | 2 +-
 modules/jms11/pom.xml| 2 +-
 modules/jta/pom.xml  | 2 +-
 modules/kafka/pom.xml| 2 +-
 modules/log4j/pom.xml| 2 +-
 modules/log4j2/pom.xml   | 2 +-
 modules/mesos/pom.xml| 2 +-
 modules/mqtt/pom.xml | 2 +-
 modules/osgi-karaf/pom.xml   | 2 +-
 modules/osgi-paxlogging/pom.xml  | 2 +-
 modules/osgi/pom.xml | 2 +-
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 modules/rest-http/pom.xml| 2 +-
 modules/scalar-2.10/pom.xml  | 2 +-
 modules/scalar/pom.xml   | 2 +-
 modules/schedule/pom.xml | 2 +-
 modules/schema-import/pom.xml| 2 +-
 modules/slf4j/pom.xml| 2 +-
 modules/spark-2.10/pom.xml   | 2 +-
 modules/spark/pom.xml| 2 +-
 modules/spring/pom.xml   | 2 +-
 modules/ssh/pom.xml  | 2 +-
 modules/tools/pom.xml| 2 +-
 modules/twitter/pom.xml  | 2 +-
 modules/urideploy/pom.xml| 2 +-
 modules/visor-console-2.10/pom.xml   | 2 +-
 modules/visor-console/pom.xml| 2 +-
 modules/visor-plugins/pom.xml| 2 +-
 mo

ignite git commit: IGNITE-2033 Completed base refactoring - Fixes #306.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 da50f0c6c -> 539f819c3


IGNITE-2033 Completed base refactoring - Fixes #306.

Signed-off-by: Andrey 


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

Branch: refs/heads/ignite-843-rc2
Commit: 539f819c31f240607f4486b9a84f322f185c617f
Parents: da50f0c
Author: Dmitriyff 
Authored: Wed Dec 9 14:56:03 2015 +0700
Committer: Andrey 
Committed: Wed Dec 9 14:56:03 2015 +0700

--
 .../src/main/js/app/data/os.json|   4 +
 .../app/directives/loading/loading.directive.js |  27 ++
 .../main/js/app/directives/loading/loading.jade |  18 ++
 .../ui-ace-docker/ui-ace-docker.controller.js   |  43 +++
 .../ui-ace-docker/ui-ace-docker.directive.js|  37 +++
 .../directives/ui-ace-docker/ui-ace-docker.jade |  35 +++
 .../ui-ace-java/ui-ace-java.controller.js   |  58 
 .../ui-ace-java/ui-ace-java.directive.js|  33 +++
 .../app/directives/ui-ace-java/ui-ace-java.jade |  28 ++
 .../ui-ace-pojos/ui-ace-pojos.controller.js |  89 ++
 .../ui-ace-pojos/ui-ace-pojos.directive.js  |  37 +++
 .../directives/ui-ace-pojos/ui-ace-pojos.jade   |  33 +++
 .../ui-ace-pom/ui-ace-pom.controller.js |  40 +++
 .../ui-ace-pom/ui-ace-pom.directive.js  |  32 ++
 .../app/directives/ui-ace-pom/ui-ace-pom.jade   |  17 ++
 .../ui-ace-xml/ui-ace-xml.controller.js |  38 +++
 .../ui-ace-xml/ui-ace-xml.directive.js  |  33 +++
 .../app/directives/ui-ace-xml/ui-ace-xml.jade   |  17 ++
 .../js/app/filters/hasPojo/hasPojo.filter.js|  26 ++
 .../control-center-web/src/main/js/app/index.js |  37 ++-
 .../app/modules/states/configuration/index.js   |  16 +-
 .../configuration/summary/summary.controller.js | 133 +
 .../configuration/summary/summary.resource.js   |  41 +++
 .../main/js/app/services/UiAceOnLoad/service.js |  36 +++
 .../control-center-web/src/main/js/config.js|   1 +
 .../main/js/controllers/summary-controller.js   | 293 ---
 .../src/main/js/gulpfile.js/tasks/copy.js   |   4 +-
 .../main/js/helpers/generator/generator-xml.js  |   2 +-
 .../control-center-web/src/main/js/package.json |   1 +
 .../js/views/configuration/summary-tabs.jade|   2 +-
 .../main/js/views/configuration/summary.jade| 134 +++--
 31 files changed, 953 insertions(+), 392 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/data/os.json
--
diff --git a/modules/control-center-web/src/main/js/app/data/os.json 
b/modules/control-center-web/src/main/js/app/data/os.json
new file mode 100644
index 000..5b67c37
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/data/os.json
@@ -0,0 +1,4 @@
+[
+   "debian:8", 
+   "ubuntu:14.10"
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
new file mode 100644
index 000..7cb3769
--- /dev/null
+++ 
b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+import template from './loading.jade!';
+
+export default ['igniteLoading', [() => {
+   return {
+   restrict: 'E',
+   template,
+   replace: true,
+   transclude: true
+   }
+}]]

http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/directives/loading/loading.jade
---