ignite git commit: Javadoc enhancements - added @see

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master dbc3f873d -> fffba70a7


Javadoc enhancements - added @see


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

Branch: refs/heads/master
Commit: fffba70a79c2bf2e97df52f06e9a537556ce931d
Parents: dbc3f87
Author: Yakov Zhdanov 
Authored: Thu Jan 18 20:57:17 2018 +0300
Committer: Yakov Zhdanov 
Committed: Thu Jan 18 20:57:17 2018 +0300

--
 .../main/java/org/apache/ignite/cache/PartitionLossPolicy.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fffba70a/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java 
b/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
index 16608a0..7c9b2a7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
@@ -19,6 +19,7 @@ package org.apache.ignite.cache;
 
 import java.util.Collection;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -31,6 +32,9 @@ import org.jetbrains.annotations.Nullable;
  * 
  * READ_ONLY_* and READ_WRITE_* policies do not 
automatically change partition state
  * and thus do not change rebalancing assignments for such partitions.
+ *
+ * @see Ignite#resetLostPartitions(Collection)
+ * @see IgniteCache#lostPartitions()
  */
 public enum PartitionLossPolicy {
 /**

ignite git commit: IEP-12: updated javadoc with notes about data consistency in atomic caches in failure scenarios when entry processors and putIfAbsent/replace/remove operations are used.

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master 0e8224f9c -> d7987e6d5


IEP-12: updated javadoc with notes about data consistency in atomic caches in 
failure scenarios when entry processors and putIfAbsent/replace/remove 
operations are used.


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

Branch: refs/heads/master
Commit: d7987e6d5f633d6d0e4dc8816387efcba7bafbdd
Parents: 0e8224f
Author: yzhdanov <6ufalug04ap>
Authored: Fri Dec 22 15:32:48 2017 +0300
Committer: yzhdanov <6ufalug04ap>
Committed: Fri Dec 22 15:32:48 2017 +0300

--
 .../java/org/apache/ignite/IgniteCache.java | 85 ++--
 .../apache/ignite/cache/CacheAtomicityMode.java | 39 -
 2 files changed, 115 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d7987e6d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 6a0add9..cd8264b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -37,6 +37,7 @@ import javax.cache.integration.CacheWriter;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.EntryProcessorException;
 import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheEntry;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cache.CacheMetrics;
@@ -556,12 +557,34 @@ public interface IgniteCache<K, V> extends 
javax.cache.Cache<K, V>, IgniteAsyncS
 public long localSizeLong(int partition, CachePeekMode... peekModes);
 
 /**
+ * Asynchronously invokes each {@link EntryProcessor} from map's values 
against the correspondent
+ * {@link javax.cache.Cache.Entry} specified by map's key set.
+ * 
+ * If an {@link javax.cache.Cache.Entry} does not exist for the specified 
key, an attempt is made
+ * to load it (if a loader is configured) or a surrogate {@link 
javax.cache.Cache.Entry},
+ * consisting of the key and a value of null is provided.
+ * 
+ * The order that the entries for the keys are processed is undefined.
+ * Implementations may choose to process the entries in any order, 
including
+ * concurrently.  Furthermore there is no guarantee implementations will
+ * use the same {@link EntryProcessor} instance to process each entry, as
+ * the case may be in a non-local cache topology.
+ * 
+ * The result of executing the {@link EntryProcessor} is returned in the 
future as a
+ * {@link Map} of {@link EntryProcessorResult}s, one result per key. 
Should the
+ * {@link EntryProcessor} or Caching implementation throw an exception, the
+ * exception is wrapped and re-thrown when a call to
+ * {@link javax.cache.processor.EntryProcessorResult#get()} is made.
+ * 
+ * Please refer to documentation for {@link CacheAtomicityMode#ATOMIC} for 
information on
+ * system behavior in crash scenarios for atomic caches.
+ *
  * @param map Map containing keys and entry processors to be applied to 
values.
  * @param args Additional arguments to pass to the {@link EntryProcessor}.
  * @return The map of {@link EntryProcessorResult}s of the processing per 
key,
- * if any, defined by the {@link EntryProcessor} implementation.  No 
mappings
- * will be returned for {@link EntryProcessor}s that return a
- * null value for a key.
+ *  if any, defined by the {@link EntryProcessor} implementation.  No 
mappings
+ *  will be returned for {@link EntryProcessor}s that return a
+ *  null value for a key.
  * @throws TransactionException If operation within transaction is failed.
  */
 @IgniteAsyncSupported
@@ -569,7 +592,7 @@ public interface IgniteCache<K, V> extends 
javax.cache.Cache<K, V>, IgniteAsyncS
 Object... args) throws TransactionException;
 
 /**
- * Asynchronously version of the {@link #invokeAll(Set, EntryProcessor, 
Object...)} method.
+ * Asynchronously version of the {@link #invokeAll(Map, Object...)} method.
  *
  * @param map Map containing keys and entry processors to be applied to 
values.
  * @param args Additional arguments to pass to the {@link EntryProcessor}.
@@ -844,6 +867,12 @@ public interface IgniteCache<K, V> extends 
javax.cache.Cache<K, 

[07/50] [abbrv] ignite git commit: IGNITE-6399 .NET: Added ClientConnectorConfiguration. This closes #2696.

[yzhdanov]

IGNITE-6399 .NET: Added ClientConnectorConfiguration. This closes #2696.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 915682bd5facee9dd62fc5d6dfb35e37ff601db8
Parents: 718e365
Author: Pavel Tupitsyn 
Authored: Tue Sep 19 16:32:07 2017 +0300
Committer: devozerov 
Committed: Tue Sep 19 16:33:06 2017 +0300

--
 .../utils/PlatformConfigurationUtils.java   |  53 +++
 .../Client/Cache/ScanQueryTest.cs   |   2 +-
 .../Client/ClientConnectionTest.cs  |  26 ++-
 .../Client/RawSocketTest.cs |   4 +-
 .../IgniteConfigurationSerializerTest.cs|  17 +-
 .../IgniteConfigurationTest.cs  |  40 +
 .../Apache.Ignite.Core.csproj   |   1 +
 .../Client/IgniteClientConfiguration.cs |   2 +-
 .../ClientConnectorConfiguration.cs | 159 +++
 .../Configuration/SqlConnectorConfiguration.cs  |   2 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  50 +-
 .../IgniteConfigurationSection.xsd  |  52 ++
 12 files changed, 400 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/915682bd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index d54aac1..7e17bdb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -53,6 +53,7 @@ import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
 import org.apache.ignite.configuration.AtomicConfiguration;
 import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.DataPageEvictionMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.MemoryConfiguration;
@@ -682,6 +683,12 @@ public class PlatformConfigurationUtils {
 
cfg.setSqlConnectorConfiguration(readSqlConnectorConfiguration(in));
 
 if (in.readBoolean())
+
cfg.setClientConnectorConfiguration(readClientConnectorConfiguration(in));
+
+if (!in.readBoolean())  // ClientConnectorConfigurationEnabled override
+cfg.setClientConnectorConfiguration(null);
+
+if (in.readBoolean())
 
cfg.setPersistentStoreConfiguration(readPersistentStoreConfiguration(in));
 
 readPluginConfiguration(cfg, in);
@@ -1147,6 +1154,10 @@ public class PlatformConfigurationUtils {
 
 writeSqlConnectorConfiguration(w, cfg.getSqlConnectorConfiguration());
 
+writeClientConnectorConfiguration(w, 
cfg.getClientConnectorConfiguration());
+
+w.writeBoolean(cfg.getClientConnectorConfiguration() != null);
+
 writePersistentStoreConfiguration(w, 
cfg.getPersistentStoreConfiguration());
 
 w.writeString(cfg.getIgniteHome());
@@ -1483,6 +1494,48 @@ public class PlatformConfigurationUtils {
 }
 
 /**
+ * Reads the client connector configuration.
+ *
+ * @param in Reader.
+ * @return Config.
+ */
+private static ClientConnectorConfiguration 
readClientConnectorConfiguration(BinaryRawReader in) {
+return new ClientConnectorConfiguration()
+.setHost(in.readString())
+.setPort(in.readInt())
+.setPortRange(in.readInt())
+.setSocketSendBufferSize(in.readInt())
+.setSocketReceiveBufferSize(in.readInt())
+.setTcpNoDelay(in.readBoolean())
+.setMaxOpenCursorsPerConnection(in.readInt())
+.setThreadPoolSize(in.readInt());
+}
+
+/**
+ * Writes the client connector configuration.
+ *
+ * @param w Writer.
+ */
+private static void writeClientConnectorConfiguration(BinaryRawWriter w, 
ClientConnectorConfiguration cfg) {
+assert w != null;
+
+if (cfg != null) {
+w.writeBoolean(true);
+
+w.writeString(cfg.getHost());
+w.writeInt(cfg.getPort());
+

[09/50] [abbrv] ignite git commit: IGNITE-6376 Web console: Enable task and job events in demo mode by default. (cherry picked from commit ff17783)

[yzhdanov]

IGNITE-6376 Web console: Enable task and job events in demo mode by default.
(cherry picked from commit ff17783)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 6318c1a15f05e952c22e42e6e238816d7ffdb0ca
Parents: 4338799
Author: vsisko 
Authored: Wed Sep 20 17:19:58 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Sep 20 17:25:00 2017 +0700

--
 .../internal/visor/node/VisorNodeDataCollectorTask.java | 2 +-
 .../visor/node/VisorNodeDataCollectorTaskResult.java| 4 ++--
 modules/web-console/backend/routes/demo/domains.json| 5 +
 .../configuration/generator/JavaTransformer.service.js  | 5 +++--
 .../org/apache/ignite/console/demo/AgentClusterDemo.java| 9 -
 5 files changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6318c1a1/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index 80664a1..abd9ce2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -89,7 +89,7 @@ public class VisorNodeDataCollectorTask extends 
VisorMultiNodeTaskhttp://git-wip-us.apache.org/repos/asf/ignite/blob/6318c1a1/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index c1e2f1f..6e10b84 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -169,7 +169,7 @@ public class VisorNodeDataCollectorTaskResult extends 
VisorDataTransferObject {
 /**
  * @return All task monitoring state collected from nodes.
  */
-public Map isTaskMonitoringEnabled() {
+public Map getTaskMonitoringEnabled() {
 return taskMonitoringEnabled;
 }
 
@@ -283,7 +283,7 @@ public class VisorNodeDataCollectorTaskResult extends 
VisorDataTransferObject {
 unhandledEx.putAll(res.getUnhandledEx());
 gridNames.putAll(res.getGridNames());
 topVersions.putAll(res.getTopologyVersions());
-taskMonitoringEnabled.putAll(res.isTaskMonitoringEnabled());
+taskMonitoringEnabled.putAll(res.getTaskMonitoringEnabled());
 errCnts.putAll(res.getErrorCounts());
 evts.addAll(res.getEvents());
 evtsEx.putAll(res.getEventsEx());

http://git-wip-us.apache.org/repos/asf/ignite/blob/6318c1a1/modules/web-console/backend/routes/demo/domains.json
--
diff --git a/modules/web-console/backend/routes/demo/domains.json 
b/modules/web-console/backend/routes/demo/domains.json
index ae46758..25f5019 100644
--- a/modules/web-console/backend/routes/demo/domains.json
+++ b/modules/web-console/backend/routes/demo/domains.json
@@ -17,6 +17,7 @@
 "className": "Integer"
   }
 ],
+"keyFieldName": "id",
 "valueFields": [
   {
 "databaseFieldName": "NAME",
@@ -60,6 +61,7 @@
 "className": "String"
   }
 ],
+"keyFieldName": "id",
 "valueFields": [
   {
 "databaseFieldName": "COUNTRY_ID",
@@ -156,6 +158,7 @@
 "className": "Double"
   }
 ],
+"keyFieldName": "id",
 "valueFields": [
   {
 "databaseFieldName": "DEPARTMENT_ID",
@@ -241,6 +244,7 @@
 "className": "Integer"
   }
 ],
+"keyFieldName": "id",
 "valueFields": [
   {
 "databaseFieldName": "NAME",
@@ -284,6 +288,7 @@
 "className": "String"
   }
 ],
+"keyFieldName": "id",
 "valueFields": [
   {
 "databaseFieldName": "PARKING_ID",

http://git-wip-us.apache.org/repos/asf/ignite/blob/6318c1a1/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js

[12/50] [abbrv] ignite git commit: IGNITE-6449 Added missing cache configuration properties. (cherry picked from commit 9b2bca7)

[yzhdanov]

IGNITE-6449 Added missing cache configuration properties.
(cherry picked from commit 9b2bca7)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 1a6461582eac95e1e51faf8acd9b8bd10394dd47
Parents: 4e38b79
Author: vsisko 
Authored: Wed Sep 20 19:07:55 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Sep 20 19:09:00 2017 +0700

--
 .../commands/cache/VisorCacheCommand.scala  | 23 ++--
 1 file changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a646158/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 42ff01c..f754275 100755
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -839,11 +839,24 @@ object VisorCacheCommand {
 
 cacheT += ("Group", cfg.getGroupName)
 cacheT += ("Dynamic Deployment ID", cfg.getDynamicDeploymentId)
+cacheT += ("System", bool2Str(cfg.isSystem))
+
 cacheT += ("Mode", cfg.getMode)
 cacheT += ("Atomicity Mode", safe(cfg.getAtomicityMode))
 cacheT += ("Statistic Enabled", bool2Str(cfg.isStatisticsEnabled))
 cacheT += ("Management Enabled", bool2Str(cfg.isManagementEnabled))
 
+cacheT += ("On-heap cache enabled", bool2Str(cfg.isOnheapCacheEnabled))
+cacheT += ("Partition Loss Policy", cfg.getPartitionLossPolicy)
+cacheT += ("Query Parallelism", cfg.getQueryParallelism)
+cacheT += ("Copy On Read", bool2Str(cfg.isCopyOnRead))
+cacheT += ("Listener Configurations", cfg.getListenerConfigurations)
+cacheT += ("Load Previous Value", bool2Str(cfg.isLoadPreviousValue))
+cacheT += ("Memory Policy Name", cfg.getMemoryPolicyName)
+cacheT += ("Node Filter", cfg.getNodeFilter)
+cacheT += ("Read From Backup", bool2Str(cfg.isReadFromBackup))
+cacheT += ("Topology Validator", cfg.getTopologyValidator)
+
 cacheT += ("Time To Live Eager Flag", cfg.isEagerTtl)
 
 cacheT += ("Write Synchronization Mode", 
safe(cfg.getWriteSynchronizationMode))
@@ -860,6 +873,8 @@ object VisorCacheCommand {
 cacheT += ("Rebalance Timeout", rebalanceCfg.getTimeout)
 cacheT += ("Rebalance Delay", rebalanceCfg.getPartitionedDelay)
 cacheT += ("Time Between Rebalance Messages", rebalanceCfg.getThrottle)
+cacheT += ("Rebalance Batches Count", 
rebalanceCfg.getBatchesPrefetchCnt)
+cacheT += ("Rebalance Cache Order", rebalanceCfg.getRebalanceOrder)
 
 cacheT += ("Eviction Policy Enabled", bool2Str(evictCfg.getPolicy != 
null))
 cacheT += ("Eviction Policy", safe(evictCfg.getPolicy))
@@ -881,8 +896,9 @@ object VisorCacheCommand {
 cacheT += ("Store Keep Binary", storeCfg.isStoreKeepBinary)
 cacheT += ("Store Read Through", bool2Str(storeCfg.isReadThrough))
 cacheT += ("Store Write Through", bool2Str(storeCfg.isWriteThrough))
+cacheT += ("Store Write Coalescing", 
bool2Str(storeCfg.getWriteBehindCoalescing))
 
-cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.isEnabled))
+cacheT += ("Write-Behind Enabled", 
bool2Str(storeCfg.isWriteBehindEnabled))
 cacheT += ("Write-Behind Flush Size", storeCfg.getFlushSize)
 cacheT += ("Write-Behind Frequency", storeCfg.getFlushFrequency)
 cacheT += ("Write-Behind Flush Threads Count", 
storeCfg.getFlushThreadCount)
@@ -895,8 +911,11 @@ object VisorCacheCommand {
 cacheT += ("Expiry Policy Factory Class Name", 
safe(cfg.getExpiryPolicyFactory))
 
 cacheT +=("Query Execution Time Threshold", 
queryCfg.getLongQueryWarningTimeout)
-cacheT +=("Query Schema Name", queryCfg.getSqlSchema)
 cacheT +=("Query Escaped Names", bool2Str(queryCfg.isSqlEscapeAll))
+cacheT +=("Query Schema Name", queryCfg.getSqlSchema)
+cacheT +=("Query Indexed Types", queryCfg.getIndexedTypes)
+cacheT +=("Maximum payload size for offheap indexes", 
cfg.getSqlIndexMaxInlineSize)
+cacheT +=("Query Metrics History Size", cfg.getQueryDetailMetricsSize)
 
 val sqlFxs = 

[14/50] [abbrv] ignite git commit: IGNITE-6446 Fix permission transition hook and permissions for basic configuration screen. (cherry picked from commit 0f8a2bf)

[yzhdanov]

IGNITE-6446 Fix permission transition hook and permissions for basic 
configuration screen.
(cherry picked from commit 0f8a2bf)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 58ba0d229476b502241940e474c25f0d895c
Parents: bd60ab1
Author: Ilya Borisov 
Authored: Thu Sep 21 10:25:19 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Sep 21 10:26:22 2017 +0700

--
 .../frontend/app/modules/states/configuration.state.js| 1 +
 modules/web-console/frontend/app/modules/user/user.module.js  | 7 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/58ba0444/modules/web-console/frontend/app/modules/states/configuration.state.js
--
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration.state.js 
b/modules/web-console/frontend/app/modules/states/configuration.state.js
index d2c1410..8d05a45 100644
--- a/modules/web-console/frontend/app/modules/states/configuration.state.js
+++ b/modules/web-console/frontend/app/modules/states/configuration.state.js
@@ -77,6 +77,7 @@ angular.module('ignite-console.states.configuration', 
['ui.router'])
 })
 .state('base.configuration.tabs.basic', {
 url: '/basic',
+permission: 'configuration',
 template: '',
 tfMetaTags: {
 title: 'Basic Configuration'

http://git-wip-us.apache.org/repos/asf/ignite/blob/58ba0444/modules/web-console/frontend/app/modules/user/user.module.js
--
diff --git a/modules/web-console/frontend/app/modules/user/user.module.js 
b/modules/web-console/frontend/app/modules/user/user.module.js
index 5cd8bc5..5ab0e0f 100644
--- a/modules/web-console/frontend/app/modules/user/user.module.js
+++ b/modules/web-console/frontend/app/modules/user/user.module.js
@@ -69,14 +69,14 @@ angular.module('ignite-console.user', [
 AclService.attachRole(role);
 });
 
-$transitions.onEnter({}, (trans) => {
+$transitions.onBefore({}, (trans) => {
 const $state = trans.router.stateService;
 const {name, permission} = trans.to();
 
 if (_.isEmpty(permission))
 return;
 
-trans.injector().get('User').read()
+return trans.injector().get('User').read()
 .then(() => {
 if (AclService.can(permission)) {
 Activities.post({action: $state.href(name, 
trans.params('to'))});
@@ -85,6 +85,9 @@ angular.module('ignite-console.user', [
 }
 
 return $state.target(trans.to().failState || '403');
+})
+.catch(() => {
+return $state.target(trans.to().failState || '403');
 });
 });
 }]);

[15/50] [abbrv] ignite git commit: IGNITE-6461 Web Console: Sanitize user on save. (cherry picked from commit 1b6873c)

[yzhdanov]

IGNITE-6461 Web Console: Sanitize user on save.
(cherry picked from commit 1b6873c)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 3847b47752db7d83c85a76e09964fd154e2f0cc4
Parents: 58ba044
Author: Alexey Kuznetsov 
Authored: Thu Sep 21 14:36:08 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Sep 21 14:38:02 2017 +0700

--
 modules/web-console/backend/routes/admin.js |  5 +++--
 modules/web-console/backend/services/users.js   |  5 +
 .../list-of-registered-users.controller.js  |  1 -
 .../web-console/frontend/app/core/admin/Admin.data.js   | 12 
 4 files changed, 16 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3847b477/modules/web-console/backend/routes/admin.js
--
diff --git a/modules/web-console/backend/routes/admin.js 
b/modules/web-console/backend/routes/admin.js
index c00b17a..5ee41c8 100644
--- a/modules/web-console/backend/routes/admin.js
+++ b/modules/web-console/backend/routes/admin.js
@@ -33,6 +33,7 @@ module.exports = {
  * @param {MailsService} mailsService
  * @param {SessionsService} sessionsService
  * @param {UsersService} usersService
+ * @param {NotificationsService} notificationsService
  * @returns {Promise}
  */
 module.exports.factory = function(_, express, settings, mongo, spacesService, 
mailsService, sessionsService, usersService, notificationsService) {
@@ -55,8 +56,8 @@ module.exports.factory = function(_, express, settings, 
mongo, spacesService, ma
 .catch(res.api.error);
 });
 
-// Save user.
-router.post('/save', (req, res) => {
+// Grant or revoke admin access to user.
+router.post('/toggle', (req, res) => {
 const params = req.body;
 
 mongo.Account.findByIdAndUpdate(params.userId, {admin: 
params.adminFlag}).exec()

http://git-wip-us.apache.org/repos/asf/ignite/blob/3847b477/modules/web-console/backend/services/users.js
--
diff --git a/modules/web-console/backend/services/users.js 
b/modules/web-console/backend/services/users.js
index 0710713..991928a 100644
--- a/modules/web-console/backend/services/users.js
+++ b/modules/web-console/backend/services/users.js
@@ -51,6 +51,7 @@ module.exports.factory = (_, errors, settings, mongo, 
spacesService, mailsServic
 class UsersService {
 /**
  * Save profile information.
+ *
  * @param {String} host - The host
  * @param {Object} user - The user
  * @returns {Promise.} that resolves account id of 
merge operation.
@@ -93,10 +94,13 @@ module.exports.factory = (_, errors, settings, mongo, 
spacesService, mailsServic
 
 /**
  * Save user.
+ *
  * @param {Object} changed - The user
  * @returns {Promise.} that resolves account id of 
merge operation.
  */
 static save(changed) {
+delete changed.admin;
+
 return mongo.Account.findById(changed._id).exec()
 .then((user) => {
 if (!changed.password)
@@ -207,6 +211,7 @@ module.exports.factory = (_, errors, settings, mongo, 
spacesService, mailsServic
 
 /**
  * Remove account.
+ *
  * @param {String} host.
  * @param {mongo.ObjectId|String} userId - The account id for remove.
  * @returns {Promise.<{rowsAffected}>} - The number of affected rows.

http://git-wip-us.apache.org/repos/asf/ignite/blob/3847b477/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
--
diff --git 
a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
 
b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 2e36c5c..f82ccbe 100644
--- 
a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ 
b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -91,7 +91,6 @@ export default class IgniteListOfRegisteredUsersCtrl {
 user.adminChanging = true;
 
 AdminData.toggleAdmin(user)
-.then(() => user.admin = !user.admin)
 .finally(() => user.adminChanging = false);
 

[42/50] [abbrv] ignite git commit: Fixed NPE in case of null value for indexing.

[yzhdanov]

Fixed NPE in case of null value for indexing.

(cherry picked from commit 6cf3b13)

(cherry picked from commit dd9804b)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 25e4706501c1c0908df6d4cd070f84490c1ef6c4
Parents: 2310417
Author: mcherkasov 
Authored: Thu Aug 31 12:11:01 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:29:38 2017 +0300

--
 .../internal/processors/query/h2/database/InlineIndexHelper.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/25e47065/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
index 1789ac8..aa53a35 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
@@ -383,6 +383,9 @@ public class InlineIndexHelper {
 if (type == Value.NULL)
 return Integer.MIN_VALUE;
 
+if (v == ValueNull.INSTANCE)
+return fixSort(1, sortType());
+
 if (this.type != type)
 throw new UnsupportedOperationException("Invalid fast index type: 
" + type);
 

[24/50] [abbrv] ignite git commit: Merge remote-tracking branch 'professional/ignite-2.1.5' into ignite-2.1.5

[yzhdanov]

Merge remote-tracking branch 'professional/ignite-2.1.5' into ignite-2.1.5


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: e82f077df78972a58fdd06917839445711432705
Parents: aeb4aea 21d7fed
Author: Dmitriy Govorukhin 
Authored: Thu Sep 21 18:56:40 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Thu Sep 21 18:56:40 2017 +0300

--
 .../pagemem/store/IgnitePageStoreManager.java   |   4 +-
 .../cache/CacheAffinitySharedManager.java   |   4 +-
 .../persistence/file/FilePageStoreManager.java  |   7 +-
 .../processors/query/GridQueryProcessor.java|  30 ++-
 .../pagemem/NoOpPageStoreManager.java   |   2 +-
 .../IgnitePersistentStoreSchemaLoadTest.java| 237 ---
 6 files changed, 184 insertions(+), 100 deletions(-)
--

[44/50] [abbrv] ignite git commit: IGNITE-6434 Fixed error in checkpointer during topology change. Fixes #2718

[yzhdanov]

IGNITE-6434 Fixed error in checkpointer during topology change. Fixes #2718


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 21de1c56268c18685dd3620b7e3dc776ca2cf532
Parents: ae9c6d6
Author: Eduard Shangareev 
Authored: Fri Sep 22 16:17:42 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 16:18:36 2017 +0300

--
 .../dht/GridDhtPartitionTopologyImpl.java   | 495 ++-
 .../GridCacheDatabaseSharedManager.java |   5 +-
 .../IgnitePdsExchangeDuringCheckpointTest.java  | 135 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |   4 +-
 .../ignite/testsuites/IgnitePdsTestSuite2.java  |   4 +
 5 files changed, 407 insertions(+), 236 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/21de1c56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index cad21d3..5a1e050 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -298,20 +298,27 @@ public class GridDhtPartitionTopologyImpl implements 
GridDhtPartitionTopology {
 GridDhtPartitionsExchangeFuture exchFut)
 throws IgniteInterruptedCheckedException
 {
-U.writeLock(lock);
+ctx.database().checkpointReadLock();
 
 try {
-if (stopping)
-return;
+U.writeLock(lock);
 
-long updateSeq = this.updateSeq.incrementAndGet();
+try {
+if (stopping)
+return;
 
-initPartitions0(affVer, exchFut, updateSeq);
+long updateSeq = this.updateSeq.incrementAndGet();
 
-consistencyCheck();
+initPartitions0(affVer, exchFut, updateSeq);
+
+consistencyCheck();
+}
+finally {
+lock.writeLock().unlock();
+}
 }
 finally {
-lock.writeLock().unlock();
+ctx.database().checkpointReadUnlock();
 }
 }
 
@@ -589,101 +596,109 @@ public class GridDhtPartitionTopologyImpl implements 
GridDhtPartitionTopology {
 ", affVer=" + grp.affinity().lastVersion() +
 ", fut=" + exchFut + ']';
 
-lock.writeLock().lock();
+ctx.database().checkpointReadLock();
 
 try {
-if (stopping)
-return false;
 
-assert readyTopVer.initialized() : readyTopVer;
-assert lastTopChangeVer.equals(readyTopVer);
+lock.writeLock().lock();
 
-if (log.isDebugEnabled())
-log.debug("Partition map before afterExchange [exchId=" + 
exchFut.exchangeId() + ", fullMap=" +
-fullMapString() + ']');
+try {
+if (stopping)
+return false;
 
-long updateSeq = this.updateSeq.incrementAndGet();
+assert readyTopVer.initialized() : readyTopVer;
+assert lastTopChangeVer.equals(readyTopVer);
 
-for (int p = 0; p < num; p++) {
-GridDhtLocalPartition locPart = localPartition0(p, topVer, 
false, false, false);
+if (log.isDebugEnabled())
+log.debug("Partition map before afterExchange [exchId=" + 
exchFut.exchangeId() + ", fullMap=" +
+fullMapString() + ']');
 
-if (partitionLocalNode(p, topVer)) {
-// This partition will be created during next topology 
event,
-// which obviously has not happened at this point.
-if (locPart == null) {
-if (log.isDebugEnabled())
-log.debug("Skipping local partition afterExchange 
(will not create): " + p);
+long updateSeq = this.updateSeq.incrementAndGet();
 
-continue;
-}
+for (int p = 0; p < num; p++) {
+GridDhtLocalPartition locPart = localPartition0(p, 

[40/50] [abbrv] ignite git commit: IGNITE-6101 Try to improve local scans performance

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index ad3846f..e64363d 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -183,6 +183,7 @@ 
org.apache.ignite.igfs.mapreduce.records.IgfsByteDelimiterRecordResolver
 org.apache.ignite.igfs.mapreduce.records.IgfsFixedLengthRecordResolver
 org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver
 org.apache.ignite.igfs.mapreduce.records.IgfsStringDelimiterRecordResolver
+org.apache.ignite.internal.DuplicateTypeIdException
 org.apache.ignite.internal.ExecutorAwareMessage
 org.apache.ignite.internal.GridClosureCallMode
 org.apache.ignite.internal.GridComponent$DiscoveryDataExchangeType
@@ -310,6 +311,7 @@ 
org.apache.ignite.internal.jdbc2.JdbcDatabaseMetadata$UpdateMetadataTask
 org.apache.ignite.internal.jdbc2.JdbcQueryTask
 org.apache.ignite.internal.jdbc2.JdbcQueryTask$1
 org.apache.ignite.internal.jdbc2.JdbcQueryTask$QueryResult
+org.apache.ignite.internal.jdbc2.JdbcQueryTaskV2
 org.apache.ignite.internal.jdbc2.JdbcSqlFieldsQuery
 org.apache.ignite.internal.managers.GridManagerAdapter$1$1
 
org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet
@@ -341,7 +343,6 @@ org.apache.ignite.internal.mem.IgniteOutOfMemoryException
 org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl$Segment
 org.apache.ignite.internal.pagemem.wal.StorageException
 org.apache.ignite.internal.pagemem.wal.WALIterator
-org.apache.ignite.internal.pagemem.wal.record.TxRecord$TxAction
 org.apache.ignite.internal.pagemem.wal.record.WALRecord$RecordType
 org.apache.ignite.internal.pagemem.wal.record.delta.DeltaApplicationException
 org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
@@ -569,7 +570,6 @@ 
org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManagerImpl$CacheD
 org.apache.ignite.internal.processors.cache.IgniteCacheProxy
 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl
 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$1
-org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$1$1
 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$2
 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$3
 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$4
@@ -585,6 +585,7 @@ org.apache.ignite.internal.processors.cache.StoredCacheData
 org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy
 org.apache.ignite.internal.processors.cache.binary.BinaryMetadataHolder
 org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
+org.apache.ignite.internal.processors.cache.binary.BinaryMetadataTransport$2
 
org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$3
 org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessage
 org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage
@@ -905,6 +906,7 @@ 
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogMan
 org.apache.ignite.internal.processors.cache.persistence.wal.SegmentEofException
 
org.apache.ignite.internal.processors.cache.persistence.wal.crc.IgniteDataIntegrityViolationException
 
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneWalRecordsIterator
+org.apache.ignite.internal.processors.cache.query.CacheQueryEntry
 org.apache.ignite.internal.processors.cache.query.CacheQueryType
 
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
 
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$1
@@ -919,8 +921,7 @@ 
org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$2
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$10
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$13$1
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12$1
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$1
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$2
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$5
@@ -935,9 +936,9 @@ 
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$Metadata
 
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$1
 

[20/50] [abbrv] ignite git commit: IGNITE-6465: JDBC thin driver: added SQLSTATE propagation for BatchUpdateException. This closes #2719.

[yzhdanov]

IGNITE-6465: JDBC thin driver: added SQLSTATE propagation for 
BatchUpdateException. This closes #2719.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: be8afd4f39599b7e26ad148331c5aa6ba4faf513
Parents: 099d33c
Author: tledkov-gridgain 
Authored: Thu Sep 21 17:51:26 2017 +0300
Committer: devozerov 
Committed: Thu Sep 21 17:52:17 2017 +0300

--
 .../jdbc/thin/JdbcThinErrorsSelfTest.java   | 31 
 .../internal/jdbc/thin/JdbcThinStatement.java   |  7 +++--
 2 files changed, 36 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/be8afd4f/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
index afd06ed..db70f3be 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.jdbc.thin;
 
+import java.sql.BatchUpdateException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.sql.Statement;
 import org.apache.ignite.jdbc.JdbcErrorsAbstractSelfTest;
 import org.apache.ignite.lang.IgniteCallable;
 
@@ -74,4 +76,33 @@ public class JdbcThinErrorsSelfTest extends 
JdbcErrorsAbstractSelfTest {
 }
 }, "0700E");
 }
+
+/**
+ * Test error code for the case when error is caused on batch execution.
+ * @throws SQLException if failed.
+ */
+@SuppressWarnings("MagicConstant")
+public void testBatchUpdateException() throws SQLException {
+try (final Connection conn = getConnection()) {
+try (Statement stmt = conn.createStatement()) {
+stmt.executeUpdate("CREATE TABLE test (id int primary key, val 
varchar)");
+
+stmt.addBatch("insert into test (id, val) values (1, 'val1')");
+stmt.addBatch("insert into test (id, val) values (2, 'val2')");
+stmt.addBatch("insert into test (id1, val1) values (3, 
'val3')");
+
+stmt.executeBatch();
+
+fail("BatchUpdateException is expected");
+}
+catch (BatchUpdateException e) {
+assertEquals(2, e.getUpdateCounts().length);
+
+for (int updCnt : e.getUpdateCounts())
+assertEquals(1, updCnt);
+
+assertEquals("42000", e.getSQLState());
+}
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/be8afd4f/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
index 6ab50de..8e096c8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
@@ -27,6 +27,7 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
 import org.apache.ignite.internal.processors.odbc.SqlStateCode;
 import org.apache.ignite.internal.processors.odbc.ClientListenerResponse;
 import org.apache.ignite.internal.processors.odbc.jdbc.JdbcBatchExecuteRequest;
@@ -371,8 +372,10 @@ public class JdbcThinStatement implements Statement {
 try {
 JdbcBatchExecuteResult res = conn.sendRequest(new 
JdbcBatchExecuteRequest(conn.getSchema(), batch));
 
-if (res.errorCode() != ClientListenerResponse.STATUS_SUCCESS)
-throw new BatchUpdateException(res.errorMessage(), null, 
res.errorCode(), res.updateCounts());
+if (res.errorCode() != ClientListenerResponse.STATUS_SUCCESS) {
+throw new BatchUpdateException(res.errorMessage(), 
IgniteQueryErrorCode.codeToSqlState(res.errorCode()),
+res.errorCode(), res.updateCounts());
+}
 
 return res.updateCounts();
 }

[10/50] [abbrv] ignite git commit: IGNITE-6304 Fixed script execution after throttling interval. (cherry picked from commit d1f178f)

[yzhdanov]

IGNITE-6304 Fixed script execution after throttling interval.
(cherry picked from commit d1f178f)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 668e29fa2766ad5f0fda829e027b777407d9ca4f
Parents: 6318c1a
Author: vsisko 
Authored: Wed Sep 20 17:27:14 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Sep 20 17:28:35 2017 +0700

--
 .../commands/alert/VisorAlertCommand.scala  | 29 ++--
 1 file changed, 15 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/668e29fa/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index fb60a1e..254dc2d 100644
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -85,7 +85,7 @@ import scala.util.control.Breaks._
  * 2) Alert condition as string.
  * 3, ...) Values of alert conditions ordered as in alert command.
  * -i
- * Configure alert notification minimal throttling interval in 
seconds. Default is 60 seconds.
+ * Configure alert notification minimal throttling interval in 
seconds. Default is 0 seconds.
  *
  * -
  * This defines a mnemonic for the metric that will be measured:
@@ -267,7 +267,7 @@ class VisorAlertCommand extends VisorConsoleCommand {
 var script: Option[String] = None
 val conditions = mutable.ArrayBuffer.empty[VisorAlertCondition]
 var freq = DFLT_FREQ
-var interval = DFLT_FREQ
+var interval = 0L
 
 try {
 args.foreach(arg => {
@@ -653,25 +653,26 @@ class VisorAlertCommand extends VisorConsoleCommand {
 private def executeAlertScript(alert: VisorAlert, node: ClusterNode, 
values: Seq[String]) {
 val n = alert.notification
 
+if (n.notified && System.currentTimeMillis() - n.notifiedTime < 
n.throttleInterval)
+return
+
 try {
 n.script.foreach(script => {
-if (!n.notified && (n.notifiedTime < 0 || 
(System.currentTimeMillis() - n.notifiedTime) > n.throttleInterval)) {
-val scriptFile = new File(script)
+val scriptFile = new File(script)
 
-if (!scriptFile.exists())
-throw new FileNotFoundException("Script/executable not 
found: " + script)
+if (!scriptFile.exists())
+throw new FileNotFoundException("Script/executable not 
found: " + script)
 
-val scriptFolder = scriptFile.getParentFile
+val scriptFolder = scriptFile.getParentFile
 
-val p = Process(Seq(script, 
alert.name.getOrElse(alert.id), alert.conditionSpec) ++ values,
-Some(scriptFolder))
+val p = Process(Seq(script, alert.name.getOrElse(alert.id), 
alert.conditionSpec) ++ values,
+Some(scriptFolder))
 
-p.run(ProcessLogger((fn: String) => {}))
+p.run(ProcessLogger((fn: String) => {}))
 
-n.notifiedTime = System.currentTimeMillis()
+n.notifiedTime = System.currentTimeMillis()
 
-n.notified = true
-}
+n.notified = true
 })
 }
 catch {
@@ -865,7 +866,7 @@ object VisorAlertCommand {
 "2) Alert condition as string.",
 "3, ...) Values of alert conditions ordered as in alert 
command."
 ),
-"-i" -> "Configure alert notification minimal throttling interval 
in seconds. Default is 60 seconds.",
+"-i" -> "Configure alert notification minimal throttling interval 
in seconds. Default is 0 seconds.",
 "-" -> Seq(
 "This defines a mnemonic for the metric that will be 
measured:",
 "",

[26/50] [abbrv] ignite git commit: IGNITE-6294: ODBC: implemented SQLSTATE management. This closes #2716.

[yzhdanov]

IGNITE-6294: ODBC: implemented SQLSTATE management. This closes #2716.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: fc34091c750cdaf759a54a989a84c76f8d9f9f7f
Parents: 49a3631
Author: Igor Sapego 
Authored: Thu Sep 21 20:02:33 2017 +0300
Committer: devozerov 
Committed: Thu Sep 21 20:05:40 2017 +0300

--
 .../odbc/odbc/OdbcConnectionContext.java|   6 +-
 .../processors/odbc/odbc/OdbcMessageParser.java |  17 +-
 .../odbc/odbc/OdbcQueryExecuteBatchResult.java  |  16 +-
 .../odbc/odbc/OdbcRequestHandler.java   |  54 +++-
 .../processors/odbc/odbc/OdbcUtils.java |  24 +-
 modules/platforms/cpp/odbc-test/Makefile.am |   1 +
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   1 +
 .../project/vs/odbc-test.vcxproj.filters|   3 +
 .../platforms/cpp/odbc-test/src/errors_test.cpp | 289 +++
 .../platforms/cpp/odbc-test/src/parser_test.cpp |   4 +-
 .../cpp/odbc-test/src/queries_test.cpp  |  16 +-
 modules/platforms/cpp/odbc/include/Makefile.am  |   1 +
 .../cpp/odbc/include/ignite/odbc/common_types.h | 131 -
 .../ignite/odbc/diagnostic/diagnosable.h|   9 +
 .../odbc/diagnostic/diagnosable_adapter.h   |   8 +
 .../cpp/odbc/include/ignite/odbc/message.h  |  48 +--
 .../cpp/odbc/include/ignite/odbc/odbc_error.h   |  94 ++
 .../cpp/odbc/include/ignite/odbc/parser.h   |  35 ++-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |   1 +
 .../cpp/odbc/project/vs/odbc.vcxproj.filters|   3 +
 modules/platforms/cpp/odbc/src/common_types.cpp |  51 
 modules/platforms/cpp/odbc/src/connection.cpp   |  25 +-
 .../odbc/src/diagnostic/diagnosable_adapter.cpp |   8 +
 .../odbc/src/diagnostic/diagnostic_record.cpp   | 105 ++-
 modules/platforms/cpp/odbc/src/message.cpp  |  37 ++-
 .../cpp/odbc/src/query/batch_query.cpp  |  13 +-
 .../odbc/src/query/column_metadata_query.cpp|  11 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |  31 +-
 .../cpp/odbc/src/query/table_metadata_query.cpp |  11 +-
 modules/platforms/cpp/odbc/src/statement.cpp|  11 +-
 30 files changed, 960 insertions(+), 104 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc34091c/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
index f2450e2..a4af478 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
@@ -32,10 +32,10 @@ import org.apache.ignite.internal.util.GridSpinBusyLock;
  */
 public class OdbcConnectionContext implements ClientListenerConnectionContext {
 /** Version 2.1.0. */
-private static final ClientListenerProtocolVersion VER_2_1_0 = 
ClientListenerProtocolVersion.create(2, 1, 0);
+public static final ClientListenerProtocolVersion VER_2_1_0 = 
ClientListenerProtocolVersion.create(2, 1, 0);
 
 /** Version 2.1.5: added "lazy" flag. */
-private static final ClientListenerProtocolVersion VER_2_1_5 = 
ClientListenerProtocolVersion.create(2, 1, 5);
+public static final ClientListenerProtocolVersion VER_2_1_5 = 
ClientListenerProtocolVersion.create(2, 1, 5);
 
 /** Current version. */
 private static final ClientListenerProtocolVersion CURRENT_VER = VER_2_1_5;
@@ -101,7 +101,7 @@ public class OdbcConnectionContext implements 
ClientListenerConnectionContext {
 handler = new OdbcRequestHandler(ctx, busyLock, maxCursors, 
distributedJoins,
 enforceJoinOrder, replicatedOnly, collocated, lazy);
 
-parser = new OdbcMessageParser(ctx);
+parser = new OdbcMessageParser(ctx, ver);
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc34091c/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
index 2ab7cee..04e2e25 100644
--- 

[31/50] [abbrv] ignite git commit: IGNITE-6334 Throttle writing threads during ongoing checkpoint - Fixes #2710.

[yzhdanov]

IGNITE-6334 Throttle writing threads during ongoing checkpoint - Fixes #2710.

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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 520c2e368baf4cb79912a14663ea3fd1c7da6487
Parents: 73e1578
Author: Ivan Rakov 
Authored: Fri Sep 22 12:40:22 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 12:44:22 2017 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   |   5 +
 .../PersistentStoreConfiguration.java   |  28 +-
 .../GridCacheDatabaseSharedManager.java |  48 ++-
 .../persistence/pagemem/PageMemoryImpl.java |  96 +-
 .../persistence/pagemem/PagesWriteThrottle.java | 104 ++
 .../pagemem/BPlusTreePageMemoryImplTest.java|   4 +-
 .../BPlusTreeReuseListPageMemoryImplTest.java   |   3 +-
 .../MetadataStoragePageMemoryImplTest.java  |   4 +-
 .../pagemem/PageMemoryImplNoLoadTest.java   |   4 +-
 .../persistence/pagemem/PageMemoryImplTest.java |   4 +-
 .../pagemem/PagesWriteThrottleSandboxTest.java  | 264 +++
 .../pagemem/PagesWriteThrottleSmokeTest.java| 322 +++
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   4 +
 13 files changed, 866 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/520c2e36/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 628b165..f627e24 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Properties;
 import javax.net.ssl.HostnameVerifier;
 import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.configuration.PersistentStoreConfiguration;
 import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.jetbrains.annotations.Nullable;
@@ -718,6 +719,10 @@ public final class IgniteSystemProperties {
  */
 public static final String IGNITE_WAL_LOG_TX_RECORDS = 
"IGNITE_WAL_LOG_TX_RECORDS";
 
+/** If this property is set, {@link 
PersistentStoreConfiguration#writeThrottlingEnabled} will be overridden to true
+ * independent of initial value in configuration. */
+public static final String IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED = 
"IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED";
+
 /**
  * Enforces singleton.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/520c2e36/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
index abca5a5..c44e92d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
@@ -84,6 +84,9 @@ public class PersistentStoreConfiguration implements 
Serializable {
 /** Default wal archive directory. */
 public static final String DFLT_WAL_ARCHIVE_PATH = "db/wal/archive";
 
+/** Default write throttling enabled. */
+public static final boolean DFLT_WRITE_THROTTLING_ENABLED = false;
+
 /** */
 private String persistenceStorePath;
 
@@ -162,6 +165,11 @@ public class PersistentStoreConfiguration implements 
Serializable {
 private long walAutoArchiveAfterInactivity = -1;
 
 /**
+ * If true, threads that generate dirty pages too fast during ongoing 
checkpoint will be throttled.
+ */
+private boolean writeThrottlingEnabled = DFLT_WRITE_THROTTLING_ENABLED;
+
+/**
  * Returns a path the root directory where the Persistent Store will 
persist data and indexes.
  */
 public String getPersistentStorePath() {
@@ -240,7 +248,7 @@ public class PersistentStoreConfiguration implements 
Serializable {
 /**
  * Sets a number of threads to use for the checkpointing purposes.
  *
- * @param checkpointingThreads Number of checkpointing threads. One thread 
is used by default.
+ * @param 

[45/50] [abbrv] ignite git commit: IGNITE-6484 writeComplete conditional wait is made uninterruptable

[yzhdanov]

IGNITE-6484 writeComplete conditional wait is made uninterruptable


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 6452201dea49d5583e61e7fb3d33fd8c096135bd
Parents: 21de1c5
Author: Alexei Scherbakov 
Authored: Fri Sep 22 16:36:38 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 16:37:14 2017 +0300

--
 .../cache/persistence/wal/FileWriteAheadLogManager.java | 4 ++--
 .../java/org/apache/ignite/internal/util/IgniteUtils.java   | 9 +
 .../db/file/IgnitePdsThreadInterruptionTest.java| 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6452201d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index 87069d9..9b2d948 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -1828,7 +1828,7 @@ public class FileWriteAheadLogManager extends 
GridCacheSharedManagerAdapter impl
 
 try {
 while (written < expWritten && envFailed == null)
-U.await(writeComplete);
+U.awaitQuiet(writeComplete);
 }
 finally {
 lock.unlock();
@@ -2163,7 +2163,7 @@ public class FileWriteAheadLogManager extends 
GridCacheSharedManagerAdapter impl
 
 try {
 while (fileIO != null)
-U.await(nextSegment);
+U.awaitQuiet(nextSegment);
 }
 finally {
 lock.unlock();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6452201d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 13e99fb..6fb7242 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -7396,6 +7396,15 @@ public abstract class IgniteUtils {
 }
 
 /**
+ * Awaits for condition ignoring interrupts.
+ *
+ * @param cond Condition to await for.
+ */
+public static void awaitQuiet(Condition cond) {
+cond.awaitUninterruptibly();
+}
+
+/**
  * Awaits for condition.
  *
  * @param cond Condition to await for.

http://git-wip-us.apache.org/repos/asf/ignite/blob/6452201d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
index aab569a..6f11d4d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
@@ -41,7 +41,7 @@ public class IgnitePdsThreadInterruptionTest extends 
GridCommonAbstractTest {
 private static final int PAGE_SIZE = 1 << 12; // 4096
 
 /** */
-public static final int THREADS_CNT = 1;
+public static final int THREADS_CNT = 10;
 
 /**
  * Cache name.

[36/50] [abbrv] ignite git commit: ignite-5918 Adding and searching objects in index tree produces a lot of garbage

[yzhdanov]

ignite-5918 Adding and searching objects in index tree produces a lot of garbage

(cherry picked from commit 0e0c2c7)

(cherry picked from commit 20739d8)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 71cd1e9188f59293c505dedd37c325687f3159f0
Parents: 212603e
Author: Igor Seliverstov 
Authored: Wed Aug 9 18:46:53 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:28:26 2017 +0300

--
 .../java/org/apache/ignite/IgniteCache.java |   1 -
 .../query/h2/database/H2TreeIndex.java  |   6 +-
 .../query/h2/database/InlineIndexHelper.java| 414 ++-
 .../h2/database/InlineIndexHelperTest.java  | 248 +--
 .../IgniteCacheWithIndexingTestSuite.java   |   3 +
 5 files changed, 642 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/71cd1e91/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 0cf2a82..973eeab 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -1261,7 +1261,6 @@ public interface IgniteCache extends 
javax.cache.Cache, IgniteAsyncS
 public  IgniteFuture> 
invokeAllAsync(Set keys,
 EntryProcessor entryProcessor, Object... args) throws 
TransactionException;
 
-
 /**
  * Invokes an {@link CacheEntryProcessor} against the set of {@link 
javax.cache.Cache.Entry}s
  * specified by the set of keys.

http://git-wip-us.apache.org/repos/asf/ignite/blob/71cd1e91/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 35bfdc1..de5dc75 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -145,7 +145,11 @@ public class H2TreeIndex extends GridH2IndexBase {
 if 
(!InlineIndexHelper.AVAILABLE_TYPES.contains(col.column.getType()))
 break;
 
-InlineIndexHelper idx = new 
InlineIndexHelper(col.column.getType(), col.column.getColumnId(), col.sortType);
+InlineIndexHelper idx = new InlineIndexHelper(
+col.column.getType(),
+col.column.getColumnId(),
+col.sortType,
+table.getCompareMode());
 
 res.add(idx);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/71cd1e91/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
index 19cf857..1789ac8 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
@@ -23,8 +23,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import org.apache.ignite.internal.pagemem.PageUtils;
+import org.apache.ignite.internal.util.GridUnsafe;
 import org.h2.result.SortOrder;
 import org.h2.table.IndexColumn;
+import org.h2.value.CompareMode;
 import org.h2.value.Value;
 import org.h2.value.ValueBoolean;
 import org.h2.value.ValueByte;
@@ -84,16 +86,28 @@ public class InlineIndexHelper {
 /** */
 private final short size;
 
+/** */
+private final boolean compareBinaryUnsigned;
+
+/** */
+private final boolean compareStringsOptimized;
+
 /**
  * @param type Index type (see {@link Value}).
  * @param colIdx Index column index.
  * @param sortType Column sort type (see {@link IndexColumn#sortType}).
  */
-

[27/50] [abbrv] ignite git commit: IGNITE-6120 Fixed version check for ignite-2.2.0. (cherry picked from commit f4ead8b)

[yzhdanov]

IGNITE-6120 Fixed version check for ignite-2.2.0.
(cherry picked from commit f4ead8b)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: ccc8c9b40d09e1d3314a519f1e9417e79c150d9d
Parents: fc34091
Author: Alexey Kuznetsov 
Authored: Fri Sep 15 23:19:16 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Sep 22 09:58:11 2017 +0700

--
 .../frontend/app/modules/agent/AgentManager.service.js   | 4 +++-
 .../web-console/frontend/app/modules/sql/sql.controller.js   | 8 
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ccc8c9b4/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
--
diff --git 
a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js 
b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 9a736b6..c24a92f 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -26,6 +26,8 @@ const State = {
 CONNECTED: 'CONNECTED'
 };
 
+const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1'];
+
 class ConnectionState {
 constructor(cluster) {
 this.agents = [];
@@ -499,7 +501,7 @@ export default class IgniteAgentManager {
  */
 querySql(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, 
replicatedOnly, local, pageSz, lazy) {
 if (this.available('2.0.0')) {
-const task = this.available('2.1.4-p1') ?
+const task = this.available(...LAZY_QUERY_SINCE) ?
 this.visorTask('querySqlX2', nid, cacheName, query, 
nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz, lazy) :
 this.visorTask('querySqlX2', nid, cacheName, query, 
nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/ccc8c9b4/modules/web-console/frontend/app/modules/sql/sql.controller.js
--
diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js 
b/modules/web-console/frontend/app/modules/sql/sql.controller.js
index c43dc5c..7d8df7a 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.controller.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js
@@ -28,9 +28,9 @@ const ROW_IDX = {value: -2, type: 'java.lang.Integer', label: 
'ROW_IDX'};
 
 const NON_COLLOCATED_JOINS_SINCE = '1.7.0';
 
-const ENFORCE_JOIN_VERS = [['1.7.9', '1.8.0'], ['1.8.4', '1.9.0'], ['1.9.1']];
+const ENFORCE_JOIN_SINCE = [['1.7.9', '1.8.0'], ['1.8.4', '1.9.0'], '1.9.1'];
 
-const LAZY_QUERY_VERS = ['2.1.4-p1'];
+const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1'];
 
 const _fullColName = (col) => {
 const res = [];
@@ -1367,7 +1367,7 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 const cache = _.find($scope.caches, {name: paragraph.cacheName});
 
 if (cache)
-return !!_.find(cache.nodes, (node) => 
Version.since(node.version, ...ENFORCE_JOIN_VERS));
+return !!_.find(cache.nodes, (node) => 
Version.since(node.version, ...ENFORCE_JOIN_SINCE));
 
 return false;
 };
@@ -1376,7 +1376,7 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 const cache = _.find($scope.caches, {name: paragraph.cacheName});
 
 if (cache)
-return !!_.find(cache.nodes, (node) => 
Version.since(node.version, ...LAZY_QUERY_VERS));
+return !!_.find(cache.nodes, (node) => 
Version.since(node.version, ...LAZY_QUERY_SINCE));
 
 return false;
 };

[48/50] [abbrv] ignite git commit: IGNITE-6493 fix IgnitePdsWalTlbTest.testWalDirectOutOfMemory() incorrect usage dataStreamer, must be in try-with-resource

[yzhdanov]

IGNITE-6493 fix IgnitePdsWalTlbTest.testWalDirectOutOfMemory() incorrect usage 
dataStreamer, must be in try-with-resource

Signed-off-by: Andrey Gura 

(cherry picked from commit 21cc7a4)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: d3a672e8b99202589aba8ffa4a9c1561a68a985d
Parents: 251a333
Author: Dmitriy Govorukhin 
Authored: Mon Sep 25 13:28:42 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Sep 25 13:34:01 2017 +0300

--
 .../processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d3a672e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
index fd0fd34..8b3cbf8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
@@ -113,9 +113,7 @@ public class IgnitePdsWalTlbTest extends 
GridCommonAbstractTest {
 
 boolean locked = true;
 
-try {
-IgniteDataStreamer streamer = 
ig.dataStreamer(CACHE_NAME);
-
+try (IgniteDataStreamer streamer = 
ig.dataStreamer(CACHE_NAME)) {
 for (int i = 0; i < 100_000; i++) {
 streamer.addData(i, 1);
 

[46/50] [abbrv] ignite git commit: IGNITE-6063 InlineIdexHelperTest fails - Fixes #2444.

[yzhdanov]

IGNITE-6063 InlineIdexHelperTest fails - Fixes #2444.

Signed-off-by: Alexey Goncharuk 

(cherry picked from commit 09d255e)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: a318c4a17b62a5876dd07b3cdcdb025b3ff03662
Parents: 6452201
Author: Igor Seliverstov 
Authored: Tue Aug 15 14:46:32 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Sep 25 12:40:24 2017 +0300

--
 .../processors/query/h2/database/InlineIndexHelperTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a318c4a1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
index fc06502..6828218 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
@@ -495,7 +495,7 @@ public class InlineIndexHelperTest extends 
GridCommonAbstractTest {
 Value v1 = s1 == null ? ValueNull.INSTANCE : ValueString.get(s1);
 Value v2 = s2 == null ? ValueNull.INSTANCE : ValueString.get(s2);
 
-int c = v1.compareTypeSafe(v2, 
CompareMode.getInstance(CompareMode.DEFAULT, 0));
+int c = v1.compareTypeSafe(v2, CompareMode.getInstance(null, 0));
 
 return ha.canRelyOnCompare(c, v1, v2);
 }
@@ -505,7 +505,7 @@ public class InlineIndexHelperTest extends 
GridCommonAbstractTest {
 Value v1 = b1 == null ? ValueNull.INSTANCE : ValueBytes.get(b1);
 Value v2 = b2 == null ? ValueNull.INSTANCE : ValueBytes.get(b2);
 
-int c = v1.compareTypeSafe(v2, 
CompareMode.getInstance(CompareMode.DEFAULT, 0));
+int c = v1.compareTypeSafe(v2, CompareMode.getInstance(null, 0));
 
 return ha.canRelyOnCompare(c, v1, v2);
 }

[18/50] [abbrv] ignite git commit: Web Console: minor refactoring. (cherry picked from commit abe4ee8)

[yzhdanov]

Web Console: minor refactoring.
(cherry picked from commit abe4ee8)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: f5ff60eb72cf6bf55511b2c73f841eb50af59526
Parents: b6d570f
Author: Alexey Kuznetsov 
Authored: Thu Sep 21 21:13:59 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Sep 21 21:28:06 2017 +0700

--
 .../frontend/app/modules/agent/AgentManager.service.js   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f5ff60eb/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
--
diff --git 
a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js 
b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 7c84edc..9a736b6 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -101,7 +101,7 @@ export default class IgniteAgentManager {
 
 this.clusterVersion = '2.1.0';
 
-if (!$root.IgniteDemoMode) {
+if (!this.isDemoMode()) {
 this.connectionSbj.subscribe({
 next: ({cluster}) => {
 const version = _.get(cluster, 'clusterVersion');
@@ -115,6 +115,10 @@ export default class IgniteAgentManager {
 }
 }
 
+isDemoMode() {
+return this.$root.IgniteDemoMode;
+}
+
 available(sinceVersion) {
 return this.Version.since(this.clusterVersion, sinceVersion);
 }
@@ -141,7 +145,7 @@ export default class IgniteAgentManager {
 self.socket.on('agents:stat', ({clusters, count}) => {
 const conn = self.connectionSbj.getValue();
 
-conn.update(self.$root.IgniteDemoMode, count, clusters);
+conn.update(self.isDemoMode(), count, clusters);
 
 self.connectionSbj.next(conn);
 });

[39/50] [abbrv] ignite git commit: IGNITE-6355 Calculating cache size during cache stop sporadically fails with ClusterGroupEmptyCheckedException - Fixes #2647.

[yzhdanov]

IGNITE-6355 Calculating cache size during cache stop sporadically fails with 
ClusterGroupEmptyCheckedException - Fixes #2647.

Signed-off-by: Alexey Goncharuk 

(cherry picked from commit 0dd9755)

(cherry picked from commit 297ed38)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 9f5c9e385e258c48ce29ca4e9cec222f737eb910
Parents: 7daefd2
Author: Ivan Rakov 
Authored: Mon Sep 18 16:58:10 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:29:09 2017 +0300

--
 .../processors/cache/GridCacheAdapter.java | 17 ++---
 .../processors/cache/IgniteCacheProxyImpl.java |  8 
 2 files changed, 10 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5c9e38/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 382b94d..40f2b49 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
@@ -3730,20 +3730,15 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(grp.nodes());
 
 if (nodes.isEmpty())
 return new GridFinishedFuture<>(0);
 
 ctx.kernalContext().task().setThreadContext(TC_SUBGRID, nodes);
 
-try {
-return ctx.kernalContext().task().execute(
-new SizeTask(ctx.name(), 
ctx.affinity().affinityTopologyVersion(), peekModes), null);
-}
-catch (ClusterGroupEmptyException e) {
-return new GridFinishedFuture<>(0);
-}
+return ctx.kernalContext().task().execute(
+new SizeTask(ctx.name(), ctx.affinity().affinityTopologyVersion(), 
peekModes), null);
 }
 
 /** {@inheritDoc} */
@@ -3756,7 +3751,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(grp.nodes());
 
 if (nodes.isEmpty())
 return new GridFinishedFuture<>(0L);
@@ -3779,13 +3774,13 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(grp.forPredicate(new 
IgnitePredicate() {
 /** {@inheritDoc} */
 @Override public boolean apply(ClusterNode clusterNode) {
 return ((modes.primary && aff.primaryByPartition(clusterNode, 
part, topVer)) ||
 (modes.backup && aff.backupByPartition(clusterNode, 
part, topVer)));
 }
-}).nodes();
+}).nodes());
 
 if (nodes.isEmpty())
 return new GridFinishedFuture<>(0L);

http://git-wip-us.apache.org/repos/asf/ignite/blob/9f5c9e38/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
index 54fcafa..337c1bb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
@@ -1662,10 +1662,10 @@ public class IgniteCacheProxyImpl extends 
AsyncSupportAdapter

[21/50] [abbrv] ignite git commit: IGNITE-6228 Avoid closing page store by thread interruption. Fixes #2715

[yzhdanov]

IGNITE-6228 Avoid closing page store by thread interruption. Fixes #2715


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 111d8abbe6ec7710c7f0e7ebe6d43f3ccb904dcb
Parents: be8afd4
Author: Alexei Scherbakov 
Authored: Thu Sep 21 17:40:16 2017 +0300
Committer: Alexey Goncharuk 
Committed: Thu Sep 21 18:10:22 2017 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   |   5 +
 .../PersistentStoreConfiguration.java   |   6 +-
 .../GridCacheDatabaseSharedManager.java |   7 +-
 .../cache/persistence/file/AsyncFileIO.java | 218 +++
 .../persistence/file/AsyncFileIOFactory.java|  52 +
 .../cache/persistence/file/FileIOFactory.java   |  25 ++-
 .../cache/persistence/file/FilePageStore.java   |   5 +-
 .../file/FileVersionCheckingFactory.java|   2 +-
 .../persistence/file/RandomAccessFileIO.java|  48 ++--
 .../file/RandomAccessFileIOFactory.java |  14 +-
 .../wal/AbstractWalRecordsIterator.java |   2 +-
 .../cache/persistence/wal/FileInput.java|   7 +
 .../wal/FileWriteAheadLogManager.java   |   8 +-
 .../reader/StandaloneWalRecordsIterator.java|   4 +-
 .../internal/util/future/GridFutureAdapter.java |  16 ++
 .../resources/META-INF/classnames.properties|   2 +
 .../file/IgnitePdsThreadInterruptionTest.java   | 205 +
 .../db/wal/IgniteWalFlushFailoverTest.java  |  22 +-
 .../db/wal/crc/IgniteDataIntegrityTests.java|  39 ++--
 .../development/utils/IgniteWalConverter.java   |   1 -
 .../IgnitePdsWithIndexingCoreTestSuite.java |   2 +
 21 files changed, 606 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/111d8abb/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 30d5339..628b165 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -706,6 +706,11 @@ public final class IgniteSystemProperties {
 public static final String IGNITE_ENABLE_FORCIBLE_NODE_KILL = 
"IGNITE_ENABLE_FORCIBLE_NODE_KILL";
 
 /**
+ * If this property is set, then Ignite will use Async File IO factory by 
default.
+ */
+public static final String IGNITE_USE_ASYNC_FILE_IO_FACTORY = 
"IGNITE_USE_ASYNC_FILE_IO_FACTORY";
+
+/**
  * If the property is set {@link 
org.apache.ignite.internal.pagemem.wal.record.TxRecord} records
  * will be logged to WAL.
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/111d8abb/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
index 888bf42..abca5a5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
@@ -17,6 +17,8 @@
 package org.apache.ignite.configuration;
 
 import java.io.Serializable;
+import org.apache.ignite.IgniteSystemProperties;
+import 
org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory;
 import 
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
 import 
org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -137,7 +139,9 @@ public class PersistentStoreConfiguration implements 
Serializable {
 private boolean alwaysWriteFullPages = DFLT_WAL_ALWAYS_WRITE_FULL_PAGES;
 
 /** Factory to provide I/O interface for files */
-private FileIOFactory fileIOFactory = new RandomAccessFileIOFactory();
+private FileIOFactory fileIOFactory =
+
IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_USE_ASYNC_FILE_IO_FACTORY,
 false) ?
+new AsyncFileIOFactory() : new RandomAccessFileIOFactory();
 
 /**
  * Number of sub-intervals the whole {@link #setRateTimeInterval(long)} 
will be split into to calculate

[03/50] [abbrv] ignite git commit: IGNITE-6428 Fixed IgniteOOME in PDS Indexing suite (increased memory policy size) - Fixes #2690.

[yzhdanov]

IGNITE-6428 Fixed IgniteOOME in PDS Indexing suite (increased memory policy 
size) - Fixes #2690.

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

Branch: refs/heads/ignite-2.1.5-p1
Commit: be60c08687f873a278d882666b61d60af7c0205c
Parents: 4a1e90c
Author: dpavlov 
Authored: Tue Sep 19 15:23:18 2017 +0300
Committer: Alexey Goncharuk 
Committed: Tue Sep 19 15:30:42 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/be60c086/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 2d237cb..96f832b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -120,7 +120,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
 MemoryPolicyConfiguration memPlcCfg = new MemoryPolicyConfiguration();
 
 memPlcCfg.setName("dfltMemPlc");
-memPlcCfg.setMaxSize(100 * 1024 * 1024);
+memPlcCfg.setMaxSize(150 * 1024 * 1024);
 memPlcCfg.setInitialSize(100 * 1024 * 1024);
 memPlcCfg.setSwapFilePath("work/swap");
 

[04/50] [abbrv] ignite git commit: IGNITE-6099: ODBC: Implemented SQLGetInfo for all info types. This closes #2689.

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/718e365f/modules/platforms/cpp/odbc/src/connection.cpp
--
diff --git a/modules/platforms/cpp/odbc/src/connection.cpp 
b/modules/platforms/cpp/odbc/src/connection.cpp
index 472eb75..777973a 100644
--- a/modules/platforms/cpp/odbc/src/connection.cpp
+++ b/modules/platforms/cpp/odbc/src/connection.cpp
@@ -46,7 +46,8 @@ namespace ignite
 socket(),
 connected(false),
 parser(),
-config()
+config(),
+info(config)
 {
 // No-op.
 }
@@ -58,9 +59,6 @@ namespace ignite
 
 const config::ConnectionInfo& Connection::GetInfo() const
 {
-// Connection info is constant and the same for all connections 
now.
-const static config::ConnectionInfo info;
-
 return info;
 }
 

[33/50] [abbrv] ignite git commit: IGNITE-6480 fix serverTopologyNodes method - Fixes #2726.

[yzhdanov]

IGNITE-6480 fix serverTopologyNodes method - Fixes #2726.

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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 1ccdc97898b37c7f2240cb222c98899603536fc0
Parents: 24f904e
Author: Dmitriy Govorukhin 
Authored: Fri Sep 22 13:14:57 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 13:24:34 2017 +0300

--
 .../internal/managers/discovery/GridDiscoveryManager.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1ccdc978/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 18815ac..5ce7816 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -183,7 +183,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 private static final int DISCOVERY_HISTORY_SIZE = 
getInteger(IGNITE_DISCOVERY_HISTORY_SIZE, 500);
 
 /** Predicate filtering out daemon nodes. */
-private static final IgnitePredicate FILTER_DAEMON = new 
P1() {
+private static final IgnitePredicate FILTER_NOT_DAEMON = new 
P1() {
 @Override public boolean apply(ClusterNode n) {
 return !n.isDaemon();
 }
@@ -738,7 +738,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 discoEvt.eventNode(node);
 discoEvt.type(EVT_NODE_JOINED);
 
-discoEvt.topologySnapshot(topVer, new 
ArrayList<>(F.view(topSnapshot, FILTER_DAEMON)));
+discoEvt.topologySnapshot(topVer, new 
ArrayList<>(F.view(topSnapshot, FILTER_NOT_DAEMON)));
 
 discoWrk.discoCache = discoCache;
 
@@ -2059,7 +2059,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
  * @return Server topology nodes or {@code null} if there are no nodes for 
passed in version.
  */
 @Nullable public Collection serverTopologyNodes(long topVer) {
-return F.view(topology(topVer), F.not(FILTER_CLI));
+return F.view(topology(topVer), F.not(FILTER_CLI), FILTER_NOT_DAEMON);
 }
 
 /** @return All daemon nodes in topology. */
@@ -2522,7 +2522,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 evt.node(ctx.discovery().localNode());
 evt.eventNode(node);
 evt.type(type);
-evt.topologySnapshot(topVer, U.arrayList(topSnapshot, FILTER_DAEMON));
+evt.topologySnapshot(topVer, U.arrayList(topSnapshot, FILTER_NOT_DAEMON));
 
 if (type == EVT_NODE_METRICS_UPDATED)
 evt.message("Metrics were updated: " + node);

[28/50] [abbrv] ignite git commit: Versions updated.

[yzhdanov]

Versions updated.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: cd4e25ecb4912beb85a571b33e0f1096a24bbb7c
Parents: ccc8c9b
Author: Alexey Kuznetsov 
Authored: Fri Sep 22 10:10:52 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Sep 22 10:10:52 2017 +0700

--
 modules/web-console/frontend/app/services/Version.service.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cd4e25ec/modules/web-console/frontend/app/services/Version.service.js
--
diff --git a/modules/web-console/frontend/app/services/Version.service.js 
b/modules/web-console/frontend/app/services/Version.service.js
index 8ae23d3..beb27fa 100644
--- a/modules/web-console/frontend/app/services/Version.service.js
+++ b/modules/web-console/frontend/app/services/Version.service.js
@@ -73,12 +73,12 @@ const compare = (a, b) => {
 
 export default class IgniteVersion {
 constructor() {
-this.webConsole = '2.1.0';
+this.webConsole = '2.2.0';
 
 this.supportedVersions = [
 {
-label: 'Ignite 2.1',
-ignite: '2.1.0'
+label: 'Ignite 2.x',
+ignite: '2.2.0'
 },
 {
 label: 'Ignite 2.0',

[38/50] [abbrv] ignite git commit: IGNITE-6385 Offheap page eviction doesn't work if data is loaded without data streamer - Fixes #2666.

[yzhdanov]

IGNITE-6385 Offheap page eviction doesn't work if data is loaded without data 
streamer - Fixes #2666.

Signed-off-by: Alexey Goncharuk 

(cherry picked from commit 64b4abe)

(cherry picked from commit 7ca611f)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 7daefd2701c7a566d759c2b7de4912ea3f5d37a8
Parents: 1faa8db
Author: Ivan Rakov 
Authored: Mon Sep 18 11:35:17 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:28:54 2017 +0300

--
 .../cache/persistence/freelist/PagesList.java   | 35 ++-
 .../paged/PageEvictionDataStreamerTest.java | 65 
 .../paged/PageEvictionMultinodeTest.java|  6 +-
 .../IgniteCacheEvictionSelfTestSuite.java   |  2 +
 4 files changed, 91 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7daefd27/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index 6c355f6..8a540a0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
 import org.apache.ignite.internal.pagemem.PageIdUtils;
 import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
@@ -154,9 +155,8 @@ public abstract class PagesList extends DataStructure {
  */
 protected final void init(long metaPageId, boolean initNew) throws 
IgniteCheckedException {
 if (metaPageId != 0L) {
-if (initNew) {
+if (initNew)
 init(metaPageId, PagesListMetaIO.VERSIONS.latest());
-}
 else {
 Map bucketsData = new HashMap<>();
 
@@ -509,10 +509,14 @@ public abstract class PagesList extends DataStructure {
  */
 private Stripe getPageForPut(int bucket) throws IgniteCheckedException {
 // Striped pool optimization.
-int stripeIdx; IgniteThread igniteThread = IgniteThread.current();
+IgniteThread igniteThread = IgniteThread.current();
 
-if (igniteThread != null && (stripeIdx = igniteThread.stripe()) != -1) 
{
-Stripe[] tails = getBucket(bucket);
+Stripe[] tails = getBucket(bucket);
+
+if (igniteThread != null && igniteThread.policy() == 
GridIoPolicy.DATA_STREAMER_POOL) {
+int stripeIdx = igniteThread.stripe();
+
+assert stripeIdx != -1 : igniteThread;
 
 while (tails == null || stripeIdx >= tails.length) {
 addStripe(bucket, true);
@@ -523,8 +527,6 @@ public abstract class PagesList extends DataStructure {
 return tails[stripeIdx];
 }
 
-Stripe[] tails = getBucket(bucket);
-
 if (tails == null)
 return addStripe(bucket, true);
 
@@ -854,9 +856,8 @@ public abstract class PagesList extends DataStructure {
 
 assert nextPageAddr != 0L;
 
-if (locked == null) {
+if (locked == null)
 locked = new GridLongList(6);
-}
 
 locked.add(nextId);
 locked.add(nextPage);
@@ -911,9 +912,8 @@ public abstract class PagesList extends DataStructure {
 updateTail(bucket, pageId, prevId);
 
 // Release write.
-for (int i = 0; i < locked.size(); i+=3) {
+for (int i = 0; i < locked.size(); i += 3)
 writeUnlock(locked.get(i), locked.get(i + 1), locked.get(i 
+ 2), FALSE, true);
-}
 }
 }
 
@@ -933,9 +933,13 @@ public abstract class PagesList extends DataStructure {
 int len = tails.length;
 
 // Striped pool optimization.
-int stripeIdx; IgniteThread igniteThread = 

[30/50] [abbrv] ignite git commit: IGNITE-6213 Removed locDepOwner flag and marked as deprecated - Fixes #2723.

[yzhdanov]

IGNITE-6213 Removed locDepOwner flag and marked as deprecated - Fixes #2723.

Signed-off-by: Alexey Goncharuk 

(cherry picked from commit 1649c53)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 73e1578370c35f3428b097f2f185adf34dace881
Parents: f08127d
Author: Dmitriy Govorukhin 
Authored: Fri Sep 22 12:11:15 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 12:35:17 2017 +0300

--
 .../internal/GridEventConsumeHandler.java   |  9 +++-
 .../managers/deployment/GridDeploymentInfo.java |  1 +
 .../deployment/GridDeploymentInfoBean.java  | 21 +++-
 .../cache/GridCacheDeploymentManager.java   | 54 ++--
 .../processors/cache/GridCacheIoManager.java|  9 +++-
 .../continuous/CacheContinuousQueryHandler.java |  9 +++-
 6 files changed, 45 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/73e15783/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 54e3d7f..ac568f0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -321,8 +321,13 @@ class GridEventConsumeHandler implements 
GridContinuousHandler {
 GridDeploymentInfo depInfo = wrapper.depInfo;
 
 if (depInfo != null) {
-depMgr.p2pContext(nodeId, depInfo.classLoaderId(), 
depInfo.userVersion(), depInfo.deployMode(),
-depInfo.participants(), 
depInfo.localDeploymentOwner());
+depMgr.p2pContext(
+nodeId,
+depInfo.classLoaderId(),
+depInfo.userVersion(),
+depInfo.deployMode(),
+depInfo.participants()
+);
 }
 
 ldr = depMgr.globalLoader();

http://git-wip-us.apache.org/repos/asf/ignite/blob/73e15783/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
index b14fcce..3396d82 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
@@ -49,6 +49,7 @@ public interface GridDeploymentInfo {
 /**
  * @return Local deployment ownership flag.
  */
+@Deprecated
 public boolean localDeploymentOwner();
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/73e15783/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 68f45da..7f58ce3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -52,6 +52,7 @@ public class GridDeploymentInfoBean implements Message, 
GridDeploymentInfo, Exte
 private String userVer;
 
 /** */
+@Deprecated // Left for backward compatibility only.
 private boolean locDepOwner;
 
 /** Node class loader participant map. */
@@ -71,15 +72,17 @@ public class GridDeploymentInfoBean implements Message, 
GridDeploymentInfo, Exte
  * @param userVer User version.
  * @param depMode Deployment mode.
  * @param participants Participants.
- * @param locDepOwner Local deployment owner flag.
  */
-public GridDeploymentInfoBean(IgniteUuid clsLdrId, String userVer, 
DeploymentMode depMode,
-Map

[50/50] [abbrv] ignite git commit: TCP communication skip local node loopback address

[yzhdanov]

TCP communication skip local node loopback address


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: cc87a6215ed3d91948f6d0fa04b104a1e33a40be
Parents: d9a2786
Author: Yakov Zhdanov 
Authored: Fri Oct 13 20:41:56 2017 +0300
Committer: Yakov Zhdanov 
Committed: Fri Oct 13 20:41:56 2017 +0300

--
 .../spi/communication/tcp/TcpCommunicationSpi.java   | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cc87a621/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 1dd48d1..15faeb3 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2987,6 +2987,10 @@ public class TcpCommunicationSpi extends 
IgniteSpiAdapter implements Communicati
 if (isExtAddrsExist)
 addrs.addAll(extAddrs);
 
+if (log.isDebugEnabled())
+log.debug("Addresses resolved from attributes [rmtNode=" + 
node.id() + ", addrs=" + addrs +
+", isRmtAddrsExist=" + isRmtAddrsExist + ']');
+
 Set allInetAddrs = U.newHashSet(addrs.size());
 
 for (InetSocketAddress addr : addrs) {
@@ -3015,7 +3019,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter 
implements Communicati
 }
 
 if (log.isDebugEnabled())
-log.debug("Addresses to connect for node [rmtNode=" + node.id() + 
", addrs=" + addrs.toString() + ']');
+log.debug("Addresses to connect for node [rmtNode=" + node.id() + 
", addrs=" + addrs + ']');
 
 boolean conn = false;
 GridCommunicationClient client = null;
@@ -3024,6 +3028,15 @@ public class TcpCommunicationSpi extends 
IgniteSpiAdapter implements Communicati
 int connectAttempts = 1;
 
 for (InetSocketAddress addr : addrs) {
+if (addr.getAddress().isLoopbackAddress() && addr.getPort() == 
boundTcpPort) {
+if (log.isDebugEnabled())
+log.debug("Skipping local address [addr=" + addr +
+", locAddrs=" + 
node.attribute(createSpiAttributeName(ATTR_ADDRS)) +
+", node=" + node + ']');
+
+continue;
+}
+
 long connTimeout0 = connTimeout;
 
 int attempt = 1;

[17/50] [abbrv] ignite git commit: IGNITE-6342 Fixed exchange hanging on eviction when partition is lost

[yzhdanov]

IGNITE-6342 Fixed exchange hanging on eviction when partition is lost


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: b6d570fb0d5cc5638f857a5aa463600a942fbba0
Parents: 931320f
Author: Alexey Goncharuk 
Authored: Thu Sep 21 16:37:42 2017 +0300
Committer: Alexey Goncharuk 
Committed: Thu Sep 21 16:39:28 2017 +0300

--
 .../discovery/GridDiscoveryManager.java | 18 +++---
 .../dht/GridDhtPartitionTopologyImpl.java   | 13 +++-
 .../GridDhtPartitionsExchangeFuture.java|  2 +-
 .../preloader/GridDhtPartitionsFullMessage.java |  2 +-
 .../persistence/GridCacheOffheapManager.java|  2 +-
 .../IgniteCacheDatabaseSharedManager.java   |  2 +-
 .../cache/persistence/tree/io/IOVersions.java   |  3 +
 .../ignite/spi/discovery/tcp/ServerImpl.java|  3 +-
 .../IgnitePdsContinuousRestartTest.java | 45 -
 ...ousRestartTestWithSharedGroupAndIndexes.java | 67 
 .../ignite/testsuites/IgnitePdsTestSuite2.java  |  3 +
 11 files changed, 144 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b6d570fb/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 15473f1..18815ac 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -1265,7 +1265,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 "(all nodes in topology should have identical value) " 
+
 "[locPreferIpV4=" + locPreferIpV4 + ", rmtPreferIpV4=" 
+ rmtPreferIpV4 +
 ", locId8=" + U.id8(locNode.id()) + ", rmtId8=" + 
U.id8(n.id()) +
-", rmtAddrs=" + U.addressesAsString(n) + ']',
+", rmtAddrs=" + U.addressesAsString(n) + ", rmtNode=" 
+ U.toShortString(n) + "]",
 "Local and remote 'java.net.preferIPv4Stack' system 
properties do not match.");
 
 ipV4Warned = true;
@@ -1280,7 +1280,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 throw new IgniteCheckedException("Remote node has 
deployment mode different from local " +
 "[locId8=" + U.id8(locNode.id()) + ", locMode=" + 
locMode +
 ", rmtId8=" + U.id8(n.id()) + ", rmtMode=" + rmtMode +
-", rmtAddrs=" + U.addressesAsString(n) + ']');
+", rmtAddrs=" + U.addressesAsString(n) + ", rmtNode=" 
+ U.toShortString(n) + "]");
 
 boolean rmtP2pEnabled = n.attribute(ATTR_PEER_CLASSLOADING);
 
@@ -1288,7 +1288,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 throw new IgniteCheckedException("Remote node has peer 
class loading enabled flag different from" +
 " local [locId8=" + U.id8(locNode.id()) + ", 
locPeerClassLoading=" + locP2pEnabled +
 ", rmtId8=" + U.id8(n.id()) + ", rmtPeerClassLoading=" 
+ rmtP2pEnabled +
-", rmtAddrs=" + U.addressesAsString(n) + ']');
+", rmtAddrs=" + U.addressesAsString(n) + ", rmtNode=" 
+ U.toShortString(n) + "]");
 }
 
 Boolean rmtMarshUseDfltSuid = 
n.attribute(ATTR_MARSHALLER_USE_DFLT_SUID);
@@ -1302,7 +1302,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 "[locMarshUseDfltSuid=" + locMarshUseDfltSuid + ", 
rmtMarshUseDfltSuid=" + rmtMarshUseDfltSuid +
 ", locNodeAddrs=" + U.addressesAsString(locNode) +
 ", rmtNodeAddrs=" + U.addressesAsString(n) +
-", locNodeId=" + locNode.id() + ", rmtNodeId=" + n.id() + 
']');
+", locNodeId=" + locNode.id() + ", rmtNodeId=" + n.id() + 
", rmtNode=" + U.toShortString(n) + "]");
 }
 
 Boolean rmtMarshStrSerVer2 = 
n.attribute(ATTR_MARSHALLER_USE_BINARY_STRING_SER_VER_2);
@@ -1316,7 +1316,7 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 "[locMarshStrSerVer2=" + 

[25/50] [abbrv] ignite git commit: IGNITE-6460 Fixed consistentId used in lightweight ClusterNode. Fixes #2707

[yzhdanov]

IGNITE-6460 Fixed consistentId used in lightweight ClusterNode. Fixes #2707


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 49a3631937b09c2fa795d29411635b3b5f82f15a
Parents: e82f077
Author: Eduard Shangareev 
Authored: Thu Sep 21 18:55:00 2017 +0300
Committer: Alexey Goncharuk 
Committed: Thu Sep 21 18:57:33 2017 +0300

--
 .../ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/49a36319/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index b2797a40..20fb6c5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -652,7 +652,7 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
 
 /**
  * IMPORTANT!
- * Only purpose of this constructor is creating node which contains only 
necessary data to store on disc
+ * Only purpose of this constructor is creating node which contains 
necessary data to store on disc only
  * @param node to copy data from
  */
 public TcpDiscoveryNode(
@@ -667,6 +667,6 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
 this.daemon = node.isDaemon();
 this.clientRouterNodeId = node.isClient() ? node.id() : null;
 
-attrs = Collections.emptyMap();
+attrs = Collections.singletonMap(ATTR_NODE_CONSISTENT_ID, 
consistentId);
 }
 }

[47/50] [abbrv] ignite git commit: IGNITE-6050 Fix eternal wait in DataStreamerTest.TestBufferSize

[yzhdanov]

IGNITE-6050 Fix eternal wait in DataStreamerTest.TestBufferSize

This closes #2448

(cherry picked from commit 2cf1260)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 251a333dfbf09d3f6b69bbb2b7658eb3d88fcf0a
Parents: a318c4a
Author: Pavel Tupitsyn 
Authored: Tue Aug 29 14:16:00 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Sep 25 13:33:13 2017 +0300

--
 .../Dataload/DataStreamerTest.cs| 71 +---
 1 file changed, 48 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/251a333d/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
index de95003..fe5955f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
@@ -38,6 +38,9 @@ namespace Apache.Ignite.Core.Tests.Dataload
 /** Node. */
 private IIgnite _grid;
 
+/** Node 2. */
+private IIgnite _grid2;
+
 /** Cache. */
 private ICache _cache;
 
@@ -49,7 +52,7 @@ namespace Apache.Ignite.Core.Tests.Dataload
 {
 _grid = Ignition.Start(TestUtils.GetTestConfiguration());
 
-Ignition.Start(new 
IgniteConfiguration(TestUtils.GetTestConfiguration())
+_grid2 = Ignition.Start(new 
IgniteConfiguration(TestUtils.GetTestConfiguration())
 {
 IgniteInstanceName = "grid1"
 });
@@ -228,42 +231,64 @@ namespace Apache.Ignite.Core.Tests.Dataload
 [Test]
 public void TestBufferSize()
 {
-using (IDataStreamer ldr = _grid.GetDataStreamer(CacheName))
+using (var ldr = _grid.GetDataStreamer(CacheName))
 {
-var fut = ldr.AddData(1, 1);
+const int timeout = 5000;
+
+var part1 = GetPrimaryPartitionKeys(_grid, 4);
+var part2 = GetPrimaryPartitionKeys(_grid2, 4);
+
+var task = ldr.AddData(part1[0], part1[0]);
 
 Thread.Sleep(100);
 
-Assert.IsFalse(fut.IsCompleted);
+Assert.IsFalse(task.IsCompleted);
 
 ldr.PerNodeBufferSize = 2;
 
-ldr.AddData(2, 2);
-ldr.AddData(3, 3);
-ldr.AddData(4, 4).Wait();
-fut.Wait();
+ldr.AddData(part2[0], part2[0]);
+ldr.AddData(part1[1], part1[1]);
+Assert.IsTrue(ldr.AddData(part2[1], part2[1]).Wait(timeout));
+Assert.IsTrue(task.Wait(timeout));
 
-Assert.AreEqual(1, _cache.Get(1));
-Assert.AreEqual(2, _cache.Get(2));
-Assert.AreEqual(3, _cache.Get(3));
-Assert.AreEqual(4, _cache.Get(4));
+Assert.AreEqual(part1[0], _cache.Get(part1[0]));
+Assert.AreEqual(part1[1], _cache.Get(part1[1]));
+Assert.AreEqual(part2[0], _cache.Get(part2[0]));
+Assert.AreEqual(part2[1], _cache.Get(part2[1]));
 
-ldr.AddData(new List>
+Assert.IsTrue(ldr.AddData(new[]
 {
-new KeyValuePair(5, 5), 
-new KeyValuePair(6, 6),
-new KeyValuePair(7, 7), 
-new KeyValuePair(8, 8)
-}).Wait();
-
-Assert.AreEqual(5, _cache.Get(5));
-Assert.AreEqual(6, _cache.Get(6));
-Assert.AreEqual(7, _cache.Get(7));
-Assert.AreEqual(8, _cache.Get(8));
+new KeyValuePair(part1[2], part1[2]),
+new KeyValuePair(part1[3], part1[3]),
+new KeyValuePair(part2[2], part2[2]),
+new KeyValuePair(part2[3], part2[3])
+}).Wait(timeout));
+
+Assert.AreEqual(part1[2], _cache.Get(part1[2]));
+Assert.AreEqual(part1[3], _cache.Get(part1[3]));
+Assert.AreEqual(part2[2], _cache.Get(part2[2]));
+Assert.AreEqual(part2[3], _cache.Get(part2[3]));

[11/50] [abbrv] ignite git commit: IGNITE-6435 Web Console: Added version to footer. (cherry picked from commit 3c75184)

[yzhdanov]

IGNITE-6435 Web Console: Added version to footer.
(cherry picked from commit 3c75184)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 4e38b792517ff182391b78821937db57353a7388
Parents: 668e29f
Author: Dmitriy Shabalin 
Authored: Wed Sep 20 19:00:09 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Sep 20 19:01:58 2017 +0700

--
 modules/web-console/frontend/app/app.js |   2 +
 .../app/components/version-picker/index.js  |   2 +-
 .../app/modules/branding/branding.module.js |   4 +-
 .../app/modules/branding/branding.provider.js   | 111 
 .../app/modules/branding/branding.service.js|  47 +
 .../modules/configuration/Version.service.js| 169 --
 .../configuration/configuration.module.js   |   4 -
 .../generator/ConfigurationGenerator.js |   2 +-
 .../configuration/generator/Maven.service.js|   2 +-
 .../frontend/app/services/Version.service.js| 171 +++
 .../frontend/app/services/Version.spec.js   | 106 
 .../web-console/frontend/app/services/index.js  |  23 +++
 .../frontend/test/unit/Version.test.js  | 106 
 13 files changed, 354 insertions(+), 395 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4e38b792/modules/web-console/frontend/app/app.js
--
diff --git a/modules/web-console/frontend/app/app.js 
b/modules/web-console/frontend/app/app.js
index f072fc5..f2ee8ef 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -128,6 +128,7 @@ import gridItemSelected from 
'./components/grid-item-selected';
 import bsSelectMenu from './components/bs-select-menu';
 import protectFromBsSelectRender from 
'./components/protect-from-bs-select-render';
 import uiGridHovering from './components/ui-grid-hovering';
+import igniteServices from './services';
 
 // Inject external modules.
 import IgniteModules from 'IgniteModules/index';
@@ -188,6 +189,7 @@ angular.module('ignite-console', [
 webConsoleHeader.name,
 webConsoleFooter.name,
 igniteIcon.name,
+igniteServices.name,
 versionPicker.name,
 userNotifications.name,
 pageConfigure.name,

http://git-wip-us.apache.org/repos/asf/ignite/blob/4e38b792/modules/web-console/frontend/app/components/version-picker/index.js
--
diff --git 
a/modules/web-console/frontend/app/components/version-picker/index.js 
b/modules/web-console/frontend/app/components/version-picker/index.js
index f58753e..04ff903 100644
--- a/modules/web-console/frontend/app/components/version-picker/index.js
+++ b/modules/web-console/frontend/app/components/version-picker/index.js
@@ -20,6 +20,6 @@ import component from './component';
 
 export default angular
 .module('ignite-console.version-picker', [
-'ignite-console.configuration'
+'ignite-console.services'
 ])
 .component('versionPicker', component);

http://git-wip-us.apache.org/repos/asf/ignite/blob/4e38b792/modules/web-console/frontend/app/modules/branding/branding.module.js
--
diff --git 
a/modules/web-console/frontend/app/modules/branding/branding.module.js 
b/modules/web-console/frontend/app/modules/branding/branding.module.js
index 9c4a5e5..2313728 100644
--- a/modules/web-console/frontend/app/modules/branding/branding.module.js
+++ b/modules/web-console/frontend/app/modules/branding/branding.module.js
@@ -17,7 +17,7 @@
 
 import angular from 'angular';
 
-import IgniteBranding from './branding.provider';
+import IgniteBranding from './branding.service';
 
 import igniteHeaderLogo from './header-logo.directive';
 import igniteHeaderTitle from './header-title.directive';
@@ -30,7 +30,7 @@ angular
 .module('ignite-console.branding', [
 'tf.metatags'
 ])
-.provider(...IgniteBranding)
+.service('IgniteBranding', IgniteBranding)
 .config(['tfMetaTagsProvider', (tfMetaTagsProvider) => {
 tfMetaTagsProvider.setDefaults({
 title: 'Apache Ignite - Management Tool and Configuration Wizard',

http://git-wip-us.apache.org/repos/asf/ignite/blob/4e38b792/modules/web-console/frontend/app/modules/branding/branding.provider.js
--
diff --git 
a/modules/web-console/frontend/app/modules/branding/branding.provider.js 
b/modules/web-console/frontend/app/modules/branding/branding.provider.js
deleted 

[43/50] [abbrv] ignite git commit: IGNITE-6219 - IgniteCache#loadCache executes local load in caller thread

[yzhdanov]

IGNITE-6219 - IgniteCache#loadCache executes local load in caller thread

(cherry picked from commit e5f45fd)

(cherry picked from commit 2a6658e)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: ae9c6d603d04a46b4603d97d7db986bb33801228
Parents: 25e4706
Author: Dmitriy Govorukhin 
Authored: Fri Sep 22 15:33:37 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:33:37 2017 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   | 10 +
 .../processors/task/GridTaskWorker.java | 22 +++-
 .../resources/META-INF/classnames.properties|  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ae9c6d60/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index ec79026..9992b0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Properties;
 import javax.net.ssl.HostnameVerifier;
 import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.configuration.PersistentStoreConfiguration;
 import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.jetbrains.annotations.Nullable;
@@ -706,6 +707,11 @@ public final class IgniteSystemProperties {
 public static final String IGNITE_ENABLE_FORCIBLE_NODE_KILL = 
"IGNITE_ENABLE_FORCIBLE_NODE_KILL";
 
 /**
+ * If this property is set, then Ignite will use Async File IO factory by 
default.
+ */
+public static final String IGNITE_USE_ASYNC_FILE_IO_FACTORY = 
"IGNITE_USE_ASYNC_FILE_IO_FACTORY";
+
+/**
  * Tasks stealing will be started if tasks queue size per data-streamer 
thread exceeds this threshold.
  * 
  * Default value is {@code 4}.
@@ -721,6 +727,10 @@ public final class IgniteSystemProperties {
  */
 public static final String IGNITE_WAL_LOG_TX_RECORDS = 
"IGNITE_WAL_LOG_TX_RECORDS";
 
+/** If this property is set, {@link 
PersistentStoreConfiguration#writeThrottlingEnabled} will be overridden to true
+ * independent of initial value in configuration. */
+public static final String IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED = 
"IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED";
+
 /**
  * Enforces singleton.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/ae9c6d60/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 74fe57d..b94a427 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -574,7 +574,7 @@ class GridTaskWorker extends GridWorker implements 
GridTimeoutObject {
 if (F.isEmpty(jobs))
 return;
 
-Collection jobResList = new 
ArrayList<>(jobs.size());
+List jobResList = new ArrayList<>(jobs.size());
 
 Collection sibs = new ArrayList<>(jobs.size());
 
@@ -632,6 +632,26 @@ class GridTaskWorker extends GridWorker implements 
GridTimeoutObject {
 // Set mapped flag.
 ses.onMapped();
 
+// Move local jobs to the end of the list, because
+// they will be invoked in current thread that will hold other
+// jobs.
+int jobResSize = jobResList.size();
+
+if (jobResSize > 1) {
+UUID locId = ctx.discovery().localNode().id();
+
+for (int i = 0; i < jobResSize; i++) {
+UUID jobNodeId = jobResList.get(i).getNode().id();
+
+if (jobNodeId.equals(locId) && i < jobResSize - 1) {
+Collections.swap(jobResList, i, jobResSize - 1);
+
+jobResSize--;
+i--;
+}
+}
+}
+
 // Send out all remote mappedJobs.
 for (GridJobResultImpl res : 

[41/50] [abbrv] ignite git commit: IGNITE-6101 Try to improve local scans performance

[yzhdanov]

IGNITE-6101 Try to improve local scans performance

(cherry picked from commit 8d5e73c)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 2310417165d7fd663ff668359ee9a46c775feebf
Parents: 9f5c9e3
Author: Igor Seliverstov 
Authored: Thu Sep 21 19:45:22 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:29:25 2017 +0300

--
 .../ignite/internal/binary/BinaryUtils.java |  26 ++
 .../processors/cache/CacheObjectUtils.java  |  63 ++-
 .../processors/cache/GridCacheAdapter.java  |   6 +-
 .../processors/cache/GridCacheEntryEx.java  |  10 +
 .../processors/cache/GridCacheMapEntry.java |  27 +-
 .../processors/cache/IgniteCacheProxyImpl.java  |  26 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../distributed/near/GridNearCacheEntry.java|   4 +-
 .../processors/cache/query/CacheQueryEntry.java |  58 +++
 .../query/GridCacheDistributedQueryManager.java |  16 +-
 .../cache/query/GridCacheQueryAdapter.java  |  53 ++-
 .../cache/query/GridCacheQueryManager.java  | 466 +--
 .../IgniteCacheObjectProcessorImpl.java | 164 ---
 .../UserCacheObjectByteArrayImpl.java   |  59 +++
 .../cacheobject/UserCacheObjectImpl.java|  82 
 .../cacheobject/UserKeyCacheObjectImpl.java | 101 
 .../service/GridServiceProcessor.java   |   6 +-
 .../resources/META-INF/classnames.properties|  22 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   6 +
 .../GridCacheQueryTransformerSelfTest.java  |  41 ++
 20 files changed, 744 insertions(+), 496 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 969f3e1..2e0db93 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -59,6 +59,12 @@ import org.apache.ignite.binary.BinaryType;
 import org.apache.ignite.binary.Binarylizable;
 import org.apache.ignite.internal.binary.builder.BinaryLazyValue;
 import org.apache.ignite.internal.binary.streams.BinaryInputStream;
+import org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
+import 
org.apache.ignite.internal.processors.cacheobject.UserCacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cacheobject.UserCacheObjectImpl;
+import 
org.apache.ignite.internal.processors.cacheobject.UserKeyCacheObjectImpl;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
@@ -701,6 +707,26 @@ public class BinaryUtils {
 }
 
 /**
+ * @param obj Object to check.
+ * @return True if this is an object of a known type.
+ */
+public static boolean knownCacheObject(Object obj) {
+if (obj == null)
+return false;
+
+Class cls= obj.getClass();
+
+return cls == KeyCacheObjectImpl.class ||
+cls == BinaryObjectImpl.class ||
+cls == CacheObjectImpl.class ||
+cls == CacheObjectByteArrayImpl.class ||
+cls == BinaryEnumObjectImpl.class ||
+cls == UserKeyCacheObjectImpl.class ||
+cls == UserCacheObjectImpl.class ||
+cls == UserCacheObjectByteArrayImpl.class;
+}
+
+/**
  * @param arr Array to check.
  * @return {@code true} if this array is of a known type.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
index f9c76df..e942924 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java

[34/50] [abbrv] ignite git commit: IGNITE-6466 Fixed testGetForInitialWrite - Fixes #2721.

[yzhdanov]

IGNITE-6466 Fixed testGetForInitialWrite - Fixes #2721.

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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 98afbfdab47112cbae722a7317d1af39472e1f88
Parents: 1ccdc97
Author: dpavlov 
Authored: Fri Sep 22 13:47:14 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 13:49:44 2017 +0300

--
 .../processors/cache/persistence/tree/io/DataPageIO.java   | 6 +++---
 .../internal/processors/cache/persistence/tree/io/PageIO.java  | 2 +-
 .../IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java   | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
index e6876a1..628ff38 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
@@ -68,8 +68,8 @@ public class DataPageIO extends PageIO {
 /** */
 private static final int FIRST_ENTRY_OFF = INDIRECT_CNT_OFF + 1;
 
-/** */
-private static final int ITEMS_OFF = FIRST_ENTRY_OFF + 2;
+/** Offset of items (internal page pointers) within data page */
+public static final int ITEMS_OFF = FIRST_ENTRY_OFF + 2;
 
 /** */
 private static final int ITEM_SIZE = 2;
@@ -1445,7 +1445,7 @@ public class DataPageIO extends PageIO {
 /** {@inheritDoc} */
 @Override protected void printPage(long addr, int pageSize, 
GridStringBuilder sb) throws IgniteCheckedException {
 sb.a("DataPageIO [\n");
-printPageLayout(addr, 0, sb);
+printPageLayout(addr, pageSize, sb);
 sb.a("\n]");
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
index 57339a1..b51a934 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
@@ -550,7 +550,7 @@ public abstract class PageIO {
 
 /**
  * @param addr Address.
- * @param pageSize
+ * @param pageSize Page size.
  * @param sb Sb.
  */
 protected abstract void printPage(long addr, int pageSize, 
GridStringBuilder sb) throws IgniteCheckedException ;

http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
index 297e69f..2278981 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -235,8 +235,10 @@ public class 
IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
 try {
 DataPageIO.VERSIONS.latest().initNewPage(pageAddr, 
fullId.pageId(), mem.pageSize());
 
-for (int i = PageIO.COMMON_HEADER_END; i < 
mem.pageSize(); i++)
+for (int i = PageIO.COMMON_HEADER_END + 
DataPageIO.ITEMS_OFF; i < mem.pageSize(); i++)
 

[49/50] [abbrv] ignite git commit: GG-12822 Moved notNullConstraint out of public API

[yzhdanov]

GG-12822 Moved notNullConstraint out of public API


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: d9a2786d725d4649407b031d241c49da3c57fb79
Parents: d3a672e
Author: devozerov 
Authored: Wed Sep 27 17:23:48 2017 +0300
Committer: Alexey Goncharuk 
Committed: Wed Sep 27 17:23:48 2017 +0300

--
 .../org/apache/ignite/cache/QueryEntity.java|  25 +
 .../processors/query/QueryEntityEx.java | 103 +++
 .../internal/processors/query/QuerySchema.java  |  42 ++--
 .../internal/processors/query/QueryUtils.java   |  26 -
 .../resources/META-INF/classnames.properties|  10 +-
 .../query/h2/ddl/DdlStatementsProcessor.java|  10 +-
 .../query/IgniteSqlNotNullConstraintTest.java   |   8 +-
 7 files changed, 182 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a2786d/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index fe54670..b824209 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -83,9 +83,6 @@ public class QueryEntity implements Serializable {
 /** Table name. */
 private String tableName;
 
-/** Fields that must have non-null value. */
-private Set notNullFields;
-
 /**
  * Creates an empty query entity.
  */
@@ -112,8 +109,6 @@ public class QueryEntity implements Serializable {
 idxs = other.idxs != null ? new ArrayList<>(other.idxs) : null;
 
 tableName = other.tableName;
-
-notNullFields = other.notNullFields != null ? new 
HashSet<>(other.notNullFields) : null;
 }
 
 /**
@@ -365,19 +360,7 @@ public class QueryEntity implements Serializable {
  * @return Set of names of fields that must have non-null values.
  */
 @Nullable public Set getNotNullFields() {
-return notNullFields;
-}
-
-/**
- * Sets names of fields that must checked for null.
- *
- * @param notNullFields Set of names of fields that must have non-null 
values.
- * @return {@code this} for chaining.
- */
-public QueryEntity setNotNullFields(@Nullable Set notNullFields) {
-this.notNullFields = notNullFields;
-
-return this;
+return null;
 }
 
 /**
@@ -620,6 +603,7 @@ public class QueryEntity implements Serializable {
 
 if (o == null || getClass() != o.getClass())
 return false;
+
 QueryEntity entity = (QueryEntity)o;
 
 return F.eq(keyType, entity.keyType) &&
@@ -630,14 +614,13 @@ public class QueryEntity implements Serializable {
 F.eq(keyFields, entity.keyFields) &&
 F.eq(aliases, entity.aliases) &&
 F.eqNotOrdered(idxs, entity.idxs) &&
-F.eq(tableName, entity.tableName) &&
-F.eq(notNullFields, entity.notNullFields);
+F.eq(tableName, entity.tableName);
 }
 
 /** {@inheritDoc} */
 @Override public int hashCode() {
 return Objects.hash(keyType, valType, keyFieldName, valueFieldName, 
fields, keyFields, aliases, idxs,
-tableName, notNullFields);
+tableName);
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a2786d/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryEntityEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryEntityEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryEntityEx.java
new file mode 100644
index 000..ec0d5fa
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryEntityEx.java
@@ -0,0 +1,103 @@
+/*
+ * 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 

[32/50] [abbrv] ignite git commit: IGNITE-6334 Fixed compilation after conflict

[yzhdanov]

IGNITE-6334 Fixed compilation after conflict


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 24f904e6af7d17111bc9ec273d6555b70057e25c
Parents: 520c2e3
Author: Alexey Goncharuk 
Authored: Fri Sep 22 13:12:15 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 22 13:13:03 2017 +0300

--
 .../persistence/pagemem/PagesWriteThrottleSmokeTest.java | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/24f904e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
index 12a601d..f4f21ef 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.file.OpenOption;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
@@ -50,6 +51,10 @@ 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 static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.READ;
+import static java.nio.file.StandardOpenOption.WRITE;
+
 /**
  *
  */
@@ -288,12 +293,12 @@ public class PagesWriteThrottleSmokeTest extends 
GridCommonAbstractTest {
 
 /** {@inheritDoc} */
 @Override public FileIO create(File file) throws IOException {
-return create(file, "rw");
+return create(file, CREATE, READ, WRITE);
 }
 
 /** {@inheritDoc} */
-@Override public FileIO create(File file, String mode) throws 
IOException {
-final FileIO delegate = delegateFactory.create(file, mode);
+@Override public FileIO create(File file, OpenOption... openOption) 
throws IOException {
+final FileIO delegate = delegateFactory.create(file, openOption);
 
 return new FileIODecorator(delegate) {
 @Override public int write(ByteBuffer srcBuf) throws 
IOException {

[19/50] [abbrv] ignite git commit: IGNITE-6448: Fixed a bug causing stale SQL statement to reside in cache after ALTER TABLE command. This closes #2702.

[yzhdanov]

IGNITE-6448: Fixed a bug causing stale SQL statement to reside in cache after 
ALTER TABLE command. This closes #2702.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 099d33ceaee8bb8b3edbd1bee91a580572537e45
Parents: f5ff60e
Author: tledkov-gridgain 
Authored: Thu Sep 21 17:46:47 2017 +0300
Committer: devozerov 
Committed: Thu Sep 21 17:47:24 2017 +0300

--
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   3 +
 .../thin/JdbcThinSelectAfterAlterTable.java | 173 +++
 .../processors/query/h2/IgniteH2Indexing.java   |   9 +
 .../processors/query/h2/opt/GridH2Table.java|   2 +
 4 files changed, 187 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/099d33ce/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
index 0bd86b3..3dc00a4 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
@@ -54,6 +54,7 @@ import 
org.apache.ignite.jdbc.thin.JdbcThinNoDefaultSchemaTest;
 import org.apache.ignite.jdbc.thin.JdbcThinPreparedStatementSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinResultSetSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinSchemaCaseTest;
+import org.apache.ignite.jdbc.thin.JdbcThinSelectAfterAlterTable;
 import org.apache.ignite.jdbc.thin.JdbcThinStatementSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinUpdateStatementSelfTest;
 
@@ -147,6 +148,8 @@ public class IgniteJdbcDriverTestSuite extends TestSuite {
 // New thin JDBC driver, full SQL tests
 suite.addTest(new TestSuite(JdbcThinComplexDmlDdlSelfTest.class));
 
+suite.addTest(new TestSuite(JdbcThinSelectAfterAlterTable.class));
+
 return suite;
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/099d33ce/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
new file mode 100644
index 000..13b8f3e
--- /dev/null
+++ 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
@@ -0,0 +1,173 @@
+/*
+ * 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.jdbc.thin;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Base class for complex SQL tests based on JDBC driver.
+ */
+public class JdbcThinSelectAfterAlterTable extends GridCommonAbstractTest {
+/** IP finder. */
+private static final TcpDiscoveryIpFinder 

[23/50] [abbrv] ignite git commit: IGNITE-6316: SQL: fixed CacheConfiguration persistence logic for DDL operations. This closes #2701.

[yzhdanov]

IGNITE-6316: SQL: fixed CacheConfiguration persistence logic for DDL 
operations. This closes #2701.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 21d7fed8a43ba4606eaf850438fc39fcc3223d1c
Parents: 111d8ab
Author: Alexander Paschenko 
Authored: Thu Sep 21 18:51:18 2017 +0300
Committer: devozerov 
Committed: Thu Sep 21 18:56:04 2017 +0300

--
 .../pagemem/store/IgnitePageStoreManager.java   |   4 +-
 .../cache/CacheAffinitySharedManager.java   |   4 +-
 .../persistence/file/FilePageStoreManager.java  |   7 +-
 .../processors/query/GridQueryProcessor.java|  30 ++-
 .../pagemem/NoOpPageStoreManager.java   |   2 +-
 .../IgnitePersistentStoreSchemaLoadTest.java| 237 ---
 6 files changed, 184 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/21d7fed8/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
index eaa85ad..64c5927 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.pagemem.store;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor;
@@ -185,9 +184,10 @@ public interface IgnitePageStoreManager extends 
GridCacheSharedManager, IgniteCh
 
 /**
  * @param cacheData Cache configuration.
+ * @param overwrite Whether stored configuration should be overwritten if 
it exists.
  * @throws IgniteCheckedException If failed.
  */
-public void storeCacheData(StoredCacheData cacheData) throws 
IgniteCheckedException;
+public void storeCacheData(StoredCacheData cacheData, boolean overwrite) 
throws IgniteCheckedException;
 /**
  * @param grpId Cache group ID.
  * @return {@code True} if index store for given cache group existed 
before node started.

http://git-wip-us.apache.org/repos/asf/ignite/blob/21d7fed8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index ffb55e4..f446932 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -2595,8 +2595,8 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 if (cctx.pageStore() != null && cctx.database().persistenceEnabled() 
&& !cctx.kernalContext().clientNode()) {
 try {
 cctx.pageStore().storeCacheData(
-new StoredCacheData(cfg)
-);
+new StoredCacheData(cfg),
+false);
 }
 catch (IgniteCheckedException e) {
 U.error(log(), "Error while saving cache configuration on 
disk, cfg = " + cfg, e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/21d7fed8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index d60151a..b3eb74a 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++ 

[22/50] [abbrv] ignite git commit: ignite-6470 Fixed wrong casting og long value to int

[yzhdanov]

ignite-6470 Fixed wrong casting og long value to int

Signed-off-by: Andrey Gura 

(cherry picked from commit b98ffab)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: aeb4aeaef44ff7abc152f3942dee9e40086bc69c
Parents: 111d8ab
Author: EdShangGG 
Authored: Thu Sep 21 18:36:37 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Thu Sep 21 18:55:30 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/aeb4aeae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
index 98764a2..0547dbc 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
@@ -538,6 +538,6 @@ public class FilePageStore implements PageStore {
 if (!inited)
 return 0;
 
-return (int)(allocated.get() - headerSize()) / pageSize;
+return (int)((allocated.get() - headerSize()) / pageSize);
 }
 }

[29/50] [abbrv] ignite git commit: IGNITE-6476 Fixed "No suitable driver found" in demo mode. (cherry picked from commit 27295f2)

[yzhdanov]

IGNITE-6476 Fixed "No suitable driver found" in demo mode.
(cherry picked from commit 27295f2)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: f08127d50357c4ea24217c096f00942189ed
Parents: cd4e25e
Author: Alexey Kuznetsov 
Authored: Fri Sep 22 11:30:12 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Sep 22 11:31:51 2017 +0700

--
 .../org/apache/ignite/console/demo/AgentMetadataDemo.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f08127d5/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
index 4683dd8..b017fb0 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
@@ -58,6 +58,8 @@ public class AgentMetadataDemo {
 log.info("DEMO: Prepare in-memory H2 database...");
 
 try {
+Class.forName("org.h2.Driver");
+
 Connection conn = 
DriverManager.getConnection("jdbc:h2:mem:demo-db;DB_CLOSE_DELAY=-1", "sa", "");
 
 File sqlScript = resolvePath("demo/db-init.sql");
@@ -75,6 +77,11 @@ public class AgentMetadataDemo {
 
 log.info("DEMO: JDBC URL for test drive metadata load: 
jdbc:h2:mem:demo-db");
 }
+catch (ClassNotFoundException e) {
+log.error("DEMO: Failed to load H2 driver!", e);
+
+throw new SQLException("Failed to load H2 driver", e);
+}
 catch (SQLException e) {
 log.error("DEMO: Failed to start test drive for metadata!", e);
 

[16/50] [abbrv] ignite git commit: IGNITE-6457: JDBC thin driver: now schema in URL string is case-insensitive by default. This closes #2712.

[yzhdanov]

IGNITE-6457: JDBC thin driver: now schema in URL string is case-insensitive by 
default. This closes #2712.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 931320f6ded6f927931c6dca2b9ed6795632365c
Parents: 3847b47
Author: tledkov-gridgain 
Authored: Thu Sep 21 14:40:13 2017 +0300
Committer: devozerov 
Committed: Thu Sep 21 14:41:30 2017 +0300

--
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../jdbc/thin/JdbcThinConnectionSelfTest.java   |   6 +-
 .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java  |   6 +-
 .../jdbc/thin/JdbcThinSchemaCaseTest.java   | 129 +++
 .../org/apache/ignite/IgniteJdbcThinDriver.java |   1 -
 .../internal/jdbc/thin/JdbcThinConnection.java  |  23 +++-
 6 files changed, 159 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/931320f6/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
index 3d3ef27..0bd86b3 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
@@ -53,6 +53,7 @@ import 
org.apache.ignite.jdbc.thin.JdbcThinMissingLongArrayResultsTest;
 import org.apache.ignite.jdbc.thin.JdbcThinNoDefaultSchemaTest;
 import org.apache.ignite.jdbc.thin.JdbcThinPreparedStatementSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinResultSetSelfTest;
+import org.apache.ignite.jdbc.thin.JdbcThinSchemaCaseTest;
 import org.apache.ignite.jdbc.thin.JdbcThinStatementSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinUpdateStatementSelfTest;
 
@@ -122,6 +123,7 @@ public class IgniteJdbcDriverTestSuite extends TestSuite {
 suite.addTest(new TestSuite(JdbcThinStatementSelfTest.class));
 suite.addTest(new TestSuite(JdbcThinComplexQuerySelfTest.class));
 suite.addTest(new TestSuite(JdbcThinNoDefaultSchemaTest.class));
+suite.addTest(new TestSuite(JdbcThinSchemaCaseTest.class));
 suite.addTest(new TestSuite(JdbcThinEmptyCacheSelfTest.class));
 suite.addTest(new TestSuite(JdbcThinMetadataSelfTest.class));
 suite.addTest(new TestSuite(JdbcThinErrorsSelfTest.class));

http://git-wip-us.apache.org/repos/asf/ignite/blob/931320f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index 95068c5..17ce686 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -324,15 +324,15 @@ public class JdbcThinConnectionSelfTest extends 
JdbcThinAbstractSelfTest {
 "Invalid URL format (only schema name is allowed in URL path 
parameter 'host:port[/schemaName]')" );
 
 try (Connection conn = 
DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1/public")) {
-assertEquals("Invalid schema", "public", conn.getSchema());
+assertEquals("Invalid schema", "PUBLIC", conn.getSchema());
 }
 
-try (Connection conn = 
DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1/" + 
DEFAULT_CACHE_NAME)) {
+try (Connection conn = 
DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1/\"" + 
DEFAULT_CACHE_NAME + '"')) {
 assertEquals("Invalid schema", DEFAULT_CACHE_NAME, 
conn.getSchema());
 }
 
 try (Connection conn = 
DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1/_not_exist_schema_")) 
{
-assertEquals("Invalid schema", "_not_exist_schema_", 
conn.getSchema());
+assertEquals("Invalid schema", "_NOT_EXIST_SCHEMA_", 
conn.getSchema());
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/931320f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
--
diff --git 

[37/50] [abbrv] ignite git commit: IGNITE-6051 Improve future listeners model in DataStreamerImpl

[yzhdanov]

IGNITE-6051 Improve future listeners model in DataStreamerImpl

(cherry picked from commit 18ca0b2)

(cherry picked from commit cec55c3)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 1faa8dbed4009b691ee0fd5920aead8ec3e6719c
Parents: 71cd1e9
Author: Yakov Zhdanov 
Authored: Mon Aug 21 17:28:25 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:28:40 2017 +0300

--
 .../datastreamer/DataStreamerImpl.java  |  63 ++--
 .../util/future/GridCompoundFuture.java |  40 --
 .../datastreamer/DataStreamerImplSelfTest.java  | 143 ++-
 3 files changed, 221 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1faa8dbe/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 1869dcf..6ed552a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -941,10 +941,16 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 }
 };
 
+GridCompoundFuture opFut = new SilentCompoundFuture();
+
+opFut.listen(lsnr);
+
 final List futs;
 
 try {
-futs = buf.update(entriesForNode, topVer, lsnr, remap);
+futs = buf.update(entriesForNode, topVer, opFut, 
remap);
+
+opFut.markInitialized();
 }
 catch (IgniteInterruptedCheckedException e1) {
 resFut.onDone(e1);
@@ -1382,7 +1388,7 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 /**
  * @param newEntries Infos.
  * @param topVer Topology version.
- * @param lsnr Listener for the operation future.
+ * @param opFut Completion future for the operation.
  * @param remap Remapping flag.
  * @return Future for operation.
  * @throws IgniteInterruptedCheckedException If failed.
@@ -1390,10 +1396,11 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 @Nullable List update(
 Iterable newEntries,
 AffinityTopologyVersion topVer,
-IgniteInClosure lsnr,
+GridCompoundFuture opFut,
 boolean remap
 ) throws IgniteInterruptedCheckedException {
 List res = null;
+GridFutureAdapter[] futs = new GridFutureAdapter[stripes.length];
 
 for (DataStreamerEntry entry : newEntries) {
 List entries0 = null;
@@ -1408,9 +1415,16 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 synchronized (b) {
 curFut0 = b.curFut;
 
-// Listener should be added only once per whole entries 
collection.
-// Should we simplify the model and get rid of all futures?
-curFut0.listen(lsnr);
+if (futs[b.partId] != curFut0) {
+opFut.add(curFut0);
+
+if (res == null)
+res = new ArrayList<>();
+
+res.add(curFut0);
+
+futs[b.partId] = curFut0;
+}
 
 if (b.batchTopVer == null)
 b.batchTopVer = topVer;
@@ -1426,14 +1440,28 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 }
 }
 
-if (res == null)
-res = new ArrayList<>();
+if (!allowOverwrite() && !topVer.equals(curBatchTopVer)) {
+for (int i = 0; i < stripes.length; i++) {
+PerStripeBuffer b0 = stripes[i];
 
-res.add(curFut0);
+// renew all stale versions
+synchronized (b0) {
+ 

[35/50] [abbrv] ignite git commit: IGNITE-5658 Optimizations for data streamer

[yzhdanov]

IGNITE-5658 Optimizations for data streamer

(cherry picked from commit aa81dd1)

(cherry picked from commit 1ad4f14)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 212603e1a969b9320f40207cd9233bed9152b3e4
Parents: 98afbfd
Author: Igor Seliverstov 
Authored: Wed Aug 9 19:29:39 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Sep 22 15:28:11 2017 +0300

--
 .../org/apache/ignite/IgniteDataStreamer.java   |  26 +-
 .../apache/ignite/IgniteSystemProperties.java   |  12 +-
 .../ignite/internal/GridKernalContext.java  |   2 +-
 .../ignite/internal/GridKernalContextImpl.java  |   6 +-
 .../apache/ignite/internal/IgniteKernal.java|   5 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   3 +
 .../org/apache/ignite/internal/IgnitionEx.java  |  23 +-
 .../ignite/internal/jdbc2/JdbcConnection.java   |   5 +-
 .../managers/communication/GridIoManager.java   |   6 +
 .../managers/communication/GridIoMessage.java   |   3 +
 .../cache/persistence/freelist/PagesList.java   |  67 +++--
 .../wal/reader/StandaloneGridKernalContext.java |   2 +-
 .../datastreamer/DataStreamerImpl.java  | 281 ---
 .../datastreamer/DataStreamerRequest.java   |  59 +++-
 .../ignite/internal/util/StripedExecutor.java   |  89 +-
 .../org/apache/ignite/thread/IgniteThread.java  |  10 +
 .../DataStreamProcessorSelfTest.java|  14 +-
 .../datastreamer/DataStreamerImplSelfTest.java  |   3 +-
 18 files changed, 424 insertions(+), 192 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/212603e1/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index e2473dc..b1f5851 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -20,6 +20,7 @@ package org.apache.ignite;
 import java.util.Collection;
 import java.util.Map;
 import javax.cache.CacheException;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.stream.StreamReceiver;
@@ -72,7 +73,7 @@ import org.jetbrains.annotations.Nullable;
  *  this setting limits maximum allowed number of parallel buffered stream 
messages that
  *  are being processed on remote nodes. If this number is exceeded, then
  *  {@link #addData(Object, Object)} method will block to control memory 
utilization.
- *  Default is defined by {@link #DFLT_MAX_PARALLEL_OPS} value.
+ *  Default is equal to CPU count on remote node multiply by {@link 
#DFLT_PARALLEL_OPS_MULTIPLIER}.
  *  
  *  
  *  {@link #autoFlushFrequency(long)} - automatic flush frequency in 
milliseconds. Essentially,
@@ -100,11 +101,23 @@ import org.jetbrains.annotations.Nullable;
  * 
  */
 public interface IgniteDataStreamer extends AutoCloseable {
-/** Default max concurrent put operations count. */
+/**
+ * Default max concurrent put operations count.
+ * @deprecated Is not used anymore.
+ */
+@Deprecated
 public static final int DFLT_MAX_PARALLEL_OPS = 16;
 
-/** Default per node buffer size. */
-public static final int DFLT_PER_NODE_BUFFER_SIZE = 1024;
+/**
+ * Default multiplier for data streamer pool size to get concurrent 
batches count for each remote node.
+ *
+ * @see IgniteConfiguration#getDataStreamerThreadPoolSize()
+ * @see #perNodeParallelOperations()
+ */
+public static final int DFLT_PARALLEL_OPS_MULTIPLIER = 8;
+
+/** Default operations batch size to sent to remote node for loading. */
+public static final int DFLT_PER_NODE_BUFFER_SIZE = 512;
 
 /** Default timeout for streamer's operations. */
 public static final long DFLT_UNLIMIT_TIMEOUT = -1;
@@ -203,9 +216,11 @@ public interface IgniteDataStreamer extends 
AutoCloseable {
  * 
  * This method should be called prior to {@link #addData(Object, Object)} 
call.
  * 
- * If not provided, default value is {@link #DFLT_MAX_PARALLEL_OPS}.
+ * If not provided, default value is calculated as follows
+ * {@link #DFLT_PARALLEL_OPS_MULTIPLIER} * {@code 
DATA_STREAMER_POOL_SIZE_ON_REMOTE_NODE}.
  *
  * @param parallelOps Maximum number of parallel stream operations for a 

[02/50] [abbrv] ignite git commit: ignite-6262 Flaky deadlock detection tests are fixed

[yzhdanov]

ignite-6262 Flaky deadlock detection tests are fixed

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 4a1e90c654ce8f169960b6ef5035cdb9fa837a19
Parents: 542f2c2
Author: Vitaliy Biryukov 
Authored: Tue Sep 19 13:23:45 2017 +0300
Committer: Andrey Gura 
Committed: Tue Sep 19 13:31:51 2017 +0300

--
 .../AbstractDeadlockDetectionTest.java  |  65 ++
 .../TxOptimisticDeadlockDetectionTest.java  |  54 +
 .../TxPessimisticDeadlockDetectionTest.java | 223 +--
 3 files changed, 116 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1e90c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractDeadlockDetectionTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractDeadlockDetectionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractDeadlockDetectionTest.java
index 7381f5a..c0034f5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractDeadlockDetectionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractDeadlockDetectionTest.java
@@ -17,13 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
+import java.util.Collection;
+import java.util.Set;
+import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.cache.affinity.Affinity;
 import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import org.apache.ignite.internal.util.typedef.PA;
 import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
@@ -35,6 +47,59 @@ import java.util.List;
  */
 public abstract class AbstractDeadlockDetectionTest extends 
GridCommonAbstractTest {
 /**
+ * Checks that transactions and futures are completed and entries are not 
locked.
+ * @param involvedKeys Involved keys.
+ */
+protected void checkAllTransactionsCompleted(Set involvedKeys, int 
nodesCnt, String cacheName) {
+boolean fail = false;
+
+for (int i = 0; i < nodesCnt; i++) {
+Ignite ignite = ignite(i);
+
+int cacheId = 
((IgniteCacheProxy)ignite.cache(cacheName)).context().cacheId();
+
+GridCacheSharedContext cctx = 
((IgniteKernal)ignite).context().cache().context();
+
+IgniteTxManager txMgr = cctx.tm();
+
+Collection activeTxs = 
txMgr.activeTransactions();
+
+for (IgniteInternalTx tx : activeTxs) {
+Collection entries = tx.allEntries();
+
+for (IgniteTxEntry entry : entries) {
+if (entry.cacheId() == cacheId) {
+fail = true;
+
+U.error(log, "Transaction still exists: " + "\n" + 
tx.xidVersion() +
+"\n" + tx.nearXidVersion() + "\n nodeId=" + 
cctx.localNodeId() + "\n tx=" + tx);
+}
+}
+}
+
+Collection futs = 
txMgr.deadlockDetectionFutures();
+
+assertTrue(futs.isEmpty());
+
+GridCacheAdapter intCache = internalCache(i, 
cacheName);
+
+GridCacheConcurrentMap map = intCache.map();
+
+for (Object key : involvedKeys) {
+KeyCacheObject keyCacheObj = 
intCache.context().toCacheKeyObject(key);
+
+GridCacheMapEntry entry = map.getEntry(intCache.context(), 
keyCacheObj);
+
+if (entry != null)
+   

[13/50] [abbrv] ignite git commit: IGNITE-6250 .NET: Thin client: Basic exception handling

[yzhdanov]

IGNITE-6250 .NET: Thin client: Basic exception handling

This closes #2698


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: bd60ab1fa6aaf433849e8a052af41a2a333c7904
Parents: 1a64615
Author: Pavel Tupitsyn 
Authored: Wed Sep 20 16:49:49 2017 +0300
Committer: devozerov 
Committed: Wed Sep 20 18:12:58 2017 +0300

--
 .../odbc/ClientListenerNioListener.java |   2 +-
 .../odbc/ClientListenerRequestHandler.java  |   3 +-
 .../odbc/jdbc/JdbcRequestHandler.java   |   2 +-
 .../odbc/odbc/OdbcRequestHandler.java   |   2 +-
 .../client/ClientConnectionContext.java |   4 +-
 .../platform/client/ClientMessageParser.java|  20 ++-
 .../platform/client/ClientRawRequest.java   |  45 +++
 .../platform/client/ClientRequest.java  |   9 ++
 .../platform/client/ClientRequestHandler.java   |  17 +--
 .../platform/client/ClientResponse.java |  33 -
 .../platform/client/ClientStatus.java   |  45 +++
 .../platform/client/IgniteClientException.java  |  65 ++
 .../client/cache/ClientCacheRequest.java|  11 +-
 .../Client/Cache/CacheTest.cs   |  20 +++
 .../Client/Cache/ScanQueryTest.cs   |  34 -
 .../Client/ClientConnectionTest.cs  |   5 +-
 .../Client/RawSocketTest.cs | 130 +--
 .../Apache.Ignite.Core.csproj   |   2 +
 .../Client/IgniteClientException.cs | 108 +++
 .../Impl/Client/Cache/CacheClient.cs|  23 +++-
 .../Impl/Client/ClientSocket.cs |  21 +--
 .../Impl/Client/ClientStatus.cs |  31 +
 22 files changed, 546 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bd60ab1f/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index f0f4903..faecab3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -154,7 +154,7 @@ public class ClientListenerNioListener extends 
GridNioServerListenerAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/bd60ab1f/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
index e28d0d9..cebde08 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
@@ -35,9 +35,10 @@ public interface ClientListenerRequestHandler {
  * Handle exception.
  *
  * @param e Exception.
+ * @param req Request.
  * @return Error response.
  */
-public ClientListenerResponse handleException(Exception e);
+public ClientListenerResponse handleException(Exception e, 
ClientListenerRequest req);
 
 /**
  * Write successful handshake response.

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd60ab1f/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index 2143fb6f..ea25b11 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -188,7 +188,7 @@ public class JdbcRequestHandler implements 
ClientListenerRequestHandler {
 }
 
 /** {@inheritDoc} */
-@Override public ClientListenerResponse handleException(Exception e) {
+@Override public 

[08/50] [abbrv] ignite git commit: IGNITE-6431 Web console: Fixed duplicate "Partition loss policy" field. (cherry picked from commit 2299589)

[yzhdanov]

IGNITE-6431 Web console: Fixed duplicate "Partition loss policy" field.
(cherry picked from commit 2299589)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 433879963db63103ba597e67e703f6ab7d3c64e1
Parents: 915682b
Author: vsisko 
Authored: Wed Sep 20 00:10:46 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Sep 20 00:12:21 2017 +0700

--
 .../states/configuration/caches/general.pug | 23 ++--
 1 file changed, 2 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/43387996/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
--
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
index 87c67f5..50f39e6 100644
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
+++ 
b/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
@@ -45,25 +45,6 @@ include /app/helpers/jade/mixins
 .settings-row
 +cacheMode('Mode:', `${model}.cacheMode`, '"cacheMode"', 
'PARTITIONED')
 
-//- Since ignite 2.0
-.settings-row(ng-if='$ctrl.available("2.0.0")')
-+dropdown('Partition loss policy:', model + 
'.partitionLossPolicy', '"partitionLossPolicy"', 'true', 'IGNORE',
-'[\
-{value: "READ_ONLY_SAFE", label: 
"READ_ONLY_SAFE"},\
-{value: "READ_ONLY_ALL", label: "READ_ONLY_ALL"},\
-{value: "READ_WRITE_SAFE", label: 
"READ_WRITE_SAFE"},\
-{value: "READ_WRITE_ALL", label: 
"READ_WRITE_ALL"},\
-{value: "IGNORE", label: "IGNORE"}\
-]',
-'Defines how cache will behave in a case when one or 
more partitions are lost:\
-\
-READ_ONLY_SAFE - all writes to the cache will 
be failed with an exception, reads will only be allowed for keys in non-lost 
partitions\
-READ_ONLY_ALL - all writes to the cache will 
be failed with an exception, all reads will proceed as if all partitions were 
in a consistent state\
-READ_WRITE_SAFE - all reads and writes will be 
allowed for keys in valid partitions\
-READ_WRITE_ALL - all reads and writes will 
proceed as if all partitions were in a consistent state\
-IGNORE - if partition is lost, reset its state 
and do not clear intermediate data\
-')
-
 .settings-row
 +dropdown('Atomicity:', `${model}.atomicityMode`, 
'"atomicityMode"', 'true', 'ATOMIC',
 '[\
@@ -96,10 +77,10 @@ include /app/helpers/jade/mixins
 READ_ONLY_SAFE - in this mode all writes to the 
cache will be failed with an exception,\
 reads will only be allowed for keys in  non-lost 
partitions.\
 Reads from lost partitions will be failed with an 
exception.\
-READ_ONLY_ALL - in this mode фll writes to the 
cache will be failed with an exception.\
+READ_ONLY_ALL - in this mode all writes to the 
cache will be failed with an exception.\
 All reads will proceed as if all partitions were 
in a consistent state.\
 The result of reading from a lost partition is 
undefined and may be different on different nodes in the cluster.\
-READ_WRITE_SAFE - in this mode Aall reads and 
writes will be allowed for keys in valid partitions.\
+READ_WRITE_SAFE - in this mode all reads and 
writes will be allowed for keys in valid partitions.\
 All reads and writes for keys in lost partitions 
will be failed with an exception.\
 READ_WRITE_ALL - in this mode all reads and writes 
will proceed as if all partitions were in a consistent state.\
 The result of reading from a lost partition is 
undefined and may be different on different nodes in the cluster.\

[05/50] [abbrv] ignite git commit: IGNITE-6099: ODBC: Implemented SQLGetInfo for all info types. This closes #2689.

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/718e365f/modules/platforms/cpp/odbc/src/config/connection_info.cpp
--
diff --git a/modules/platforms/cpp/odbc/src/config/connection_info.cpp 
b/modules/platforms/cpp/odbc/src/config/connection_info.cpp
index 4925957..362d46b 100644
--- a/modules/platforms/cpp/odbc/src/config/connection_info.cpp
+++ b/modules/platforms/cpp/odbc/src/config/connection_info.cpp
@@ -48,184 +48,846 @@ namespace ignite
 {
 switch (type)
 {
+#ifdef SQL_ACCESSIBLE_PROCEDURES
+DBG_STR_CASE(SQL_ACCESSIBLE_PROCEDURES);
+#endif // SQL_ACCESSIBLE_PROCEDURES
+#ifdef SQL_ACCESSIBLE_TABLES
+DBG_STR_CASE(SQL_ACCESSIBLE_TABLES);
+#endif // SQL_ACCESSIBLE_TABLES
+#ifdef SQL_ACTIVE_ENVIRONMENTS
+DBG_STR_CASE(SQL_ACTIVE_ENVIRONMENTS);
+#endif // SQL_ACTIVE_ENVIRONMENTS
+#ifdef SQL_DRIVER_NAME
 DBG_STR_CASE(SQL_DRIVER_NAME);
+#endif // SQL_DRIVER_NAME
+#ifdef SQL_DBMS_NAME
 DBG_STR_CASE(SQL_DBMS_NAME);
+#endif // SQL_DBMS_NAME
+#ifdef SQL_DRIVER_ODBC_VER
 DBG_STR_CASE(SQL_DRIVER_ODBC_VER);
+#endif // SQL_DRIVER_ODBC_VER
+#ifdef SQL_DBMS_VER
 DBG_STR_CASE(SQL_DBMS_VER);
+#endif // SQL_DBMS_VER
+#ifdef SQL_DRIVER_VER
 DBG_STR_CASE(SQL_DRIVER_VER);
+#endif // SQL_DRIVER_VER
+#ifdef SQL_COLUMN_ALIAS
 DBG_STR_CASE(SQL_COLUMN_ALIAS);
+#endif // SQL_COLUMN_ALIAS
+#ifdef SQL_IDENTIFIER_QUOTE_CHAR
 DBG_STR_CASE(SQL_IDENTIFIER_QUOTE_CHAR);
+#endif // SQL_IDENTIFIER_QUOTE_CHAR
+#ifdef SQL_CATALOG_NAME_SEPARATOR
 DBG_STR_CASE(SQL_CATALOG_NAME_SEPARATOR);
+#endif // SQL_CATALOG_NAME_SEPARATOR
+#ifdef SQL_SPECIAL_CHARACTERS
 DBG_STR_CASE(SQL_SPECIAL_CHARACTERS);
+#endif // SQL_SPECIAL_CHARACTERS
+#ifdef SQL_CATALOG_TERM
 DBG_STR_CASE(SQL_CATALOG_TERM);
+#endif // SQL_CATALOG_TERM
+#ifdef SQL_TABLE_TERM
 DBG_STR_CASE(SQL_TABLE_TERM);
+#endif // SQL_TABLE_TERM
+#ifdef SQL_SCHEMA_TERM
 DBG_STR_CASE(SQL_SCHEMA_TERM);
+#endif // SQL_SCHEMA_TERM
+#ifdef SQL_NEED_LONG_DATA_LEN
 DBG_STR_CASE(SQL_NEED_LONG_DATA_LEN);
-//DBG_STR_CASE(SQL_ASYNC_DBC_FUNCTIONS);
+#endif // SQL_NEED_LONG_DATA_LEN
+#ifdef SQL_ASYNC_DBC_FUNCTIONS
+DBG_STR_CASE(SQL_ASYNC_DBC_FUNCTIONS);
+#endif // SQL_ASYNC_DBC_FUNCTIONS
+#ifdef SQL_ASYNC_NOTIFICATION
 DBG_STR_CASE(SQL_ASYNC_NOTIFICATION);
+#endif // SQL_ASYNC_NOTIFICATION
+#ifdef SQL_GETDATA_EXTENSIONS
 DBG_STR_CASE(SQL_GETDATA_EXTENSIONS);
+#endif // SQL_GETDATA_EXTENSIONS
+#ifdef SQL_ODBC_INTERFACE_CONFORMANCE
 DBG_STR_CASE(SQL_ODBC_INTERFACE_CONFORMANCE);
+#endif // SQL_ODBC_INTERFACE_CONFORMANCE
+#ifdef SQL_SQL_CONFORMANCE
 DBG_STR_CASE(SQL_SQL_CONFORMANCE);
+#endif // SQL_SQL_CONFORMANCE
+#ifdef SQL_CATALOG_USAGE
 DBG_STR_CASE(SQL_CATALOG_USAGE);
+#endif // SQL_CATALOG_USAGE
+#ifdef SQL_SCHEMA_USAGE
 DBG_STR_CASE(SQL_SCHEMA_USAGE);
+#endif // SQL_SCHEMA_USAGE
+#ifdef SQL_MAX_IDENTIFIER_LEN
 DBG_STR_CASE(SQL_MAX_IDENTIFIER_LEN);
+#endif // SQL_MAX_IDENTIFIER_LEN
+#ifdef SQL_AGGREGATE_FUNCTIONS
 DBG_STR_CASE(SQL_AGGREGATE_FUNCTIONS);
+#endif // SQL_AGGREGATE_FUNCTIONS
+#ifdef SQL_NUMERIC_FUNCTIONS
 DBG_STR_CASE(SQL_NUMERIC_FUNCTIONS);
+#endif // SQL_NUMERIC_FUNCTIONS
+#ifdef SQL_STRING_FUNCTIONS
 DBG_STR_CASE(SQL_STRING_FUNCTIONS);
+#endif // SQL_STRING_FUNCTIONS
+#ifdef SQL_TIMEDATE_FUNCTIONS
 DBG_STR_CASE(SQL_TIMEDATE_FUNCTIONS);
+#endif // SQL_TIMEDATE_FUNCTIONS
+#ifdef SQL_TIMEDATE_ADD_INTERVALS
 DBG_STR_CASE(SQL_TIMEDATE_ADD_INTERVALS);
+#endif // SQL_TIMEDATE_ADD_INTERVALS
+#ifdef SQL_TIMEDATE_DIFF_INTERVALS
 DBG_STR_CASE(SQL_TIMEDATE_DIFF_INTERVALS);
+#endif // SQL_TIMEDATE_DIFF_INTERVALS
+#ifdef SQL_DATETIME_LITERALS
 DBG_STR_CASE(SQL_DATETIME_LITERALS);
+#endif // SQL_DATETIME_LITERALS
+#ifdef SQL_SYSTEM_FUNCTIONS
 DBG_STR_CASE(SQL_SYSTEM_FUNCTIONS);
+#endif // SQL_SYSTEM_FUNCTIONS
+#ifdef SQL_CONVERT_FUNCTIONS
 DBG_STR_CASE(SQL_CONVERT_FUNCTIONS);
+#endif // SQL_CONVERT_FUNCTIONS
+#ifdef SQL_OJ_CAPABILITIES
 DBG_STR_CASE(SQL_OJ_CAPABILITIES);
+#endif // SQL_OJ_CAPABILITIES
+#ifdef SQL_POS_OPERATIONS
 DBG_STR_CASE(SQL_POS_OPERATIONS);
+#endif // SQL_POS_OPERATIONS
+#ifdef SQL_MAX_CONCURRENT_ACTIVITIES
 DBG_STR_CASE(SQL_MAX_CONCURRENT_ACTIVITIES);
+#endif // SQL_MAX_CONCURRENT_ACTIVITIES
+#ifdef SQL_CURSOR_COMMIT_BEHAVIOR
 

[01/50] [abbrv] ignite git commit: .NET: Remove empty file (merge byproduct)

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.1.5-p1 [created] cc87a6215


.NET: Remove empty file (merge byproduct)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 542f2c2b8b93529bde63a76eb8833d6fd2c61020
Parents: 6c416d5
Author: Pavel Tupitsyn 
Authored: Tue Sep 19 13:30:01 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Sep 19 13:30:01 2017 +0300

--
 modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/542f2c2b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs
deleted file mode 100644
index e69de29..000

[06/50] [abbrv] ignite git commit: IGNITE-6099: ODBC: Implemented SQLGetInfo for all info types. This closes #2689.

[yzhdanov]

IGNITE-6099: ODBC: Implemented SQLGetInfo for all info types. This closes #2689.


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 718e365f47bb5c91bc910854a7626b1933c83e59
Parents: be60c08
Author: Igor Sapego 
Authored: Tue Sep 19 16:23:54 2017 +0300
Committer: devozerov 
Committed: Tue Sep 19 16:25:51 2017 +0300

--
 .../cpp/odbc-test/src/connection_info_test.cpp  |3 +-
 .../ignite/odbc/config/connection_info.h|8 +-
 .../cpp/odbc/include/ignite/odbc/connection.h   |3 +
 .../cpp/odbc/src/config/connection_info.cpp | 2235 --
 modules/platforms/cpp/odbc/src/connection.cpp   |6 +-
 5 files changed, 1997 insertions(+), 258 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/718e365f/modules/platforms/cpp/odbc-test/src/connection_info_test.cpp
--
diff --git a/modules/platforms/cpp/odbc-test/src/connection_info_test.cpp 
b/modules/platforms/cpp/odbc-test/src/connection_info_test.cpp
index c2fe4f8..2119c09 100644
--- a/modules/platforms/cpp/odbc-test/src/connection_info_test.cpp
+++ b/modules/platforms/cpp/odbc-test/src/connection_info_test.cpp
@@ -36,7 +36,8 @@ BOOST_AUTO_TEST_CASE(TestConnectionInfoSupportedInfo)
 char buffer[4096];
 short reslen = 0;
 
-ConnectionInfo info;
+Configuration cfg;
+ConnectionInfo info(cfg);
 
 SqlResult::Type result;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/718e365f/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
--
diff --git 
a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h 
b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
index c17d5ec..fb6351a 100644
--- a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
+++ b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 
 namespace ignite
 {
@@ -50,8 +51,10 @@ namespace ignite
 
 /**
  * Constructor.
+ *
+ * @param config Configuration.
  */
-ConnectionInfo();
+ConnectionInfo(const Configuration& config);
 
 /**
  * Destructor.
@@ -88,6 +91,9 @@ namespace ignite
 
 /** Short parameters. */
 UshortInfoMap shortParams;
+
+/** Configuration. */
+const Configuration& config;
 };
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/718e365f/modules/platforms/cpp/odbc/include/ignite/odbc/connection.h
--
diff --git a/modules/platforms/cpp/odbc/include/ignite/odbc/connection.h 
b/modules/platforms/cpp/odbc/include/ignite/odbc/connection.h
index fa80a01..34fed5f 100644
--- a/modules/platforms/cpp/odbc/include/ignite/odbc/connection.h
+++ b/modules/platforms/cpp/odbc/include/ignite/odbc/connection.h
@@ -316,6 +316,9 @@ namespace ignite
 
 /** Configuration. */
 config::Configuration config;
+
+/** Connection info. */
+config::ConnectionInfo info;
 };
 }
 }

[1/2] ignite git commit: IGNITE-6101 Try to improve local scans performance

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master 79d47f873 -> 1c9d80a54


http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9d80a5/modules/core/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index 675bd56..947b508 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -132,6 +132,7 @@ 
org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask
 org.apache.ignite.compute.gridify.aop.GridifyDefaultTask
 org.apache.ignite.configuration.CacheConfiguration
 org.apache.ignite.configuration.CacheConfiguration$IgniteAllNodesPredicate
+org.apache.ignite.configuration.CheckpointWriteOrder
 org.apache.ignite.configuration.CollectionConfiguration
 org.apache.ignite.configuration.DataPageEvictionMode
 org.apache.ignite.configuration.DeploymentMode
@@ -303,6 +304,7 @@ org.apache.ignite.internal.executor.GridExecutorService
 org.apache.ignite.internal.executor.GridExecutorService$1
 org.apache.ignite.internal.executor.GridExecutorService$TaskTerminateListener
 org.apache.ignite.internal.igfs.common.IgfsIpcCommand
+org.apache.ignite.internal.jdbc2.JdbcBatchUpdateTask
 org.apache.ignite.internal.jdbc2.JdbcConnection$JdbcConnectionValidationTask
 org.apache.ignite.internal.jdbc2.JdbcDatabaseMetadata$UpdateMetadataTask
 org.apache.ignite.internal.jdbc2.JdbcQueryTask
@@ -347,19 +349,25 @@ 
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
 org.apache.ignite.internal.processors.affinity.GridAffinityMessage
 org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob
 org.apache.ignite.internal.processors.cache.CacheAffinityChangeMessage
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$1
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$10
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$11
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$12
-org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$12$1
-org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$12$2
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$13
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$14
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$15
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$16
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$17
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$18
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$18$1
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$18$2
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$19
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$2
-org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$3
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$20
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$21
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$22
+org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$4
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$5
-org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$6
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$7
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$8
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$9
@@ -411,15 +419,16 @@ 
org.apache.ignite.internal.processors.cache.DynamicCacheChangeRequest
 org.apache.ignite.internal.processors.cache.EntryProcessorResourceInjectorProxy
 org.apache.ignite.internal.processors.cache.ExchangeActions$1
 org.apache.ignite.internal.processors.cache.ExchangeActions$2
+org.apache.ignite.internal.processors.cache.GatewayProtectedCacheProxy
 org.apache.ignite.internal.processors.cache.GridCacheAdapter
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$10
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$11
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$12
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$13
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$14
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$15$1
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$15
 org.apache.ignite.internal.processors.cache.GridCacheAdapter$16
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$17
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$17$1
 

[2/2] ignite git commit: IGNITE-6101 Try to improve local scans performance

[yzhdanov]

IGNITE-6101 Try to improve local scans performance


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

Branch: refs/heads/master
Commit: 1c9d80a540cbce0a9d9a65e3fac2e06f53b73f43
Parents: 79d47f8
Author: Igor Seliverstov 
Authored: Fri Aug 25 12:22:44 2017 +0300
Committer: Yakov Zhdanov 
Committed: Fri Aug 25 12:22:44 2017 +0300

--
 .../ignite/internal/binary/BinaryUtils.java |  26 +
 .../processors/cache/CacheObjectUtils.java  |  65 ++-
 .../processors/cache/GridCacheAdapter.java  |   6 +-
 .../processors/cache/GridCacheEntryEx.java  |  10 +
 .../processors/cache/GridCacheMapEntry.java |  27 +-
 .../processors/cache/IgniteCacheProxyImpl.java  |  26 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../distributed/near/GridNearCacheEntry.java|   4 +-
 .../processors/cache/query/CacheQueryEntry.java |  58 +++
 .../query/GridCacheDistributedQueryManager.java |  16 +-
 .../cache/query/GridCacheQueryAdapter.java  |  53 ++-
 .../cache/query/GridCacheQueryManager.java  | 470 +--
 .../IgniteCacheObjectProcessorImpl.java | 164 ---
 .../UserCacheObjectByteArrayImpl.java   |  59 +++
 .../cacheobject/UserCacheObjectImpl.java|  82 
 .../cacheobject/UserKeyCacheObjectImpl.java | 101 
 .../service/GridServiceProcessor.java   |   6 +-
 .../resources/META-INF/classnames.properties|  88 ++--
 .../processors/cache/GridCacheTestEntryEx.java  |   6 +
 .../GridCacheQueryTransformerSelfTest.java  |  41 ++
 20 files changed, 788 insertions(+), 524 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9d80a5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 74d1730..8970a4e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -60,6 +60,12 @@ import org.apache.ignite.binary.BinaryType;
 import org.apache.ignite.binary.Binarylizable;
 import org.apache.ignite.internal.binary.builder.BinaryLazyValue;
 import org.apache.ignite.internal.binary.streams.BinaryInputStream;
+import org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
+import 
org.apache.ignite.internal.processors.cacheobject.UserCacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cacheobject.UserCacheObjectImpl;
+import 
org.apache.ignite.internal.processors.cacheobject.UserKeyCacheObjectImpl;
 import org.apache.ignite.internal.util.MutableSingletonList;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -707,6 +713,26 @@ public class BinaryUtils {
 }
 
 /**
+ * @param obj Object to check.
+ * @return True if this is an object of a known type.
+ */
+public static boolean knownCacheObject(Object obj) {
+if (obj == null)
+return false;
+
+Class cls= obj.getClass();
+
+return cls == KeyCacheObjectImpl.class ||
+cls == BinaryObjectImpl.class ||
+cls == CacheObjectImpl.class ||
+cls == CacheObjectByteArrayImpl.class ||
+cls == BinaryEnumObjectImpl.class ||
+cls == UserKeyCacheObjectImpl.class ||
+cls == UserCacheObjectImpl.class ||
+cls == UserCacheObjectByteArrayImpl.class;
+}
+
+/**
  * @param arr Array to check.
  * @return {@code true} if this array is of a known type.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9d80a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
index 5afa751..aeca79e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectUtils.java
@@ -17,15 +17,14 @@
 
 package 

ignite git commit: IGNITE-6051 Improve future listeners model in DataStreamerImpl

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master 8436ae006 -> 18ca0b231


IGNITE-6051 Improve future listeners model in DataStreamerImpl


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

Branch: refs/heads/master
Commit: 18ca0b2318c8014b0a3e63729d0256de1b11485e
Parents: 8436ae0
Author: Yakov Zhdanov 
Authored: Mon Aug 21 17:28:25 2017 +0300
Committer: Yakov Zhdanov 
Committed: Mon Aug 21 17:28:25 2017 +0300

--
 .../datastreamer/DataStreamerImpl.java  |  63 ++--
 .../util/future/GridCompoundFuture.java |  40 --
 .../datastreamer/DataStreamerImplSelfTest.java  | 143 ++-
 3 files changed, 221 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/18ca0b23/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index c11288c..aee0d26 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -941,10 +941,16 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 }
 };
 
+GridCompoundFuture opFut = new SilentCompoundFuture();
+
+opFut.listen(lsnr);
+
 final List futs;
 
 try {
-futs = buf.update(entriesForNode, topVer, lsnr, remap);
+futs = buf.update(entriesForNode, topVer, opFut, 
remap);
+
+opFut.markInitialized();
 }
 catch (IgniteInterruptedCheckedException e1) {
 resFut.onDone(e1);
@@ -1382,7 +1388,7 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 /**
  * @param newEntries Infos.
  * @param topVer Topology version.
- * @param lsnr Listener for the operation future.
+ * @param opFut Completion future for the operation.
  * @param remap Remapping flag.
  * @return Future for operation.
  * @throws IgniteInterruptedCheckedException If failed.
@@ -1390,10 +1396,11 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 @Nullable List update(
 Iterable newEntries,
 AffinityTopologyVersion topVer,
-IgniteInClosure lsnr,
+GridCompoundFuture opFut,
 boolean remap
 ) throws IgniteInterruptedCheckedException {
 List res = null;
+GridFutureAdapter[] futs = new GridFutureAdapter[stripes.length];
 
 for (DataStreamerEntry entry : newEntries) {
 List entries0 = null;
@@ -1408,9 +1415,16 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 synchronized (b) {
 curFut0 = b.curFut;
 
-// Listener should be added only once per whole entries 
collection.
-// Should we simplify the model and get rid of all futures?
-curFut0.listen(lsnr);
+if (futs[b.partId] != curFut0) {
+opFut.add(curFut0);
+
+if (res == null)
+res = new ArrayList<>();
+
+res.add(curFut0);
+
+futs[b.partId] = curFut0;
+}
 
 if (b.batchTopVer == null)
 b.batchTopVer = topVer;
@@ -1426,14 +1440,28 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 }
 }
 
-if (res == null)
-res = new ArrayList<>();
+if (!allowOverwrite() && !topVer.equals(curBatchTopVer)) {
+for (int i = 0; i < stripes.length; i++) {
+PerStripeBuffer b0 = stripes[i];
 
-res.add(curFut0);
+// renew all stale versions
+synchronized (b0) {
+  

ignite git commit: Deprecated IgniteConfiguration.discoStartupDelay

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master f4e4f77d1 -> 8436ae006


Deprecated IgniteConfiguration.discoStartupDelay


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

Branch: refs/heads/master
Commit: 8436ae006dd0e45d040a71a7c5a9234e5b8174d5
Parents: f4e4f77
Author: Yakov Zhdanov 
Authored: Mon Aug 21 17:14:38 2017 +0300
Committer: Yakov Zhdanov 
Committed: Mon Aug 21 17:14:38 2017 +0300

--
 .../org/apache/ignite/configuration/IgniteConfiguration.java  | 5 +
 .../ignite/internal/managers/communication/GridIoManager.java | 7 ---
 .../internal/processors/cache/persistence/MemoryPolicy.java   | 3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index cafa675..1cc99da 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -374,6 +374,7 @@ public class IgniteConfiguration {
 private boolean cacheSanityCheckEnabled = DFLT_CACHE_SANITY_CHECK_ENABLED;
 
 /** Discovery startup delay. */
+@Deprecated
 private long discoStartupDelay = DFLT_DISCOVERY_STARTUP_DELAY;
 
 /** Tasks classes sharing mode. */
@@ -1932,7 +1933,9 @@ public class IgniteConfiguration {
  * delay, you should increase this value.
  *
  * @return Time in milliseconds for when nodes can be out-of-sync.
+ * @deprecated Not used any more.
  */
+@Deprecated
 public long getDiscoveryStartupDelay() {
 return discoStartupDelay;
 }
@@ -1944,7 +1947,9 @@ public class IgniteConfiguration {
  * @param discoStartupDelay Time in milliseconds for when nodes
  *  can be out-of-sync during startup.
  * @return {@code this} for chaining.
+ * @deprecated Not used any more.
  */
+@Deprecated
 public IgniteConfiguration setDiscoveryStartupDelay(long 
discoStartupDelay) {
 this.discoStartupDelay = discoStartupDelay;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 2005032..f63f5f0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -164,9 +164,6 @@ public class GridIoManager extends 
GridManagerAdapter 
waitMap =
 new ConcurrentHashMap8<>();
@@ -227,8 +224,6 @@ public class GridIoManager extends 
GridManagerAdapter 0");
-
 startSpi();
 
 getSpi().setListener(commLsnr = new 
CommunicationListener() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
index 7c7d7bc..4059c12 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
@@ -46,7 +46,8 @@ public class MemoryPolicy {
 PageMemory pageMem,
 MemoryPolicyConfiguration cfg,
 MemoryMetricsImpl memMetrics,
-PageEvictionTracker evictionTracker) {
+PageEvictionTracker evictionTracker
+) {
 this.pageMem = pageMem;
 this.memMetrics = memMetrics;
 this.cfg = cfg;

ignite git commit: IGNITE-5658 Optimizations for data streamer

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master 0e0c2c7dc -> aa81dd14a


IGNITE-5658 Optimizations for data streamer


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

Branch: refs/heads/master
Commit: aa81dd14a7d0e21d448acf23a8a3d4eca0f8
Parents: 0e0c2c7
Author: Igor Seliverstov 
Authored: Wed Aug 9 19:29:39 2017 +0300
Committer: Yakov Zhdanov 
Committed: Wed Aug 9 19:29:39 2017 +0300

--
 .../org/apache/ignite/IgniteDataStreamer.java   |  26 +-
 .../apache/ignite/IgniteSystemProperties.java   |   8 +
 .../ignite/internal/GridKernalContext.java  |   2 +-
 .../ignite/internal/GridKernalContextImpl.java  |   6 +-
 .../apache/ignite/internal/IgniteKernal.java|   5 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   3 +
 .../org/apache/ignite/internal/IgnitionEx.java  |  23 +-
 .../ignite/internal/jdbc2/JdbcConnection.java   |   5 +-
 .../managers/communication/GridIoManager.java   |   6 +
 .../managers/communication/GridIoMessage.java   |   3 +
 .../cache/persistence/freelist/PagesList.java   |  67 +++--
 .../wal/reader/StandaloneGridKernalContext.java |   2 +-
 .../datastreamer/DataStreamerImpl.java  | 281 ---
 .../datastreamer/DataStreamerRequest.java   |  59 +++-
 .../ignite/internal/util/StripedExecutor.java   |  89 +-
 .../org/apache/ignite/thread/IgniteThread.java  |  10 +
 .../DataStreamProcessorSelfTest.java|  14 +-
 .../datastreamer/DataStreamerImplSelfTest.java  |   3 +-
 18 files changed, 427 insertions(+), 185 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa81dd14/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index e2473dc..b1f5851 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -20,6 +20,7 @@ package org.apache.ignite;
 import java.util.Collection;
 import java.util.Map;
 import javax.cache.CacheException;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.stream.StreamReceiver;
@@ -72,7 +73,7 @@ import org.jetbrains.annotations.Nullable;
  *  this setting limits maximum allowed number of parallel buffered stream 
messages that
  *  are being processed on remote nodes. If this number is exceeded, then
  *  {@link #addData(Object, Object)} method will block to control memory 
utilization.
- *  Default is defined by {@link #DFLT_MAX_PARALLEL_OPS} value.
+ *  Default is equal to CPU count on remote node multiply by {@link 
#DFLT_PARALLEL_OPS_MULTIPLIER}.
  *  
  *  
  *  {@link #autoFlushFrequency(long)} - automatic flush frequency in 
milliseconds. Essentially,
@@ -100,11 +101,23 @@ import org.jetbrains.annotations.Nullable;
  * 
  */
 public interface IgniteDataStreamer extends AutoCloseable {
-/** Default max concurrent put operations count. */
+/**
+ * Default max concurrent put operations count.
+ * @deprecated Is not used anymore.
+ */
+@Deprecated
 public static final int DFLT_MAX_PARALLEL_OPS = 16;
 
-/** Default per node buffer size. */
-public static final int DFLT_PER_NODE_BUFFER_SIZE = 1024;
+/**
+ * Default multiplier for data streamer pool size to get concurrent 
batches count for each remote node.
+ *
+ * @see IgniteConfiguration#getDataStreamerThreadPoolSize()
+ * @see #perNodeParallelOperations()
+ */
+public static final int DFLT_PARALLEL_OPS_MULTIPLIER = 8;
+
+/** Default operations batch size to sent to remote node for loading. */
+public static final int DFLT_PER_NODE_BUFFER_SIZE = 512;
 
 /** Default timeout for streamer's operations. */
 public static final long DFLT_UNLIMIT_TIMEOUT = -1;
@@ -203,9 +216,11 @@ public interface IgniteDataStreamer extends 
AutoCloseable {
  * 
  * This method should be called prior to {@link #addData(Object, Object)} 
call.
  * 
- * If not provided, default value is {@link #DFLT_MAX_PARALLEL_OPS}.
+ * If not provided, default value is calculated as follows
+ * {@link #DFLT_PARALLEL_OPS_MULTIPLIER} * {@code 
DATA_STREAMER_POOL_SIZE_ON_REMOTE_NODE}.
  *
  * @param parallelOps Maximum number of parallel stream operations for a 
single node.
+ 

ignite git commit: ignite-5918 Adding and searching objects in index tree produces a lot of garbage

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master 8d6e8420f -> 0e0c2c7dc


ignite-5918 Adding and searching objects in index tree produces a lot of garbage


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

Branch: refs/heads/master
Commit: 0e0c2c7dc6cece3cc92a13c5430af605606bbcfe
Parents: 8d6e842
Author: Igor Seliverstov 
Authored: Wed Aug 9 18:46:53 2017 +0300
Committer: Yakov Zhdanov 
Committed: Wed Aug 9 18:46:53 2017 +0300

--
 .../java/org/apache/ignite/IgniteCache.java |   1 -
 .../query/h2/database/H2TreeIndex.java  |   6 +-
 .../query/h2/database/InlineIndexHelper.java| 414 ++-
 .../h2/database/InlineIndexHelperTest.java  | 248 +--
 .../IgniteCacheWithIndexingTestSuite.java   |   3 +
 5 files changed, 642 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 0cf2a82..973eeab 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -1261,7 +1261,6 @@ public interface IgniteCache extends 
javax.cache.Cache, IgniteAsyncS
 public  IgniteFuture> 
invokeAllAsync(Set keys,
 EntryProcessor entryProcessor, Object... args) throws 
TransactionException;
 
-
 /**
  * Invokes an {@link CacheEntryProcessor} against the set of {@link 
javax.cache.Cache.Entry}s
  * specified by the set of keys.

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index eb579c3..d186623 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -145,7 +145,11 @@ public class H2TreeIndex extends GridH2IndexBase {
 if 
(!InlineIndexHelper.AVAILABLE_TYPES.contains(col.column.getType()))
 break;
 
-InlineIndexHelper idx = new 
InlineIndexHelper(col.column.getType(), col.column.getColumnId(), col.sortType);
+InlineIndexHelper idx = new InlineIndexHelper(
+col.column.getType(),
+col.column.getColumnId(),
+col.sortType,
+table.getCompareMode());
 
 res.add(idx);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
index 19cf857..1789ac8 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
@@ -23,8 +23,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import org.apache.ignite.internal.pagemem.PageUtils;
+import org.apache.ignite.internal.util.GridUnsafe;
 import org.h2.result.SortOrder;
 import org.h2.table.IndexColumn;
+import org.h2.value.CompareMode;
 import org.h2.value.Value;
 import org.h2.value.ValueBoolean;
 import org.h2.value.ValueByte;
@@ -84,16 +86,28 @@ public class InlineIndexHelper {
 /** */
 private final short size;
 
+/** */
+private final boolean compareBinaryUnsigned;
+
+/** */
+private final boolean compareStringsOptimized;
+
 /**
  * @param type Index type (see {@link Value}).
  * @param colIdx Index column index.
  * @param sortType Column sort type (see {@link IndexColumn#sortType}).
  */
-public 

ignite git commit: ignite-5658 added pool sizes to attributes

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 e9b851ae4 -> 7adcd6feb


ignite-5658 added pool sizes to attributes


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

Branch: refs/heads/ignite-5658
Commit: 7adcd6feb4db354b48b63efaafc26ea76940708e
Parents: e9b851a
Author: Yakov Zhdanov 
Authored: Tue Aug 1 13:50:41 2017 +0300
Committer: Yakov Zhdanov 
Committed: Tue Aug 1 13:50:41 2017 +0300

--
 .../org/apache/ignite/IgniteDataStreamer.java   |  2 +-
 .../apache/ignite/IgniteSystemProperties.java   |  7 +
 .../apache/ignite/internal/IgniteKernal.java|  5 
 .../ignite/internal/IgniteNodeAttributes.java   |  6 +
 .../datastreamer/DataStreamerImpl.java  | 28 
 5 files changed, 42 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7adcd6fe/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index 0e84e36..3b0a3d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -104,7 +104,7 @@ public interface IgniteDataStreamer extends 
AutoCloseable {
 public static final int DFLT_PARALLEL_OPS_MULTIPLIER = 20;
 
 /** Default per node buffer size. */
-public static final int DFLT_PER_NODE_BUFFER_SIZE = 1024;
+public static final int DFLT_PER_NODE_BUFFER_SIZE = 512;
 
 /** Default timeout for streamer's operations. */
 public static final long DFLT_UNLIMIT_TIMEOUT = -1;

http://git-wip-us.apache.org/repos/asf/ignite/blob/7adcd6fe/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 264fb4b..d3e64cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -697,6 +697,13 @@ public final class IgniteSystemProperties {
 public static final String IGNITE_ENABLE_FORCIBLE_NODE_KILL = 
"IGNITE_ENABLE_FORCIBLE_NODE_KILL";
 
 /**
+ * If this property is set data streamer will use striped pool for 
processing requests
+ * (default is {@code false}).
+ */
+public static final String 
IGNITE_DATA_STREAMER_USE_STRIPED_POOL_WHEN_ISOLATED =
+"IGNITE_DATA_STREAMER_USE_STRIPED_POOL_WHEN_ISOLATED";
+
+/**
  * Enforces singleton.
  */
 private IgniteSystemProperties() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7adcd6fe/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 5186409..88246ca 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
@@ -213,6 +213,7 @@ import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CLIENT_MODE;
 import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
+import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DATA_STREAMER_POOL_SIZE;
 import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
 import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS;
@@ -234,6 +235,7 @@ import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PREFIX;
 import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_RESTART_ENABLED;
 import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_PORT_RANGE;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS;
+import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_STRIPED_POOL_SIZE;
 import static 

ignite git commit: ignite-5658 disabling striped pool for benchmarks

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 b16455779 -> e9b851ae4


ignite-5658 disabling striped pool for benchmarks


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

Branch: refs/heads/ignite-5658
Commit: e9b851ae49a4aaebc8eae8161e76a0389edfc8ec
Parents: b164557
Author: Yakov Zhdanov 
Authored: Tue Aug 1 10:38:43 2017 +0300
Committer: Yakov Zhdanov 
Committed: Tue Aug 1 10:38:43 2017 +0300

--
 .../internal/processors/datastreamer/DataStreamerImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e9b851ae/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 6e9fbb5..9d56668 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -1716,8 +1716,8 @@ public class DataStreamerImpl implements 
IgniteDataStreamer, Delayed
 rcvr == ISOLATED_UPDATER ? partId : 
GridIoMessage.STRIPE_DISABLED_PART);
 
 try {
-ctx.io().sendToGridTopic(node, TOPIC_DATASTREAM, req,
-req.partition() == GridIoMessage.STRIPE_DISABLED_PART 
? plc : GridIoPolicy.SYSTEM_POOL);
+ctx.io().sendToGridTopic(node, TOPIC_DATASTREAM, req, 
plc); // TODO
+//req.partition() == 
GridIoMessage.STRIPE_DISABLED_PART ? plc : GridIoPolicy.SYSTEM_POOL);
 
 if (log.isDebugEnabled())
 log.debug("Sent request to node [nodeId=" + node.id() 
+ ", req=" + req + ']');

ignite git commit: FreeList striped pool optimisation

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 66645fe49 -> b16455779


FreeList striped pool optimisation


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

Branch: refs/heads/ignite-5658
Commit: b1645577980c2f547133b883604900af8b58f78b
Parents: 66645fe
Author: Igor Seliverstov 
Authored: Mon Jul 31 18:53:08 2017 +0300
Committer: Igor Seliverstov 
Committed: Mon Jul 31 18:53:08 2017 +0300

--
 .../cache/persistence/freelist/PagesList.java   | 21 
 1 file changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b1645577/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index 15bc4a0..6284da0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -508,21 +508,26 @@ public abstract class PagesList extends DataStructure {
  * @throws IgniteCheckedException If failed.
  */
 private Stripe getPageForPut(int bucket) throws IgniteCheckedException {
-Stripe[] tails = getBucket(bucket);
-
-if (tails == null)
-return addStripe(bucket, true);
-
 // Striped pool optimization
 int stripeIdx = IgniteThread.currentStripe();
 
 if (stripeIdx != -1) {
-if (stripeIdx >= tails.length)
-return addStripe(bucket, true);
+Stripe[] tails = getBucket(bucket);
+
+while (tails == null || stripeIdx >= tails.length) {
+addStripe(bucket, true);
+
+tails = getBucket(bucket);
+}
 
 return tails[stripeIdx];
 }
 
+Stripe[] tails = getBucket(bucket);
+
+if (tails == null)
+return addStripe(bucket, true);
+
 return randomTail(tails);
 }
 
@@ -932,7 +937,7 @@ public abstract class PagesList extends DataStructure {
 
 if (stripeIdx != -1) {
 if (stripeIdx >= len)
-return addStripe(bucket, !isReuseBucket(bucket));
+return null;
 
 Stripe stripe = tails[stripeIdx];
 

[2/8] ignite git commit: Version changed to 2.2.0-SNAPSHOT

[yzhdanov]

Version changed to 2.2.0-SNAPSHOT


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

Branch: refs/heads/ignite-5658
Commit: 52ad9180a7e96795a9dec921ab6ac36cb0072be7
Parents: 1597a18
Author: Anton Vinogradov 
Authored: Fri Jul 28 18:16:18 2017 +0300
Committer: Anton Vinogradov 
Committed: Fri Jul 28 18:16:18 2017 +0300

--
 examples/pom.xml   | 2 +-
 modules/aop/pom.xml| 2 +-
 modules/apache-license-gen/pom.xml | 2 +-
 modules/aws/pom.xml| 2 +-
 modules/benchmarks/pom.xml | 2 +-
 modules/camel/pom.xml  | 2 +-
 modules/cassandra/pom.xml  | 2 +-
 modules/cassandra/serializers/pom.xml  | 4 ++--
 modules/cassandra/store/pom.xml| 4 ++--
 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/flink/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-4.2/pom.xml  | 2 +-
 modules/hibernate-5.1/pom.xml  | 2 +-
 modules/hibernate-core/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/kubernetes/pom.xml | 2 +-
 modules/log4j/pom.xml  | 2 +-
 modules/log4j2/pom.xml | 2 +-
 modules/mesos/pom.xml  | 2 +-
 modules/ml/pom.xml | 5 ++---
 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/configure.ac | 2 +-
 modules/platforms/cpp/configure.acrel  | 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 +-
 modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs   | 2 +-
 modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs | 2 +-
 .../Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs  | 6 +++---
 .../dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs | 6 +++---
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 6 +++---
 .../Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs  | 6 +++---
 .../Properties/AssemblyInfo.cs | 6 +++---
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 6 +++---
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs   | 6 +++---
 .../Properties/AssemblyInfo.cs | 6 +++---
 .../Apache.Ignite.EntityFramework/Properties/AssemblyInfo.cs   | 6 +++---
 .../dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs   | 6 +++---
 .../dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs| 6 +++---
 .../dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs   | 6 +++---
 

[8/8] ignite git commit: FreeList striped pool optimisation

[yzhdanov]

FreeList striped pool optimisation


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

Branch: refs/heads/ignite-5658
Commit: 66645fe499e34b964d8c1679e5cff3dc5af624e1
Parents: b83cb75
Author: Igor Seliverstov 
Authored: Mon Jul 31 18:12:05 2017 +0300
Committer: Igor Seliverstov 
Committed: Mon Jul 31 18:12:05 2017 +0300

--
 .../cache/persistence/freelist/PagesList.java   | 60 +++-
 .../org/apache/ignite/thread/IgniteThread.java  |  6 ++
 2 files changed, 39 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/66645fe4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index 39a6865..15bc4a0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.util.GridLongList;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.thread.IgniteThread;
 import org.jetbrains.annotations.Nullable;
 
 import static java.lang.Boolean.FALSE;
@@ -66,7 +67,7 @@ public abstract class PagesList extends DataStructure {
 /** */
 private static final int MAX_STRIPES_PER_BUCKET =
 
IgniteSystemProperties.getInteger("IGNITE_PAGES_LIST_STRIPES_PER_BUCKET",
-Math.min(8, Runtime.getRuntime().availableProcessors() * 2));
+Math.max(8, Runtime.getRuntime().availableProcessors()));
 
 /** */
 protected final AtomicLong[] bucketsSize;
@@ -512,6 +513,16 @@ public abstract class PagesList extends DataStructure {
 if (tails == null)
 return addStripe(bucket, true);
 
+// Striped pool optimization
+int stripeIdx = IgniteThread.currentStripe();
+
+if (stripeIdx != -1) {
+if (stripeIdx >= tails.length)
+return addStripe(bucket, true);
+
+return tails[stripeIdx];
+}
+
 return randomTail(tails);
 }
 
@@ -607,12 +618,8 @@ public abstract class PagesList extends DataStructure {
 try {
 long tailAddr = writeLockPage(tailId, tailPage, bucket, 
lockAttempt++); // Explicit check.
 
-if (tailAddr == 0L) {
-if (isReuseBucket(bucket) && lockAttempt == 
TRY_LOCK_ATTEMPTS)
-addStripeForReuseBucket(bucket);
-
+if (tailAddr == 0L)
 continue;
-}
 
 assert PageIO.getPageId(tailAddr) == tailId : "pageId = " + 
PageIO.getPageId(tailAddr) + ", tailId = " + tailId;
 assert PageIO.getType(tailAddr) == PageIO.T_PAGE_LIST_NODE;
@@ -912,13 +919,26 @@ public abstract class PagesList extends DataStructure {
  * @param bucket Bucket index.
  * @return Page for take.
  */
-private Stripe getPageForTake(int bucket) {
+private Stripe getPageForTake(int bucket) throws IgniteCheckedException {
 Stripe[] tails = getBucket(bucket);
 
 if (tails == null || bucketsSize[bucket].get() == 0)
 return null;
 
 int len = tails.length;
+
+// Striped pool optimization
+int stripeIdx = IgniteThread.currentStripe();
+
+if (stripeIdx != -1) {
+if (stripeIdx >= len)
+return addStripe(bucket, !isReuseBucket(bucket));
+
+Stripe stripe = tails[stripeIdx];
+
+return stripe.empty ? null : stripe;
+}
+
 int init = randomInt(len);
 int cur = init;
 
@@ -943,6 +963,10 @@ public abstract class PagesList extends DataStructure {
  */
 private long writeLockPage(long pageId, long page, int bucket, int 
lockAttempt)
 throws IgniteCheckedException {
+
+if (IgniteThread.currentStripe() != -1)
+return writeLock(pageId, page);
+
 long pageAddr = tryWriteLock(pageId, page);
 
 if (pageAddr != 0L)
@@ -952,8 +976,7 @@ public abstract class PagesList extends DataStructure {
 Stripe[] stripes = getBucket(bucket);
 
   

[7/8] ignite git commit: Merge branch 'master' into ignite-5658

[yzhdanov]

Merge branch 'master' into ignite-5658


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

Branch: refs/heads/ignite-5658
Commit: b83cb75531e44b36516dea185842920af582b387
Parents: 741d9dc 5ba4a38
Author: Igor Seliverstov 
Authored: Mon Jul 31 13:07:06 2017 +0300
Committer: Igor Seliverstov 
Committed: Mon Jul 31 13:07:06 2017 +0300

--
 examples/pom.xml|   2 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/benchmarks/pom.xml  |   2 +-
 modules/camel/pom.xml   |   2 +-
 modules/cassandra/pom.xml   |   2 +-
 modules/cassandra/serializers/pom.xml   |   4 +-
 modules/cassandra/store/pom.xml |   4 +-
 modules/clients/pom.xml |   2 +-
 .../client/suite/IgniteClientTestSuite.java |   2 +
 .../tcp/redis/RedisProtocolServerSelfTest.java  | 110 ++
 .../tcp/redis/RedisProtocolStringSelfTest.java  |  19 --
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../processors/rest/GridRestCommand.java|   3 +
 .../handlers/cache/GridCacheCommandHandler.java |  41 
 .../server/GridRedisFlushCommandHandler.java| 117 ++
 .../protocols/tcp/redis/GridRedisCommand.java   |   6 +-
 .../tcp/redis/GridRedisNioListener.java |   2 +
 .../core/src/main/resources/ignite.properties   |   2 +-
 modules/extdata/p2p/pom.xml |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml |   2 +-
 modules/flink/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-4.2/pom.xml   |   2 +-
 modules/hibernate-5.1/pom.xml   |   2 +-
 modules/hibernate-core/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/kubernetes/pom.xml  |   2 +-
 modules/log4j/pom.xml   |   2 +-
 modules/log4j2/pom.xml  |   2 +-
 modules/mesos/pom.xml   |   2 +-
 modules/ml/pom.xml  |   5 +-
 modules/mqtt/pom.xml|   2 +-
 modules/osgi-karaf/pom.xml  |   2 +-
 modules/osgi-paxlogging/pom.xml |   2 +-
 modules/osgi/pom.xml|   2 +-
 .../include/ignite/binary/binary_writer.h   |   4 +-
 .../ignite/impl/binary/binary_reader_impl.h |  50 +++--
 .../ignite/impl/binary/binary_type_impl.h   |  67 ++
 .../ignite/impl/binary/binary_writer_impl.h |  43 ++--
 .../src/impl/binary/binary_reader_impl.cpp  |  63 +++---
 .../src/impl/binary/binary_writer_impl.cpp  |  41 ++--
 modules/platforms/cpp/common/configure.ac   |   2 +-
 modules/platforms/cpp/configure.ac  |   2 +-
 modules/platforms/cpp/configure.acrel   |   2 +-
 .../core-test/config/cache-query-default.xml|  29 +++
 modules/platforms/cpp/core-test/configure.ac|   2 +-
 .../src/binary_reader_writer_raw_test.cpp   |  36 
 .../core-test/src/binary_reader_writer_test.cpp | 135 +---
 .../cpp/core-test/src/cache_query_test.cpp  | 215 ++-
 modules/platforms/cpp/core/configure.ac |   2 +-
 .../ignite/cache/query/query_fields_row.h   |  28 +++
 .../ignite/cache/query/query_sql_fields.h   |  13 +-
 .../ignite/impl/cache/query/query_argument.h|  63 ++
 .../impl/cache/query/query_fields_row_impl.h|  29 +++
 .../cpp/core/include/ignite/impl/ignite_impl.h  |   6 -
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   4 +
 modules/platforms/cpp/examples/configure.ac |   2 +-
 modules/platforms/cpp/ignite/configure.ac   |   2 +-
 .../cpp/odbc/install/ignite-odbc-amd64.wxs  |   2 +-
 .../cpp/odbc/install/ignite-odbc-x86.wxs|   2 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs   

[4/8] ignite git commit: IGNITE-5706: Redis FLUSHDB and FLUSHALL command support. - Fixes #2250.

[yzhdanov]

IGNITE-5706: Redis FLUSHDB and FLUSHALL command support. - Fixes #2250.

Signed-off-by: shroman 


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

Branch: refs/heads/ignite-5658
Commit: 1be77384122e41ce69db828e4432e56824c76f79
Parents: 96b43e5
Author: shroman 
Authored: Mon Jul 31 15:35:14 2017 +0900
Committer: shroman 
Committed: Mon Jul 31 15:35:14 2017 +0900

--
 .../client/suite/IgniteClientTestSuite.java |   2 +
 .../tcp/redis/RedisProtocolServerSelfTest.java  | 110 +
 .../tcp/redis/RedisProtocolStringSelfTest.java  |  19 ---
 .../processors/rest/GridRestCommand.java|   3 +
 .../handlers/cache/GridCacheCommandHandler.java |  41 +++
 .../server/GridRedisFlushCommandHandler.java| 117 +++
 .../protocols/tcp/redis/GridRedisCommand.java   |   6 +-
 .../tcp/redis/GridRedisNioListener.java |   2 +
 8 files changed, 280 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1be77384/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index ff7e7e7..223268c 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -58,6 +58,7 @@ import 
org.apache.ignite.internal.processors.rest.RestProcessorStartSelfTest;
 import org.apache.ignite.internal.processors.rest.TaskCommandHandlerSelfTest;
 import 
org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRestParserSelfTest;
 import 
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolConnectSelfTest;
+import 
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolServerSelfTest;
 import 
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringSelfTest;
 import org.apache.ignite.testframework.IgniteTestSuite;
 
@@ -92,6 +93,7 @@ public class IgniteClientTestSuite extends TestSuite {
 // Test TCP rest processor with original REDIS client.
 suite.addTestSuite(RedisProtocolStringSelfTest.class);
 suite.addTestSuite(RedisProtocolConnectSelfTest.class);
+suite.addTestSuite(RedisProtocolServerSelfTest.class);
 
 suite.addTestSuite(RestProcessorStartSelfTest.class);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1be77384/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolServerSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolServerSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolServerSelfTest.java
new file mode 100644
index 000..a424d77
--- /dev/null
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolServerSelfTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.rest.protocols.tcp.redis;
+
+import java.util.HashMap;
+import org.junit.Assert;
+import redis.clients.jedis.Jedis;
+
+/**
+ * Tests for Server commands of Redis protocol.
+ */
+public class RedisProtocolServerSelfTest extends RedisCommonAbstractTest {
+/**
+ * @throws Exception If failed.
+ */
+public void testDbSize() throws Exception {

[6/8] ignite git commit: Fixed compilation.

[yzhdanov]

Fixed compilation.


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

Branch: refs/heads/ignite-5658
Commit: 5ba4a3879e109864d570042b273ea2fbc11753a0
Parents: d758a3f
Author: sboikov 
Authored: Mon Jul 31 12:02:59 2017 +0300
Committer: sboikov 
Committed: Mon Jul 31 12:02:59 2017 +0300

--
 .../processors/rest/handlers/cache/GridCacheCommandHandler.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ba4a387/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 003fcdb..f2ca071 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -553,7 +553,7 @@ public class GridCacheCommandHandler extends 
GridRestCommandHandlerAdapter {
 
 // HashSet wrapping for correct serialization
 Set cacheNames = map == null ?
-new HashSet<>(ctx.cache().publicCaches()) : new 
HashSet<>(map.keySet());
+new HashSet(ctx.cache().publicCaches()) : new 
HashSet<>(map.keySet());
 
 GridCompoundFuture compFut = new GridCompoundFuture();
 

[5/8] ignite git commit: IGNITE-4377 Cannot find schema for object with compact footer - fix .NET test Problem seems to be solved. Retry mechanism removed from tests.

[yzhdanov]

IGNITE-4377 Cannot find schema for object with compact footer - fix .NET test
Problem seems to be solved. Retry mechanism removed from tests.


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

Branch: refs/heads/ignite-5658
Commit: d758a3f1b09def177b11d85c782ff11e274cfdec
Parents: 1be7738
Author: Pavel Tupitsyn 
Authored: Mon Jul 31 11:49:49 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jul 31 11:49:49 2017 +0300

--
 .../Binary/BinaryCompactFooterInteropTest.cs| 29 
 1 file changed, 5 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d758a3f1/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
index 6f97677..e76811f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
@@ -17,7 +17,6 @@
 
 namespace Apache.Ignite.Core.Tests.Binary
 {
-using System;
 using System.Collections;
 using System.Linq;
 using Apache.Ignite.Core.Binary;
@@ -64,32 +63,14 @@ namespace Apache.Ignite.Core.Tests.Binary
 [Test]
 public void TestFromJava([Values(true, false)] bool client)
 {
-// Retry multiple times: IGNITE-4377
-for (int i = 0; i < 10; i++)
-{
-var grid = client ? _clientGrid : _grid;
-
-try
-{
-grid.GetOrCreateCache("default").Put(ComputeApiTest.EchoTypeBinarizable, i * 99);
-
-var fromJava = 
grid.GetCompute().ExecuteJavaTask(
-ComputeApiTest.EchoTask, 
ComputeApiTest.EchoTypeBinarizable);
+var grid = client ? _clientGrid : _grid;
 
-Assert.AreEqual(i * 99, fromJava.Field);
+grid.GetOrCreateCache("default").Put(ComputeApiTest.EchoTypeBinarizable, 99);
 
-return;
-}
-catch (Exception ex)
-{
-Console.WriteLine("TestFromJava failed on try {0}: \n 
{1}", i, ex);
+var fromJava = 
grid.GetCompute().ExecuteJavaTask(
+ComputeApiTest.EchoTask, ComputeApiTest.EchoTypeBinarizable);
 
-if (i < 9)
-continue;
-
-throw;
-}
-}
+Assert.AreEqual(99, fromJava.Field);
 }
 
 /// 

[3/8] ignite git commit: IGNITE-5621: Support BINARY and VARBINARY SQL types for C++

[yzhdanov]

IGNITE-5621: Support BINARY and VARBINARY SQL types for C++


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

Branch: refs/heads/ignite-5658
Commit: 96b43e5df358d6f488261d1603d66fc70ff6aea8
Parents: 52ad918
Author: Igor Sapego 
Authored: Fri Jul 28 19:30:35 2017 +0300
Committer: Igor Sapego 
Committed: Fri Jul 28 19:30:35 2017 +0300

--
 .../core-test/config/cache-query-default.xml|  29 +++
 .../cpp/core-test/src/cache_query_test.cpp  | 215 ++-
 .../ignite/cache/query/query_fields_row.h   |  28 +++
 .../ignite/cache/query/query_sql_fields.h   |  13 +-
 .../ignite/impl/cache/query/query_argument.h|  63 ++
 .../impl/cache/query/query_fields_row_impl.h|  29 +++
 6 files changed, 373 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/96b43e5d/modules/platforms/cpp/core-test/config/cache-query-default.xml
--
diff --git a/modules/platforms/cpp/core-test/config/cache-query-default.xml 
b/modules/platforms/cpp/core-test/config/cache-query-default.xml
index 16f601d..42ac80f 100644
--- a/modules/platforms/cpp/core-test/config/cache-query-default.xml
+++ b/modules/platforms/cpp/core-test/config/cache-query-default.xml
@@ -160,6 +160,35 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/96b43e5d/modules/platforms/cpp/core-test/src/cache_query_test.cpp
--
diff --git a/modules/platforms/cpp/core-test/src/cache_query_test.cpp 
b/modules/platforms/cpp/core-test/src/cache_query_test.cpp
index e763e08..4993279 100644
--- a/modules/platforms/cpp/core-test/src/cache_query_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_query_test.cpp
@@ -47,7 +47,7 @@ using ignite::impl::binary::BinaryUtils;
 /**
  * Person class for query tests.
  */
-class IGNITE_IMPORT_EXPORT QueryPerson
+class QueryPerson
 {
 public:
 /**
@@ -203,7 +203,7 @@ private:
 /**
  * Relation class for query tests.
  */
-class IGNITE_IMPORT_EXPORT QueryRelation
+class QueryRelation
 {
 public:
 /**
@@ -257,6 +257,40 @@ private:
 int32_t someVal;
 };
 
+/**
+ * Byte array test type.
+ */
+struct ByteArrayType
+{
+/**
+ * Test constructor.
+ *
+ * @param val Init value.
+ */
+ByteArrayType(int32_t val) :
+intVal(val),
+arrayVal(val + 1, val + 1)
+{
+// No-op.
+}
+
+/**
+ * Default constructor.
+ */
+ByteArrayType() :
+intVal(0),
+arrayVal()
+{
+// No-op.
+}
+
+/** Int field. */
+int32_t intVal;
+
+/** Array field. */
+std::vector arrayVal;
+};
+
 namespace ignite
 {
 namespace binary
@@ -300,7 +334,7 @@ namespace ignite
 IGNITE_BINARY_IS_NULL_FALSE(QueryRelation)
 IGNITE_BINARY_GET_NULL_DEFAULT_CTOR(QueryRelation)
 
-static void Write(BinaryWriter& writer, QueryRelation obj)
+static void Write(BinaryWriter& writer, const QueryRelation& obj)
 {
 writer.WriteInt32("personId", obj.GetPersonId());
 writer.WriteInt32("someVal", obj.GetHobbyId());
@@ -314,6 +348,32 @@ namespace ignite
 dst = QueryRelation(personId, someVal);
 }
 IGNITE_BINARY_TYPE_END
+
+/**
+ * Binary type definition for ByteArrayType.
+ */
+IGNITE_BINARY_TYPE_START(ByteArrayType)
+IGNITE_BINARY_GET_TYPE_ID_AS_HASH(ByteArrayType)
+IGNITE_BINARY_GET_TYPE_NAME_AS_IS(ByteArrayType)
+IGNITE_BINARY_GET_FIELD_ID_AS_HASH
+IGNITE_BINARY_IS_NULL_FALSE(ByteArrayType)
+IGNITE_BINARY_GET_NULL_DEFAULT_CTOR(ByteArrayType)
+
+static void 

[1/8] ignite git commit: IGNITE-5758: CPP: Added pointers semantics for primitive types

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 741d9dc35 -> 66645fe49


IGNITE-5758: CPP: Added pointers semantics for primitive types


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

Branch: refs/heads/ignite-5658
Commit: 1597a186e9d158d12e7e35e9db1158e5252c2e04
Parents: ab899cf
Author: Igor Sapego 
Authored: Fri Jul 28 13:51:25 2017 +0300
Committer: Igor Sapego 
Committed: Fri Jul 28 13:51:25 2017 +0300

--
 .../include/ignite/binary/binary_writer.h   |   4 +-
 .../ignite/impl/binary/binary_reader_impl.h |  50 ---
 .../ignite/impl/binary/binary_type_impl.h   |  67 +
 .../ignite/impl/binary/binary_writer_impl.h |  43 --
 .../src/impl/binary/binary_reader_impl.cpp  |  63 -
 .../src/impl/binary/binary_writer_impl.cpp  |  41 +++---
 .../src/binary_reader_writer_raw_test.cpp   |  36 +
 .../core-test/src/binary_reader_writer_test.cpp | 135 ++-
 .../cpp/core/include/ignite/impl/ignite_impl.h  |   6 -
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   4 +
 10 files changed, 326 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1597a186/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
--
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h 
b/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
index 1489494..e609591 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
@@ -58,7 +58,7 @@ namespace ignite
  *
  * @param impl Implementation.
  */
-BinaryWriter(ignite::impl::binary::BinaryWriterImpl* impl);
+BinaryWriter(impl::binary::BinaryWriterImpl* impl);
 
 /**
  * Write 8-byte signed integer. Maps to "byte" type in Java.
@@ -337,7 +337,7 @@ namespace ignite
  * Start collection write.
  *
  * @param fieldName Field name.
- * @param type Collection type.
+ * @param typ Collection type.
  * @return Collection writer.
  */
 template

http://git-wip-us.apache.org/repos/asf/ignite/blob/1597a186/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
--
diff --git 
a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h 
b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
index 5621c0d..4a0e2d4 100644
--- 
a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
+++ 
b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
@@ -884,6 +884,17 @@ namespace ignite
 template
 T ReadTopObject()
 {
+return ignite::binary::ReadHelper::Read(*this);
+}
+
+/**
+ * Read object.
+ *
+ * @return Read object.
+ */
+template
+void ReadTopObject0(T& res)
+{
 int32_t pos = stream->Position();
 int8_t hdr = stream->ReadInt8();
 
@@ -891,7 +902,9 @@ namespace ignite
 {
 case IGNITE_HDR_NULL:
 {
-return GetNull();
+res = GetNull();
+
+return;
 }
 
 case IGNITE_HDR_HND:
@@ -908,11 +921,11 @@ namespace ignite
 
 stream->Position(curPos + portOff); // Position 
stream right on the object.
 
-T val = ReadTopObject();
+ReadTopObject0(res);
 
 stream->Position(curPos + portLen + 4); // 
Position stream after binary.
 
-return val;
+return;
 }
 
 case IGNITE_HDR_FULL:
@@ -985,12 +998,11 @@ namespace ignite
 footerBegin, 
footerEnd, schemaType);
 ignite::binary::BinaryReader reader();
 
-T val;
-BType::Read(reader, val);
+

ignite git commit: ignite-5658 minor

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 55f51b54f -> 741d9dc35


ignite-5658 minor


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

Branch: refs/heads/ignite-5658
Commit: 741d9dc35864c05ad2f3c24b9d2fe40deaf325b2
Parents: 55f51b5
Author: Yakov Zhdanov 
Authored: Fri Jul 28 17:54:37 2017 +0300
Committer: Yakov Zhdanov 
Committed: Fri Jul 28 17:54:37 2017 +0300

--
 .../java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/741d9dc3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 355b1b0..3876fe0 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -254,7 +254,7 @@ public class IgniteBenchmarkArguments {
 
 /** */
 @Parameter(names = {"-stpo", "--streamerParallelOps"}, description = "Data 
streamer max parallel ops")
-private int streamerPerNodeParallelOps = 
IgniteDataStreamer.DFLT_MAX_PARALLEL_OPS;
+private int streamerPerNodeParallelOps = 0;
 
 /**
  * @return {@code True} if need set {@link PersistentStoreConfiguration}.

[08/50] [abbrv] ignite git commit: Assembly procedure fix

[yzhdanov]

Assembly procedure fix


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

Branch: refs/heads/ignite-5658
Commit: db43b0c40161f8756ab5cad0c1b4b404f0743d8f
Parents: bd7a08e
Author: Anton Vinogradov 
Authored: Thu Jul 20 14:58:09 2017 +0300
Committer: Anton Vinogradov 
Committed: Thu Jul 20 14:58:09 2017 +0300

--
 DEVNOTES.txt | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/db43b0c4/DEVNOTES.txt
--
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 8a689b8..340153e 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -2,14 +2,14 @@ Ignite Fabric Maven Build Instructions
 ==
 1) Optional: build Apache Ignite.NET as described at 
modules/platforms/dotnet/DEVNOTES.txt.
 
-2) Compile and package:
+2) Compile and install:
 
-  mvn clean package -Pall-java,all-scala,licenses -DskipTests
+  mvn clean install -Pall-java,all-scala,licenses -DskipTests
 
   or if you have built Apache Ignite.NET on the first step use following 
command:
   (Note that 'doxygen' should be installed before running this command.)
 
-  mvn clean package -Pall-java,all-scala,licenses -DskipTests -DclientDocs
+  mvn clean install -Pall-java,all-scala,licenses -DskipTests -DclientDocs
 
 3) Javadoc generation (optional):
 
@@ -25,14 +25,14 @@ Ignite Fabric with LGPL Maven Build Instructions
 ==
 1) Optional: build Apache Ignite.NET as described at 
modules/platforms/dotnet/DEVNOTES.txt.
 
-2) Compile and package:
+2) Compile and install:
 
-  mvn clean package -Pall-java,all-scala,licenses -DskipTests
+  mvn clean install -Pall-java,all-scala,licenses -DskipTests
 
   or if you have built Apache Ignite.NET on the first step use following 
command:
   (Note that 'doxygen' should be installed before running this command.)
 
-  mvn clean package -Pall-java,all-scala,licenses -DskipTests -DclientDocs
+  mvn clean install -Pall-java,all-scala,licenses -DskipTests -DclientDocs
 
 3) Javadoc generation with LGPL (optional):
 
@@ -46,15 +46,15 @@ Look for apache-ignite-fabric-lgpl--bin.zip in 
./target/bin directory.
 
 Ignite Hadoop Accelerator Maven Build Instructions
 
-1) Compile and package:
+1) Compile and install:
 
-mvn clean package -Pall-java,all-scala,licenses -DskipTests
+mvn clean install -Pall-java,all-scala,licenses -DskipTests
 
 Use 'hadoop.version' parameter to build Ignite against a specific Hadoop 
version.
 Use 'spark.version' parameter to build ignite-spark module for a specific 
Spark version. Version should be >= 2.0.0.
 For example:
 
-mvn clean package -Pall-java,all-scala,licenses -DskipTests 
-Dhadoop.version=2.4.2 -Dspark.version=2.1.1
+mvn clean install -Pall-java,all-scala,licenses -DskipTests 
-Dhadoop.version=2.4.2 -Dspark.version=2.1.1
 
 2) Assembly Hadoop Accelerator:
   mvn initialize -Prelease -Dignite.edition=hadoop

[28/50] [abbrv] ignite git commit: IGNITE-5770 Refactor PlatformProcessor to PlatformTarget mechanism

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc9e4b9/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index f76bbac..a38cf2f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -93,12 +93,9 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 
 try
 {
-// OnStart receives the same InteropProcessor as here 
(just as another GlobalRef) and stores it.
-// Release current reference immediately.
-void* res = JNI.IgnitionStart(ctx.NativeContext, cfgPath0, 
gridName0, InteropFactoryId,
+// OnStart receives InteropProcessor referece and stores 
it.
+JNI.IgnitionStart(ctx.NativeContext, cfgPath0, gridName0, 
InteropFactoryId,
 mem.SynchronizeOutput());
-
-JNI.Release(res);
 }
 finally
 {
@@ -122,304 +119,6 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 }
 }
 
-internal static void IgnitionStopAll(void* ctx, bool cancel)
-{
-JNI.IgnitionStopAll(ctx, cancel);
-}
-
-internal static void ProcessorReleaseStart(IUnmanagedTarget target)
-{
-JNI.ProcessorReleaseStart(target.Context, target.Target);
-}
-
-internal static IUnmanagedTarget ProcessorProjection(IUnmanagedTarget 
target)
-{
-void* res = JNI.ProcessorProjection(target.Context, target.Target);
-
-return target.ChangeTarget(res);
-}
-
-internal static IUnmanagedTarget ProcessorCache(IUnmanagedTarget 
target, string name)
-{
-sbyte* name0 = IgniteUtils.StringToUtf8Unmanaged(name);
-
-try
-{
-void* res = JNI.ProcessorCache(target.Context, target.Target, 
name0);
-
-return target.ChangeTarget(res);
-}
-finally
-{
-Marshal.FreeHGlobal(new IntPtr(name0));
-}
-}
-
-internal static IUnmanagedTarget ProcessorCreateCache(IUnmanagedTarget 
target, string name)
-{
-sbyte* name0 = IgniteUtils.StringToUtf8Unmanaged(name);
-
-try
-{
-void* res = JNI.ProcessorCreateCache(target.Context, 
target.Target, name0);
-
-return target.ChangeTarget(res);
-}
-finally
-{
-Marshal.FreeHGlobal(new IntPtr(name0));
-}
-}
-
-internal static IUnmanagedTarget ProcessorCreateCache(IUnmanagedTarget 
target, long memPtr)
-{
-void* res = JNI.ProcessorCreateCacheFromConfig(target.Context, 
target.Target, memPtr);
-
-return target.ChangeTarget(res);
-}
-
-internal static IUnmanagedTarget 
ProcessorGetOrCreateCache(IUnmanagedTarget target, string name)
-{
-sbyte* name0 = IgniteUtils.StringToUtf8Unmanaged(name);
-
-try
-{
-void* res = JNI.ProcessorGetOrCreateCache(target.Context, 
target.Target, name0);
-
-return target.ChangeTarget(res);
-}
-finally
-{
-Marshal.FreeHGlobal(new IntPtr(name0));
-}
-}
-
-internal static IUnmanagedTarget 
ProcessorGetOrCreateCache(IUnmanagedTarget target, long memPtr)
-{
-void* res = 
JNI.ProcessorGetOrCreateCacheFromConfig(target.Context, target.Target, memPtr);
-
-return target.ChangeTarget(res);
-}
-
-internal static IUnmanagedTarget 
ProcessorCreateNearCache(IUnmanagedTarget target, string name, long memPtr)
-{
-sbyte* name0 = IgniteUtils.StringToUtf8Unmanaged(name);
-
-try
-{
-void* res = JNI.ProcessorCreateNearCache(target.Context, 
target.Target, name0, memPtr);
-
-return target.ChangeTarget(res);
-}
-finally
-{
-Marshal.FreeHGlobal(new IntPtr(name0));
-}
-}
-
-internal static IUnmanagedTarget 
ProcessorGetOrCreateNearCache(IUnmanagedTarget target, string name, long memPtr)
-{
-sbyte* name0 = IgniteUtils.StringToUtf8Unmanaged(name);
-
-try
-{
-void* res = JNI.ProcessorGetOrCreateNearCache(target.Context, 
target.Target, name0, memPtr);
-
-return target.ChangeTarget(res);
-}
-finally
-{
- 

[34/50] [abbrv] ignite git commit: IGNITE-4648 IgniteInternalTx.prepare() does not wait for async operations to complete

[yzhdanov]

IGNITE-4648 IgniteInternalTx.prepare() does not wait for async operations to 
complete


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

Branch: refs/heads/ignite-5658
Commit: e96225f1ed4080243844108e798e3fa74d13d542
Parents: de259ff
Author: Dmitrii Ryabov 
Authored: Wed Jul 26 17:00:52 2017 +0300
Committer: Anton Vinogradov 
Committed: Wed Jul 26 17:00:52 2017 +0300

--
 .../cache/GridCacheSharedContext.java   |   6 +-
 .../cache/distributed/near/GridNearTxLocal.java |   6 +-
 .../IgniteTxImplicitSingleStateImpl.java|   2 +-
 .../IgniteTxRemoteStateAdapter.java |   2 +-
 .../cache/transactions/IgniteTxState.java   |   2 +-
 .../cache/transactions/IgniteTxStateImpl.java   |   2 +-
 .../transactions/PlatformTransactions.java  |   2 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |   2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   8 +-
 .../processors/cache/jta/CacheJtaResource.java  |  20 +-
 .../cache/AbstractCacheJtaSelfTest.java | 183 --
 .../GridPartitionedCacheJtaFactorySelfTest.java |  41 ---
 ...rtitionedCacheJtaFactoryUseSyncSelfTest.java |  32 ---
 ...titionedCacheJtaLookupClassNameSelfTest.java |  83 ---
 .../GridReplicatedCacheJtaFactorySelfTest.java  |  32 ---
 ...eplicatedCacheJtaFactoryUseSyncSelfTest.java |  32 ---
 ...plicatedCacheJtaLookupClassNameSelfTest.java |  32 ---
 .../cache/jta/AbstractCacheJtaSelfTest.java | 248 +++
 .../GridPartitionedCacheJtaFactorySelfTest.java |  41 +++
 ...rtitionedCacheJtaFactoryUseSyncSelfTest.java |  32 +++
 ...titionedCacheJtaLookupClassNameSelfTest.java |  83 +++
 .../GridReplicatedCacheJtaFactorySelfTest.java  |  32 +++
 ...eplicatedCacheJtaFactoryUseSyncSelfTest.java |  32 +++
 ...plicatedCacheJtaLookupClassNameSelfTest.java |  32 +++
 .../processors/cache/jta/package-info.java  |  22 ++
 .../ignite/testsuites/IgniteJtaTestSuite.java   |  12 +-
 .../Cache/CacheAbstractTransactionalTest.cs |  53 ++--
 27 files changed, 591 insertions(+), 483 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e96225f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 5387cc8..1876023 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -910,7 +910,7 @@ public class GridCacheSharedContext {
  * @throws IgniteCheckedException If failed.
  */
 public void endTx(GridNearTxLocal tx) throws IgniteCheckedException {
-tx.txState().awaitLastFut(this);
+tx.txState().awaitLastFuture(this);
 
 tx.close();
 }
@@ -924,7 +924,7 @@ public class GridCacheSharedContext {
 GridCacheContext ctx = tx.txState().singleCacheContext(this);
 
 if (ctx == null) {
-tx.txState().awaitLastFut(this);
+tx.txState().awaitLastFuture(this);
 
 return tx.commitNearTxLocalAsync();
 }
@@ -938,7 +938,7 @@ public class GridCacheSharedContext {
  * @return Rollback future.
  */
 public IgniteInternalFuture rollbackTxAsync(GridNearTxLocal tx) throws 
IgniteCheckedException {
-tx.txState().awaitLastFut(this);
+tx.txState().awaitLastFuture(this);
 
 return tx.rollbackNearTxLocalAsync();
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e96225f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 81e5ca8..58ecee9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -3120,9 +3120,13 @@ public class GridNearTxLocal extends 
GridDhtTxLocalAdapter implements AutoClosea
 }
 
 /**
+ * @param 

[31/50] [abbrv] ignite git commit: IGNITE-5802: Fix all wrong TODO comments in ML component

[yzhdanov]

IGNITE-5802: Fix all wrong TODO comments in ML component

This closes #2340


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

Branch: refs/heads/ignite-5658
Commit: 131847203d55f4f3907a7ff62d53ff69345fa605
Parents: bdc9e4b
Author: Yury Babak 
Authored: Tue Jul 25 15:22:34 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jul 25 15:22:34 2017 +0300

--
 .../ml/clustering/KMeansDistributedClusterer.java   |  6 +++---
 .../ignite/ml/clustering/KMeansLocalClusterer.java  |  2 +-
 .../main/java/org/apache/ignite/ml/math/MathUtils.java  |  1 +
 .../java/org/apache/ignite/ml/math/VectorUtils.java |  7 +--
 .../ignite/ml/math/decompositions/LUDecomposition.java  |  2 +-
 .../ignite/ml/math/decompositions/QRDecomposition.java  |  2 +-
 .../ml/math/exceptions/MathIllegalNumberException.java  |  8 
 .../org/apache/ignite/ml/math/impls/CacheUtils.java |  4 ++--
 .../ignite/ml/math/impls/matrix/AbstractMatrix.java |  2 --
 .../impls/storage/matrix/DenseOffHeapMatrixStorage.java |  2 +-
 .../storage/vector/DenseLocalOffHeapVectorStorage.java  |  2 +-
 .../storage/vector/SparseLocalOffHeapVectorStorage.java |  2 +-
 .../storage/vector/SparseLocalOnHeapVectorStorage.java  |  4 ++--
 .../apache/ignite/ml/math/impls/vector/CacheVector.java |  4 ++--
 .../ignite/ml/math/impls/vector/MapWrapperVector.java   |  1 -
 .../ignite/ml/math/impls/vector/SparseLocalVector.java  |  6 +++---
 .../apache/ignite/ml/math/impls/vector/VectorView.java  |  2 +-
 .../java/org/apache/ignite/ml/math/util/MatrixUtil.java |  4 ++--
 .../regressions/AbstractMultipleLinearRegression.java   |  4 ++--
 .../ml/regressions/OLSMultipleLinearRegression.java |  2 +-
 .../src/test/java/org/apache/ignite/ml/TestUtils.java   |  2 +-
 .../apache/ignite/ml/math/benchmark/MathBenchmark.java  |  2 +-
 .../ignite/ml/math/benchmark/VectorBenchmarkTest.java   |  2 +-
 .../ml/math/decompositions/EigenDecompositionTest.java  |  2 +-
 .../ml/math/impls/matrix/MatrixAttributeTest.java   |  2 --
 .../storage/matrix/MatrixStorageImplementationTest.java |  2 +-
 .../ignite/ml/math/impls/vector/AbstractVectorTest.java |  4 ++--
 .../impls/vector/PivotedVectorViewConstructorTest.java  |  2 +-
 .../ml/math/impls/vector/VectorAttributesTest.java  |  2 +-
 .../ignite/ml/math/impls/vector/VectorFoldMapTest.java  |  2 +-
 .../ml/math/impls/vector/VectorImplementationsTest.java | 12 ++--
 .../ignite/ml/math/impls/vector/VectorIterableTest.java |  2 +-
 .../ignite/ml/math/impls/vector/VectorToMatrixTest.java |  4 ++--
 .../ml/regressions/OLSMultipleLinearRegressionTest.java |  4 ++--
 34 files changed, 55 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/13184720/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
index 5f702d2..2ef61ad 100644
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
+++ 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
@@ -80,7 +80,7 @@ public class KMeansDistributedClusterer extends 
BaseKMeansClusterer centers = new ArrayList<>();
 List newCenters = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/13184720/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansLocalClusterer.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansLocalClusterer.java
 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansLocalClusterer.java
index 9f2aefb..3d005b4 100644
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansLocalClusterer.java
+++ 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansLocalClusterer.java
@@ -92,7 +92,7 @@ public class KMeansLocalClusterer extends 
BaseKMeansClustererhttp://git-wip-us.apache.org/repos/asf/ignite/blob/13184720/modules/ml/src/main/java/org/apache/ignite/ml/math/MathUtils.java
--
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/MathUtils.java 
b/modules/ml/src/main/java/org/apache/ignite/ml/math/MathUtils.java
index c2164ab..c7b33c3 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/MathUtils.java

[18/50] [abbrv] ignite git commit: IGNITE-5754 Web Console agent: Use POST instead of GET for requests.

[yzhdanov]

IGNITE-5754 Web Console agent: Use POST instead of GET for requests.


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

Branch: refs/heads/ignite-5658
Commit: abc6e46fb9ec1c5ee228c01943c516ba0f602456
Parents: 95f4abc
Author: Andrey Novikov 
Authored: Mon Jul 24 10:54:01 2017 +0700
Committer: Andrey Novikov 
Committed: Mon Jul 24 10:54:01 2017 +0700

--
 modules/web-console/backend/app/agentSocket.js  |  4 +-
 .../web-console/backend/app/browsersHandler.js  |  2 +-
 .../console/agent/handlers/RestListener.java|  7 +--
 .../ignite/console/agent/rest/RestExecutor.java | 49 +++-
 4 files changed, 22 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/abc6e46f/modules/web-console/backend/app/agentSocket.js
--
diff --git a/modules/web-console/backend/app/agentSocket.js 
b/modules/web-console/backend/app/agentSocket.js
index db1deaa..0853339 100644
--- a/modules/web-console/backend/app/agentSocket.js
+++ b/modules/web-console/backend/app/agentSocket.js
@@ -126,7 +126,7 @@ module.exports.factory = function(_) {
  * Send event to agent.
  *
  * @param {String} event - Event name.
- * @param {Array.?} args - Transmitted arguments.
+ * @param {Object?} args - Transmitted arguments.
  * @returns {Promise}
  */
 emitEvent(event, ...args) {
@@ -202,7 +202,7 @@ module.exports.factory = function(_) {
 params[`p${idx + 1}`] = args[idx];
 });
 
-return this.emitEvent('node:rest', {uri: 'ignite', demo, params, 
method: 'GET'})
+return this.emitEvent('node:rest', {uri: 'ignite', demo, params})
 .then(this.restResultParse);
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/abc6e46f/modules/web-console/backend/app/browsersHandler.js
--
diff --git a/modules/web-console/backend/app/browsersHandler.js 
b/modules/web-console/backend/app/browsersHandler.js
index c4ea532..4fb5088 100644
--- a/modules/web-console/backend/app/browsersHandler.js
+++ b/modules/web-console/backend/app/browsersHandler.js
@@ -179,7 +179,7 @@ module.exports.factory = (_, socketio, configure, errors, 
mongo) => {
  */
 executeOnNode(agent, demo, params) {
 return agent
-.then((agentSock) => agentSock.emitEvent('node:rest', {uri: 
'ignite', demo, params, method: 'GET'}))
+.then((agentSock) => agentSock.emitEvent('node:rest', {uri: 
'ignite', demo, params}))
 .then((res) => {
 if (res.status === 0)
 return JSON.parse(res.data);

http://git-wip-us.apache.org/repos/asf/ignite/blob/abc6e46f/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
index c70514d..8855060 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
@@ -61,11 +61,6 @@ public class RestListener extends AbstractListener {
 
 boolean demo = (boolean)args.get("demo");
 
-if (!args.containsKey("method"))
-throw new IllegalArgumentException("Missing method in arguments: " 
+ args);
-
-String mtd = args.get("method").toString();
-
 Map headers = null;
 
 if (args.containsKey("headers"))
@@ -76,6 +71,6 @@ public class RestListener extends AbstractListener {
 if (args.containsKey("body"))
 body = args.get("body").toString();
 
-return restExecutor.execute(demo, path, params, mtd, headers, body);
+return restExecutor.execute(demo, path, params, headers, body);
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/abc6e46f/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
 

[38/50] [abbrv] ignite git commit: Added related GridIoPolicy in IgniteThread.

[yzhdanov]

Added related GridIoPolicy in IgniteThread.


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

Branch: refs/heads/ignite-5658
Commit: 3a3650fb2eadcd6a1186cc186fa5d471cd1e74d5
Parents: 2574beb
Author: sboikov 
Authored: Thu Jul 27 13:57:11 2017 +0300
Committer: sboikov 
Committed: Thu Jul 27 13:57:11 2017 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  | 34 +--
 .../managers/communication/GridIoPolicy.java|  3 ++
 .../service/GridServiceProcessor.java   |  2 +-
 .../util/StripedCompositeReadWriteLock.java |  6 ++--
 .../ignite/internal/util/StripedExecutor.java   |  4 ++-
 .../org/apache/ignite/thread/IgniteThread.java  | 35 ++--
 .../ignite/thread/IgniteThreadFactory.java  | 15 ++---
 .../ignite/thread/IgniteThreadPoolExecutor.java | 33 +-
 .../GridThreadPoolExecutorServiceSelfTest.java  |  2 +-
 9 files changed, 95 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3a3650fb/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 1139ec6..23baeb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -64,6 +64,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.MemoryConfiguration;
 import org.apache.ignite.configuration.TransactionConfiguration;
 import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
 import 
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
 import org.apache.ignite.internal.processors.igfs.IgfsThreadFactory;
 import org.apache.ignite.internal.processors.igfs.IgfsUtils;
@@ -1694,7 +1695,8 @@ public class IgnitionEx {
 cfg.getPublicThreadPoolSize(),
 cfg.getPublicThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.PUBLIC_POOL);
 
 execSvc.allowCoreThreadTimeOut(true);
 
@@ -1706,7 +1708,8 @@ public class IgnitionEx {
 cfg.getServiceThreadPoolSize(),
 cfg.getServiceThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.SERVICE_POOL);
 
 svcExecSvc.allowCoreThreadTimeOut(true);
 
@@ -1718,7 +1721,8 @@ public class IgnitionEx {
 cfg.getSystemThreadPoolSize(),
 cfg.getSystemThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.SYSTEM_POOL);
 
 sysExecSvc.allowCoreThreadTimeOut(true);
 
@@ -1738,7 +1742,8 @@ public class IgnitionEx {
 cfg.getManagementThreadPoolSize(),
 cfg.getManagementThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.MANAGEMENT_POOL);
 
 mgmtExecSvc.allowCoreThreadTimeOut(true);
 
@@ -1753,7 +1758,8 @@ public class IgnitionEx {
 cfg.getPeerClassLoadingThreadPoolSize(),
 cfg.getPeerClassLoadingThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.P2P_POOL);
 
 p2pExecSvc.allowCoreThreadTimeOut(true);
 
@@ -1764,7 +1770,8 @@ public class IgnitionEx {
 cfg.getDataStreamerThreadPoolSize(),
 cfg.getDataStreamerThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
-new LinkedBlockingQueue());
+new LinkedBlockingQueue(),
+GridIoPolicy.DATA_STREAMER_POOL);
 
 dataStreamerExecSvc.allowCoreThreadTimeOut(true);
 
@@ -1811,7 +1818,8 @@ public class IgnitionEx {
 myCfg.getUtilityCacheThreadPoolSize(),
 myCfg.getUtilityCacheThreadPoolSize(),
 myCfg.getUtilityCacheKeepAliveTime(),
-  

[24/50] [abbrv] ignite git commit: IGNITE-5812 Set width for dropdown as for element.

[yzhdanov]

IGNITE-5812 Set width for dropdown as for element.


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

Branch: refs/heads/ignite-5658
Commit: 39fa8fae3ec80fd3a4c07f4610ab46817b75dd23
Parents: 0d2992c
Author: Dmitriy Shabalin 
Authored: Tue Jul 25 14:30:47 2017 +0700
Committer: Andrey Novikov 
Committed: Tue Jul 25 14:30:47 2017 +0700

--
 modules/web-console/frontend/app/app.js |   8 +-
 .../frontend/app/decorator/select.js|  77 --
 .../frontend/app/decorator/tooltip.js   |  73 -
 .../services/AngularStrapSelect.decorator.js|  77 ++
 .../services/AngularStrapTooltip.decorator.js   | 103 +++
 .../views/configuration/domains-import.tpl.pug  |   4 +-
 6 files changed, 186 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/39fa8fae/modules/web-console/frontend/app/app.js
--
diff --git a/modules/web-console/frontend/app/app.js 
b/modules/web-console/frontend/app/app.js
index dc5c6e9..0667e8f 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -20,9 +20,6 @@ import '../app/primitives';
 
 import './app.config';
 
-import './decorator/select';
-import './decorator/tooltip';
-
 import './modules/form/form.module';
 import './modules/agent/agent.module';
 import './modules/sql/sql.module';
@@ -97,6 +94,9 @@ import UnsavedChangesGuard from 
'./services/UnsavedChangesGuard.service';
 import Clusters from './services/Clusters';
 import Caches from './services/Caches';
 
+import AngularStrapTooltip from './services/AngularStrapTooltip.decorator';
+import AngularStrapSelect from './services/AngularStrapSelect.decorator';
+
 // Filters.
 import byName from './filters/byName.filter';
 import defaultName from './filters/default-name.filter';
@@ -195,6 +195,8 @@ angular
 gridColumnSelector.name,
 bsSelectMenu.name,
 protectFromBsSelectRender.name,
+AngularStrapTooltip.name,
+AngularStrapSelect.name,
 // Ignite modules.
 IgniteModules.name
 ])

http://git-wip-us.apache.org/repos/asf/ignite/blob/39fa8fae/modules/web-console/frontend/app/decorator/select.js
--
diff --git a/modules/web-console/frontend/app/decorator/select.js 
b/modules/web-console/frontend/app/decorator/select.js
deleted file mode 100644
index 2d22707..000
--- a/modules/web-console/frontend/app/decorator/select.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import angular from 'angular';
-
-/**
- * Special decorator that fix problem in AngularStrap selectAll / deselectAll 
methods.
- * If this problem will be fixed in AngularStrap we can remove this delegate.
- */
-angular.module('mgcrea.ngStrap.select')
-.decorator('$select', ['$delegate', ($delegate) => {
-function SelectFactoryDecorated(element, controller, config) {
-const delegate = $delegate(element, controller, config);
-
-// Common vars.
-const options = angular.extend({}, $delegate.defaults, config);
-
-const scope = delegate.$scope;
-
-const valueByIndex = (index) => {
-if (angular.isUndefined(scope.$matches[index]))
-return null;
-
-return scope.$matches[index].value;
-};
-
-const selectAll = (active) => {
-const selected = [];
-
-scope.$apply(() => {
-for (let i = 0; i < scope.$matches.length; i++) {
-if (scope.$isActive(i) === active) {
-selected[i] = scope.$matches[i].value;
-
-delegate.activate(i);
-
- 

[47/50] [abbrv] ignite git commit: ignite-5858 Fixed affinity initialization on new coordinator (broken in aeb9336b3b161ddfff73f17e41cd453409b84a16).

[yzhdanov]

ignite-5858 Fixed affinity initialization on new coordinator (broken in 
aeb9336b3b161ddfff73f17e41cd453409b84a16).


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

Branch: refs/heads/ignite-5658
Commit: b698bbfcaa2056b9792404aef38e427ff323bd57
Parents: 89bba2f
Author: sboikov 
Authored: Fri Jul 28 10:25:16 2017 +0300
Committer: sboikov 
Committed: Fri Jul 28 10:25:16 2017 +0300

--
 .../processors/cache/CacheAffinitySharedManager.java   |  2 +-
 .../cache/GridCachePartitionExchangeManager.java   | 13 -
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 10 +-
 3 files changed, 22 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b698bbfc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 5a7f634..51834c5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -1461,7 +1461,7 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
  * @throws IgniteCheckedException If failed.
  * @return Future completed when caches initialization is done.
  */
-private IgniteInternalFuture initCoordinatorCaches(final 
GridDhtPartitionsExchangeFuture fut)
+public IgniteInternalFuture initCoordinatorCaches(final 
GridDhtPartitionsExchangeFuture fut)
 throws IgniteCheckedException {
 final List futs = new 
ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b698bbfc/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 6a7258f..f6fa833 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
@@ -1745,6 +1745,9 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 /** Busy flag used as performance optimization to stop current 
preloading. */
 private volatile boolean busy;
 
+/** */
+private boolean crd;
+
 /**
  * Constructor.
  */
@@ -1940,7 +1943,15 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
 lastInitializedFut = exchFut;
 
-exchFut.init();
+boolean newCrd = false;
+
+if (!crd) {
+List srvNodes = 
exchFut.discoCache().serverNodes();
+
+crd = newCrd = !srvNodes.isEmpty() && 
srvNodes.get(0).isLocal();
+}
+
+exchFut.init(newCrd);
 
 int dumpCnt = 0;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b698bbfc/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 71e41b0..52a74ab 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
@@ -414,9 +414,10 @@ public class GridDhtPartitionsExchangeFuture extends 
GridDhtTopologyFutureAdapte
 /**
  * Starts 

[26/50] [abbrv] ignite git commit: IGNITE-5820 Web Console: Adjust modals height.

[yzhdanov]

IGNITE-5820 Web Console: Adjust modals height.


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

Branch: refs/heads/ignite-5658
Commit: 2005eec081add6906fa204c4db0cfcc4a4907292
Parents: f277530
Author: Andrey Novikov 
Authored: Tue Jul 25 15:49:21 2017 +0700
Committer: Andrey Novikov 
Committed: Tue Jul 25 15:49:21 2017 +0700

--
 .../web-console/frontend/app/primitives/modal/index.scss| 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2005eec0/modules/web-console/frontend/app/primitives/modal/index.scss
--
diff --git a/modules/web-console/frontend/app/primitives/modal/index.scss 
b/modules/web-console/frontend/app/primitives/modal/index.scss
index 87d8dc3..fcf9885 100644
--- a/modules/web-console/frontend/app/primitives/modal/index.scss
+++ b/modules/web-console/frontend/app/primitives/modal/index.scss
@@ -57,6 +57,15 @@
 transform: translateZ(1px);
 }
 
+.modal .modal-dialog--adjust-height {
+margin-top: 0;
+margin-bottom: 0;
+
+.modal-body {
+max-height: calc(100vh - 150px);
+}
+}
+
 .modal .modal-content {
 background-color: $gray-lighter;
 

[46/50] [abbrv] ignite git commit: IGNITE-5769 Abstract away .NET->Java calls

[yzhdanov]

IGNITE-5769 Abstract away .NET->Java calls

This closes #2352


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

Branch: refs/heads/ignite-5658
Commit: 89bba2fa2c423d5713c8412ba0069b869005694c
Parents: 47fea40
Author: Pavel Tupitsyn 
Authored: Fri Jul 28 10:06:16 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Jul 28 10:06:16 2017 +0300

--
 .../platform/PlatformTargetProxy.java   |   11 +
 .../platform/PlatformTargetProxyImpl.java   |   79 +-
 .../plugin/PlatformTestPluginTarget.java|7 +-
 .../cpp/jni/include/ignite/jni/exports.h|1 +
 .../platforms/cpp/jni/include/ignite/jni/java.h |5 +-
 modules/platforms/cpp/jni/project/vs/module.def |1 +
 modules/platforms/cpp/jni/src/exports.cpp   |4 +
 modules/platforms/cpp/jni/src/java.cpp  |   19 +-
 .../Plugin/PluginTest.cs|   13 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs   |7 +-
 .../Apache.Ignite.Core.csproj   |5 +-
 .../dotnet/Apache.Ignite.Core/Ignition.cs   |9 +-
 .../Impl/Binary/BinaryProcessor.cs  |6 +-
 .../Impl/Binary/BinaryWriterExtensions.cs   |  107 ++
 .../Cache/Affinity/PlatformAffinityFunction.cs  |7 +-
 .../Impl/Cache/CacheAffinityImpl.cs |   18 +-
 .../Impl/Cache/CacheEnumerator.cs   |8 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  113 +-
 .../Impl/Cache/Query/AbstractQueryCursor.cs |   12 +-
 .../Continuous/ContinuousQueryHandleImpl.cs |   12 +-
 .../Impl/Cache/Query/FieldsQueryCursor.cs   |6 +-
 .../Impl/Cache/Query/QueryCursor.cs |5 +-
 .../Impl/Cluster/ClusterGroupImpl.cs|   76 +-
 .../Impl/Common/DelegateTypeDescriptor.cs   |9 +-
 .../Impl/Common/Listenable.cs   |8 +-
 .../Impl/Compute/ComputeImpl.cs |   12 +-
 .../Impl/DataStructures/AtomicLong.cs   |9 +-
 .../Impl/DataStructures/AtomicReference.cs  |8 +-
 .../Impl/DataStructures/AtomicSequence.cs   |9 +-
 .../Impl/Datastream/DataStreamerImpl.cs |8 +-
 .../Impl/Datastream/StreamReceiverHolder.cs |   13 +-
 .../Apache.Ignite.Core/Impl/Events/Events.cs|   11 +-
 .../Impl/IPlatformTargetInternal.cs |  102 ++
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs|   48 +-
 .../Impl/Messaging/Messaging.cs |   10 +-
 .../Impl/PlatformDisposableTargetAdapter.cs |   75 ++
 .../Impl/PlatformJniTarget.cs   |  536 +
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   | 1086 --
 .../Impl/PlatformTargetAdapter.cs   |  534 +
 .../Impl/Services/Services.cs   |   19 +-
 .../Impl/Transactions/TransactionsImpl.cs   |   29 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs|3 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs|   10 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs|7 +
 .../Interop/IPlatformTarget.cs  |   15 +
 45 files changed, 1690 insertions(+), 1402 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/89bba2fa/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
index 1ee57cb..29de311 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
@@ -105,6 +105,17 @@ public interface PlatformTargetProxy {
 void inStreamAsync(int type, long memPtr) throws Exception;
 
 /**
+ * Asynchronous operation accepting memory stream and returning 
PlatformListenableTarget.
+ * Supports cancellable async operations.
+ *
+ * @param type Operation type.
+ * @param memPtr Memory pointer.
+ * @return Result.
+ * @throws Exception If case of failure.
+ */
+Object inStreamOutObjectAsync(int type, long memPtr) throws Exception;
+
+/**
  * Returns the underlying target.
  *
  * @return Underlying target.

http://git-wip-us.apache.org/repos/asf/ignite/blob/89bba2fa/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxyImpl.java

[37/50] [abbrv] ignite git commit: Removed unused methods from IgniteThreadPoolExecutor.

[yzhdanov]

Removed unused methods from IgniteThreadPoolExecutor.


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

Branch: refs/heads/ignite-5658
Commit: 2574bebde0fc5591bc09e2241f1352e1f0e9cbca
Parents: 5704e39
Author: sboikov 
Authored: Thu Jul 27 13:21:14 2017 +0300
Committer: sboikov 
Committed: Thu Jul 27 13:21:14 2017 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |   3 +-
 .../internal/processors/igfs/IgfsImpl.java  |   2 +-
 .../ignite/thread/IgniteThreadPoolExecutor.java | 144 +--
 .../loadtests/colocation/GridTestMain.java  |  45 --
 .../marshaller/GridMarshallerResourceBean.java  |   5 +-
 .../GridThreadPoolExecutorServiceSelfTest.java  |   7 +-
 6 files changed, 10 insertions(+), 196 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2574bebd/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index d219333..1139ec6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1776,8 +1776,7 @@ public class IgnitionEx {
 cfg.getIgfsThreadPoolSize(),
 DFLT_THREAD_KEEP_ALIVE_TIME,
 new LinkedBlockingQueue(),
-new IgfsThreadFactory(cfg.getIgniteInstanceName(), "igfs"),
-null /* Abort policy will be used. */);
+new IgfsThreadFactory(cfg.getIgniteInstanceName(), "igfs"));
 
 igfsExecSvc.allowCoreThreadTimeOut(true);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2574bebd/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 7eb61d1..5808e7c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -247,7 +247,7 @@ public final class IgfsImpl implements IgfsEx {
 }
 
 dualPool = secondaryFs != null ? new IgniteThreadPoolExecutor(4, 
Integer.MAX_VALUE, 5000L,
-new SynchronousQueue(), new 
IgfsThreadFactory(cfg.getName()), null) : null;
+new SynchronousQueue(), new 
IgfsThreadFactory(cfg.getName())) : null;
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/2574bebd/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
 
b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
index 8002aaa..639ef94 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
@@ -19,150 +19,14 @@ package org.apache.ignite.thread;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * An {@link ExecutorService} that executes submitted tasks using pooled grid 
threads.
  */
 public class IgniteThreadPoolExecutor extends ThreadPoolExecutor {
-/** Default core pool size (value is {@code 100}). */
-public static final int DFLT_CORE_POOL_SIZE = 100;
-
-/**
- * Creates a new service with default initial parameters.
- * Default values are:
- * 
- * 
- *  Name
- *  Default Value
- * 
- * 
- *  Core Pool Size
- *  {@code 100} (see {@link #DFLT_CORE_POOL_SIZE}).
- * 
- * 
- *  Maximum Pool Size
- *  None, is it is not used for unbounded queues.
- * 
- * 
- *  Keep alive time
- *  No limit (see {@link Long#MAX_VALUE}).
- * 
- * 
- *  Blocking Queue (see 

[15/50] [abbrv] ignite git commit: Merge branch 'ignite-2.1.3'

[yzhdanov]

Merge branch 'ignite-2.1.3'


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

Branch: refs/heads/ignite-5658
Commit: ca496f6e9e48a107abb72a4fea87b5b11da66806
Parents: 0adaf6e c1a3b37
Author: Pavel Tupitsyn 
Authored: Fri Jul 21 17:05:10 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Jul 21 17:05:10 2017 +0300

--
 .../dht/preloader/GridDhtPartitionMap.java  |  7 +-
 .../wal/FileWriteAheadLogManager.java   | 93 +---
 .../dotnet/PlatformDotNetCacheStore.java| 31 +++
 .../Apache.Ignite.Core.Tests.csproj |  5 ++
 .../Cache/Store/CacheStoreSessionTest.cs| 90 +--
 .../Store/CacheStoreSessionTestCodeConfig.cs| 68 ++
 .../Store/CacheStoreSessionTestSharedFactory.cs | 48 ++
 .../Cache/Store/CacheStoreTest.cs   | 10 ++-
 .../cache-store-session-shared-factory.xml  | 76 
 .../Config/Cache/Store/cache-store-session.xml  | 20 ++---
 .../Impl/Cache/Store/CacheStoreInternal.cs  | 14 ++-
 modules/web-console/frontend/app/app.js | 14 +++
 .../frontend/app/data/pom-dependencies.json |  5 +-
 .../configuration/generator/Maven.service.js|  9 +-
 .../frontend/app/modules/states/errors.state.js |  6 +-
 .../frontend/app/modules/states/signin.state.js | 10 ++-
 .../frontend/webpack/webpack.common.js  |  4 +-
 17 files changed, 422 insertions(+), 88 deletions(-)
--

[36/50] [abbrv] ignite git commit: Tried to simplify GridDhtAtomicCache.updateAllAsyncInternal0.

[yzhdanov]

Tried to simplify GridDhtAtomicCache.updateAllAsyncInternal0.


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

Branch: refs/heads/ignite-5658
Commit: 5704e393102cc8c24df7bfb4ff9053003530b7fc
Parents: 9e79c4b
Author: sboikov 
Authored: Thu Jul 27 12:50:37 2017 +0300
Committer: sboikov 
Committed: Thu Jul 27 12:50:37 2017 +0300

--
 .../dht/atomic/DhtAtomicUpdateResult.java   | 131 +++
 .../dht/atomic/GridDhtAtomicCache.java  | 380 ---
 .../GridNearAtomicAbstractUpdateFuture.java |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 4 files changed, 282 insertions(+), 235 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5704e393/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
new file mode 100644
index 000..e7d2b19
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheUpdateAtomicResult;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ *
+ */
+class DhtAtomicUpdateResult {
+/** */
+private GridCacheReturn retVal;
+
+/** */
+private Collection> 
deleted;
+
+/** */
+private GridDhtAtomicAbstractUpdateFuture dhtFut;
+
+/** */
+private IgniteCacheExpiryPolicy expiry;
+
+/**
+ *
+ */
+DhtAtomicUpdateResult() {
+// No-op.
+}
+
+/**
+ * @param retVal Return value.
+ * @param deleted Deleted entries.
+ * @param dhtFut DHT update future.
+ */
+DhtAtomicUpdateResult(GridCacheReturn retVal,
+Collection> deleted,
+GridDhtAtomicAbstractUpdateFuture dhtFut) {
+this.retVal = retVal;
+this.deleted = deleted;
+this.dhtFut = dhtFut;
+}
+
+/**
+ * @param expiry Expiry policy.
+ */
+void expiryPolicy(@Nullable IgniteCacheExpiryPolicy expiry) {
+this.expiry = expiry;
+}
+
+/**
+ * @return Expiry policy.
+ */
+@Nullable IgniteCacheExpiryPolicy expiryPolicy() {
+return expiry;
+}
+
+/**
+ * @param entry Entry.
+ * @param updRes Entry update result.
+ * @param entries All entries.
+ */
+void addDeleted(GridDhtCacheEntry entry,
+GridCacheUpdateAtomicResult updRes,
+Collection entries) {
+if (updRes.removeVersion() != null) {
+if (deleted == null)
+deleted = new ArrayList<>(entries.size());
+
+deleted.add(F.t(entry, updRes.removeVersion()));
+}
+}
+
+/**
+ * @return Deleted entries.
+ */
+Collection> deleted() {
+

[30/50] [abbrv] ignite git commit: IGNITE-5770 Refactor PlatformProcessor to PlatformTarget mechanism

[yzhdanov]

IGNITE-5770 Refactor PlatformProcessor to PlatformTarget mechanism

This closes #2336


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

Branch: refs/heads/ignite-5658
Commit: bdc9e4b91403595c496a5fa4aca70228665feaaa
Parents: bd7d407
Author: Pavel Tupitsyn 
Authored: Tue Jul 25 15:15:43 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jul 25 15:15:43 2017 +0300

--
 .../platform/PlatformAbstractTarget.java|   6 +-
 .../processors/platform/PlatformIgnition.java   |   5 +-
 .../platform/PlatformNoopProcessor.java | 132 -
 .../processors/platform/PlatformProcessor.java  | 216 
 .../platform/PlatformProcessorImpl.java | 554 +++
 .../platform/cluster/PlatformClusterGroup.java  |  29 +
 .../datastructures/PlatformAtomicReference.java |  13 +-
 .../platforms/cpp/core/include/ignite/ignite.h  |   6 +-
 .../include/ignite/impl/compute/compute_impl.h  |   5 +-
 .../cpp/core/include/ignite/impl/ignite_impl.h  | 112 ++--
 .../ignite/impl/interop/interop_target.h|  16 +-
 modules/platforms/cpp/core/src/ignition.cpp |  23 +-
 .../cpp/core/src/impl/ignite_environment.cpp|  37 +-
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |  25 +-
 .../core/src/impl/interop/interop_target.cpp|  18 +-
 .../cpp/jni/include/ignite/jni/exports.h|  31 +-
 .../platforms/cpp/jni/include/ignite/jni/java.h |  70 +--
 modules/platforms/cpp/jni/project/vs/module.def |  30 +-
 modules/platforms/cpp/jni/src/exports.cpp   | 116 +---
 modules/platforms/cpp/jni/src/java.cpp  | 518 +
 .../dotnet/Apache.Ignite.Core/Ignition.cs   |  12 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   2 +-
 .../Impl/Cluster/ClusterGroupImpl.cs|  78 ++-
 .../Impl/Compute/ComputeImpl.cs |   6 +-
 .../Impl/Datastream/DataStreamerImpl.cs |   3 +-
 .../Impl/Datastream/StreamReceiverHolder.cs |   2 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs| 279 +-
 .../Apache.Ignite.Core/Impl/Log/JavaLogger.cs   |  23 +-
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |  18 +-
 .../Impl/Plugin/PluginContext.cs|   7 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs|  91 +--
 .../Impl/Unmanaged/UnmanagedUtils.cs| 308 +--
 32 files changed, 768 insertions(+), 2023 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc9e4b9/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
index 5e785e2..4a584f9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
@@ -130,7 +130,7 @@ public abstract class PlatformAbstractTarget implements 
PlatformTarget {
  * @return Dummy value which is never returned.
  * @throws IgniteCheckedException Exception to be thrown.
  */
-private  T throwUnsupported(int type) throws IgniteCheckedException {
+public static  T throwUnsupported(int type) throws 
IgniteCheckedException {
 throw new IgniteCheckedException("Unsupported operation type: " + 
type);
 }
 
@@ -142,8 +142,8 @@ public abstract class PlatformAbstractTarget implements 
PlatformTarget {
  * @param writer Writer.
  * @throws IgniteCheckedException In case of error.
  */
-protected PlatformListenable readAndListenFuture(BinaryRawReader reader, 
IgniteInternalFuture fut,
- 
PlatformFutureUtils.Writer writer)
+private PlatformListenable readAndListenFuture(BinaryRawReader reader, 
IgniteInternalFuture fut,
+   PlatformFutureUtils.Writer 
writer)
 throws IgniteCheckedException {
 long futId = reader.readLong();
 int futTyp = reader.readInt();

http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc9e4b9/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java
 

[39/50] [abbrv] ignite git commit: ignite-5682 Added stale version check for GridDhtPartFullMessage not related to exchange.

[yzhdanov]

ignite-5682 Added stale version check for GridDhtPartFullMessage not related to 
exchange.


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

Branch: refs/heads/ignite-5658
Commit: eb9d06d9ff89388318cc3a857276c154675bc6f1
Parents: 3a3650f
Author: Dmitry Pavlov 
Authored: Thu Jul 27 14:51:25 2017 +0300
Committer: sboikov 
Committed: Thu Jul 27 14:51:25 2017 +0300

--
 .../cache/CacheAffinitySharedManager.java   |  5 +-
 .../processors/cache/GridCacheIoManager.java|  2 +-
 .../GridCachePartitionExchangeManager.java  | 44 ++-
 .../dht/GridClientPartitionTopology.java| 12 +++-
 .../dht/GridDhtPartitionTopology.java   |  9 ++-
 .../dht/GridDhtPartitionTopologyImpl.java   | 34 +++-
 .../preloader/GridDhtPartitionExchangeId.java   |  2 +-
 .../GridDhtPartitionsExchangeFuture.java| 36 
 .../preloader/GridDhtPartitionsFullMessage.java |  4 +-
 ...cingDelayedPartitionMapExchangeSelfTest.java | 58 
 .../junits/common/GridCommonAbstractTest.java   |  6 +-
 11 files changed, 151 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eb9d06d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 0f46a90..5a7f634 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -442,7 +442,8 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 grp.topology().update(topVer,
 clientTop.partitionMap(true),
 clientTop.updateCounters(false),
-Collections.emptySet());
+Collections.emptySet(),
+null);
 }
 
 grpHolder = new CacheGroupHolder1(grp, 
grpHolder.affinity());
@@ -504,7 +505,7 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 
 grp.topology().updateTopologyVersion(topFut, discoCache, -1, 
false);
 
-grp.topology().update(topVer, partMap, null, 
Collections.emptySet());
+grp.topology().update(topVer, partMap, null, 
Collections.emptySet(), null);
 
 topFut.validate(grp, discoCache.allNodes());
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb9d06d9/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 9f1873e..981c6e2 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
@@ -533,7 +533,7 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 }
 
 /**
- * @param nodeId Node ID.
+ * @param nodeId Sender Node ID.
  * @param cacheMsg Cache message.
  * @param c Handler closure.
  * @param plc Message policy.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb9d06d9/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 d4fe93f..6a7258f 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
@@ -129,7 +129,7 @@ public class 

[07/50] [abbrv] ignite git commit: IGNITE-5776: Add option to turn on filter reachable addresses in TcpCommunicationSpi. This closes #2317.

[yzhdanov]

IGNITE-5776: Add option to turn on filter reachable addresses in 
TcpCommunicationSpi. This closes #2317.


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

Branch: refs/heads/ignite-5658
Commit: bd7a08e31d03b2c51b225cf388dc1197348a1593
Parents: e285f9d
Author: Evgenii Zhuravlev 
Authored: Thu Jul 20 13:32:18 2017 +0300
Committer: Andrey V. Mashenkov 
Committed: Thu Jul 20 13:32:18 2017 +0300

--
 .../communication/tcp/TcpCommunicationSpi.java  | 77 ++--
 1 file changed, 56 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bd7a08e3/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 35d3032..5b952e8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -311,6 +311,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter 
implements Communicati
 /** Default value for {@code TCP_NODELAY} socket option (value is 
true). */
 public static final boolean DFLT_TCP_NODELAY = true;
 
+/** Default value for {@code FILTER_REACHABLE_ADDRESSES} socket option 
(value is false). */
+public static final boolean DFLT_FILTER_REACHABLE_ADDRESSES = false;
+
 /** Default received messages threshold for sending ack. */
 public static final int DFLT_ACK_SND_THRESHOLD = 32;
 
@@ -1016,6 +1019,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter 
implements Communicati
 /** {@code TCP_NODELAY} option value for created sockets. */
 private boolean tcpNoDelay = DFLT_TCP_NODELAY;
 
+/** {@code FILTER_REACHABLE_ADDRESSES} option value for created sockets. */
+private boolean filterReachableAddresses = DFLT_FILTER_REACHABLE_ADDRESSES;
+
 /** Number of received messages after which acknowledgment is sent. */
 private int ackSndThreshold = DFLT_ACK_SND_THRESHOLD;
 
@@ -1626,6 +1632,33 @@ public class TcpCommunicationSpi extends 
IgniteSpiAdapter implements Communicati
 }
 
 /**
+ * Gets value for {@code FILTER_REACHABLE_ADDRESSES} socket option.
+ *
+ * @return {@code True} if needed to filter reachable addresses.
+ */
+public boolean isFilterReachableAddresses() {
+return filterReachableAddresses;
+}
+
+/**
+ * Setting this option to {@code true} enables filter for reachable
+ * addresses on creating tcp client.
+ * 
+ * Usually its advised to set this value to {@code false}.
+ * 
+ * If not provided, default value is {@link 
#DFLT_FILTER_REACHABLE_ADDRESSES}.
+ *
+ * @param filterReachableAddresses {@code True} to filter reachable 
addresses.
+ * @return {@code this} for chaining.
+ */
+@IgniteSpiConfiguration(optional = true)
+public TcpCommunicationSpi setFilterReachableAddresses(boolean 
filterReachableAddresses) {
+this.filterReachableAddresses = filterReachableAddresses;
+
+return this;
+}
+
+/**
  * Sets receive buffer size for sockets created or accepted by this SPI.
  * 
  * If not provided, default is {@link #DFLT_SOCK_BUF_SIZE}.
@@ -2952,35 +2985,37 @@ public class TcpCommunicationSpi extends 
IgniteSpiAdapter implements Communicati
 if (isExtAddrsExist)
 addrs.addAll(extAddrs);
 
-Set allInetAddrs = U.newHashSet(addrs.size());
+if (filterReachableAddresses) {
+Set allInetAddrs = U.newHashSet(addrs.size());
 
-for (InetSocketAddress addr : addrs) {
-// Skip unresolved as addr.getAddress() can return null.
-if(!addr.isUnresolved())
-allInetAddrs.add(addr.getAddress());
-}
+for (InetSocketAddress addr : addrs) {
+// Skip unresolved as addr.getAddress() can return null.
+if (!addr.isUnresolved())
+allInetAddrs.add(addr.getAddress());
+}
 
-List reachableInetAddrs = U.filterReachable(allInetAddrs);
+List reachableInetAddrs = 
U.filterReachable(allInetAddrs);
 
-if (reachableInetAddrs.size() < allInetAddrs.size()) {
-LinkedHashSet addrs0 = 
U.newLinkedHashSet(addrs.size());
+if 

[01/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-2.1.3'

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-5658 9936dd850 -> 55f51b54f


Merge remote-tracking branch 'remotes/community/ignite-2.1.3'


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

Branch: refs/heads/ignite-5658
Commit: e5f2d90c6db491ea03b2f76230a1467bc93e35df
Parents: b3bce81 0d6b730
Author: sboikov 
Authored: Wed Jul 19 12:08:37 2017 +0300
Committer: sboikov 
Committed: Wed Jul 19 12:08:37 2017 +0300

--
 .../internal/managers/communication/GridIoMessageFactory.java| 2 +-
 .../wal/record/delta/MetaPageUpdatePartitionDataRecord.java  | 2 ++
 .../processors/cache/persistence/GridCacheOffheapManager.java| 2 +-
 .../java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
 .../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java  | 2 ++
 .../cache/distributed/GridCacheAbstractNodeRestartSelfTest.java  | 2 +-
 .../GridCachePartitionEvictionDuringReadThroughSelfTest.java | 1 +
 .../replicated/GridCacheReplicatedNodeRestartSelfTest.java   | 2 +-
 .../ignite/internal/processors/database/BPlusTreeSelfTest.java   | 4 +++-
 .../internal/processors/database/FreeListImplSelfTest.java   | 4 +++-
 .../apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java  | 3 +--
 11 files changed, 18 insertions(+), 8 deletions(-)
--

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

[yzhdanov]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-5658
Commit: 0adaf6e4a04fa6405a5596e583e760871e1092dd
Parents: 48f2994 0d2b989
Author: Anton Vinogradov 
Authored: Fri Jul 21 15:31:28 2017 +0300
Committer: Anton Vinogradov 
Committed: Fri Jul 21 15:31:28 2017 +0300

--
 .../apache/ignite/ml/math/DistanceMeasure.java  |   2 +-
 .../ignite/ml/math/EuclideanDistance.java   |   3 +-
 .../math/decompositions/EigenDecomposition.java |   2 +-
 .../apache/ignite/ml/math/impls/CacheUtils.java | 198 +++--
 .../ml/math/impls/matrix/AbstractMatrix.java|   4 +-
 .../ignite/ml/math/impls/matrix/BlockEntry.java |  50 +++
 .../ml/math/impls/matrix/CacheMatrix.java   |   9 +-
 .../matrix/SparseBlockDistributedMatrix.java| 208 +
 .../impls/matrix/SparseDistributedMatrix.java   |  26 +-
 .../storage/matrix/BaseBlockMatrixKey.java  |  41 ++
 .../impls/storage/matrix/BlockMatrixKey.java| 144 ++
 .../storage/matrix/BlockMatrixStorage.java  | 435 +++
 .../vector/SparseLocalOnHeapVectorStorage.java  |   4 +-
 .../ignite/ml/math/statistics/Variance.java |   1 +
 .../ignite/ml/math/statistics/package-info.java |  22 +
 .../org/apache/ignite/ml/math/util/MapUtil.java |   2 +-
 .../ignite/ml/math/util/package-info.java   |  22 +
 .../java/org/apache/ignite/ml/package-info.java |  22 +
 .../ml/math/MathImplDistributedTestSuite.java   |   2 +
 .../SparseDistributedBlockMatrixTest.java   | 379 
 .../matrix/SparseDistributedMatrixTest.java |  32 +-
 21 files changed, 1528 insertions(+), 80 deletions(-)
--

[06/50] [abbrv] ignite git commit: IGNITE-5775: Fix bug with delay for compute jobs. This closes #2319.

[yzhdanov]

IGNITE-5775: Fix bug with delay for compute jobs. This closes #2319.


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

Branch: refs/heads/ignite-5658
Commit: e285f9dbebc6fd86e81e52828813be9b9d2633f2
Parents: 02e2507
Author: Andrey V. Mashenkov 
Authored: Thu Jul 20 13:24:25 2017 +0300
Committer: Andrey V. Mashenkov 
Committed: Thu Jul 20 13:24:25 2017 +0300

--
 .../processors/job/GridJobProcessor.java| 10 +--
 .../internal/IgniteComputeJobOneThreadTest.java | 75 
 .../testsuites/IgniteComputeGridTestSuite.java  |  3 +
 3 files changed, 83 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e285f9db/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 7d2073e..cc8d903 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1794,6 +1794,11 @@ public class GridJobProcessor extends 
GridProcessorAdapter {
 return;
 }
 
+if (!activeJobs.remove(worker.getJobId(), worker))
+cancelledJobs.remove(worker.getJobId(), worker);
+
+heldJobs.remove(worker.getJobId());
+
 try {
 handleCollisions();
 }
@@ -1801,11 +1806,6 @@ public class GridJobProcessor extends 
GridProcessorAdapter {
 rwLock.readUnlock();
 }
 }
-
-if (!activeJobs.remove(worker.getJobId(), worker))
-cancelledJobs.remove(worker.getJobId(), worker);
-
-heldJobs.remove(worker.getJobId());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e285f9db/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
new file mode 100644
index 000..76f669e
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Test of absence of gaps between jobs in compute
+ */
+public class IgniteComputeJobOneThreadTest extends GridCommonAbstractTest {
+@Override protected IgniteConfiguration getConfiguration(String name) 
throws Exception {
+FifoQueueCollisionSpi colSpi = new FifoQueueCollisionSpi();
+colSpi.setParallelJobsNumber(1);
+
+return super.getConfiguration(name)
+.setMetricsUpdateFrequency(1)
+.setCollisionSpi(colSpi);
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+startGrid(0);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+  

[27/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-2.1.3'

[yzhdanov]

Merge remote-tracking branch 'remotes/community/ignite-2.1.3'


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

Branch: refs/heads/ignite-5658
Commit: bd7d4077bdf0cd95618f5a8935f900f4854b5672
Parents: 3019433 2005eec
Author: sboikov 
Authored: Tue Jul 25 13:17:01 2017 +0300
Committer: sboikov 
Committed: Tue Jul 25 13:17:01 2017 +0300

--
 .../dht/GridClientPartitionTopology.java|   9 +-
 .../dht/GridDhtPartitionTopologyImpl.java   |   9 +-
 .../IgniteCacheDatabaseSharedManager.java   |  22 ++-
 .../database/SwapPathConstructionSelfTest.java  | 157 +++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 modules/web-console/backend/.eslintrc   |  39 +++--
 modules/web-console/backend/app/agentSocket.js  |   4 +-
 .../web-console/backend/app/browsersHandler.js  |   2 +-
 modules/web-console/backend/package.json|  27 ++--
 modules/web-console/frontend/.eslintrc  |  40 ++---
 modules/web-console/frontend/app/app.js |  45 +++---
 .../components/activities-user-dialog/index.js  |  28 ++--
 .../page-configure-advanced/controller.js   |   9 +-
 .../components/page-configure-basic/service.js  |   8 +-
 .../app/components/page-configure/controller.js |  12 +-
 .../page-configure/controller.spec.js   |  48 --
 .../page-configure/services/PageConfigure.js|  18 ++-
 .../components/web-console-header/component.js  |  12 +-
 .../app/components/web-console-header/index.js  |   4 +-
 .../components/web-console-header/style.scss|   6 +-
 .../frontend/app/decorator/select.js|  77 -
 .../frontend/app/decorator/tooltip.js   |  73 -
 .../frontend/app/modules/ace.module.js  |   6 +-
 .../app/modules/branding/branding.module.js |  16 +-
 .../generator/ConfigurationGenerator.js |   2 +-
 .../generator/PlatformGenerator.js  |   4 +-
 .../frontend/app/modules/demo/Demo.module.js|  10 +-
 .../app/modules/dialog/dialog.controller.js |   4 -
 .../app/modules/form/field/label.directive.js   |   4 +-
 .../app/modules/form/field/tooltip.directive.js |   4 +-
 .../frontend/app/modules/sql/sql.controller.js  |   2 +-
 .../frontend/app/modules/sql/sql.module.js  |  66 
 .../frontend/app/modules/states/admin.state.js  |   6 +-
 .../app/modules/states/configuration.state.js   |  35 +++--
 .../states/configuration/clusters/memory.pug|   8 +-
 .../summary/summary-zipper.service.js   |   2 +-
 .../frontend/app/modules/states/errors.state.js |   4 +-
 .../frontend/app/modules/states/logout.state.js |  12 +-
 .../app/modules/states/password.state.js|   4 +-
 .../app/modules/states/profile.state.js |   9 +-
 .../frontend/app/modules/states/signin.state.js |  32 ++--
 .../app/modules/user/AclRoute.provider.js   |   6 +-
 .../frontend/app/modules/user/user.module.js|  30 +++-
 .../frontend/app/primitives/modal/index.scss|   9 ++
 .../frontend/app/primitives/panel/index.scss|   2 +-
 .../services/AngularStrapSelect.decorator.js|  77 +
 .../services/AngularStrapTooltip.decorator.js   | 103 
 .../app/services/CopyToClipboard.service.js |   4 +-
 .../app/services/LegacyTable.service.js |   2 +-
 modules/web-console/frontend/app/vendor.js  |   8 +-
 modules/web-console/frontend/package.json   |  57 +++
 .../views/configuration/domains-import.tpl.pug  |   4 +-
 .../frontend/views/includes/header-left.pug |  41 ++---
 modules/web-console/frontend/views/index.pug|  14 +-
 .../console/agent/handlers/RestListener.java|   7 +-
 .../ignite/console/agent/rest/RestExecutor.java |  49 +++---
 56 files changed, 726 insertions(+), 569 deletions(-)
--


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

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

[21/50] [abbrv] ignite git commit: Test for cache partitions state, fix for client cache start.

[yzhdanov]

Test for cache partitions state, fix for client cache start.


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

Branch: refs/heads/ignite-5658
Commit: aeb9336b3b161ddfff73f17e41cd453409b84a16
Parents: ca496f6
Author: sboikov 
Authored: Mon Jul 24 11:47:16 2017 +0300
Committer: sboikov 
Committed: Mon Jul 24 11:47:16 2017 +0300

--
 .../cache/CacheAffinitySharedManager.java   |  51 ++-
 .../dht/GridClientPartitionTopology.java|   7 +-
 .../dht/GridDhtPartitionTopology.java   |  12 +-
 .../dht/GridDhtPartitionTopologyImpl.java   |  45 +-
 .../GridDhtPartitionsExchangeFuture.java| 120 +++---
 .../GridCacheDatabaseSharedManager.java |   6 +-
 .../CacheLateAffinityAssignmentTest.java|  36 +-
 .../distributed/CachePartitionStateTest.java| 410 +++
 .../TestCacheNodeExcludingFilter.java   |  53 +++
 .../db/IgnitePdsCacheRestoreTest.java   | 208 ++
 .../testsuites/IgniteCacheTestSuite6.java   |  38 ++
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   3 +
 12 files changed, 863 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aeb9336b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 79ab183..f519b4e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -517,6 +517,16 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 }
 }
 
+for (DynamicCacheDescriptor desc : startDescs) {
+if (desc.cacheConfiguration().getCacheMode() != LOCAL) {
+CacheGroupContext grp = 
cctx.cache().cacheGroup(desc.groupId());
+
+assert grp != null;
+
+
grp.topology().onExchangeDone(grp.affinity().cachedAffinity(topVer), true);
+}
+}
+
 cctx.cache().initCacheProxies(topVer, null);
 
 cctx.cache().completeClientCacheChangeFuture(msg.requestId(), null);
@@ -1299,6 +1309,19 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 }
 
 /**
+ * @param grpId Group ID.
+ * @return Group name for debug purpose.
+ */
+private String debugGroupName(int grpId) {
+CacheGroupDescriptor desc = caches.group(grpId);
+
+if (desc != null)
+return desc.cacheOrGroupName();
+else
+return "Unknown group: " + grpId;
+}
+
+/**
  * @param fut Exchange future.
  * @throws IgniteCheckedException If failed.
  */
@@ -1396,19 +1419,31 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
  * Called on exchange initiated by server node leave.
  *
  * @param fut Exchange future.
+ * @param crd Coordinator flag.
  * @throws IgniteCheckedException If failed.
  * @return {@code True} if affinity should be assigned by coordinator.
  */
-public boolean onServerLeft(final GridDhtPartitionsExchangeFuture fut) 
throws IgniteCheckedException {
+public boolean onServerLeft(final GridDhtPartitionsExchangeFuture fut, 
boolean crd) throws IgniteCheckedException {
 ClusterNode leftNode = fut.discoveryEvent().eventNode();
 
 assert !leftNode.isClient() : leftNode;
 
-for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
-if (grp.isLocal())
-continue;
+if (crd) {
+// Need initialize CacheGroupHolders if this node become 
coordinator on this exchange.
+forAllRegisteredCacheGroups(new 
IgniteInClosureX() {
+@Override public void applyx(CacheGroupDescriptor desc) throws 
IgniteCheckedException {
+CacheGroupHolder cache = 
groupHolder(fut.topologyVersion(), desc);
 
-grp.affinity().calculate(fut.topologyVersion(), 
fut.discoveryEvent(), fut.discoCache());
+cache.aff.calculate(fut.topologyVersion(), 
fut.discoveryEvent(), fut.discoCache());
+}
+});
+}
+else {
+forAllCacheGroups(false, new 

[03/50] [abbrv] ignite git commit: IGNITE-5781 Visor throws ClassCastException if cache store implementation is other than CacheJdbcPojoStore

[yzhdanov]

IGNITE-5781 Visor throws ClassCastException if cache store implementation is 
other than CacheJdbcPojoStore

Signed-off-by: Konstantin Boudnik 


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

Branch: refs/heads/ignite-5658
Commit: 02e2507598598c09ecf3eaa45e5c9b7c4db74152
Parents: cde3da4
Author: Aleksandr_Meterko 
Authored: Wed Jul 19 16:55:15 2017 +0400
Committer: Konstantin Boudnik 
Committed: Wed Jul 19 15:16:30 2017 -0700

--
 .../org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/02e25075/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
old mode 100644
new mode 100755
index e50402c..a03096f
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
@@ -64,7 +64,7 @@ public class VisorCacheJdbcType extends 
VisorDataTransferObject {
 public static List list(Factory factory) {
 List res = new ArrayList<>();
 
-if (factory != null || factory instanceof CacheJdbcPojoStoreFactory) {
+if (factory instanceof CacheJdbcPojoStoreFactory) {
 CacheJdbcPojoStoreFactory jdbcFactory = 
(CacheJdbcPojoStoreFactory) factory;
 
 JdbcType[] jdbcTypes = jdbcFactory.getTypes();

[10/50] [abbrv] ignite git commit: IGNITE-3950 Deadlock when exchange starts with pending explicit lock

[yzhdanov]

IGNITE-3950 Deadlock when exchange starts with pending explicit lock


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

Branch: refs/heads/ignite-5658
Commit: 48f29943efa9cbfc1e2c4068f7e16373dec2b0b9
Parents: db43b0c
Author: Vitaliy Biryukov 
Authored: Fri Jul 21 15:29:23 2017 +0300
Committer: Anton Vinogradov 
Committed: Fri Jul 21 15:29:23 2017 +0300

--
 .../cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/48f29943/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index 6fd5dd3..11b0eea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -117,8 +117,6 @@ public class IgniteCacheMultiTxLockSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testExplicitLockManyKeysWithClient() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-3950;);
-
 checkExplicitLock(4, true);
 }
 

[16/50] [abbrv] ignite git commit: IGNITE-5067 - Fixed absolute swap file path handling for memory policy configuration. Fixes #1867

[yzhdanov]

IGNITE-5067 - Fixed absolute swap file path handling for memory policy 
configuration. Fixes #1867


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

Branch: refs/heads/ignite-5658
Commit: 6f749bf4bebb135250a3f99923ed87b4b7d0c29f
Parents: c1a3b37
Author: Sergey Chugunov 
Authored: Fri Jul 21 17:59:10 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Jul 21 18:00:40 2017 +0300

--
 .../IgniteCacheDatabaseSharedManager.java   |  22 ++-
 .../database/SwapPathConstructionSelfTest.java  | 157 +++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 3 files changed, 174 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6f749bf4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
index eec3b85..e07c51e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.management.JMException;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.MemoryMetrics;
@@ -204,8 +203,9 @@ public class IgniteCacheDatabaseSharedManager extends 
GridCacheSharedManagerAdap
 
 /**
  * @param memCfg Database config.
+ * @throws IgniteCheckedException If failed to initialize swap path.
  */
-protected void initPageMemoryPolicies(MemoryConfiguration memCfg) {
+protected void initPageMemoryPolicies(MemoryConfiguration memCfg) throws 
IgniteCheckedException {
 MemoryPolicyConfiguration[] memPlcsCfgs = memCfg.getMemoryPolicies();
 
 if (memPlcsCfgs == null) {
@@ -261,12 +261,13 @@ public class IgniteCacheDatabaseSharedManager extends 
GridCacheSharedManagerAdap
  * @param memCfg Database config.
  * @param memPlcCfg Memory policy config.
  * @param memPlcName Memory policy name.
+ * @throws IgniteCheckedException If failed to initialize swap path.
  */
 private void addMemoryPolicy(
 MemoryConfiguration memCfg,
 MemoryPolicyConfiguration memPlcCfg,
 String memPlcName
-) {
+) throws IgniteCheckedException {
 String dfltMemPlcName = memCfg.getDefaultMemoryPolicyName();
 
 if (dfltMemPlcName == null)
@@ -844,12 +845,14 @@ public class IgniteCacheDatabaseSharedManager extends 
GridCacheSharedManagerAdap
  * @param plcCfg memory policy with PageMemory specific parameters.
  * @param memMetrics {@link MemoryMetrics} object to collect memory usage 
metrics.
  * @return Memory policy instance.
+ *
+ * @throws IgniteCheckedException If failed to initialize swap path.
  */
 private MemoryPolicy initMemory(
 MemoryConfiguration memCfg,
 MemoryPolicyConfiguration plcCfg,
 MemoryMetricsImpl memMetrics
-) {
+) throws IgniteCheckedException {
 File allocPath = buildAllocPath(plcCfg);
 
 DirectMemoryProvider memProvider = allocPath == null ?
@@ -892,8 +895,10 @@ public class IgniteCacheDatabaseSharedManager extends 
GridCacheSharedManagerAdap
  * Builds allocation path for memory mapped file to be used with 
PageMemory.
  *
  * @param plc MemoryPolicyConfiguration.
+ *
+ * @throws IgniteCheckedException If resolving swap directory fails.
  */
-@Nullable protected File buildAllocPath(MemoryPolicyConfiguration plc) {
+@Nullable protected File buildAllocPath(MemoryPolicyConfiguration plc) 
throws IgniteCheckedException {
 String path = plc.getSwapFilePath();
 
 if (path == null)
@@ -938,13 +943,14 @@ public class IgniteCacheDatabaseSharedManager extends 
GridCacheSharedManagerAdap
  * @param path Path to the working directory.
  * @param consId Consistent ID of the local node.
  * @return DB storage path.
+ *
+ * @throws IgniteCheckedException If resolving swap directory fails.
  */
-protected File buildPath(String path, String consId) {
+protected File 

[14/50] [abbrv] ignite git commit: IGNITE-5786 .NET: Fix cache store session handling for cross-cache transactions

[yzhdanov]

IGNITE-5786 .NET: Fix cache store session handling for cross-cache transactions

This closes #2331


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

Branch: refs/heads/ignite-5658
Commit: c1a3b3744f89e27906621e62e9d73281791fcf30
Parents: 6de0571
Author: Pavel Tupitsyn 
Authored: Fri Jul 21 17:04:39 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Jul 21 17:04:39 2017 +0300

--
 .../dotnet/PlatformDotNetCacheStore.java| 31 +++
 .../Apache.Ignite.Core.Tests.csproj |  5 ++
 .../Cache/Store/CacheStoreSessionTest.cs| 90 +---
 .../Store/CacheStoreSessionTestCodeConfig.cs| 68 +++
 .../Store/CacheStoreSessionTestSharedFactory.cs | 48 +++
 .../Cache/Store/CacheStoreTest.cs   | 10 ++-
 .../cache-store-session-shared-factory.xml  | 76 +
 .../Config/Cache/Store/cache-store-session.xml  | 20 ++---
 .../Impl/Cache/Store/CacheStoreInternal.cs  | 14 ++-
 9 files changed, 320 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c1a3b374/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index dd61a54..471eb01 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -47,6 +47,7 @@ import javax.cache.integration.CacheLoaderException;
 import javax.cache.integration.CacheWriterException;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 /**
@@ -90,6 +91,9 @@ public class PlatformDotNetCacheStore implements 
CacheStore, Platfor
 /** Key used to distinguish session deployment.  */
 private static final Object KEY_SES = new Object();
 
+/** Key to designate a set of stores that share current session.  */
+private static final Object KEY_SES_STORES = new Object();
+
 /** */
 @CacheStoreSessionResource
 private CacheStoreSession ses;
@@ -337,6 +341,23 @@ public class PlatformDotNetCacheStore implements 
CacheStore, Platfor
 writer.writeLong(session());
 writer.writeString(ses.cacheName());
 writer.writeBoolean(commit);
+
+// When multiple stores (caches) participate in a single 
transaction,
+// they share a single session, but sessionEnd is called 
on each store.
+// Same thing happens on platform side: session is shared; 
each store must be notified,
+// then session should be closed.
+Collection stores = (Collection) 
ses.properties().get(KEY_SES_STORES);
+assert stores != null;
+
+stores.remove(ptr);
+boolean last = stores.isEmpty();
+
+writer.writeBoolean(last);
+
+if (last) {
+// Session object has been released on platform side, 
remove marker.
+ses.properties().remove(KEY_SES);
+}
 }
 }, null);
 }
@@ -415,6 +436,16 @@ public class PlatformDotNetCacheStore implements 
CacheStore, Platfor
 ses.properties().put(KEY_SES, sesPtr);
 }
 
+// Keep track of all stores that use current session (cross-cache tx 
uses single session for all caches).
+Collection stores = (Collection) 
ses.properties().get(KEY_SES_STORES);
+
+if (stores == null) {
+stores = new HashSet<>();
+ses.properties().put(KEY_SES_STORES, stores);
+}
+
+stores.add(ptr);
+
 return sesPtr;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c1a3b374/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 90b7970..e4f65bc 100644

[32/50] [abbrv] ignite git commit: IGNITE-5278: BLAS implemented.

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/de259fff/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
--
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java 
b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
new file mode 100644
index 000..00bce47
--- /dev/null
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
@@ -0,0 +1,357 @@
+/*
+ * 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.ml.math;
+
+import java.util.function.BiPredicate;
+import org.apache.ignite.ml.math.impls.matrix.DenseLocalOnHeapMatrix;
+import org.apache.ignite.ml.math.impls.matrix.SparseLocalOnHeapMatrix;
+import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
+import org.apache.ignite.ml.math.impls.vector.SparseLocalVector;
+import org.apache.ignite.ml.math.util.MatrixUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+/** Tests for BLAS operations (all operations are only available for local 
matrices and vectors). */
+public class BlasTest {
+/** Test 'axpy' operation for two array-based vectors. */
+@Test
+public void testAxpyArrayArray() {
+Vector y = new DenseLocalOnHeapVector(new double[] {1.0, 2.0});
+double a = 2.0;
+Vector x = new DenseLocalOnHeapVector(new double[] {1.0, 2.0});
+
+Vector exp = x.times(a).plus(y);
+Blas.axpy(a, x, y);
+
+Assert.assertEquals(y, exp);
+}
+
+/** Test 'axpy' operation for sparse vector and array-based vector. */
+@Test
+public void testAxpySparseArray() {
+DenseLocalOnHeapVector y = new DenseLocalOnHeapVector(new double[] 
{1.0, 2.0});
+double a = 2.0;
+SparseLocalVector x = sparseFromArray(new double[] {1.0, 2.0});
+
+SparseLocalVector exp = (SparseLocalVector)x.times(a).plus(y);
+Blas.axpy(a, x, y);
+
+Assert.assertTrue(elementsEqual(exp, y));
+}
+
+/** Test 'dot' operation. */
+@Test
+public void testDot() {
+DenseLocalOnHeapVector v1 = new DenseLocalOnHeapVector(new double[] 
{1.0, 1.0});
+DenseLocalOnHeapVector v2 = new DenseLocalOnHeapVector(new double[] 
{2.0, 2.0});
+
+Assert.assertEquals(Blas.dot(v1, v2), v1.dot(v2), 0.0);
+}
+
+/** Test 'scal' operation for dense matrix. */
+@Test
+public void testScalDense() {
+double[] data = new double[] {1.0, 1.0};
+double alpha = 2.0;
+
+DenseLocalOnHeapVector v = new DenseLocalOnHeapVector(data);
+Vector exp = new DenseLocalOnHeapVector(data, true).times(alpha);
+Blas.scal(alpha, v);
+
+Assert.assertEquals(v, exp);
+}
+
+/** Test 'scal' operation for sparse matrix. */
+@Test
+public void testScalSparse() {
+double[] data = new double[] {1.0, 1.0};
+double alpha = 2.0;
+
+SparseLocalVector v = sparseFromArray(data);
+Vector exp = sparseFromArray(data).times(alpha);
+
+Blas.scal(alpha, v);
+
+Assert.assertEquals(v, exp);
+}
+
+/** Test 'spr' operation for dense vector v and dense matrix A. */
+@Test
+public void testSprDenseDense() {
+double alpha = 3.0;
+
+DenseLocalOnHeapVector v = new DenseLocalOnHeapVector(new double[] 
{1.0, 2.0});
+DenseLocalOnHeapVector u = new DenseLocalOnHeapVector(new double[] 
{3.0, 13.0, 20.0, 0.0});
+
+// m is alpha * v * v^t
+DenseLocalOnHeapMatrix m = (DenseLocalOnHeapMatrix)new 
DenseLocalOnHeapMatrix(new double[][] {{1.0, 0.0},
+{2.0, 4.0}}, StorageConstants.COLUMN_STORAGE_MODE).times(alpha);
+DenseLocalOnHeapMatrix a = new DenseLocalOnHeapMatrix(new double[][] 
{{3.0, 0.0}, {13.0, 20.0}},
+StorageConstants.COLUMN_STORAGE_MODE);
+
+//m := alpha * v * v.t + A
+Blas.spr(alpha, v, u);
+
+DenseLocalOnHeapMatrix mu = fromVector(u, a.rowSize(), 
StorageConstants.COLUMN_STORAGE_MODE, (i, j) -> i >= j);
+Assert.assertEquals(m.plus(a), mu);
+}
+
+/** Test 'spr' operation for sparse vector v (sparse in representation, 
dense in fact) and dense matrix A. */
+

[17/50] [abbrv] ignite git commit: Fixed checking full map on updates.

[yzhdanov]

Fixed checking full map on updates.


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

Branch: refs/heads/ignite-5658
Commit: 95f4abc709bcf2a4534f9631b3ecea8266cfc485
Parents: 6f749bf
Author: Pavel Kovalenko 
Authored: Fri Jul 21 18:03:07 2017 +0300
Committer: Pavel Kovalenko 
Committed: Fri Jul 21 18:03:44 2017 +0300

--
 .../cache/distributed/dht/GridClientPartitionTopology.java  | 9 +++--
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95f4abc7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index f4ed517..6ff572b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -628,8 +628,13 @@ public class GridClientPartitionTopology implements 
GridDhtPartitionTopology {
 }
 }
 
-for (GridDhtPartitionMap part : partMap.values())
-fullMapUpdated |= !node2part.containsKey(part);
+// Check that we have new nodes.
+for (GridDhtPartitionMap part : partMap.values()) {
+if (fullMapUpdated)
+break;
+
+fullMapUpdated = !node2part.containsKey(part.nodeId());
+}
 
 // Remove entry if node left.
 for (Iterator it = partMap.keySet().iterator(); 
it.hasNext(); ) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/95f4abc7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 601da1b..0ca291d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1154,8 +1154,13 @@ public class GridDhtPartitionTopologyImpl implements 
GridDhtPartitionTopology {
 }
 }
 
-for (GridDhtPartitionMap part : partMap.values())
-fullMapUpdated |= !node2part.containsKey(part);
+// Check that we have new nodes.
+for (GridDhtPartitionMap part : partMap.values()) {
+if (fullMapUpdated)
+break;
+
+fullMapUpdated = !node2part.containsKey(part.nodeId());
+}
 
 // Remove entry if node left.
 for (Iterator it = partMap.keySet().iterator(); 
it.hasNext(); ) {

[45/50] [abbrv] ignite git commit: IGNITE-5769 Abstract away .NET->Java calls

[yzhdanov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/89bba2fa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/StreamReceiverHolder.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/StreamReceiverHolder.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/StreamReceiverHolder.cs
index c91334d..b717d14 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/StreamReceiverHolder.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/StreamReceiverHolder.cs
@@ -27,7 +27,6 @@ namespace Apache.Ignite.Core.Impl.Datastream
 using Apache.Ignite.Core.Impl.Binary.IO;
 using Apache.Ignite.Core.Impl.Cache;
 using Apache.Ignite.Core.Impl.Common;
-using Apache.Ignite.Core.Impl.Unmanaged;
 
 /// 
 /// Binary wrapper for .
@@ -44,7 +43,7 @@ namespace Apache.Ignite.Core.Impl.Datastream
 private readonly object _rcv;
 
 /** Invoker delegate. */
-private readonly Action _invoke;
+private readonly Action _invoke;
 
 /// 
 /// Initializes a new instance of the  class.
@@ -77,7 +76,7 @@ namespace Apache.Ignite.Core.Impl.Datastream
 /// Receiver.
 /// Invoke delegate.
 public StreamReceiverHolder(object rcv, 
-Action 
invoke)
+Action invoke)
 {
 Debug.Assert(rcv != null);
 Debug.Assert(invoke != null);
@@ -109,7 +108,7 @@ namespace Apache.Ignite.Core.Impl.Datastream
 /// Cache.
 /// Stream.
 /// Binary flag.
-public void Receive(Ignite grid, IUnmanagedTarget cache, IBinaryStream 
stream, bool keepBinary)
+public void Receive(Ignite grid, IPlatformTargetInternal cache, 
IBinaryStream stream, bool keepBinary)
 {
 Debug.Assert(grid != null);
 Debug.Assert(cache != null);
@@ -126,8 +125,8 @@ namespace Apache.Ignite.Core.Impl.Datastream
 /// Cache.
 /// Stream.
 /// Binary flag.
-public static void InvokeReceiver(IStreamReceiver 
receiver, Ignite grid, IUnmanagedTarget cache,
-IBinaryStream stream, bool keepBinary)
+public static void InvokeReceiver(IStreamReceiver 
receiver, Ignite grid, 
+IPlatformTargetInternal cache, IBinaryStream stream, bool 
keepBinary)
 {
 var reader = grid.Marshaller.StartUnmarshal(stream, keepBinary);
 
@@ -138,7 +137,7 @@ namespace Apache.Ignite.Core.Impl.Datastream
 for (var i = 0; i < size; i++)
 entries.Add(new CacheEntry(reader.ReadObject(), 
reader.ReadObject()));
 
-receiver.Receive(grid.GetCache(cache, keepBinary), 
entries);
+receiver.Receive(Ignite.GetCache(cache, keepBinary), 
entries);
 }
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/89bba2fa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs
index eb454d6..3c7363e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs
@@ -30,13 +30,11 @@ namespace Apache.Ignite.Core.Impl.Events
 using Apache.Ignite.Core.Impl.Binary.IO;
 using Apache.Ignite.Core.Impl.Common;
 using Apache.Ignite.Core.Impl.Handle;
-using Apache.Ignite.Core.Impl.Unmanaged;
-using UU = Apache.Ignite.Core.Impl.Unmanaged.UnmanagedUtils;
 
 /// 
 /// Ignite events.
 /// 
-internal sealed class Events : PlatformTarget, IEvents
+internal sealed class Events : PlatformTargetAdapter, IEvents
 {
 /// 
 /// Opcodes.
@@ -66,15 +64,14 @@ namespace Apache.Ignite.Core.Impl.Events
 
 /** Cluster group. */
 private readonly IClusterGroup _clusterGroup;
-
+
 /// 
 /// Initializes a new instance of the  class.
 /// 
 /// Target.
-/// Marshaller.
 /// Cluster group.
-public Events(IUnmanagedTarget target, Marshaller marsh, IClusterGroup 
clusterGroup) 
-: base(target, marsh)
+public Events(IPlatformTargetInternal target, IClusterGroup 
clusterGroup) 
+: base(target)
 {
 Debug.Assert(clusterGroup != null);
 

[40/50] [abbrv] ignite git commit: Minor (added more clear method IgniteTxHandler.prepareNearTxLocal).

[yzhdanov]

Minor (added more clear method IgniteTxHandler.prepareNearTxLocal).


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

Branch: refs/heads/ignite-5658
Commit: e9a0d694867467400e295fe71dba4244d8b54ecd
Parents: eb9d06d
Author: sboikov 
Authored: Thu Jul 27 15:25:06 2017 +0300
Committer: sboikov 
Committed: Thu Jul 27 15:25:06 2017 +0300

--
 ...arOptimisticSerializableTxPrepareFuture.java |  2 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  2 +-
 .../GridNearPessimisticTxPrepareFuture.java |  2 +-
 .../cache/transactions/IgniteTxHandler.java | 59 +++-
 4 files changed, 35 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e9a0d694/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 72ddc67..d7b47de 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -574,7 +574,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
 final MiniFuture fut,
 final boolean nearEntries) {
 IgniteInternalFuture prepFut = nearEntries ?
-cctx.tm().txHandler().prepareNearTx(cctx.localNodeId(), req, true) 
:
+cctx.tm().txHandler().prepareNearTxLocal(req) :
 cctx.tm().txHandler().prepareColocatedTx(tx, req);
 
 prepFut.listen(new 
CI1() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9a0d694/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index edddf7d..df0d28e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -564,7 +564,7 @@ public class GridNearOptimisticTxPrepareFuture extends 
GridNearOptimisticTxPrepa
 assert !(m.hasColocatedCacheEntries() && 
m.hasNearCacheEntries()) : m;
 
 IgniteInternalFuture prepFut =
-m.hasNearCacheEntries() ? 
cctx.tm().txHandler().prepareNearTx(n.id(), req, true)
+m.hasNearCacheEntries() ? 
cctx.tm().txHandler().prepareNearTxLocal(req)
 : cctx.tm().txHandler().prepareColocatedTx(tx, req);
 
 prepFut.listen(new 
CI1() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9a0d694/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index e934319..2bcdade 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -237,7 +237,7 @@ public class GridNearPessimisticTxPrepareFuture extends 
GridNearTxPrepareFutureA
 add(fut);
 
 IgniteInternalFuture prepFut = nearEntries ?
-cctx.tm().txHandler().prepareNearTx(cctx.localNodeId(), req, true) 
:
+

[02/50] [abbrv] ignite git commit: Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite

[yzhdanov]

Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite


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

Branch: refs/heads/ignite-5658
Commit: cde3da448e297846e0ae5aca58a8f8f07fc407fc
Parents: e5f2d90 23f26af
Author: Alexey Goncharuk 
Authored: Wed Jul 19 12:13:01 2017 +0300
Committer: Alexey Goncharuk 
Committed: Wed Jul 19 12:13:01 2017 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   |  20 +++
 .../cache/CacheObjectsReleaseFuture.java|  60 +
 .../cache/GridCacheExplicitLockSpan.java|  10 +-
 .../processors/cache/GridCacheMvccManager.java  |  24 +++-
 .../cache/GridCacheSharedContext.java   |   4 +-
 ...idNearAtomicAbstractSingleUpdateRequest.java |   9 +-
 ...GridNearAtomicSingleUpdateInvokeRequest.java |   6 +
 .../atomic/GridNearAtomicUpdateResponse.java|   2 +-
 .../GridDhtPartitionsExchangeFuture.java|  30 +++--
 .../cache/transactions/IgniteTxAdapter.java |  44 ++-
 .../cache/transactions/IgniteTxManager.java |   5 +-
 .../service/GridServiceProcessor.java   |   4 +-
 .../processors/service/ServiceContextImpl.java  |   2 +
 .../util/future/GridCompoundFuture.java |   6 +-
 .../util/tostring/GridToStringBuilder.java  |   2 +-
 .../spi/IgniteSpiOperationTimeoutHelper.java|   8 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 131 ---
 .../ignite/spi/discovery/tcp/ServerImpl.java|  72 +++---
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |  16 ++-
 .../IgniteClientReconnectAbstractTest.java  |   5 +
 .../cache/GridCachePutAllFailoverSelfTest.java  |  15 +++
 .../cache/IgniteCachePutAllRestartTest.java |  15 +++
 .../CacheGetInsideLockChangingTopologyTest.java |   5 +
 .../GridCacheAbstractNodeRestartSelfTest.java   |  12 +-
 ...niteBinaryMetadataUpdateNodeRestartTest.java |  10 ++
 .../distributed/IgniteCacheGetRestartTest.java  |   5 +
 .../IgniteCacheNearRestartRollbackSelfTest.java |  15 +++
 ...teSynchronizationModesMultithreadedTest.java |   5 +
 .../IgniteCachePutRetryAbstractSelfTest.java|   5 +
 .../org/apache/ignite/spi/GridTcpForwarder.java |  26 
 .../tcp/TcpCommunicationSpiDropNodesTest.java   |  15 +++
 .../TcpCommunicationSpiFaultyClientTest.java|  20 ++-
 .../IgniteCacheRestartTestSuite2.java   |   2 +
 33 files changed, 494 insertions(+), 116 deletions(-)
--