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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov 
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:17:06 2015 +0300

--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--

[04/10] ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

[av]

ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: c5ed0d0e23329b8badb594e6f625eb58a24e2392
Parents: d8576b8
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 14:14:43 2015 +0700

--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index f2d5961..38a419a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -65,6 +65,9 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 /** Number of threads that will perform cache flushing. */
 private int flushThreadCnt;
 
+/** Keep binary in store flag. */
+private boolean storeKeepBinary;
+
 /**
  * @param ignite Ignite instance.
  * @param ccfg Cache configuration.
@@ -81,6 +84,7 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 
 cfg.store = compactClass(store);
 cfg.storeFactory = compactClass(ccfg.getCacheStoreFactory());
+cfg.storeKeepBinary = ccfg.isStoreKeepBinary();
 
 cfg.readThrough = ccfg.isReadThrough();
 cfg.writeThrough = ccfg.isWriteThrough();
@@ -123,6 +127,13 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 }
 
 /**
+ * @return Keep binary in store flag.
+ */
+public boolean storeKeepBinary() {
+return storeKeepBinary;
+}
+
+/**
  * @return Whether cache should operate in read-through mode.
  */
 public boolean readThrough() {
@@ -175,4 +186,4 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 @Override public String toString() {
 return S.toString(VisorCacheStoreConfiguration.class, this);
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/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 0d8d036..57f7066 100644
--- 
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
@@ -866,6 +866,7 @@ object VisorCacheCommand {
 cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
 cacheT += ("Store Class", safe(storeCfg.store()))
 cacheT += ("Store Factory Class", storeCfg.storeFactory())
+cacheT += ("Store Keep Binary", storeCfg.storeKeepBinary())
 cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
 cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
 

[05/10] ignite git commit: ignite-1.5 Fixed benchmark configuration.

[av]

ignite-1.5 Fixed benchmark configuration.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 8c2b6740c43b3e32c424d2862155ce384fbafe51
Parents: d8576b8
Author: sboikov 
Authored: Tue Dec 22 10:16:37 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:16:37 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c2b6740/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03cfddb..def652a 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -89,7 +89,7 @@ j=10
 CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode 
-ds ${ver}tx-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-optim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-pessim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-opt-serial-put-get-1-backup,\

[01/10] ignite git commit: ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 b534c4271 -> c0cfc6a78


ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

Signed-off-by: S.Vladykin 


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

Branch: refs/heads/ignite-1.5.1-2
Commit: a0cdb59645ce0a84344c6c92b9695c1a26e2a824
Parents: 81458f5
Author: S.Vladykin 
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin 
Committed: Mon Dec 21 19:58:29 2015 +0300

--
 .../processors/query/h2/sql/GridSqlQuery.java   |  3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 65 ++--
 .../query/IgniteSqlSplitterSelfTest.java| 52 
 .../query/h2/sql/GridQueryParsingTest.java  |  9 +--
 4 files changed, 103 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index ddcb40b..d9784c8 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -163,6 +163,9 @@ public abstract class GridSqlQuery {
 if (expr == null) // For plain select should never be 
null, for union H2 itself can't parse query.
 throw new IllegalStateException("Failed to build 
query: " + buff.toString());
 
+if (expr instanceof GridSqlAlias)
+expr = expr.child();
+
 
buff.append('=').append(StringUtils.unEnclose(expr.getSQL()));
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 0c9c8fe..727c2c7 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -50,6 +50,9 @@ public class GridSqlQuerySplitter {
 /** */
 private static final String COLUMN_PREFIX = "__C";
 
+/** */
+private static final String HAVING_COLUMN = "__H";
+
 /**
  * @param idx Index of table.
  * @return Table.
@@ -158,14 +161,17 @@ public class GridSqlQuerySplitter {
 List mapExps = F.addAll(new 
ArrayList(mapQry.allColumns()),
 mapQry.columns(false));
 
-GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+final int visibleCols = mapQry.visibleColumns();
+final int havingCol = mapQry.havingColumn();
+
+List rdcExps = new ArrayList<>(visibleCols);
 
 Set colNames = new HashSet<>();
 
 boolean aggregateFound = false;
 
 for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len 
because mapExps list can grow.
-aggregateFound |= splitSelectExpression(mapExps, rdcExps, 
colNames, i, collocated);
+aggregateFound |= splitSelectExpression(mapExps, rdcExps, 
colNames, i, collocated, i == havingCol);
 
 // Fill select expressions.
 mapQry.clearColumns();
@@ -173,10 +179,13 @@ public class GridSqlQuerySplitter {
 for (GridSqlElement exp : mapExps) // Add all map expressions as 
visible.
 mapQry.addColumn(exp, true);
 
-for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible 
reduce columns.
-rdcQry.addColumn(rdcExp, true);
+for (int i = 0; i < visibleCols; i++) // Add visible reduce columns.
+rdcQry.addColumn(rdcExps.get(i), true);
+
+for (int i = visibleCols; i < rdcExps.size(); i++) // Add invisible 
reduce columns (HAVING).
+rdcQry.addColumn(rdcExps.get(i), false);
 
-for (int i = rdcExps.length; i < mapExps.size(); i++)  // Add all 
extra map columns as 

[02/10] ignite git commit: ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

[av]

ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

Signed-off-by: S.Vladykin 


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

Branch: refs/heads/ignite-1.5.1-2
Commit: da24df99525b796a79fdb55997efe1c9bd515a5d
Parents: a0cdb59
Author: vershov 
Authored: Tue Dec 22 00:08:37 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 22 00:08:37 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  44 +++-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++---
 .../query/h2/sql/GridSqlQuerySplitter.java  |  48 ++--
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala  |  13 +-
 8 files changed, 416 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index be1240c..d52662e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -365,15 +365,18 @@ public class CacheConfiguration extends 
MutableConfiguration {
 private IgnitePredicate nodeFilter;
 
 /** */
-private boolean sqlEscapeAll;
+private String sqlSchema;
 
 /** */
-private transient Class[] indexedTypes;
+private boolean sqlEscapeAll;
 
 /** */
 private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
 
 /** */
+private transient Class[] indexedTypes;
+
+/** */
 private boolean snapshotableIdx;
 
 /** Copy on read flag. */
@@ -466,6 +469,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
 rebalanceTimeout = cc.getRebalanceTimeout();
 rebalanceThrottle = cc.getRebalanceThrottle();
 snapshotableIdx = cc.isSnapshotableIndex();
+sqlSchema = cc.getSqlSchema();
 sqlEscapeAll = cc.isSqlEscapeAll();
 sqlFuncCls = cc.getSqlFunctionClasses();
 sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
@@ -1770,7 +1774,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
 }
 
 /**
- * Gets timeout in milliseconds after which long query warning will be 
printed.
+ * Sets timeout in milliseconds after which long query warning will be 
printed.
  *
  * @param longQryWarnTimeout Timeout in milliseconds.
  * @return {@code this} for chaining.
@@ -1782,6 +1786,40 @@ public class CacheConfiguration extends 
MutableConfiguration {
 }
 
 /**
+ * Gets custom name of the sql schema. If custom sql schema is not set 
then {@code null} will be returned and
+ * quoted case sensitive name will be used as sql schema.
+ *
+ * @return Schema name for current cache according to SQL ANSI-99. Could 
be {@code null}.
+ */
+@Nullable public String getSqlSchema() {
+return sqlSchema;
+}
+
+/**
+ * Sets sql schema to be used for current cache. This name will correspond 
to SQL ANSI-99 standard.
+ * Nonquoted identifiers are not case sensitive. Quoted identifiers are 
case sensitive.
+ * 
+ * Be aware of using the same string in case sensitive and case 
insensitive manner simultaneously, since
+ * behaviour for such case is not specified.
+ * 
+ * When sqlSchema is not specified, quoted {@code cacheName} is used 
instead.
+ * 
+ * {@code sqlSchema} could not be an empty string. Has to be {@code 
"\"\""} instead.
+ *
+ * @param sqlSchema Schema name for current cache according to SQL 
ANSI-99. Should not be {@code null}.
+ *
+ * @return {@code this} for chaining.
+ */
+public CacheConfiguration setSqlSchema(String sqlSchema) {
+A.ensure((sqlSchema != null), "Schema could not be null.");
+A.ensure(!sqlSchema.isEmpty(), "Schema could not be empty.");
+
+this.sqlSchema = sqlSchema;
+
+return this;
+}
+
+/**
  * If {@code true} all the SQL table and field names will be escaped with 
double quotes like
  

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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: c0cfc6a784ab94430b730d200d37788b70dc930b
Parents: b534c42 bbdb202
Author: Anton Vinogradov 
Authored: Tue Dec 22 11:54:01 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 11:54:01 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  44 +++-
 .../internal/binary/BinaryClassDescriptor.java  |  56 -
 .../ignite/internal/binary/BinaryUtils.java |  11 +
 .../processors/cache/IgniteCacheProxy.java  |   3 +-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../cache/VisorCacheStoreConfiguration.java |  13 +-
 .../internal/visor/query/VisorQueryJob.java |   6 +
 .../binary/BinaryMarshallerSelfTest.java| 110 +
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++---
 .../processors/query/h2/sql/GridSqlQuery.java   |   3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 113 +
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../query/IgniteSqlSplitterSelfTest.java|  52 
 .../query/h2/sql/GridQueryParsingTest.java  |   9 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala  |  14 +-
 .../config/benchmark-multicast.properties   |   2 +-
 19 files changed, 709 insertions(+), 107 deletions(-)
--

[08/10] ignite git commit: IGNITE-2213: Fixed serialization of duplicate fields.

[av]

IGNITE-2213: Fixed serialization of duplicate fields.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 627134b25ca730d7a7dbcec9facde158c5d15dc3
Parents: d8576b8
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:28:44 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 11:28:44 2015 +0300

--
 .../internal/binary/BinaryClassDescriptor.java  |  56 --
 .../ignite/internal/binary/BinaryUtils.java |  11 ++
 .../binary/BinaryMarshallerSelfTest.java| 110 +++
 .../IgniteBinaryCacheQueryTestSuite.java|   3 +-
 4 files changed, 169 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 1eb3882..1105809 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -35,6 +35,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -44,11 +45,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
-import static java.lang.reflect.Modifier.isStatic;
-import static java.lang.reflect.Modifier.isTransient;
-
 /**
  * Binary class descriptor.
  */
@@ -250,21 +249,24 @@ public class BinaryClassDescriptor {
 
 BinarySchema.Builder schemaBuilder = 
BinarySchema.Builder.newBuilder();
 
+Set duplicates = duplicateFields(cls);
+
 Collection names = new HashSet<>();
 Collection ids = new HashSet<>();
 
 for (Class c = cls; c != null && !c.equals(Object.class); c 
= c.getSuperclass()) {
 for (Field f : c.getDeclaredFields()) {
-int mod = f.getModifiers();
-
-if (!isStatic(mod) && !isTransient(mod)) {
+if (serializeField(f)) {
 f.setAccessible(true);
 
 String name = f.getName();
 
-if (!names.add(name))
-throw new BinaryObjectException("Duplicate 
field name [fieldName=" + name +
-", cls=" + cls.getName() + ']');
+if (duplicates.contains(name))
+name = BinaryUtils.qualifiedFieldName(c, name);
+
+boolean added = names.add(name);
+
+assert added : name;
 
 int fieldId = idMapper.fieldId(typeId, name);
 
@@ -308,6 +310,42 @@ public class BinaryClassDescriptor {
 }
 
 /**
+ * Find all fields with duplicate names in the class.
+ *
+ * @param cls Class.
+ * @return Fields with duplicate names.
+ */
+private static Set duplicateFields(Class cls) {
+Set all = new HashSet<>();
+Set duplicates = new HashSet<>();
+
+for (Class c = cls; c != null && !c.equals(Object.class); c = 
c.getSuperclass()) {
+for (Field f : c.getDeclaredFields()) {
+if (serializeField(f)) {
+String name = f.getName();
+
+if (!all.add(name))
+duplicates.add(name);
+}
+}
+}
+
+return duplicates;
+}
+
+/**
+ * Whether the field must be serialized.
+ *
+ * @param f Field.
+ * @return {@code True} if must be serialized.
+ */
+private static boolean serializeField(Field f) {
+int mod = f.getModifiers();
+
+return !Modifier.isStatic(mod) && !Modifier.isTransient(mod);
+}
+
+/**
  * @return {@code True} if enum.
  */
 boolean isEnum() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java

[03/10] ignite git commit: ignite-1.5 Minor javadocs.

[av]

ignite-1.5 Minor javadocs.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: d8576b8f9850b53c240bd21fab7fe19abd717225
Parents: da24df9
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:14:17 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 11:14:17 2015 +0700

--
 .../org/apache/ignite/internal/visor/query/VisorQueryJob.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d8576b8f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index dcca671..0f2f82e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -216,8 +216,14 @@ public class VisorQueryJob extends VisorJob

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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 11:29:06 2015 +0300

--
 .../internal/processors/cache/IgniteCacheProxy.java|  3 +--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 .../yardstick/config/benchmark-multicast.properties|  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)
--

svn commit: r1721118 - in /ignite/site/trunk/releases/mobile: ./ img/ org/ org/apache/ org/apache/ignite/ org/apache/ignite/binary/ org/apache/ignite/binary/class-use/ org/apache/ignite/cache/ org/apa

[av]

Author: av
Date: Mon Dec 21 10:49:01 2015
New Revision: 1721118

URL: http://svn.apache.org/viewvc?rev=1721118=rev
Log:
Mobile documentation draft


[This commit notification would consist of 422 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

ignite git commit: .final

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite.final-version-test [created] dbef554be


.final


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

Branch: refs/heads/ignite.final-version-test
Commit: dbef554be756fe1ccc3e87a40a56a14d7e15fb73
Parents: 73d8b90
Author: Anton Vinogradov 
Authored: Tue Dec 22 14:53:44 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 14:53:44 2015 +0300

--
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dbef554b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
index 7f81cb5..02cbc81 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
@@ -53,7 +53,10 @@ public class IgniteVersionUtils {
  * Static initializer.
  */
 static {
-VER_STR = IgniteProperties.get("ignite.version");
+VER_STR = IgniteProperties.get("ignite.version")
+.replace(".a", "-a") // Backward compatibility fix.
+.replace(".b", "-b")
+.replace(".final", "-final");
 
 BUILD_TSTAMP = Long.valueOf(IgniteProperties.get("ignite.build"));
 BUILD_TSTAMP_STR = new SimpleDateFormat("MMdd").format(new 
Date(BUILD_TSTAMP * 1000));

http://git-wip-us.apache.org/repos/asf/ignite/blob/dbef554b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java 
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
index 9826b6d..12851ba 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
@@ -43,7 +43,7 @@ public class IgniteProductVersion implements 
Comparable, E
 
 /** Regexp parse pattern. */
 private static final Pattern VER_PATTERN =
-
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(-([^0123456789][^-]+)(-SNAPSHOT)?)?(-(\\d+))?(-([\\da-f]+))?");
+
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)([-.]([^0123456789][^-]+)(-SNAPSHOT)?)?(-(\\d+))?(-([\\da-f]+))?");
 
 /** Major version number. */
 private byte major;

http://git-wip-us.apache.org/repos/asf/ignite/blob/dbef554b/modules/core/src/test/java/org/apache/ignite/internal/product/GridProductVersionSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/product/GridProductVersionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/product/GridProductVersionSelfTest.java
index 38422e3..92990de 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/product/GridProductVersionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/product/GridProductVersionSelfTest.java
@@ -50,21 +50,21 @@ public class GridProductVersionSelfTest extends 
GridCommonAbstractTest {
 assertEquals(0, ver.revisionTimestamp());
 assertArrayEquals(new byte[20], ver.revisionHash());
 
-ver = IgniteProductVersion.fromString("1.2.3-rc1-4-DEV");
+ver = IgniteProductVersion.fromString("1.2.3.b1-4-DEV");
 
 assertEquals(1, ver.major());
 assertEquals(2, ver.minor());
 assertEquals(3, ver.maintenance());
-assertEquals("rc1", ver.stage());
+assertEquals("b1", ver.stage());
 assertEquals(4, ver.revisionTimestamp());
 assertArrayEquals(new byte[20], ver.revisionHash());
 
-ver = IgniteProductVersion.fromString("1.2.3-GA1-4-DEV");
+ver = IgniteProductVersion.fromString("1.2.3.final-4-DEV");
 
 assertEquals(1, ver.major());
 assertEquals(2, ver.minor());
 assertEquals(3, ver.maintenance());
-assertEquals("GA1", ver.stage());
+assertEquals("final", ver.stage());
 assertEquals(4, ver.revisionTimestamp());
 assertArrayEquals(new byte[20], ver.revisionHash());
 
@@ 

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-final-version-test [created] dbef554be

[03/15] ignite git commit: IGNITE-2226

[av]

IGNITE-2226


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 1039bf69e94c07e5e8d26860f0df2037caab79a7
Parents: fa48b89
Author: Anton Vinogradov 
Authored: Tue Dec 22 13:18:33 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 13:18:33 2015 +0300

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1039bf69/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 51271b3..4bdad1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,7 @@
 
 
 
-
+
 
 
 

ignite git commit: IGNITE-2116

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 c8ccd4f23 -> d95ca2ef3


IGNITE-2116


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

Branch: refs/heads/ignite-1.5
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: fad8b7a5a25788193522554b47b3d425c4ff1a4f
Parents: a88e964 fe14099
Author: Anton Vinogradov 
Authored: Thu Dec 24 12:34:30 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 24 12:34:30 2015 +0300

--
 README.txt  |   4 +-
 .../internal/binary/BinaryObjectImpl.java   |   2 +-
 .../managers/communication/GridIoManager.java   |  39 +-
 .../processors/cache/GridCacheAdapter.java  |  47 ++-
 .../processors/cache/GridCacheProxyImpl.java|  29 ++
 .../cache/GridCacheSharedContext.java   |  10 +-
 .../processors/cache/IgniteCacheProxy.java  |  35 ++
 .../processors/cache/IgniteInternalCache.java   |  26 ++
 .../binary/CacheObjectBinaryProcessorImpl.java  |   4 +-
 .../distributed/dht/GridDhtLockFuture.java  |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  95 +++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 150 ---
 .../colocated/GridDhtColocatedLockFuture.java   |  11 +-
 .../distributed/near/GridNearLockFuture.java|  11 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   5 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   5 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  12 +-
 .../query/GridCacheDistributedQueryManager.java |   6 +-
 .../transactions/IgniteTxLocalAdapter.java  |   2 +
 .../cache/transactions/IgniteTxManager.java |  61 ++-
 .../datastreamer/DataStreamProcessor.java   |  12 +-
 .../processors/query/GridQueryProcessor.java|   5 +
 .../ignite/internal/util/lang/GridFunc.java |   1 +
 .../internal/visor/util/VisorTaskUtils.java | 122 +-
 .../test/config/websession/example-cache.xml|   9 +-
 ...niteClientReconnectFailoverAbstractTest.java |   3 +-
 .../binary/BinaryMarshallerSelfTest.java|  87 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  22 +-
 .../cache/GridCacheAbstractSelfTest.java|   3 +-
 ...iteCacheScanPredicateDeploymentSelfTest.java | 114 +
 ...yMetadataUpdateChangingTopologySelfTest.java |   7 +-
 ...niteBinaryMetadataUpdateNodeRestartTest.java | 411 +++
 .../distributed/IgniteCacheManyClientsTest.java |   2 +
 ...ContinuousQueryFailoverAbstractSelfTest.java | 128 +++---
 ...ridCacheContinuousQueryAbstractSelfTest.java |   3 +
 .../service/ClosureServiceClientsNodesTest.java |  22 +-
 .../GridServiceProcessorStopSelfTest.java   |  21 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |  21 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  14 +-
 .../testframework/GridSpiTestContext.java   |  18 +-
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 .../p2p/CacheDeploymentAlwaysTruePredicate.java |  29 ++
 .../ignite/tests/p2p/cache/PersonWrapper.java   | 121 ++
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java  |  16 +-
 ...eBinaryWrappedObjectFieldsQuerySelfTest.java |  28 ++
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   2 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   4 +
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 .../cache/websession/WebSessionFilter.java  |  82 ++--
 .../cache/websession/WebSessionListener.java|  25 +-
 .../internal/websession/WebSessionSelfTest.java |   2 -
 52 files changed, 1511 insertions(+), 387 deletions(-)
--

[11/14] ignite git commit: ignite-1.5 Implemented start of local node with specified configuration and custom environment variables.

[av]

ignite-1.5 Implemented start of local node with specified configuration and 
custom environment variables.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 8f5445ab934c0133f45a87b220b5d4841c9bca43
Parents: 77e77e4
Author: Alexey Kuznetsov 
Authored: Thu Dec 24 14:41:18 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Dec 24 14:41:18 2015 +0700

--
 .../internal/visor/util/VisorTaskUtils.java | 122 ++-
 1 file changed, 118 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5445ab/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 579f50c..83dbda0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.visor.util;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.net.InetAddress;
@@ -36,6 +37,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
@@ -101,6 +103,9 @@ public class VisorTaskUtils {
 /** Log files count limit */
 public static final int LOG_FILES_COUNT_LIMIT = 5000;
 
+/** */
+private static final int DFLT_BUFFER_SIZE = 4096;
+
 /** Only task event types that Visor should collect. */
 public static final int[] VISOR_TASK_EVTS = {
 EVT_JOB_STARTED,
@@ -558,7 +563,7 @@ public class VisorTaskUtils {
 try (RandomAccessFile raf = new RandomAccessFile(f, "r")) {
 FileChannel ch = raf.getChannel();
 
-ByteBuffer buf = ByteBuffer.allocate(4096);
+ByteBuffer buf = ByteBuffer.allocate(DFLT_BUFFER_SIZE);
 
 ch.read(buf);
 
@@ -823,6 +828,85 @@ public class VisorTaskUtils {
 }
 
 /**
+ * Start local node in terminal.
+ *
+ * @param log Logger.
+ * @param cfgPath Path to node configuration to start with.
+ * @param nodesToStart Number of nodes to start.
+ * @param quite If {@code true} then start node in quiet mode.
+ * @param envVars Optional map with environment variables.
+ * @return List of started processes.
+ * @throws IOException If failed to start.
+ */
+public static List startLocalNode(@Nullable IgniteLogger log, 
String cfgPath, int nodesToStart,
+boolean quite, Map envVars) throws IOException {
+String quitePar = quite ? "" : "-v";
+
+String cmdFile = new File("bin", U.isWindows() ? "ignite.bat" : 
"ignite.sh").getPath();
+
+File cmdFilePath = U.resolveIgnitePath(cmdFile);
+
+if (cmdFilePath == null || !cmdFilePath.exists())
+throw new FileNotFoundException(String.format("File not found: 
%s", cmdFile));
+
+String ignite = cmdFilePath.getCanonicalPath();
+
+File nodesCfgPath = U.resolveIgnitePath(cfgPath);
+
+if (nodesCfgPath == null || !nodesCfgPath.exists())
+throw new FileNotFoundException(String.format("File not found: 
%s", cfgPath));
+
+String nodeCfg = nodesCfgPath.getCanonicalPath();
+
+log(log, String.format("Starting %s local %s with '%s' config", 
nodesToStart, nodesToStart > 1 ? "nodes" : "node", nodeCfg));
+
+List run = new ArrayList<>();
+
+try {
+for (int i = 0; i < nodesToStart; i++) {
+if (U.isMacOs()) {
+StringBuilder envs = new StringBuilder();
+
+Map macEnv = new 
HashMap<>(System.getenv());
+
+if (envVars != null) {
+for (Map.Entry ent : 
envVars.entrySet())
+if (macEnv.containsKey(ent.getKey())) {
+String old = macEnv.get(ent.getKey());
+
+if (old == null || old.isEmpty())
+macEnv.put(ent.getKey(), ent.getValue());
+

[06/14] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Also fixed several test issues.

[av]

ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held. Also fixed several test issues.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 53ec76ffe65d5788fc1ffa32c2fba66222e51dcc
Parents: 66b33bc
Author: sboikov 
Authored: Wed Dec 23 15:06:48 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 15:06:48 2015 +0300

--
 .../managers/communication/GridIoManager.java   |  39 +-
 .../processors/cache/GridCacheAdapter.java  |  47 ++-
 .../processors/cache/GridCacheProxyImpl.java|  29 ++
 .../cache/GridCacheSharedContext.java   |  10 +-
 .../processors/cache/IgniteCacheProxy.java  |  35 ++
 .../processors/cache/IgniteInternalCache.java   |  26 ++
 .../binary/CacheObjectBinaryProcessorImpl.java  |   4 +-
 .../distributed/dht/GridDhtLockFuture.java  |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  95 +++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 150 ---
 .../colocated/GridDhtColocatedLockFuture.java   |  11 +-
 .../distributed/near/GridNearLockFuture.java|  11 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   5 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   5 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  12 +-
 .../transactions/IgniteTxLocalAdapter.java  |   2 +
 .../cache/transactions/IgniteTxManager.java |  61 ++-
 .../datastreamer/DataStreamProcessor.java   |  12 +-
 .../ignite/internal/util/lang/GridFunc.java |   1 +
 .../test/config/websession/example-cache.xml|   9 +-
 ...niteClientReconnectFailoverAbstractTest.java |   3 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  22 +-
 .../cache/GridCacheAbstractSelfTest.java|   3 +-
 ...yMetadataUpdateChangingTopologySelfTest.java |   7 +-
 ...niteBinaryMetadataUpdateNodeRestartTest.java | 411 +++
 .../distributed/IgniteCacheManyClientsTest.java |   2 +
 ...ContinuousQueryFailoverAbstractSelfTest.java | 128 +++---
 ...ridCacheContinuousQueryAbstractSelfTest.java |   3 +
 .../service/ClosureServiceClientsNodesTest.java |  22 +-
 .../GridServiceProcessorStopSelfTest.java   |  21 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |  21 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  14 +-
 .../testframework/GridSpiTestContext.java   |  18 +-
 .../cache/websession/WebSessionFilter.java  |  82 ++--
 .../cache/websession/WebSessionListener.java|  25 +-
 .../internal/websession/WebSessionSelfTest.java |   2 -
 36 files changed, 1023 insertions(+), 327 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/53ec76ff/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 bf7c7e4..42f8dae 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
@@ -666,6 +666,7 @@ public class GridIoManager extends 
GridManagerAdapter 0 || skipOnTimeout;
 
-send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, 
ackClosure);
+

[03/14] ignite git commit: ignite-2175

[av]

ignite-2175


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 60eec118428bc06f3107fee3ad55dd9a1c6d5cf3
Parents: 66b33bc
Author: Anton Vinogradov 
Authored: Wed Dec 23 13:35:14 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 13:35:14 2015 +0300

--
 .../ignite/internal/processors/query/GridQueryProcessor.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60eec118/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 7d1311f..4808e96 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1076,6 +1076,11 @@ public class GridQueryProcessor extends 
GridProcessorAdapter {
 clsName = clsName.substring(0, clsName.length() - 2) + "_array";
 }
 
+int parentEnd = clsName.lastIndexOf('$');
+
+if (parentEnd >= 0)
+clsName = clsName.substring(parentEnd + 1);
+
 return clsName;
 }
 

[12/14] ignite git commit: ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user thread and breaks tests

[av]

ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user 
thread and breaks tests


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 61c072e51b16f6776e3e73252bfd5d7f09c0f21e
Parents: 8f5445a
Author: sboikov 
Authored: Thu Dec 24 10:47:50 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 10:47:50 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/61c072e5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index a27a3d0..5c63fbd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -743,7 +743,7 @@ public class BinaryContext implements Externalizable {
  */
 protected Object readResolve() throws ObjectStreamException {
 try {
-IgniteKernal g = IgnitionEx.localIgnite();
+IgniteKernal g = IgnitionEx.gridx(gridName);
 
 if (g == null)
 throw new IllegalStateException("Failed to find grid for name: 
" + gridName);

[09/14] ignite git commit: ignite-2175

[av]

ignite-2175


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

Branch: refs/heads/ignite-1.5.1-2
Commit: bd05fa90b1d04c8c488717302d8d84fb02e1
Parents: 29c4778
Author: Anton Vinogradov 
Authored: Wed Dec 23 18:05:06 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 18:05:06 2015 +0300

--
 .../ignite/internal/binary/BinaryContext.java   |   2 +-
 .../internal/binary/BinaryObjectImpl.java   |   2 +-
 .../ignite/tests/p2p/cache/PersonWrapper.java   | 121 +++
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java  |  16 ++-
 ...eBinaryWrappedObjectFieldsQuerySelfTest.java |  28 +
 .../IgniteBinaryCacheQueryTestSuite.java|   4 +
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 8 files changed, 171 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 5c63fbd..a27a3d0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -743,7 +743,7 @@ public class BinaryContext implements Externalizable {
  */
 protected Object readResolve() throws ObjectStreamException {
 try {
-IgniteKernal g = IgnitionEx.gridx(gridName);
+IgniteKernal g = IgnitionEx.localIgnite();
 
 if (g == null)
 throw new IllegalStateException("Failed to find grid for name: 
" + gridName);

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index d712eb8..fca8955 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -533,7 +533,7 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
  */
 private Object deserializeValue(@Nullable CacheObjectContext coCtx) {
 BinaryReaderExImpl reader = reader(null,
-coCtx != null ? coCtx.kernalContext().config().getClassLoader() : 
null);
+coCtx != null ? coCtx.kernalContext().config().getClassLoader() : 
ctx.configuration().getClassLoader());
 
 Object obj0 = reader.deserialize();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
--
diff --git 
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
 
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
new file mode 100644
index 000..2655e39
--- /dev/null
+++ 
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
@@ -0,0 +1,121 @@
+/*
+ *  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.tests.p2p.cache;
+
+import java.io.Serializable;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+
+/**
+ * Wraps Person class.
+ */
+public class PersonWrapper {
+public static class Person implements 

[13/14] ignite git commit: ignite-1.5 Fixed links.

[av]

ignite-1.5 Fixed links.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: fe140992581d196fd2abe9702c3a6ac28ee9ba47
Parents: 61c072e
Author: sboikov 
Authored: Thu Dec 24 12:14:18 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 12:14:18 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/fe140992/README.txt
--
diff --git a/README.txt b/README.txt
index f66f9ee..9133f2c 100644
--- a/README.txt
+++ b/README.txt
@@ -17,9 +17,9 @@ The main feature set of Ignite In-Memory Data Fabric includes:
 
 For information on how to get started with Apache Ignite please visit:
 
-http://apacheignite.readme.io/v1.0/docs/getting-started
+http://apacheignite.readme.io/docs/getting-started
 
 
 You can find Apache Ignite documentation here:
 
-http://apacheignite.readme.io/v1.0/docs/getting-started
+http://apacheignite.readme.io/docs

[08/14] ignite git commit: Merge branch 'ignite-2175' into ignite-1.5

[av]

Merge branch 'ignite-2175' into ignite-1.5


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 29c47784eb6d07c20d4d72000522668dd381c175
Parents: 9db05f5 60eec11
Author: Anton Vinogradov 
Authored: Wed Dec 23 17:32:28 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 17:32:28 2015 +0300

--
 .../ignite/internal/processors/query/GridQueryProcessor.java| 5 +
 1 file changed, 5 insertions(+)
--

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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 9db05f5f6c64d3b6473d65a501a31287a6c7942c
Parents: 53ec76f 16a9e6d
Author: sboikov 
Authored: Wed Dec 23 15:07:22 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 15:07:22 2015 +0300

--
 .../query/GridCacheDistributedQueryManager.java |   6 +-
 ...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 .../p2p/CacheDeploymentAlwaysTruePredicate.java |  29 +
 4 files changed, 149 insertions(+), 2 deletions(-)
--

[01/14] ignite git commit: IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 a88e96474 -> fad8b7a5a


IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: fbb4982081d08ea9d8d2971a1db49e9fed547304
Parents: b6dab09
Author: thatcoach 
Authored: Wed Dec 23 09:01:13 2015 +0300
Committer: thatcoach 
Committed: Wed Dec 23 09:01:13 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 82 ++--
 1 file changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fbb49820/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index ac9771f..9f7beb8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -17,40 +17,6 @@
 
 package org.apache.ignite.internal.binary;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetSocketAddress;
-import java.sql.Timestamp;
-import java.util.AbstractQueue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import junit.framework.Assert;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryCollectionFactory;
@@ -87,9 +53,43 @@ import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 import sun.misc.Unsafe;
 
-import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.sql.Timestamp;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.*;
+import static org.junit.Assert.*;
 
 /**
  * Binary marshaller tests.
@@ -2339,8 +2339,8 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 // Check direct field access.
 assertNull(objBin.field(fieldName));
-assertEquals(1, objBin.field(fieldNameA));
-assertEquals(2, objBin.field(fieldNameB));
+assertEquals(Integer.valueOf(1), objBin.field(fieldNameA));
+assertEquals(Integer.valueOf(2), objBin.field(fieldNameB));
 
 // Check metadata.
 BinaryType type = objBin.type();
@@ -2363,8 +2363,8 @@ public class BinaryMarshallerSelfTest extends 

[10/14] ignite git commit: ignite-1.5 Fixed test.

[av]

ignite-1.5 Fixed test.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 77e77e40fb9463ba3bccd01ddf3231ff9ef6f327
Parents: bd05fa9
Author: sboikov 
Authored: Thu Dec 24 10:25:23 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 10:25:23 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/77e77e40/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 9f7beb8..20b2258 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -2532,11 +2532,10 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 assertNull(bVal);
 
-for (NonSerializableA a : bArr) {
+for (NonSerializableA a : bArr)
 a.checkAfterUnmarshalled();
-}
 
-assertEquals(floatVal, 567.89F);
+assertEquals(floatVal, 567.89F, 0);
 }
 }
 

[23/50] [abbrv] ignite git commit: 1.5.0.final-SNAPSHOT

[av]

1.5.0.final-SNAPSHOT


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

Branch: refs/heads/master
Commit: fa48b89ec77a0095364d37371d52f544593572d5
Parents: 3ee0966
Author: Ignite Teamcity 
Authored: Tue Dec 22 12:43:03 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 12:43:03 2015 +0300

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

[47/50] [abbrv] ignite git commit: ignite-1.5 Fixed links.

[av]

ignite-1.5 Fixed links.


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

Branch: refs/heads/master
Commit: fe140992581d196fd2abe9702c3a6ac28ee9ba47
Parents: 61c072e
Author: sboikov 
Authored: Thu Dec 24 12:14:18 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 12:14:18 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/fe140992/README.txt
--
diff --git a/README.txt b/README.txt
index f66f9ee..9133f2c 100644
--- a/README.txt
+++ b/README.txt
@@ -17,9 +17,9 @@ The main feature set of Ignite In-Memory Data Fabric includes:
 
 For information on how to get started with Apache Ignite please visit:
 
-http://apacheignite.readme.io/v1.0/docs/getting-started
+http://apacheignite.readme.io/docs/getting-started
 
 
 You can find Apache Ignite documentation here:
 
-http://apacheignite.readme.io/v1.0/docs/getting-started
+http://apacheignite.readme.io/docs

[39/50] [abbrv] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Also fixed several test issues.

[av]

http://git-wip-us.apache.org/repos/asf/ignite/blob/53ec76ff/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 5a4ba14..283da80 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -1009,107 +1009,111 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
  */
 private void checkEvents(final List> expEvts, 
final CacheEventListener2 lsnr,
 boolean lostAllow, boolean wait) throws Exception {
-if (wait)
+if (wait) {
 GridTestUtils.waitForCondition(new PA() {
-@Override public boolean apply() {
+@Override
+public boolean apply() {
 return expEvts.size() == lsnr.size();
 }
 }, 2000L);
+}
 
-Map> prevMap = new 
HashMap<>(lsnr.evts.size());
+synchronized (lsnr) {
+Map> prevMap = new 
HashMap<>(lsnr.evts.size());
 
-for (Map.Entry> e : 
lsnr.evts.entrySet())
-prevMap.put(e.getKey(), new ArrayList<>(e.getValue()));
+for (Map.Entry> e : 
lsnr.evts.entrySet())
+prevMap.put(e.getKey(), new ArrayList<>(e.getValue()));
 
-List> lostEvts = new ArrayList<>();
+List> lostEvts = new ArrayList<>();
 
-for (T3 exp : expEvts) {
-List rcvdEvts = lsnr.evts.get(exp.get1());
+for (T3 exp : expEvts) {
+List rcvdEvts = 
lsnr.evts.get(exp.get1());
 
-if (F.eq(exp.get2(), exp.get3()))
-continue;
+if (F.eq(exp.get2(), exp.get3()))
+continue;
 
-if (rcvdEvts == null || rcvdEvts.isEmpty()) {
-lostEvts.add(exp);
+if (rcvdEvts == null || rcvdEvts.isEmpty()) {
+lostEvts.add(exp);
 
-continue;
-}
+continue;
+}
 
-Iterator iter = rcvdEvts.iterator();
+Iterator iter = rcvdEvts.iterator();
 
-boolean found = false;
+boolean found = false;
 
-while (iter.hasNext()) {
-CacheEntryEvent e = iter.next();
+while (iter.hasNext()) {
+CacheEntryEvent e = iter.next();
 
-if ((exp.get2() != null && e.getValue() != null && 
exp.get2().equals(e.getValue()))
-&& equalOldValue(e, exp)) {
-found = true;
+if ((exp.get2() != null && e.getValue() != null && 
exp.get2().equals(e.getValue()))
+&& equalOldValue(e, exp)) {
+found = true;
 
-iter.remove();
+iter.remove();
 
-break;
+break;
+}
 }
-}
 
-// Lost event is acceptable.
-if (!found)
-lostEvts.add(exp);
-}
+// Lost event is acceptable.
+if (!found)
+lostEvts.add(exp);
+}
 
-boolean dup = false;
+boolean dup = false;
 
-// Check duplicate.
-if (!lsnr.evts.isEmpty()) {
-for (List evts : lsnr.evts.values()) {
-if (!evts.isEmpty()) {
-for (CacheEntryEvent e : evts) {
-boolean found = false;
+// Check duplicate.
+if (!lsnr.evts.isEmpty()) {
+for (List evts : lsnr.evts.values()) {
+if (!evts.isEmpty()) {
+for (CacheEntryEvent e : evts) {
+boolean found = false;
 
-for (T3 lostEvt : lostEvts) {
-if (e.getKey().equals(lostEvt.get1()) && 
e.getValue().equals(lostEvt.get2())) {
-   

[49/50] [abbrv] ignite git commit: IGNITE-2252 Added support for cache sql schema in REST topology command - Fixes #374.

[av]

IGNITE-2252 Added support for cache sql schema in REST topology command - Fixes 
#374.

Signed-off-by: Andrey 


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

Branch: refs/heads/master
Commit: debe34de1881f5a1268993ae584db70f16a761cf
Parents: 383f317
Author: Andrey 
Authored: Thu Dec 24 17:49:02 2015 +0700
Committer: Andrey 
Committed: Thu Dec 24 17:49:02 2015 +0700

--
 .../JettyRestProcessorAbstractSelfTest.java |  25 +++-
 .../connection/GridClientNioTcpConnection.java  |  17 +--
 .../client/message/GridClientCacheBean.java | 139 +++
 .../rest/client/message/GridClientNodeBean.java |  70 ++
 .../top/GridTopologyCommandHandler.java |  38 +++--
 5 files changed, 230 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/debe34de/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 4c73f78..4b1d47c 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -35,6 +35,7 @@ import java.util.regex.Pattern;
 import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
 import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
@@ -45,7 +46,6 @@ import 
org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetada
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
 import 
org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.util.typedef.P1;
 import org.apache.ignite.lang.IgniteBiPredicate;
@@ -1054,11 +1054,28 @@ public abstract class 
JettyRestProcessorAbstractSelfTest extends AbstractRestPro
 assertEquals(JSONNull.getInstance(), node.get("attributes"));
 assertEquals(JSONNull.getInstance(), node.get("metrics"));
 
-assertEquals("PARTITIONED", node.get("defaultCacheMode"));
+Collection caches = (Collection)node.get("caches");
 
-Map caches = (Map)node.get("caches");
+Collection publicCaches = 
grid(0).context().cache().publicCaches();
 
-assertEquals(F.asMap("person", "PARTITIONED"), caches);
+assertNotNull(caches);
+assertEquals(publicCaches.size(), caches.size());
+
+for (Map cache : caches) {
+final String cacheName = cache.get("name").equals("") ? null : 
(String)cache.get("name");
+
+IgniteCacheProxy publicCache = F.find(publicCaches, 
null, new P1() {
+@Override public boolean apply(IgniteCacheProxy c) {
+return F.eq(c.getName(), cacheName);
+}
+});
+
+assertNotNull(publicCache);
+
+CacheMode cacheMode = 
CacheMode.valueOf((String)cache.get("mode"));
+
+
assertEquals(publicCache.getConfiguration(CacheConfiguration.class).getCacheMode(),cacheMode);
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/debe34de/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 576df3a..cfcb07f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ 

[34/50] [abbrv] ignite git commit: 1.5.0.final-SNAPSHOT

[av]

1.5.0.final-SNAPSHOT


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

Branch: refs/heads/master
Commit: b6dab0915d691c9a4b9e949d90d93ced8458e018
Parents: 8be0ced
Author: Ignite Teamcity 
Authored: Tue Dec 22 18:21:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 18:21:45 2015 +0300

--
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 63bc44c..c81873d 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7791], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7794], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core-test/configure.ac
--
diff --git a/modules/platforms/cpp/core-test/configure.ac 
b/modules/platforms/cpp/core-test/configure.ac
index 736c721..5918135 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0.7791], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7794], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index a87bd58..7f36009 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0.7791], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7794], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index b3d72ab..c9aa6b7 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ 
examples],[1.5.0.7791],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7794],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac 

[16/50] [abbrv] ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

[av]

ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.


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

Branch: refs/heads/master
Commit: c5ed0d0e23329b8badb594e6f625eb58a24e2392
Parents: d8576b8
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 14:14:43 2015 +0700

--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index f2d5961..38a419a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -65,6 +65,9 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 /** Number of threads that will perform cache flushing. */
 private int flushThreadCnt;
 
+/** Keep binary in store flag. */
+private boolean storeKeepBinary;
+
 /**
  * @param ignite Ignite instance.
  * @param ccfg Cache configuration.
@@ -81,6 +84,7 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 
 cfg.store = compactClass(store);
 cfg.storeFactory = compactClass(ccfg.getCacheStoreFactory());
+cfg.storeKeepBinary = ccfg.isStoreKeepBinary();
 
 cfg.readThrough = ccfg.isReadThrough();
 cfg.writeThrough = ccfg.isWriteThrough();
@@ -123,6 +127,13 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 }
 
 /**
+ * @return Keep binary in store flag.
+ */
+public boolean storeKeepBinary() {
+return storeKeepBinary;
+}
+
+/**
  * @return Whether cache should operate in read-through mode.
  */
 public boolean readThrough() {
@@ -175,4 +186,4 @@ public class VisorCacheStoreConfiguration implements 
Serializable {
 @Override public String toString() {
 return S.toString(VisorCacheStoreConfiguration.class, this);
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/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 0d8d036..57f7066 100644
--- 
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
@@ -866,6 +866,7 @@ object VisorCacheCommand {
 cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
 cacheT += ("Store Class", safe(storeCfg.store()))
 cacheT += ("Store Factory Class", storeCfg.storeFactory())
+cacheT += ("Store Keep Binary", storeCfg.storeKeepBinary())
 cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
 cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
 

[24/50] [abbrv] ignite git commit: IGNITE-2226

[av]

IGNITE-2226


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

Branch: refs/heads/master
Commit: 1039bf69e94c07e5e8d26860f0df2037caab79a7
Parents: fa48b89
Author: Anton Vinogradov 
Authored: Tue Dec 22 13:18:33 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 13:18:33 2015 +0300

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1039bf69/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 51271b3..4bdad1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,7 @@
 
 
 
-
+
 
 
 

[46/50] [abbrv] ignite git commit: ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user thread and breaks tests

[av]

ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user 
thread and breaks tests


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

Branch: refs/heads/master
Commit: 61c072e51b16f6776e3e73252bfd5d7f09c0f21e
Parents: 8f5445a
Author: sboikov 
Authored: Thu Dec 24 10:47:50 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 10:47:50 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/61c072e5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index a27a3d0..5c63fbd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -743,7 +743,7 @@ public class BinaryContext implements Externalizable {
  */
 protected Object readResolve() throws ObjectStreamException {
 try {
-IgniteKernal g = IgnitionEx.localIgnite();
+IgniteKernal g = IgnitionEx.gridx(gridName);
 
 if (g == null)
 throw new IllegalStateException("Failed to find grid for name: 
" + gridName);

[13/50] [abbrv] ignite git commit: ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

[av]

ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

Signed-off-by: S.Vladykin 


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

Branch: refs/heads/master
Commit: a0cdb59645ce0a84344c6c92b9695c1a26e2a824
Parents: 81458f5
Author: S.Vladykin 
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin 
Committed: Mon Dec 21 19:58:29 2015 +0300

--
 .../processors/query/h2/sql/GridSqlQuery.java   |  3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 65 ++--
 .../query/IgniteSqlSplitterSelfTest.java| 52 
 .../query/h2/sql/GridQueryParsingTest.java  |  9 +--
 4 files changed, 103 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index ddcb40b..d9784c8 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -163,6 +163,9 @@ public abstract class GridSqlQuery {
 if (expr == null) // For plain select should never be 
null, for union H2 itself can't parse query.
 throw new IllegalStateException("Failed to build 
query: " + buff.toString());
 
+if (expr instanceof GridSqlAlias)
+expr = expr.child();
+
 
buff.append('=').append(StringUtils.unEnclose(expr.getSQL()));
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 0c9c8fe..727c2c7 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -50,6 +50,9 @@ public class GridSqlQuerySplitter {
 /** */
 private static final String COLUMN_PREFIX = "__C";
 
+/** */
+private static final String HAVING_COLUMN = "__H";
+
 /**
  * @param idx Index of table.
  * @return Table.
@@ -158,14 +161,17 @@ public class GridSqlQuerySplitter {
 List mapExps = F.addAll(new 
ArrayList(mapQry.allColumns()),
 mapQry.columns(false));
 
-GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+final int visibleCols = mapQry.visibleColumns();
+final int havingCol = mapQry.havingColumn();
+
+List rdcExps = new ArrayList<>(visibleCols);
 
 Set colNames = new HashSet<>();
 
 boolean aggregateFound = false;
 
 for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len 
because mapExps list can grow.
-aggregateFound |= splitSelectExpression(mapExps, rdcExps, 
colNames, i, collocated);
+aggregateFound |= splitSelectExpression(mapExps, rdcExps, 
colNames, i, collocated, i == havingCol);
 
 // Fill select expressions.
 mapQry.clearColumns();
@@ -173,10 +179,13 @@ public class GridSqlQuerySplitter {
 for (GridSqlElement exp : mapExps) // Add all map expressions as 
visible.
 mapQry.addColumn(exp, true);
 
-for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible 
reduce columns.
-rdcQry.addColumn(rdcExp, true);
+for (int i = 0; i < visibleCols; i++) // Add visible reduce columns.
+rdcQry.addColumn(rdcExps.get(i), true);
+
+for (int i = visibleCols; i < rdcExps.size(); i++) // Add invisible 
reduce columns (HAVING).
+rdcQry.addColumn(rdcExps.get(i), false);
 
-for (int i = rdcExps.length; i < mapExps.size(); i++)  // Add all 
extra map columns as invisible reduce columns.
+for (int i = rdcExps.size(); i < mapExps.size(); i++)  // Add all 

[48/50] [abbrv] ignite git commit: ignite-1.5 Corrected fix for hang on metadata update. Fix for ignite-647 (issues with dynamic cache start when fair affinity is used).

[av]

ignite-1.5 Corrected fix for hang on metadata update. Fix for ignite-647 
(issues with dynamic cache start when fair affinity is used).


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

Branch: refs/heads/master
Commit: 383f317d03aca8903aeaa00da903366911103cef
Parents: fe14099
Author: sboikov 
Authored: Thu Dec 24 13:12:23 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 13:12:23 2015 +0300

--
 .../processors/cache/GridCacheProcessor.java|  3 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  3 +
 .../dht/atomic/GridDhtAtomicCache.java  | 89 --
 .../GridDhtPartitionsExchangeFuture.java| 20 +++-
 ...ridNearOptimisticTxPrepareFutureAdapter.java | 10 +-
 .../ignite/IgniteCacheAffinitySelfTest.java |  7 --
 .../fair/FairAffinityDynamicCacheSelfTest.java  | 17 +---
 .../cache/CrossCacheTxRandomOperationsTest.java |  2 -
 ...yMetadataUpdateChangingTopologySelfTest.java | 97 +---
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |  3 +-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  | 21 -
 .../IgniteCacheRestartTestSuite2.java   |  3 +
 .../stream/mqtt/IgniteMqttStreamerTest.java | 33 ---
 13 files changed, 173 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/383f317d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 380c163..ff02e70 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1961,7 +1961,8 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 if (req.initiatingNodeId() == null)
 desc.staticallyConfigured(true);
 
-desc.receivedOnDiscovery(true);
+if (joiningNodeId.equals(ctx.localNodeId()))
+desc.receivedOnDiscovery(true);
 
 DynamicCacheDescriptor old = 
registeredCaches.put(maskNull(req.cacheName()), desc);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/383f317d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 7586a42..bcc2ab7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -491,6 +491,9 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 
 AffinityTopologyVersion topVer = 
ctx.cache().context().lockedTopologyVersion(null);
 
+if (topVer == null)
+topVer = 
ctx.cache().context().exchange().readyAffinityVersion();
+
 BinaryObjectException err = metaDataCache.invoke(topVer, key, new 
MetadataProcessor(mergedMeta));
 
 if (err != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/383f317d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 634a9ea..393413e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1290,59 +1290,48 @@ public class GridDhtAtomicCache extends 
GridDhtCacheAdapter {
 
 

[20/50] [abbrv] ignite git commit: IGNITE-2213: Fixed serialization of duplicate fields.

[av]

IGNITE-2213: Fixed serialization of duplicate fields.


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

Branch: refs/heads/master
Commit: 627134b25ca730d7a7dbcec9facde158c5d15dc3
Parents: d8576b8
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:28:44 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 11:28:44 2015 +0300

--
 .../internal/binary/BinaryClassDescriptor.java  |  56 --
 .../ignite/internal/binary/BinaryUtils.java |  11 ++
 .../binary/BinaryMarshallerSelfTest.java| 110 +++
 .../IgniteBinaryCacheQueryTestSuite.java|   3 +-
 4 files changed, 169 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 1eb3882..1105809 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -35,6 +35,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -44,11 +45,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
-import static java.lang.reflect.Modifier.isStatic;
-import static java.lang.reflect.Modifier.isTransient;
-
 /**
  * Binary class descriptor.
  */
@@ -250,21 +249,24 @@ public class BinaryClassDescriptor {
 
 BinarySchema.Builder schemaBuilder = 
BinarySchema.Builder.newBuilder();
 
+Set duplicates = duplicateFields(cls);
+
 Collection names = new HashSet<>();
 Collection ids = new HashSet<>();
 
 for (Class c = cls; c != null && !c.equals(Object.class); c 
= c.getSuperclass()) {
 for (Field f : c.getDeclaredFields()) {
-int mod = f.getModifiers();
-
-if (!isStatic(mod) && !isTransient(mod)) {
+if (serializeField(f)) {
 f.setAccessible(true);
 
 String name = f.getName();
 
-if (!names.add(name))
-throw new BinaryObjectException("Duplicate 
field name [fieldName=" + name +
-", cls=" + cls.getName() + ']');
+if (duplicates.contains(name))
+name = BinaryUtils.qualifiedFieldName(c, name);
+
+boolean added = names.add(name);
+
+assert added : name;
 
 int fieldId = idMapper.fieldId(typeId, name);
 
@@ -308,6 +310,42 @@ public class BinaryClassDescriptor {
 }
 
 /**
+ * Find all fields with duplicate names in the class.
+ *
+ * @param cls Class.
+ * @return Fields with duplicate names.
+ */
+private static Set duplicateFields(Class cls) {
+Set all = new HashSet<>();
+Set duplicates = new HashSet<>();
+
+for (Class c = cls; c != null && !c.equals(Object.class); c = 
c.getSuperclass()) {
+for (Field f : c.getDeclaredFields()) {
+if (serializeField(f)) {
+String name = f.getName();
+
+if (!all.add(name))
+duplicates.add(name);
+}
+}
+}
+
+return duplicates;
+}
+
+/**
+ * Whether the field must be serialized.
+ *
+ * @param f Field.
+ * @return {@code True} if must be serialized.
+ */
+private static boolean serializeField(Field f) {
+int mod = f.getModifiers();
+
+return !Modifier.isStatic(mod) && !Modifier.isTransient(mod);
+}
+
+/**
  * @return {@code True} if enum.
  */
 boolean isEnum() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java

[09/50] [abbrv] ignite git commit: 1.5.0-final-SNAPSHOT

[av]

1.5.0-final-SNAPSHOT


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

Branch: refs/heads/master
Commit: e5869237561eda9e57cb3e7c86deb7f83a8275fd
Parents: 359bf21
Author: Ignite Teamcity 
Authored: Mon Dec 21 15:53:50 2015 +0300
Committer: Ignite Teamcity 
Committed: Mon Dec 21 15:53:50 2015 +0300

--
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index f354f1a..b032282 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.1], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7768], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/core-test/configure.ac
--
diff --git a/modules/platforms/cpp/core-test/configure.ac 
b/modules/platforms/cpp/core-test/configure.ac
index 80072a8..b500ea4 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7768], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index aa4cbde..dc7c2c7 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7768], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index 4c8316a..3f47fef 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ 
examples],[1.5.0.1],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7768],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac 

[17/50] [abbrv] ignite git commit: ignite-1.5 Fixed benchmark configuration.

[av]

ignite-1.5 Fixed benchmark configuration.


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

Branch: refs/heads/master
Commit: 8c2b6740c43b3e32c424d2862155ce384fbafe51
Parents: d8576b8
Author: sboikov 
Authored: Tue Dec 22 10:16:37 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:16:37 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c2b6740/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03cfddb..def652a 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -89,7 +89,7 @@ j=10
 CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode 
-ds ${ver}tx-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-optim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-pessim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-opt-serial-put-get-1-backup,\

[14/50] [abbrv] ignite git commit: ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

[av]

ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

Signed-off-by: S.Vladykin 


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

Branch: refs/heads/master
Commit: da24df99525b796a79fdb55997efe1c9bd515a5d
Parents: a0cdb59
Author: vershov 
Authored: Tue Dec 22 00:08:37 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 22 00:08:37 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  44 +++-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++---
 .../query/h2/sql/GridSqlQuerySplitter.java  |  48 ++--
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala  |  13 +-
 8 files changed, 416 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index be1240c..d52662e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -365,15 +365,18 @@ public class CacheConfiguration extends 
MutableConfiguration {
 private IgnitePredicate nodeFilter;
 
 /** */
-private boolean sqlEscapeAll;
+private String sqlSchema;
 
 /** */
-private transient Class[] indexedTypes;
+private boolean sqlEscapeAll;
 
 /** */
 private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
 
 /** */
+private transient Class[] indexedTypes;
+
+/** */
 private boolean snapshotableIdx;
 
 /** Copy on read flag. */
@@ -466,6 +469,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
 rebalanceTimeout = cc.getRebalanceTimeout();
 rebalanceThrottle = cc.getRebalanceThrottle();
 snapshotableIdx = cc.isSnapshotableIndex();
+sqlSchema = cc.getSqlSchema();
 sqlEscapeAll = cc.isSqlEscapeAll();
 sqlFuncCls = cc.getSqlFunctionClasses();
 sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
@@ -1770,7 +1774,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
 }
 
 /**
- * Gets timeout in milliseconds after which long query warning will be 
printed.
+ * Sets timeout in milliseconds after which long query warning will be 
printed.
  *
  * @param longQryWarnTimeout Timeout in milliseconds.
  * @return {@code this} for chaining.
@@ -1782,6 +1786,40 @@ public class CacheConfiguration extends 
MutableConfiguration {
 }
 
 /**
+ * Gets custom name of the sql schema. If custom sql schema is not set 
then {@code null} will be returned and
+ * quoted case sensitive name will be used as sql schema.
+ *
+ * @return Schema name for current cache according to SQL ANSI-99. Could 
be {@code null}.
+ */
+@Nullable public String getSqlSchema() {
+return sqlSchema;
+}
+
+/**
+ * Sets sql schema to be used for current cache. This name will correspond 
to SQL ANSI-99 standard.
+ * Nonquoted identifiers are not case sensitive. Quoted identifiers are 
case sensitive.
+ * 
+ * Be aware of using the same string in case sensitive and case 
insensitive manner simultaneously, since
+ * behaviour for such case is not specified.
+ * 
+ * When sqlSchema is not specified, quoted {@code cacheName} is used 
instead.
+ * 
+ * {@code sqlSchema} could not be an empty string. Has to be {@code 
"\"\""} instead.
+ *
+ * @param sqlSchema Schema name for current cache according to SQL 
ANSI-99. Should not be {@code null}.
+ *
+ * @return {@code this} for chaining.
+ */
+public CacheConfiguration setSqlSchema(String sqlSchema) {
+A.ensure((sqlSchema != null), "Schema could not be null.");
+A.ensure(!sqlSchema.isEmpty(), "Schema could not be empty.");
+
+this.sqlSchema = sqlSchema;
+
+return this;
+}
+
+/**
  * If {@code true} all the SQL table and field names will be escaped with 
double quotes like
  * 

[07/50] [abbrv] ignite git commit: IGNITE-2215: .NET: Use standard Action and Func instead of custom delegates in binary readers.

[av]

IGNITE-2215: .NET: Use standard Action and Func instead of custom delegates in 
binary readers.


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

Branch: refs/heads/master
Commit: 6edeccde24a2897363ee905e3cc5cef10e2f47ce
Parents: d4687d9
Author: Pavel Tupitsyn 
Authored: Mon Dec 21 14:58:04 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 14:58:04 2015 +0300

--
 .../Binary/IBinaryRawReader.cs  |  4 ++--
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  | 25 ++--
 .../Impl/Binary/BinaryReader.cs | 13 +-
 .../Impl/Binary/BinaryUtils.cs  |  4 ++--
 4 files changed, 12 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
index a719e36..40ed754 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
@@ -205,7 +205,7 @@ namespace Apache.Ignite.Core.Binary
 /// Factory.
 /// Adder.
 /// Collection.
-ICollection ReadCollection(CollectionFactory factory, CollectionAdder 
adder);
+ICollection ReadCollection(Func factory, 
Action adder);
 
 /// 
 /// Read dictionary. 
@@ -218,6 +218,6 @@ namespace Apache.Ignite.Core.Binary
 /// 
 /// Factory.
 /// Dictionary.
-IDictionary ReadDictionary(DictionaryFactory factory);
+IDictionary ReadDictionary(Func factory);
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
index 2ccbbc0..4de3e92 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
@@ -21,27 +21,6 @@ namespace Apache.Ignite.Core.Binary
 using System.Collections;
 
 /// 
-/// Delegate for collection creation.
-/// 
-/// Collection size.
-/// Collection.
-public delegate ICollection CollectionFactory(int size);
-
-/// 
-/// Delegate for adding element to collection.
-/// 
-/// Collection.
-/// Element to add.
-public delegate void CollectionAdder(ICollection col, object elem);
-
-/// 
-/// Delegate for dictionary creation.
-/// 
-/// Dictionary size.
-/// Dictionary.
-public delegate IDictionary DictionaryFactory(int size);
-
-/// 
 /// Reader for binary objects. 
 /// 
 public interface IBinaryReader 
@@ -253,7 +232,7 @@ namespace Apache.Ignite.Core.Binary
 /// Factory.
 /// Adder.
 /// Collection.
-ICollection ReadCollection(string fieldName, CollectionFactory 
factory, CollectionAdder adder);
+ICollection ReadCollection(string fieldName, Func 
factory, Action adder);
 
 /// 
 /// Read named dictionary.
@@ -268,7 +247,7 @@ namespace Apache.Ignite.Core.Binary
 /// Field name.
 /// Factory.
 /// Dictionary.
-IDictionary ReadDictionary(string fieldName, DictionaryFactory 
factory);
+IDictionary ReadDictionary(string fieldName, Func 
factory);
 
 /// 
 /// Get raw reader. 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
index 7b887a9..105589a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
@@ -484,15 +484,14 @@ namespace Apache.Ignite.Core.Impl.Binary
 }
 
 /**  */
-public ICollection ReadCollection(string fieldName, CollectionFactory 
factory,
-

[08/50] [abbrv] ignite git commit: IGNITE-2184: Updated .NET/CPP version update procedure.

[av]

IGNITE-2184: Updated .NET/CPP version update procedure.


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

Branch: refs/heads/master
Commit: 359bf2142627b1dbe26e00da1fb1ac071d71b4ce
Parents: 6edeccd
Author: Pavel Tupitsyn 
Authored: Mon Dec 21 15:33:43 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 15:33:43 2015 +0300

--
 .../Properties/AssemblyInfo.cs  |  1 +
 .../Properties/AssemblyInfo.cs  |  1 +
 .../Properties/AssemblyInfo.cs  |  1 +
 .../Properties/AssemblyInfo.cs  |  1 +
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  1 +
 .../Properties/AssemblyInfo.cs  |  1 +
 .../Properties/AssemblyInfo.cs  |  1 +
 pom.xml | 42 ++--
 8 files changed, 28 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 384f61c..f250841 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index c7b9898..97941e1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -47,3 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 0c74e95..7e0ba0b 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 3512810..4e22fb7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index f6257f9..aa2297d 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ 

[29/50] [abbrv] ignite git commit: IGNITE-2225: Fixed unnecessary deserializations.

[av]

IGNITE-2225: Fixed unnecessary deserializations.


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

Branch: refs/heads/master
Commit: 2c8b259b4e0149887ce03e29cd9b2b5f103d1b86
Parents: 73d8b90
Author: vozerov-gridgain 
Authored: Tue Dec 22 15:05:24 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 15:05:24 2015 +0300

--
 .../ignite/internal/binary/GridBinaryMarshaller.java  | 10 ++
 .../cache/binary/CacheObjectBinaryProcessorImpl.java  |  3 +++
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index b21c679..71ca018 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -268,6 +268,16 @@ public class GridBinaryMarshaller {
 }
 
 /**
+ * Whether object must be deserialized anyway. I.e. it cannot be converted 
to BinaryObject.
+ *
+ * @param obj Object.
+ * @return {@code True} if object will be deserialized on unmarshal.
+ */
+public boolean mustDeserialize(Object obj) {
+return obj != null && ctx.mustDeserialize(obj.getClass());
+}
+
+/**
  * Gets writer for the given output stream.
  *
  * @param out Output stream.

http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 6aee7a9..b335179 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -435,6 +435,9 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 return new GridMapEntry<>(marshalToBinary(e.getKey()), 
marshalToBinary(e.getValue()));
 }
 
+if (binaryMarsh.mustDeserialize(obj))
+return obj; // No need to go through marshal-unmarshal because 
result will be the same as initial object.
+
 byte[] arr = binaryMarsh.marshal(obj);
 
 assert arr.length > 0;

[43/50] [abbrv] ignite git commit: ignite-2175

[av]

ignite-2175


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

Branch: refs/heads/master
Commit: bd05fa90b1d04c8c488717302d8d84fb02e1
Parents: 29c4778
Author: Anton Vinogradov 
Authored: Wed Dec 23 18:05:06 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 18:05:06 2015 +0300

--
 .../ignite/internal/binary/BinaryContext.java   |   2 +-
 .../internal/binary/BinaryObjectImpl.java   |   2 +-
 .../ignite/tests/p2p/cache/PersonWrapper.java   | 121 +++
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java  |  16 ++-
 ...eBinaryWrappedObjectFieldsQuerySelfTest.java |  28 +
 .../IgniteBinaryCacheQueryTestSuite.java|   4 +
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 8 files changed, 171 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 5c63fbd..a27a3d0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -743,7 +743,7 @@ public class BinaryContext implements Externalizable {
  */
 protected Object readResolve() throws ObjectStreamException {
 try {
-IgniteKernal g = IgnitionEx.gridx(gridName);
+IgniteKernal g = IgnitionEx.localIgnite();
 
 if (g == null)
 throw new IllegalStateException("Failed to find grid for name: 
" + gridName);

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index d712eb8..fca8955 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -533,7 +533,7 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
  */
 private Object deserializeValue(@Nullable CacheObjectContext coCtx) {
 BinaryReaderExImpl reader = reader(null,
-coCtx != null ? coCtx.kernalContext().config().getClassLoader() : 
null);
+coCtx != null ? coCtx.kernalContext().config().getClassLoader() : 
ctx.configuration().getClassLoader());
 
 Object obj0 = reader.deserialize();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd05fa90/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
--
diff --git 
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
 
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
new file mode 100644
index 000..2655e39
--- /dev/null
+++ 
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
@@ -0,0 +1,121 @@
+/*
+ *  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.tests.p2p.cache;
+
+import java.io.Serializable;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+
+/**
+ * Wraps Person class.
+ */
+public class PersonWrapper {
+public static class Person implements Serializable {

[33/50] [abbrv] ignite git commit: IGNITE-2226

[av]

IGNITE-2226


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

Branch: refs/heads/master
Commit: 8be0ced4c4eaba4002a0f963d0d74519aef7c8c6
Parents: d95ca2e
Author: Anton Vinogradov 
Authored: Tue Dec 22 18:14:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 18:14:25 2015 +0300

--
 examples/pom.xml|  2 +-
 examples/schema-import/pom.xml  |  2 +-
 modules/aop/pom.xml |  2 +-
 modules/apache-license-gen/pom.xml  |  2 +-
 modules/aws/pom.xml |  2 +-
 modules/camel/pom.xml   |  2 +-
 modules/clients/pom.xml |  2 +-
 modules/cloud/pom.xml   |  2 +-
 modules/codegen/pom.xml |  2 +-
 modules/core/pom.xml|  2 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 modules/extdata/p2p/pom.xml |  2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |  2 +-
 modules/extdata/uri/pom.xml |  2 +-
 modules/flume/pom.xml   |  2 +-
 modules/gce/pom.xml |  2 +-
 modules/geospatial/pom.xml  |  2 +-
 modules/hadoop/pom.xml  |  2 +-
 modules/hibernate/pom.xml   |  2 +-
 modules/indexing/pom.xml|  2 +-
 modules/jcl/pom.xml |  2 +-
 modules/jms11/pom.xml   |  2 +-
 modules/jta/pom.xml |  2 +-
 modules/kafka/pom.xml   |  2 +-
 modules/log4j/pom.xml   |  2 +-
 modules/log4j2/pom.xml  |  2 +-
 modules/mesos/pom.xml   |  2 +-
 modules/mqtt/pom.xml|  2 +-
 modules/osgi-karaf/pom.xml  |  2 +-
 modules/osgi-paxlogging/pom.xml |  2 +-
 modules/osgi/pom.xml|  2 +-
 modules/platforms/cpp/common/configure.ac   |  2 +-
 modules/platforms/cpp/core-test/configure.ac|  2 +-
 modules/platforms/cpp/core/configure.ac |  2 +-
 modules/platforms/cpp/examples/configure.ac |  2 +-
 modules/platforms/cpp/ignite/configure.ac   |  2 +-
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 modules/rest-http/pom.xml   |  2 +-
 modules/scalar-2.10/pom.xml |  2 +-
 modules/scalar/pom.xml  |  2 +-
 modules/schedule/pom.xml|  2 +-
 modules/schema-import/pom.xml   |  2 +-
 modules/slf4j/pom.xml   |  2 +-
 modules/spark-2.10/pom.xml  |  2 +-
 modules/spark/pom.xml   |  2 +-
 modules/spring/pom.xml  |  2 +-
 modules/ssh/pom.xml |  2 +-
 modules/tools/pom.xml   |  2 +-
 modules/twitter/pom.xml |  2 +-
 modules/urideploy/pom.xml   |  2 +-
 modules/visor-console-2.10/pom.xml  |  2 +-
 modules/visor-console/pom.xml   |  2 +-
 modules/visor-plugins/pom.xml   |  2 +-
 modules/web/pom.xml |  2 +-
 modules/yardstick/pom.xml   |  2 +-
 modules/yarn/pom.xml|  2 +-
 modules/zookeeper/pom.xml   |  2 +-
 pom.xml |  2 +-
 67 files changed, 99 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8be0ced4/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index f123855..5b8c36a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
 
 
 ignite-examples
-1.5.0-final-SNAPSHOT
+1.5.0.final-SNAPSHOT
 
 
 

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

[av]

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


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

Branch: refs/heads/master
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30:03 2015 +0300

--
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   2 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../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/flume/pom.xml   |   2 +-
 modules/gce/pom.xml |   2 +-
 modules/geospatial/pom.xml  |   2 +-
 modules/hadoop/pom.xml  |   2 +-
 modules/hibernate/pom.xml   |   2 +-
 modules/indexing/pom.xml|   2 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 modules/jcl/pom.xml |   2 +-
 modules/jms11/pom.xml   |   2 +-
 modules/jta/pom.xml |   2 +-
 modules/kafka/pom.xml   |   2 +-
 modules/log4j/pom.xml   |   2 +-
 modules/log4j2/pom.xml  |   2 +-
 modules/mesos/pom.xml   |   2 +-
 modules/mqtt/pom.xml|   2 +-
 modules/osgi-karaf/pom.xml  |   2 +-
 modules/osgi-paxlogging/pom.xml |   2 +-
 modules/osgi/pom.xml|   2 +-
 modules/platforms/cpp/common/configure.ac   |   2 +-
 modules/platforms/cpp/core-test/configure.ac|   2 +-
 modules/platforms/cpp/core/configure.ac |   2 +-
 modules/platforms/cpp/examples/configure.ac |   2 +-
 modules/platforms/cpp/ignite/configure.ac   |   2 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 modules/rest-http/pom.xml   |   2 +-
 modules/scalar-2.10/pom.xml |   2 +-
 modules/scalar/pom.xml  |   2 +-
 modules/schedule/pom.xml|   2 +-
 modules/schema-import/pom.xml   |   2 +-
 modules/slf4j/pom.xml   |   2 +-
 modules/spark-2.10/pom.xml  |   2 +-
 modules/spark/pom.xml   |   2 +-
 modules/spring/pom.xml  |   2 +-
 modules/ssh/pom.xml |   2 +-
 modules/tools/pom.xml   |   2 +-
 modules/twitter/pom.xml |   2 +-
 modules/urideploy/pom.xml   |   2 +-
 modules/visor-console-2.10/pom.xml  |   2 +-
 modules/visor-console/pom.xml   |   2 +-
 modules/visor-plugins/pom.xml   |   2 +-
 modules/web/pom.xml |   2 +-
 modules/yardstick/pom.xml   |   2 +-
 modules/yarn/pom.xml|   2 +-
 modules/zookeeper/pom.xml   |   2 +-
 pom.xml |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

[01/50] [abbrv] ignite git commit: IGNITE-2210: Fixed testMethodAnnotationWithoutGet - it cannot work with BinaryMarshaller at the moment.

[av]

Repository: ignite
Updated Branches:
  refs/heads/master 0766ad709 -> 36261adfc


IGNITE-2210: Fixed testMethodAnnotationWithoutGet - it cannot work with 
BinaryMarshaller at the moment.


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

Branch: refs/heads/master
Commit: 48a1e0a949aadcf28729b27b5413f53cff905981
Parents: 10bb798
Author: vozerov-gridgain 
Authored: Fri Dec 18 16:08:24 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 16:08:24 2015 +0300

--
 .../cache/IgniteCacheAbstractFieldsQuerySelfTest.java | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/48a1e0a9/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 4c952fc..926d294 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -846,15 +846,17 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
  * @throws Exception If failed.
  */
 public void testMethodAnnotationWithoutGet() throws Exception {
-QueryCursor qry = grid(0).cache(null)
-.query(new SqlFieldsQuery("select methodField from Organization 
where methodField='name-A'")
-.setPageSize(10));
+if (!binaryMarshaller) {
+QueryCursor qry = grid(0).cache(null)
+.query(new SqlFieldsQuery("select methodField from 
Organization where methodField='name-A'")
+.setPageSize(10));
 
-List flds = qry.getAll();
+List flds = qry.getAll();
 
-assertEquals(1, flds.size());
+assertEquals(1, flds.size());
 
-assertEquals("name-A", flds.get(0).get(0));
+assertEquals("name-A", flds.get(0).get(0));
+}
 }
 
 /**

[19/50] [abbrv] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query.

[av]

IGNITE-2190 - Fixing deserialization during scan query.


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

Branch: refs/heads/master
Commit: 3aa6f828318ac90b73ced040ae031efad763073e
Parents: 6a91996
Author: Alexey Goncharuk 
Authored: Tue Dec 22 11:08:21 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Dec 22 11:08:21 2015 +0300

--
 .../apache/ignite/internal/processors/cache/IgniteCacheProxy.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3aa6f828/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 3dada6f..271a2cf 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -460,8 +460,7 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter p = ((ScanQuery)filter).getFilter();
 
-qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL, 
((ScanQuery)filter).getPartition(),
-isKeepBinary);
+qry = ctx.queries().createScanQuery(p, 
((ScanQuery)filter).getPartition(), isKeepBinary);
 
 if (grp != null)
 qry.projection(grp);

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

[av]

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


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

Branch: refs/heads/master
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 11:29:06 2015 +0300

--
 .../internal/processors/cache/IgniteCacheProxy.java|  3 +--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 .../yardstick/config/benchmark-multicast.properties|  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)
--

[31/50] [abbrv] ignite git commit: ignite-1.5 Restored benchmarks with implicit transactions.

[av]

ignite-1.5 Restored benchmarks with implicit transactions.


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

Branch: refs/heads/master
Commit: c8ccd4f2399f4764631b504feb27efc68eb23256
Parents: 6ad758c
Author: sboikov 
Authored: Tue Dec 22 17:09:39 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 17:10:53 2015 +0300

--
 .../config/benchmark-multicast.properties   |  6 +--
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c8ccd4f2/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03d74ad..c638d94 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -89,7 +89,7 @@ j=10
 CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode 
-ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-optim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-pessim-repRead-put-get-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn 
IgnitePutGetTxBenchmark -sn IgniteNode -ds 
${ver}tx-opt-serial-put-get-1-backup,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds 

[12/50] [abbrv] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

[av]

IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

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

Branch: refs/heads/master
Commit: 81458f51c40f58b169da178bd7a572d3c9fe01ff
Parents: 2848680
Author: Alexey Goncharuk 
Authored: Mon Dec 21 18:54:38 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 21 18:54:38 2015 +0300

--
 .../internal/binary/BinaryObjectImpl.java   |  20 +-
 .../processors/cache/IgniteCacheProxy.java  |   5 +-
 .../cache/query/GridCacheQueryManager.java  |   8 +-
 .../processors/query/GridQueryProcessor.java|  10 +-
 .../IgniteCacheBinaryObjectsScanSelfTest.java   | 137 +
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +--
 .../IgniteCacheReplicatedQuerySelfTest.java |  10 +-
 .../local/IgniteCacheLocalQuerySelfTest.java|   2 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   2 +
 9 files changed, 379 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 2342766..d712eb8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -532,7 +532,8 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
  * @return Object.
  */
 private Object deserializeValue(@Nullable CacheObjectContext coCtx) {
-BinaryReaderExImpl reader = reader(null);
+BinaryReaderExImpl reader = reader(null,
+coCtx != null ? coCtx.kernalContext().config().getClassLoader() : 
null);
 
 Object obj0 = reader.deserialize();
 
@@ -560,10 +561,23 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
  * @param rCtx Reader context.
  * @return Reader.
  */
-private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx) {
+private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx, 
@Nullable ClassLoader ldr) {
+if (ldr == null)
+ldr = ctx.configuration().getClassLoader();
+
 return new BinaryReaderExImpl(ctx,
 BinaryHeapInputStream.create(arr, start),
-ctx.configuration().getClassLoader(),
+ldr,
 rCtx);
 }
+
+/**
+ * Create new reader for this object.
+ *
+ * @param rCtx Reader context.
+ * @return Reader.
+ */
+private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx) {
+return reader(rCtx, null);
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 1768ecf..3dada6f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -618,7 +618,7 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter)qry, qry.isLocal(),
@@ -630,7 +630,8 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter(new 
Iterable>() {
 @Override public Iterator> 
iterator() {
-return ctx.kernalContext().query().queryLocal(ctx, 
p);
+return 

[36/50] [abbrv] ignite git commit: Minor: fixed compilation for Java 8 in test.

[av]

Minor: fixed compilation for Java 8 in test.


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

Branch: refs/heads/master
Commit: 66b33bc0ce10ccb5c8cbeb91dc9c3fdc75c7f6c2
Parents: fbb4982
Author: vozerov-gridgain 
Authored: Wed Dec 23 12:17:48 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 23 12:17:48 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/66b33bc0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 3782596..1507543 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -475,7 +475,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest 
extends GridCommonAbstrac
 Cache.Entry entry = 
F.first(qry.getAll());
 
 assertNotNull(entry);
-assertEquals(100500L, entry.getKey().field("id"));
+assertEquals(Long.valueOf(100500L), entry.getKey().field("id"));
 assertEquals(val1, entry.getValue().deserialize());
 }
 }

[10/50] [abbrv] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

[av]

.NET: Removed unnecessary "Contains" word from namespace descriptions.


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

Branch: refs/heads/master
Commit: 12d1528fb705c4d3812a5a5ccaeb6dee6a924422
Parents: 359bf21
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:55:56 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:55:56 2015 +0300

--
 modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs  | 2 +-
 .../Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs  | 2 +-
 .../dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs  | 2 +-
 .../dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs  | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs| 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs| 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs  | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs  | 2 +-
 modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs| 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs   | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs   | 2 +-
 .../dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
index fd01160..c949b50 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
@@ -18,7 +18,7 @@
 #pragma warning disable 1587   // invalid XML comment
 
 /// 
-/// Contains Ignite Binary Objects API classes.
+/// Ignite Binary Objects API classes.
 /// 
 namespace Apache.Ignite.Core.Binary
 {

http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
index 4dd7439..ae7355c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
@@ -18,7 +18,7 @@
 #pragma warning disable 1587   // invalid XML comment
 
 /// 
-/// Contains main Data Grid APIs.
+/// Main Data Grid APIs.
 /// 
 namespace Apache.Ignite.Core.Cache
 {

http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
index 2ba6dfe..81b02bf 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
@@ -18,7 +18,7 @@
 #pragma warning disable 1587   // invalid XML comment
 
 /// 
-/// Contains APIs for creating and executing cache continuous queries.
+/// APIs for creating and executing cache continuous queries.
 /// 
 namespace Apache.Ignite.Core.Cache.Query.Continuous
 {

http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
index 2e83364..4c4ecb5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
@@ -18,7 +18,7 @@
 #pragma warning disable 1587   // invalid XML comment
 
 /// 
-/// Contains APIs for creating and executing cache queries.
+/// APIs for creating and executing 

[40/50] [abbrv] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Also fixed several test issues.

[av]

ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held. Also fixed several test issues.


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

Branch: refs/heads/master
Commit: 53ec76ffe65d5788fc1ffa32c2fba66222e51dcc
Parents: 66b33bc
Author: sboikov 
Authored: Wed Dec 23 15:06:48 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 15:06:48 2015 +0300

--
 .../managers/communication/GridIoManager.java   |  39 +-
 .../processors/cache/GridCacheAdapter.java  |  47 ++-
 .../processors/cache/GridCacheProxyImpl.java|  29 ++
 .../cache/GridCacheSharedContext.java   |  10 +-
 .../processors/cache/IgniteCacheProxy.java  |  35 ++
 .../processors/cache/IgniteInternalCache.java   |  26 ++
 .../binary/CacheObjectBinaryProcessorImpl.java  |   4 +-
 .../distributed/dht/GridDhtLockFuture.java  |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  95 +++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 150 ---
 .../colocated/GridDhtColocatedLockFuture.java   |  11 +-
 .../distributed/near/GridNearLockFuture.java|  11 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   5 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   5 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  12 +-
 .../transactions/IgniteTxLocalAdapter.java  |   2 +
 .../cache/transactions/IgniteTxManager.java |  61 ++-
 .../datastreamer/DataStreamProcessor.java   |  12 +-
 .../ignite/internal/util/lang/GridFunc.java |   1 +
 .../test/config/websession/example-cache.xml|   9 +-
 ...niteClientReconnectFailoverAbstractTest.java |   3 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  22 +-
 .../cache/GridCacheAbstractSelfTest.java|   3 +-
 ...yMetadataUpdateChangingTopologySelfTest.java |   7 +-
 ...niteBinaryMetadataUpdateNodeRestartTest.java | 411 +++
 .../distributed/IgniteCacheManyClientsTest.java |   2 +
 ...ContinuousQueryFailoverAbstractSelfTest.java | 128 +++---
 ...ridCacheContinuousQueryAbstractSelfTest.java |   3 +
 .../service/ClosureServiceClientsNodesTest.java |  22 +-
 .../GridServiceProcessorStopSelfTest.java   |  21 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |  21 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  14 +-
 .../testframework/GridSpiTestContext.java   |  18 +-
 .../cache/websession/WebSessionFilter.java  |  82 ++--
 .../cache/websession/WebSessionListener.java|  25 +-
 .../internal/websession/WebSessionSelfTest.java |   2 -
 36 files changed, 1023 insertions(+), 327 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/53ec76ff/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 bf7c7e4..42f8dae 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
@@ -666,6 +666,7 @@ public class GridIoManager extends 
GridManagerAdapter 0 || skipOnTimeout;
 
-send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, 
ackClosure);
+send(node, 

[38/50] [abbrv] ignite git commit: IGNITE-2200 - Fixed deployment. - Fixes #367.

[av]

IGNITE-2200 - Fixed deployment. - Fixes #367.

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

Branch: refs/heads/master
Commit: 16a9e6da2a8baca35d9b95bc0a28995d3f1c5780
Parents: 66b33bc
Author: Alexey Goncharuk 
Authored: Wed Dec 23 14:52:28 2015 +0300
Committer: Alexey Goncharuk 
Committed: Wed Dec 23 14:52:28 2015 +0300

--
 .../query/GridCacheDistributedQueryManager.java |   6 +-
 ...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 .../p2p/CacheDeploymentAlwaysTruePredicate.java |  29 +
 4 files changed, 149 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/16a9e6da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 7f63b4c..353fbd3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -570,7 +570,8 @@ public class GridCacheDistributedQueryManager extends 
GridCacheQueryManage
 qry.query().subjectId(),
 qry.query().taskHash(),
 queryTopologyVersion(),
-cctx.deploymentEnabled());
+// Force deployment anyway if scan query is used.
+cctx.deploymentEnabled() || (qry.query().scanFilter() != null 
&& cctx.gridDeploy().enabled()));
 
 addQueryFuture(req.id(), fut);
 
@@ -616,7 +617,8 @@ public class GridCacheDistributedQueryManager extends 
GridCacheQueryManage
 qry.subjectId(),
 qry.taskHash(),
 queryTopologyVersion(),
-cctx.deploymentEnabled());
+// Force deployment anyway if scan query is used.
+cctx.deploymentEnabled() || (qry.scanFilter() != null && 
cctx.gridDeploy().enabled()));
 
 sendRequest(fut, req, nodes);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/16a9e6da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
new file mode 100644
index 000..e1fbb0d
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import 

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

[av]

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


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

Branch: refs/heads/master
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov 
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:17:06 2015 +0300

--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--

[06/50] [abbrv] ignite git commit: ignite-1.5 Fixed client discovery impl to skip node failed message processing while disconnected.

[av]

ignite-1.5 Fixed client discovery impl to skip node failed message processing 
while disconnected.


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

Branch: refs/heads/master
Commit: d4687d9f636b38736d327351ca4b22c3262a2ae8
Parents: 58b55b5
Author: sboikov 
Authored: Mon Dec 21 10:19:51 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 10:19:51 2015 +0300

--
 .../discovery/GridDiscoveryManager.java |  4 +-
 .../dht/preloader/GridDhtPreloader.java | 29 
 .../ignite/spi/discovery/tcp/ClientImpl.java| 48 +++-
 .../IgniteClientReconnectCacheTest.java | 26 +--
 .../cache/IgniteCachePutAllRestartTest.java |  2 +-
 5 files changed, 53 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/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 92d66d7..72a2bef 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
@@ -1641,7 +1641,9 @@ public class GridDiscoveryManager extends 
GridManagerAdapter {
 
 if (cache == null) {
 throw new IgniteException("Failed to resolve nodes topology 
[cacheName=" + cacheName +
-", topVer=" + topVer + ", history=" + discoCacheHist.keySet() +
+", topVer=" + topVer +
+", history=" + discoCacheHist.keySet() +
+", snap=" + snap +
 ", locNode=" + ctx.discovery().localNode() + ']');
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index c46a66c..f0054e4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -48,7 +48,6 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
-import org.apache.ignite.internal.util.GridAtomicLong;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -92,9 +91,6 @@ public class GridDhtPreloader extends 
GridCachePreloaderAdapter {
 /** */
 private GridDhtPartitionTopology top;
 
-/** Topology version. */
-private final GridAtomicLong topVer = new GridAtomicLong();
-
 /** Force key futures. */
 private final ConcurrentMap 
forceKeyFuts = newMap();
 
@@ -149,11 +145,6 @@ public class GridDhtPreloader extends 
GridCachePreloaderAdapter {
 assert e.type() != EVT_NODE_JOINED || n.order() > loc.order() 
: "Node joined with smaller-than-local " +
 "order [newOrder=" + n.order() + ", locOrder=" + 
loc.order() + ']';
 
-boolean set = topVer.setIfGreater(e.topologyVersion());
-
-assert set : "Have you configured TcpDiscoverySpi for your 
in-memory data grid? [newVer=" +
-e.topologyVersion() + ", curVer=" + topVer.get() + ", 
evt=" + e + ']';
-
 if (e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED) {
 for (GridDhtAssignmentFetchFuture fut : 
pendingAssignmentFetchFuts.values())
 fut.onNodeLeft(e.eventNode().id());
@@ -238,20 +229,6 @@ public 

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

[av]

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


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

Branch: refs/heads/master
Commit: 9db05f5f6c64d3b6473d65a501a31287a6c7942c
Parents: 53ec76f 16a9e6d
Author: sboikov 
Authored: Wed Dec 23 15:07:22 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 15:07:22 2015 +0300

--
 .../query/GridCacheDistributedQueryManager.java |   6 +-
 ...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 .../p2p/CacheDeploymentAlwaysTruePredicate.java |  29 +
 4 files changed, 149 insertions(+), 2 deletions(-)
--

[05/50] [abbrv] ignite git commit: IGNITE-2169 Fixed incorrect null schema generation.

[av]

IGNITE-2169 Fixed incorrect null schema generation.


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

Branch: refs/heads/master
Commit: 58b55b53f15f0752c8fff97e31b94984a67d081b
Parents: 0c7dfec
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 10:20:37 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 10:20:37 2015 +0700

--
 .../ignite/schema/generator/CodeGenerator.java  |   7 +-
 .../schema/test/AbstractSchemaImportTest.java   |  18 +
 .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++
 .../apache/ignite/schema/test/model/TstKey.txt  |  96 
 .../schema/test/model/ignite-type-metadata.xml  | 180 +++
 .../test/parser/DbMetadataParserTest.java   |  17 +-
 6 files changed, 820 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
--
diff --git 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index 0e52acc..769c7d9 100644
--- 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -606,8 +606,11 @@ public class CodeGenerator {
 
 add2(src, "jdbcType.setCacheName(cacheName);");
 
-// Database info.
-add2(src, "jdbcType.setDatabaseSchema(\"" + pojo.schema() + 
"\");");
+// Database schema.
+if (pojo.schema() != null)
+add2(src, "jdbcType.setDatabaseSchema(\"" + pojo.schema() + 
"\");");
+
+// Database table.
 add2(src, "jdbcType.setDatabaseTable(\"" + tbl + "\");");
 
 // Java info.

http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
--
diff --git 
a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
 
b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
index bf0f94a..97f0f87 100644
--- 
a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
+++ 
b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
@@ -97,6 +97,24 @@ public abstract class AbstractSchemaImportTest extends 
TestCase {
 " tsCol TIMESTAMP," +
 " arrCol BINARY(10))");
 
+stmt.executeUpdate("CREATE SCHEMA IF NOT EXISTS TESTSCHEMA");
+
+stmt.executeUpdate("CREATE TABLE IF NOT EXISTS TESTSCHEMA.TST(pk 
INTEGER PRIMARY KEY, " +
+" boolCol BOOLEAN NOT NULL," +
+" byteCol TINYINT NOT NULL," +
+" shortCol SMALLINT NOT NULL," +
+" intCol INTEGER NOT NULL, " +
+" longCol BIGINT NOT NULL," +
+" floatCol REAL NOT NULL," +
+" doubleCol DOUBLE NOT NULL," +
+" doubleCol2 DOUBLE NOT NULL, " +
+" bigDecimalCol DECIMAL(10, 0)," +
+" strCol VARCHAR(10)," +
+" dateCol DATE," +
+" timeCol TIME," +
+" tsCol TIMESTAMP, " +
+" arrCol BINARY(10))");
+
 conn.commit();
 
 U.closeQuiet(stmt);

http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
--
diff --git 
a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
 
b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
new file mode 100644
index 000..23d61d0
--- /dev/null
+++ 
b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
@@ -0,0 +1,506 @@
+/*
+ * 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
+ *
+ *  

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

[av]

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


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

Branch: refs/heads/master
Commit: ece33ec4fa7f8c0d53014bda02ab0b7c1a89eef2
Parents: 48a1e0a bda0b19
Author: vozerov-gridgain 
Authored: Fri Dec 18 16:08:46 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 16:08:46 2015 +0300

--
 ...ComputeClientBinaryTaskExecutionExample.java |  4 +-
 .../CacheClientBinaryPutGetExample.java |  6 +-
 .../datagrid/CacheClientBinaryQueryExample.java | 10 +--
 .../examples/datagrid/CacheQueryExample.java|  4 +-
 .../apache/ignite/examples/model/Address.java   | 72 +++
 .../apache/ignite/examples/model/Employee.java  | 93 
 .../ignite/examples/model/EmployeeKey.java  | 93 
 .../ignite/examples/model/Organization.java | 85 --
 .../ignite/examples/model/OrganizationType.java | 32 +++
 .../apache/ignite/examples/model/Person.java|  2 +-
 .../ignite/examples/model/binary/Address.java   | 72 ---
 .../ignite/examples/model/binary/Employee.java  | 93 
 .../examples/model/binary/EmployeeKey.java  | 93 
 .../examples/model/binary/Organization.java | 93 
 .../examples/model/binary/OrganizationType.java | 32 ---
 .../ignite/examples/model/package-info.java | 23 +
 .../ignite/internal/binary/BinaryContext.java   | 16 +++-
 17 files changed, 417 insertions(+), 406 deletions(-)
--

[37/50] [abbrv] ignite git commit: ignite-2175

[av]

ignite-2175


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

Branch: refs/heads/master
Commit: 60eec118428bc06f3107fee3ad55dd9a1c6d5cf3
Parents: 66b33bc
Author: Anton Vinogradov 
Authored: Wed Dec 23 13:35:14 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 13:35:14 2015 +0300

--
 .../ignite/internal/processors/query/GridQueryProcessor.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60eec118/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 7d1311f..4808e96 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1076,6 +1076,11 @@ public class GridQueryProcessor extends 
GridProcessorAdapter {
 clsName = clsName.substring(0, clsName.length() - 2) + "_array";
 }
 
+int parentEnd = clsName.lastIndexOf('$');
+
+if (parentEnd >= 0)
+clsName = clsName.substring(parentEnd + 1);
+
 return clsName;
 }
 

[15/50] [abbrv] ignite git commit: ignite-1.5 Minor javadocs.

[av]

ignite-1.5 Minor javadocs.


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

Branch: refs/heads/master
Commit: d8576b8f9850b53c240bd21fab7fe19abd717225
Parents: da24df9
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:14:17 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 11:14:17 2015 +0700

--
 .../org/apache/ignite/internal/visor/query/VisorQueryJob.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d8576b8f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index dcca671..0f2f82e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -216,8 +216,14 @@ public class VisorQueryJob extends VisorJob

[22/50] [abbrv] ignite git commit: IGNITE-2229 - Added test for the ticket.

[av]

IGNITE-2229 - Added test for the ticket.


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

Branch: refs/heads/master
Commit: 3ee096613bbbe9538de949cfe20fafd7d2471de1
Parents: bbdb202
Author: Alexey Goncharuk 
Authored: Tue Dec 22 12:20:39 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Dec 22 12:21:22 2015 +0300

--
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 1 file changed, 145 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3ee09661/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
new file mode 100644
index 000..5921ba0
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.TextQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ * TODO https://issues.apache.org/jira/browse/IGNITE-2229
+ * Tests cache in-place modification logic with iterative value increment.
+ */
+public class IgniteCacheFullTextQueryNodeJoiningSelfTest extends 
GridCommonAbstractTest {
+/** IP finder. */
+private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
+/** Number of nodes to test on. */
+private static final int GRID_CNT = 3;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration cache = new CacheConfiguration();
+
+cache.setCacheMode(PARTITIONED);
+cache.setAtomicityMode(atomicityMode());
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setBackups(1);
+
+QueryEntity qryEntity = new QueryEntity();
+
+qryEntity.setKeyType(AffinityKey.class.getName());
+qryEntity.setValueType(IndexedEntity.class.getName());
+
+LinkedHashMap fields = new LinkedHashMap<>();
+
+fields.put("val", String.class.getName());
+
+qryEntity.setFields(fields);
+
+qryEntity.setIndexes(Arrays.asList(new QueryIndex("val", 
QueryIndexType.FULLTEXT)));
+
+

[26/50] [abbrv] ignite git commit: ignite-1.5 Fixed benchmark configuration.

[av]

ignite-1.5 Fixed benchmark configuration.


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

Branch: refs/heads/master
Commit: 60d157bde27f406bd52b3fe166f7375cf881a19c
Parents: bbdb202
Author: sboikov 
Authored: Tue Dec 22 13:29:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:29:20 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d157bd/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index def652a..43fb7d7 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-put-offheap-val-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\

[35/50] [abbrv] ignite git commit: IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.

[av]

IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.


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

Branch: refs/heads/master
Commit: fbb4982081d08ea9d8d2971a1db49e9fed547304
Parents: b6dab09
Author: thatcoach 
Authored: Wed Dec 23 09:01:13 2015 +0300
Committer: thatcoach 
Committed: Wed Dec 23 09:01:13 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 82 ++--
 1 file changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fbb49820/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index ac9771f..9f7beb8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -17,40 +17,6 @@
 
 package org.apache.ignite.internal.binary;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetSocketAddress;
-import java.sql.Timestamp;
-import java.util.AbstractQueue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import junit.framework.Assert;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryCollectionFactory;
@@ -87,9 +53,43 @@ import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 import sun.misc.Unsafe;
 
-import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.sql.Timestamp;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.*;
+import static org.junit.Assert.*;
 
 /**
  * Binary marshaller tests.
@@ -2339,8 +2339,8 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 // Check direct field access.
 assertNull(objBin.field(fieldName));
-assertEquals(1, objBin.field(fieldNameA));
-assertEquals(2, objBin.field(fieldNameB));
+assertEquals(Integer.valueOf(1), objBin.field(fieldNameA));
+assertEquals(Integer.valueOf(2), objBin.field(fieldNameB));
 
 // Check metadata.
 BinaryType type = objBin.type();
@@ -2363,8 +2363,8 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 assert fieldB.exists(objBin);
 
 assertNull(field.value(objBin));
-

[28/50] [abbrv] ignite git commit: 1.5.0-final-SNAPSHOT

[av]

1.5.0-final-SNAPSHOT


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

Branch: refs/heads/master
Commit: 73d8b90488e5b7033cc59aca341dd3e5dda8bcff
Parents: 276207a
Author: Ignite Teamcity 
Authored: Tue Dec 22 14:25:05 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 14:25:05 2015 +0300

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

[45/50] [abbrv] ignite git commit: ignite-1.5 Implemented start of local node with specified configuration and custom environment variables.

[av]

ignite-1.5 Implemented start of local node with specified configuration and 
custom environment variables.


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

Branch: refs/heads/master
Commit: 8f5445ab934c0133f45a87b220b5d4841c9bca43
Parents: 77e77e4
Author: Alexey Kuznetsov 
Authored: Thu Dec 24 14:41:18 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Dec 24 14:41:18 2015 +0700

--
 .../internal/visor/util/VisorTaskUtils.java | 122 ++-
 1 file changed, 118 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5445ab/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 579f50c..83dbda0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.visor.util;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.net.InetAddress;
@@ -36,6 +37,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
@@ -101,6 +103,9 @@ public class VisorTaskUtils {
 /** Log files count limit */
 public static final int LOG_FILES_COUNT_LIMIT = 5000;
 
+/** */
+private static final int DFLT_BUFFER_SIZE = 4096;
+
 /** Only task event types that Visor should collect. */
 public static final int[] VISOR_TASK_EVTS = {
 EVT_JOB_STARTED,
@@ -558,7 +563,7 @@ public class VisorTaskUtils {
 try (RandomAccessFile raf = new RandomAccessFile(f, "r")) {
 FileChannel ch = raf.getChannel();
 
-ByteBuffer buf = ByteBuffer.allocate(4096);
+ByteBuffer buf = ByteBuffer.allocate(DFLT_BUFFER_SIZE);
 
 ch.read(buf);
 
@@ -823,6 +828,85 @@ public class VisorTaskUtils {
 }
 
 /**
+ * Start local node in terminal.
+ *
+ * @param log Logger.
+ * @param cfgPath Path to node configuration to start with.
+ * @param nodesToStart Number of nodes to start.
+ * @param quite If {@code true} then start node in quiet mode.
+ * @param envVars Optional map with environment variables.
+ * @return List of started processes.
+ * @throws IOException If failed to start.
+ */
+public static List startLocalNode(@Nullable IgniteLogger log, 
String cfgPath, int nodesToStart,
+boolean quite, Map envVars) throws IOException {
+String quitePar = quite ? "" : "-v";
+
+String cmdFile = new File("bin", U.isWindows() ? "ignite.bat" : 
"ignite.sh").getPath();
+
+File cmdFilePath = U.resolveIgnitePath(cmdFile);
+
+if (cmdFilePath == null || !cmdFilePath.exists())
+throw new FileNotFoundException(String.format("File not found: 
%s", cmdFile));
+
+String ignite = cmdFilePath.getCanonicalPath();
+
+File nodesCfgPath = U.resolveIgnitePath(cfgPath);
+
+if (nodesCfgPath == null || !nodesCfgPath.exists())
+throw new FileNotFoundException(String.format("File not found: 
%s", cfgPath));
+
+String nodeCfg = nodesCfgPath.getCanonicalPath();
+
+log(log, String.format("Starting %s local %s with '%s' config", 
nodesToStart, nodesToStart > 1 ? "nodes" : "node", nodeCfg));
+
+List run = new ArrayList<>();
+
+try {
+for (int i = 0; i < nodesToStart; i++) {
+if (U.isMacOs()) {
+StringBuilder envs = new StringBuilder();
+
+Map macEnv = new 
HashMap<>(System.getenv());
+
+if (envVars != null) {
+for (Map.Entry ent : 
envVars.entrySet())
+if (macEnv.containsKey(ent.getKey())) {
+String old = macEnv.get(ent.getKey());
+
+if (old == null || old.isEmpty())
+macEnv.put(ent.getKey(), ent.getValue());
+else
+

[44/50] [abbrv] ignite git commit: ignite-1.5 Fixed test.

[av]

ignite-1.5 Fixed test.


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

Branch: refs/heads/master
Commit: 77e77e40fb9463ba3bccd01ddf3231ff9ef6f327
Parents: bd05fa9
Author: sboikov 
Authored: Thu Dec 24 10:25:23 2015 +0300
Committer: sboikov 
Committed: Thu Dec 24 10:25:23 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/77e77e40/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 9f7beb8..20b2258 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -2532,11 +2532,10 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 assertNull(bVal);
 
-for (NonSerializableA a : bArr) {
+for (NonSerializableA a : bArr)
 a.checkAfterUnmarshalled();
-}
 
-assertEquals(floatVal, 567.89F);
+assertEquals(floatVal, 567.89F, 0);
 }
 }
 

[25/50] [abbrv] ignite git commit: 1.5.0.final-SNAPSHOT

[av]

1.5.0.final-SNAPSHOT


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

Branch: refs/heads/master
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index edf867d..3bacd8f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -47,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
--
diff --git 

[03/50] [abbrv] ignite git commit: Minor fix.

[av]

Minor fix.


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

Branch: refs/heads/master
Commit: a34bcc8ac44c7db168e49a336596396389b00e1e
Parents: ece33ec
Author: vozerov-gridgain 
Authored: Fri Dec 18 17:40:33 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 17:40:33 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/a34bcc8a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
index df20646..70f5ea6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
@@ -33,6 +33,9 @@ import 
org.apache.ignite.plugin.extensions.communication.MessageWriter;
  */
 public abstract class CacheObjectAdapter implements CacheObject, 
Externalizable {
 /** */
+private static final long serialVersionUID = 2006765505127197251L;
+
+/** */
 @GridToStringInclude
 @GridDirectTransient
 protected Object val;

[32/50] [abbrv] ignite git commit: IGNITE-2116

[av]

IGNITE-2116


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

Branch: refs/heads/master
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

[42/50] [abbrv] ignite git commit: Merge branch 'ignite-2175' into ignite-1.5

[av]

Merge branch 'ignite-2175' into ignite-1.5


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

Branch: refs/heads/master
Commit: 29c47784eb6d07c20d4d72000522668dd381c175
Parents: 9db05f5 60eec11
Author: Anton Vinogradov 
Authored: Wed Dec 23 17:32:28 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 23 17:32:28 2015 +0300

--
 .../ignite/internal/processors/query/GridQueryProcessor.java| 5 +
 1 file changed, 5 insertions(+)
--

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

[av]

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


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

Branch: refs/heads/master
Commit: 36261adfc87ae8c0e356b2add0160282f4164398
Parents: 0766ad7 debe34d
Author: Anton Vinogradov 
Authored: Thu Dec 24 13:56:45 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 24 13:56:45 2015 +0300

--
 README.txt  |   4 +-
 RELEASE_NOTES.txt   |   1 +
 assembly/dependencies-fabric-lgpl.xml   |   7 +
 assembly/dependencies-fabric.xml|   7 +
 assembly/release-fabric-base.xml|   4 +-
 bin/ignitevisorcmd.bat  |   1 +
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 .../hibernate/CacheHibernateStoreExample.java   |   8 +
 .../datagrid/store/hibernate/Person.hbm.xml |   6 +-
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   7 +-
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |  12 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  17 +-
 .../store/auto/CacheBinaryAutoStoreExample.java |   9 +-
 .../datagrid/CacheEntryProcessorExample.java| 157 ++
 .../examples/datagrid/CacheQueryExample.java|  15 +-
 .../starschema/CacheStarSchemaExample.java  |   9 +-
 .../store/dummy/CacheDummyPersonStore.java  | 113 -
 .../store/dummy/CacheDummyStoreExample.java | 133 -
 .../datagrid/store/dummy/package-info.java  |  22 -
 .../store/jdbc/CacheJdbcPersonStore.java|  43 +-
 .../store/jdbc/CacheJdbcStoreExample.java   |  24 +-
 .../store/spring/CacheSpringPersonStore.java|  29 +-
 .../store/spring/CacheSpringStoreExample.java   |  12 +-
 .../datagrid/store/spring/package-info.java |   2 +-
 .../apache/ignite/examples/model/Address.java   |  72 +++
 .../apache/ignite/examples/model/Employee.java  |  93 
 .../ignite/examples/model/EmployeeKey.java  |  93 
 .../ignite/examples/model/Organization.java |  85 +++-
 .../ignite/examples/model/OrganizationType.java |  32 ++
 .../apache/ignite/examples/model/Person.java|   2 +-
 .../ignite/examples/model/binary/Address.java   |  72 ---
 .../ignite/examples/model/binary/Employee.java  |  93 
 .../examples/model/binary/EmployeeKey.java  |  93 
 .../examples/model/binary/Organization.java |  93 
 .../examples/model/binary/OrganizationType.java |  32 --
 .../ignite/examples/model/package-info.java |  23 +
 .../streaming/StreamVisitorExample.java |  40 +-
 .../datagrid/CacheEntryProcessorExample.java| 147 ++
 .../ScalarCacheEntryProcessorExample.scala  | 125 +
 .../examples/ScalarSnowflakeSchemaExample.scala |  31 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |  18 +-
 .../java8/examples/CacheExamplesSelfTest.java   |   8 +
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 +
 modules/aop/pom.xml |   2 +-
 .../apache/ignite/gridify/AbstractAopTest.java  |  32 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   2 +-
 modules/clients/pom.xml |  62 ++-
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../JettyRestProcessorAbstractSelfTest.java |  25 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   7 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  19 +
 .../java/org/apache/ignite/IgniteCache.java |   8 +-
 .../org/apache/ignite/binary/BinaryObject.java  |  15 +
 .../binary/BinaryReflectiveSerializer.java  |  33 ++
 .../ignite/binary/BinaryTypeConfiguration.java  |  20 +-
 .../org/apache/ignite/cache/CacheManager.java   |   4 +-
 .../ignite/cache/affinity/AffinityKey.java  |   2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |   2 +-
 .../configuration/CacheConfiguration.java   |  63 ++-
 .../apache/ignite/internal/IgniteKernal.java|  36 +-
 .../ignite/internal/IgniteVersionUtils.java |   5 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  51 +-
 .../internal/binary/BinaryClassDescriptor.java  | 181 ---
 .../ignite/internal/binary/BinaryContext.java   | 123 -
 .../internal/binary/BinaryEnumObjectImpl.java   |   7 +
 .../internal/binary/BinaryFieldAccessor.java|   3 -
 .../ignite/internal/binary/BinaryMetadata.java  |  91 +++-
 .../internal/binary/BinaryObjectExImpl.java |   7 +
 

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

[av]

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


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

Branch: refs/heads/ignite-1.5.1-2
Commit: cca90c77f56db5d96f99610ca8dc48f6066ac1b3
Parents: 8e6b365 f1f8cda
Author: Anton Vinogradov 
Authored: Wed Dec 30 09:57:01 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 30 09:57:01 2015 +0300

--
 assembly/release-fabric-base.xml | 1 +
 1 file changed, 1 insertion(+)
--

[1/2] ignite git commit: Platforms now publish DEVNOTES.txt

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 8e6b365eb -> cca90c77f


Platforms now publish DEVNOTES.txt


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

Branch: refs/heads/ignite-1.5.1-2
Commit: f1f8cda2f3f62231f42a59951bf34c39577c1bec
Parents: f97dc9f
Author: Anton Vinogradov 
Authored: Tue Dec 29 13:02:42 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 29 13:02:42 2015 +0300

--
 assembly/release-fabric-base.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f8cda2/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 5be9f8f..9f9d310 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -104,6 +104,7 @@
 /platforms/cpp
 
 README.txt
+DEVNOTES.txt
 
 
 

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-rc1-snapshot [deleted] 189d4b765

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-snapshot [deleted] 590424d45

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-rc1 [deleted] ed19ed302

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test [deleted] b0cdfe2d8

svn commit: r1722349 - /ignite/site/trunk/releases/2.2.2-test/

[av]

Author: av
Date: Wed Dec 30 15:19:22 2015
New Revision: 1722349

URL: http://svn.apache.org/viewvc?rev=1722349=rev
Log:
test release removed

Removed:
ignite/site/trunk/releases/2.2.2-test/

ignite git commit: Ignite-2087 (cherry picked from commit bd1f506)

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 c3fe96787 -> 11bee9178


Ignite-2087
(cherry picked from commit bd1f506)


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 11bee91787dd3d6f2a57739e26622e55428f3b1c
Parents: c3fe967
Author: Anton Vinogradov 
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 17 14:30:32 2015 +0300

--
 .../org/apache/ignite/cache/CacheManager.java   |  2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 51 +++-
 .../java/org/apache/ignite/IgniteSpring.java|  4 +-
 3 files changed, 43 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/11bee917/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements 
javax.cache.CacheManager {
 ignite = (IgniteKernal)IgnitionEx.start(cfg);
 }
 else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
 
 kernalGateway = ignite.context().gateway();
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/11bee917/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 4f6c6d9..5153fb3 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
@@ -495,7 +495,7 @@ public class IgnitionEx {
 URL url = U.resolveIgniteUrl(DFLT_CFG);
 
 if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
 
 U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?): 
" + DFLT_CFG);
 
@@ -581,7 +581,7 @@ public class IgnitionEx {
 return start(cfg);
 }
 else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
 }
 
 /**
@@ -697,6 +697,7 @@ public class IgnitionEx {
  * @param springCfgPath Spring XML configuration file path or URL. This 
cannot be {@code null}.
  * @param gridName Grid name that will override default.
  * @param springCtx Optional Spring application context, possibly {@code 
null}.
+ * @param ldr Optional class loader that will be used by default.
  *  Spring bean definitions for bean injection are taken from this 
context.
  *  If provided, this context can be injected into grid tasks and grid 
jobs using
  *  {@link SpringApplicationContextResource 
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
  *  been started or Spring XML configuration file is invalid.
  */
 public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws 
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader 
ldr) throws IgniteCheckedException {
 URL url = U.resolveSpringUrl(springCfgPath);
 
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
 }
 
 /**
@@ -730,7 +731,28 @@ public class IgnitionEx {
  *  been started or Spring XML configuration file is invalid.
  */
 public static Ignite start(URL springCfgUrl) throws IgniteCheckedException 
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file 
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all 
instances that may
+ * have been started so far will be stopped too.
+ * 
+ * Usually Spring XML configuration file 

svn commit: r11771 - /dev/ignite/2.2.2-test/

[av]

Author: av
Date: Tue Dec 29 13:32:11 2015
New Revision: 11771

Log:
test package removed

Removed:
dev/ignite/2.2.2-test/

svn commit: r11769 - /dev/ignite/2.2.2-test/

[av]

Author: av
Date: Tue Dec 29 13:08:34 2015
New Revision: 11769

Log:
test package removed

Removed:
dev/ignite/2.2.2-test/

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-snapshot [deleted] 94e5b5b78

svn commit: r11773 - /dev/ignite/2.2.2-test/

[av]

Author: av
Date: Tue Dec 29 13:38:30 2015
New Revision: 11773

Log:
test package removed

Removed:
dev/ignite/2.2.2-test/

svn commit: r11776 - /dev/ignite/2.2.2-test/

[av]

Author: av
Date: Tue Dec 29 14:06:51 2015
New Revision: 11776

Log:
test package removed

Removed:
dev/ignite/2.2.2-test/

ignite git commit: Platforms now publish DEVNOTES.txt

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 f97dc9fe3 -> f1f8cda2f


Platforms now publish DEVNOTES.txt


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

Branch: refs/heads/ignite-1.5
Commit: f1f8cda2f3f62231f42a59951bf34c39577c1bec
Parents: f97dc9f
Author: Anton Vinogradov 
Authored: Tue Dec 29 13:02:42 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 29 13:02:42 2015 +0300

--
 assembly/release-fabric-base.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f8cda2/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 5be9f8f..9f9d310 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -104,6 +104,7 @@
 /platforms/cpp
 
 README.txt
+DEVNOTES.txt
 
 
 

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-rc2 [deleted] 6f0849aa7

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/2.2.2-test-rc1 [deleted] 70bf4b6b2

svn commit: r11886 - /dev/ignite/2.2.2-test-rc1/

[av]

Author: av
Date: Tue Jan 12 13:41:45 2016
New Revision: 11886

Log:
test package removed

Removed:
dev/ignite/2.2.2-test-rc1/

[3/3] ignite git commit: GNITE-3235 Failed to initialize primitive boolean cache property of superclass

[av]

GNITE-3235 Failed to initialize primitive boolean cache property of superclass


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

Branch: refs/heads/ignite-3235
Commit: 7b3f4944dd4feb92cf88ae13f4ad0818b1a4f159
Parents: 50a8ec2
Author: Anton Vinogradov 
Authored: Fri Jun 3 19:10:36 2016 +0300
Committer: Anton Vinogradov 
Committed: Fri Jun 3 19:10:36 2016 +0300

--
 .../internal/jdbc2/JdbcResultSetSelfTest.java   | 60 +++-
 .../processors/query/GridQueryProcessor.java| 58 +--
 2 files changed, 87 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b3f4944/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
index 3607f53..8655b4f 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
@@ -60,7 +60,8 @@ public class JdbcResultSetSelfTest extends 
GridCommonAbstractTest {
 /** SQL query. */
 private static final String SQL =
 "select id, boolVal, byteVal, shortVal, intVal, longVal, floatVal, " +
-"doubleVal, bigVal, strVal, arrVal, dateVal, timeVal, tsVal, 
urlVal, f1, f2, f3, _val " +
+"doubleVal, bigVal, strVal, arrVal, dateVal, timeVal, tsVal, 
urlVal, f1, f2, f3, _val, " +
+"boolVal2, boolVal3 " +
 "from TestObject where id = 1";
 
 /** Statement. */
@@ -142,6 +143,8 @@ public class JdbcResultSetSelfTest extends 
GridCommonAbstractTest {
 TestObject o = new TestObject(id);
 
 o.boolVal = true;
+o.boolVal2 = true;
+o.boolVal3 = true;
 o.byteVal = 1;
 o.shortVal = 1;
 o.intVal = 1;
@@ -182,6 +185,46 @@ public class JdbcResultSetSelfTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If failed.
  */
+public void testBoolean2() throws Exception {
+ResultSet rs = stmt.executeQuery(SQL);
+
+int cnt = 0;
+
+while (rs.next()) {
+if (cnt == 0) {
+assert rs.getBoolean("boolVal2");
+assert rs.getBoolean(20);
+}
+
+cnt++;
+}
+
+assert cnt == 1;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testBoolean3() throws Exception {
+ResultSet rs = stmt.executeQuery(SQL);
+
+int cnt = 0;
+
+while (rs.next()) {
+if (cnt == 0) {
+assert rs.getBoolean("boolVal3");
+assert rs.getBoolean(21);
+}
+
+cnt++;
+}
+
+assert cnt == 1;
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testByte() throws Exception {
 ResultSet rs = stmt.executeQuery(SQL);
 
@@ -562,7 +605,20 @@ public class JdbcResultSetSelfTest extends 
GridCommonAbstractTest {
  * Test object.
  */
 @SuppressWarnings("UnusedDeclaration")
-private static class TestObject implements Serializable {
+private static class BaseTestObject implements Serializable {
+/** */
+@QuerySqlField(index = false)
+protected Boolean boolVal2;
+
+@QuerySqlField(index = false)
+protected boolean boolVal3;
+}
+
+/**
+ * Test object.
+ */
+@SuppressWarnings("UnusedDeclaration")
+private static class TestObject extends BaseTestObject {
 /** */
 @QuerySqlField
 private final int id;

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b3f4944/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 074e7e5..442763f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -17,6 +17,30 @@
 
 package org.apache.ignite.internal.processors.query;
 
+import java.lang.reflect.AccessibleObject;
+import 

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3235 [deleted] 7b3f4944d

[2/3] ignite git commit: IGNITE-3228: Minor fix.

[av]

IGNITE-3228: Minor fix.


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

Branch: refs/heads/ignite-3235
Commit: 50a8ec24fcae6cb673a257789724dd5a2dbb734a
Parents: 2490b0a
Author: vozerov-gridgain 
Authored: Thu Jun 2 11:47:38 2016 +0300
Committer: vozerov-gridgain 
Committed: Thu Jun 2 11:47:38 2016 +0300

--
 .../processors/hadoop/shuffle/collections/HadoopMultimapBase.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/50a8ec24/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
index 7dcff3d..39b7c51 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
@@ -225,8 +225,6 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 long newPageSize = nextPageSize(writtenSize + requestedSize);
 long newPagePtr = mem.allocate(newPageSize);
 
-System.out.println("ALLOCATED: " + newPageSize);
-
 HadoopOffheapBuffer b = out.buffer();
 
 b.set(newPagePtr, newPageSize);

[1/3] ignite git commit: IGNITE-3228: Hadoop: workaround/fix for inefficient memory usage.

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3235 [created] 7b3f4944d


IGNITE-3228: Hadoop: workaround/fix for inefficient memory usage.


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

Branch: refs/heads/ignite-3235
Commit: 2490b0aef17595247f8a6ae29482bc900e2a9a8d
Parents: 52a2637
Author: vozerov-gridgain 
Authored: Thu Jun 2 09:11:09 2016 +0300
Committer: vozerov-gridgain 
Committed: Thu Jun 2 09:11:09 2016 +0300

--
 .../shuffle/collections/HadoopMultimapBase.java | 90 +---
 1 file changed, 76 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2490b0ae/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
index e6995ca..7dcff3d 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java
@@ -30,7 +30,6 @@ import 
org.apache.ignite.internal.processors.hadoop.HadoopTaskContext;
 import 
org.apache.ignite.internal.processors.hadoop.shuffle.streams.HadoopDataInStream;
 import 
org.apache.ignite.internal.processors.hadoop.shuffle.streams.HadoopDataOutStream;
 import 
org.apache.ignite.internal.processors.hadoop.shuffle.streams.HadoopOffheapBuffer;
-import org.apache.ignite.internal.util.GridLongList;
 import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,7 +47,7 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 protected final int pageSize;
 
 /** */
-private final Collection allPages = new 
ConcurrentLinkedQueue<>();
+private final Collection allPages = new ConcurrentLinkedQueue<>();
 
 /**
  * @param jobInfo Job info.
@@ -64,11 +63,12 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 }
 
 /**
- * @param ptrs Page pointers.
+ * @param page Page.
  */
-private void deallocate(GridLongList ptrs) {
-while (!ptrs.isEmpty())
-mem.release(ptrs.remove(), ptrs.remove());
+private void deallocate(Page page) {
+assert page != null;
+
+mem.release(page.ptr, page.size);
 }
 
 /**
@@ -105,8 +105,8 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 
 /** {@inheritDoc} */
 @Override public void close() {
-for (GridLongList list : allPages)
-deallocate(list);
+for (Page page : allPages)
+deallocate(page);
 }
 
 /**
@@ -190,8 +190,8 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 /** */
 private long writeStart;
 
-/** Size and pointer pairs list. */
-private final GridLongList pages = new GridLongList(16);
+/** Current page. */
+private Page curPage;
 
 /**
  * @param ctx Task context.
@@ -222,11 +222,10 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 private long allocateNextPage(long requestedSize) {
 int writtenSize = writtenSize();
 
-long newPageSize = Math.max(writtenSize + requestedSize, pageSize);
+long newPageSize = nextPageSize(writtenSize + requestedSize);
 long newPagePtr = mem.allocate(newPageSize);
 
-pages.add(newPageSize);
-pages.add(newPagePtr);
+System.out.println("ALLOCATED: " + newPageSize);
 
 HadoopOffheapBuffer b = out.buffer();
 
@@ -240,10 +239,50 @@ public abstract class HadoopMultimapBase implements 
HadoopMultimap {
 
 writeStart = newPagePtr;
 
+// At this point old page is not needed, so we release it.
+Page oldPage = curPage;
+
+curPage = new Page(newPagePtr, newPageSize);
+
+if (oldPage != null)
+allPages.add(oldPage);
+
 return b.move(requestedSize);
 }
 
 /**
+ * Get next page size.
+ *
+ * @param required Required amount of data.
+ * @return Next page size.
+ */
+private long nextPageSize(long required) {
+   

ignite git commit: IGNITE-3216

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3216 9bf004690 -> b563a4870


IGNITE-3216


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

Branch: refs/heads/ignite-3216
Commit: b563a487094fd309c0da569d8d73afc40ab6bb0c
Parents: 9bf0046
Author: Anton Vinogradov 
Authored: Wed Jun 8 18:21:31 2016 +0300
Committer: Anton Vinogradov 
Committed: Wed Jun 8 18:21:31 2016 +0300

--
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b563a487/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 012d001..18239b9 100644
--- 
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
@@ -8583,7 +8583,7 @@ public abstract class IgniteUtils {
 throw new IgniteCheckedException("Addresses can not be resolved 
[addr=" + addrs +
 ", hostNames=" + hostNames + ']');
 
-return F.viewSetReadOnly(res, F.identity());
+return Collections.unmodifiableCollection(res);
 }
 
 /**
@@ -8630,7 +8630,7 @@ public abstract class IgniteUtils {
 res.add(new InetSocketAddress(addr, port));
 }
 
-return F.viewSetReadOnly(res, F.identity());
+return Collections.unmodifiableCollection(res);
 }
 
 /**

ignite git commit: IGNITE-3216

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3216 efdd7b346 -> 9bf004690


IGNITE-3216


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

Branch: refs/heads/ignite-3216
Commit: 9bf004690d008d08337f461c8b86c20ceba98d60
Parents: efdd7b3
Author: Anton Vinogradov 
Authored: Tue Jun 7 10:21:48 2016 +0300
Committer: Anton Vinogradov 
Committed: Tue Jun 7 10:21:48 2016 +0300

--
 .../ignite/internal/util/IgniteUtilsSelfTest.java| 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9bf00469/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index 520fa76..d774065 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -742,6 +742,21 @@ public class IgniteUtilsSelfTest extends 
GridCommonAbstractTest {
 }
 
 /**
+ *
+ */
+public void testToSocketAddressesNoDuplicates() {
+Collection addrs = new ArrayList<>();
+
+addrs.add("127.0.0.1");
+addrs.add("localhost");
+
+Collection hostNames = new ArrayList<>();
+int port = 1234;
+
+assertEquals(1, U.toSocketAddresses(addrs, hostNames, port).size());
+}
+
+/**
  * Test enum.
  */
 private enum TestEnum {

[09/17] ignite git commit: IGNITE-3248: Optimized fileIds() usage.

[av]

IGNITE-3248: Optimized fileIds() usage.


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

Branch: refs/heads/ignite-3216
Commit: e409b67a14ed67025a4bdd5824d4cc3a02f4e920
Parents: b96afb2
Author: vozerov-gridgain 
Authored: Sun Jun 5 21:04:03 2016 +0300
Committer: vozerov-gridgain 
Committed: Sun Jun 5 21:04:03 2016 +0300

--
 .../internal/processors/igfs/IgfsImpl.java  | 18 +++---
 .../processors/igfs/IgfsInputStreamImpl.java|  2 +-
 .../processors/igfs/IgfsMetaManager.java| 34 --
 .../meta/IgfsClientMetaIdsForPathCallable.java  | 65 
 .../meta/IgfsClientMetaInfoForPathCallable.java | 63 +++
 .../processors/igfs/IgfsOneClientNodeTest.java  |  2 +-
 6 files changed, 167 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e409b67a/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 b7b3fac..9087ff0 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
@@ -660,7 +660,7 @@ public final class IgfsImpl implements IgfsEx {
 return new IgfsFileImpl(path, info, data.groupBlockSize());
 }
 
-List fileIds = meta.fileIds(path);
+List fileIds = meta.idsForPath(path);
 
 IgniteUuid fileId = fileIds.get(fileIds.size() - 1);
 
@@ -938,7 +938,8 @@ public final class IgfsImpl implements IgfsEx {
 }
 }
 }
-} else if (mode == PRIMARY) {
+}
+else if (mode == PRIMARY) {
 checkConflictWithPrimary(path);
 
 throw new IgfsPathNotFoundException("Failed to list files 
(path not found): " + path);
@@ -993,7 +994,7 @@ public final class IgfsImpl implements IgfsEx {
 return os;
 }
 
-IgfsEntryInfo info = meta.info(meta.fileId(path));
+IgfsEntryInfo info = meta.infoForPath(path);
 
 if (info == null) {
 checkConflictWithPrimary(path);
@@ -1144,7 +1145,7 @@ public final class IgfsImpl implements IgfsEx {
 return new IgfsEventAwareOutputStream(path, desc.info(), 
bufferSize(bufSize), mode, batch);
 }
 
-final List ids = meta.fileIds(path);
+final List ids = meta.idsForPath(path);
 
 final IgniteUuid id = ids.get(ids.size() - 1);
 
@@ -1259,8 +1260,7 @@ public final class IgfsImpl implements IgfsEx {
 IgfsMode mode = resolveMode(path);
 
 // Check memory first.
-IgniteUuid fileId = meta.fileId(path);
-IgfsEntryInfo info = meta.info(fileId);
+IgfsEntryInfo info = meta.infoForPath(path);
 
 if (info == null && mode != PRIMARY) {
 assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
@@ -1469,7 +1469,7 @@ public final class IgfsImpl implements IgfsEx {
 @Nullable private FileDescriptor getFileDescriptor(IgfsPath path) throws 
IgniteCheckedException {
 assert path != null;
 
-List ids = meta.fileIds(path);
+List ids = meta.idsForPath(path);
 
 IgfsEntryInfo fileInfo = meta.info(ids.get(ids.size() - 1));
 
@@ -1645,13 +1645,13 @@ public final class IgfsImpl implements IgfsEx {
 
 switch (mode) {
 case PRIMARY:
-info = meta.info(meta.fileId(path));
+info = meta.infoForPath(path);
 
 break;
 
 case DUAL_SYNC:
 case DUAL_ASYNC:
-info = meta.info(meta.fileId(path));
+info = meta.infoForPath(path);
 
 if (info == null) {
 try {

http://git-wip-us.apache.org/repos/asf/ignite/blob/e409b67a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
 

[05/17] ignite git commit: IGNITE-3175 BigDecimal fields are not supported if query is executed from IgniteRDD: fix java.sql.Date mapping

[av]

IGNITE-3175 BigDecimal fields are not supported if query is executed from 
IgniteRDD: fix java.sql.Date mapping


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

Branch: refs/heads/ignite-3216
Commit: 4506c215b43ffb5e6319c318196e713c8c5aefbd
Parents: c10097e
Author: tledkov-gridgain 
Authored: Thu Jun 2 16:56:20 2016 +0300
Committer: Valentin Kulichenko 
Committed: Fri Jun 3 19:49:59 2016 +0300

--
 .../src/main/scala/org/apache/ignite/spark/IgniteRDD.scala  | 3 ++-
 .../ignite/spark/JavaStandaloneIgniteRDDSelfTest.java   | 9 -
 .../org/apache/ignite/spark/EntityTestAllTypeFields.scala   | 7 +--
 3 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4506c215/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
--
diff --git 
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala 
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
index 9ef9846..fa96212 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
@@ -315,9 +315,10 @@ class IgniteRDD[K, V] (
 case "java.lang.Long" ⇒ LongType
 case "java.lang.Float" ⇒ FloatType
 case "java.lang.Double" ⇒ DoubleType
-case "java.math.BigDecimal" ⇒ DecimalType.SYSTEM_DEFAULT
+case "java.math.BigDecimal" ⇒ DataTypes.createDecimalType()
 case "java.lang.String" ⇒ StringType
 case "java.util.Date" ⇒ DateType
+case "java.sql.Date" ⇒ DateType
 case "java.sql.Timestamp" ⇒ TimestampType
 case "[B" ⇒ BinaryType
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4506c215/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
--
diff --git 
a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
 
b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
index e600c6c..343158b 100644
--- 
a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
+++ 
b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
@@ -39,6 +39,7 @@ import org.apache.spark.sql.DataFrame;
 import org.apache.spark.sql.Row;
 import scala.Tuple2;
 
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.List;
@@ -279,10 +280,16 @@ public class JavaStandaloneIgniteRDDSelfTest extends 
GridCommonAbstractTest {
 assertTrue(String.format("+++ Fail on %s field", 
fieldName),
 
((Comparable)val).compareTo((BigDecimal)res) == 0);
 }
+else if (val instanceof java.sql.Date)
+assertEquals(String.format("+++ Fail on %s field", 
fieldName),
+val.toString(), df.collect()[0].get(0).toString());
 else if (val.getClass().isArray())
 assertTrue(String.format("+++ Fail on %s field", 
fieldName), 1 <= df.count());
-else
+else {
+assertTrue(String.format("+++ Fail on %s field", 
fieldName), df.collect().length > 0);
+assertTrue(String.format("+++ Fail on %s field", 
fieldName), df.collect()[0].size() > 0);
 assertEquals(String.format("+++ Fail on %s field", 
fieldName), val, df.collect()[0].get(0));
+}
 
 info(String.format("+++ Query on the filed: %s : %s passed", 
fieldName, f.getType().getSimpleName()));
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/4506c215/modules/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
--
diff --git 
a/modules/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
 
b/modules/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
index a936091..36d8274 100644
--- 
a/modules/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
+++ 
b/modules/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
@@ -35,7 +35,9 @@ class EntityTestAllTypeFields(
 @ScalarCacheQuerySqlField(index = true) val dateVal: Date,
 @ScalarCacheQuerySqlField(index = true) val 

[17/17] ignite git commit: IGNITE-3216

[av]

IGNITE-3216


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

Branch: refs/heads/ignite-3216
Commit: efdd7b346349e71083edcfc547d4fd5a5aef5d9b
Parents: 5254957
Author: Anton Vinogradov 
Authored: Mon Jun 6 19:02:43 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Jun 6 19:02:43 2016 +0300

--
 .../org/apache/ignite/internal/util/IgniteUtils.java  |  8 
 .../apache/ignite/internal/util/lang/GridFunc.java| 14 +-
 2 files changed, 9 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/efdd7b34/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 c898909..012d001 100644
--- 
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
@@ -8550,7 +8550,7 @@ public abstract class IgniteUtils {
  */
 public static Collection toInetAddresses(Collection 
addrs,
 Collection hostNames) throws IgniteCheckedException {
-List res = new ArrayList<>(addrs.size());
+Set res = new HashSet<>(addrs.size());
 
 Iterator hostNamesIt = hostNames.iterator();
 
@@ -8583,7 +8583,7 @@ public abstract class IgniteUtils {
 throw new IgniteCheckedException("Addresses can not be resolved 
[addr=" + addrs +
 ", hostNames=" + hostNames + ']');
 
-return F.viewListReadOnly(res, F.identity());
+return F.viewSetReadOnly(res, F.identity());
 }
 
 /**
@@ -8609,7 +8609,7 @@ public abstract class IgniteUtils {
  */
 public static Collection 
toSocketAddresses(Collection addrs,
 Collection hostNames, int port) {
-List res = new ArrayList<>(addrs.size());
+Set res = new HashSet<>(addrs.size());
 
 Iterator hostNamesIt = hostNames.iterator();
 
@@ -8630,7 +8630,7 @@ public abstract class IgniteUtils {
 res.add(new InetSocketAddress(addr, port));
 }
 
-return F.viewListReadOnly(res, F.identity());
+return F.viewSetReadOnly(res, F.identity());
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/efdd7b34/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 8eeca6b..39052dd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -1695,33 +1695,29 @@ public class GridFunc {
 }
 
 /**
- * Creates read-only light-weight view on given list with provided 
transformation.
+ * Creates read-only light-weight view on given set with provided 
transformation.
  * Resulting list will only "have" {@code transformed} elements. Note that 
only wrapping
  * list will be created and no duplication of data will occur.
  *
  * @param c Input list that serves as a base for the view.
  * @param trans Transformation closure.
  * @param  Type of the list.
- * @return Light-weight view on given list with provided transformation.
+ * @return Light-weight view on given set with provided transformation.
  */
 @SuppressWarnings("RedundantTypeArguments")
-public static  List viewListReadOnly(@Nullable final List c,
+public static  Set viewSetReadOnly(@Nullable final Set c,
 final IgniteClosure trans) {
 A.notNull(trans, "trans");
 
 if (isEmpty(c))
-return Collections.emptyList();
+return Collections.emptySet();
 
 assert c != null;
 
-return new GridSerializableList() {
+return new GridSerializableSet() {
 /** */
 private static final long serialVersionUID = 3126625219739967068L;
 
-@Override public T2 get(int idx) {
-return trans.apply(c.get(idx));
-}
-
 @NotNull
 @Override public Iterator iterator() {
 return F.iterator(c, trans, true);

[14/17] ignite git commit: Merge remote-tracking branch 'upstream/gridgain-7.5.25' into gridgain-7.5.25

[av]

Merge remote-tracking branch 'upstream/gridgain-7.5.25' into gridgain-7.5.25


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

Branch: refs/heads/ignite-3216
Commit: 2c0d95f23abf710af8b277f8d3df06e6d35441fa
Parents: 1308b12 6cb9947
Author: vozerov-gridgain 
Authored: Mon Jun 6 15:41:42 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Jun 6 15:41:42 2016 +0300

--
 .../ignite/internal/binary/BinaryUtils.java |  16 ++
 .../processors/cache/CacheObjectContext.java|   3 +
 .../GridCacheBinaryObjectsAbstractSelfTest.java |  78 +++-
 .../unsafe/GridOffheapSnapTreeSelfTest.java |   2 +-
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  23 +--
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  17 +-
 .../cache/IgniteCacheOffheapIndexScanTest.java  | 195 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 8 files changed, 321 insertions(+), 15 deletions(-)
--

[06/17] ignite git commit: IGFS-3246: IGFS: Infrastructure for client optimizations.

[av]

IGFS-3246: IGFS: Infrastructure for client optimizations.


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

Branch: refs/heads/ignite-3216
Commit: dcd722a3dc55d656e3517764c3b162d63f0d1ba0
Parents: 4506c21
Author: vozerov-gridgain 
Authored: Sun Jun 5 20:57:15 2016 +0300
Committer: vozerov-gridgain 
Committed: Sun Jun 5 20:57:15 2016 +0300

--
 .../internal/cluster/ClusterGroupAdapter.java   |   6 +
 .../ignite/internal/cluster/ClusterGroupEx.java |  14 ++-
 .../internal/processors/igfs/IgfsContext.java   |  14 +--
 .../internal/processors/igfs/IgfsImpl.java  |   2 -
 .../processors/igfs/IgfsMetaManager.java|  62 +-
 .../processors/igfs/IgfsNodePredicate.java  |  80 +
 .../internal/processors/igfs/IgfsProcessor.java |  37 --
 .../internal/processors/igfs/IgfsUtils.java |  21 
 .../igfs/client/IgfsClientAbstractCallable.java | 112 +++
 .../multijvm/IgniteClusterProcessProxy.java |   5 +
 10 files changed, 325 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd722a3/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 75168a1..c664f1e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -51,6 +51,7 @@ import org.apache.ignite.internal.IgniteServicesImpl;
 import org.apache.ignite.internal.IgnitionEx;
 import org.apache.ignite.internal.executor.GridExecutorService;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.igfs.IgfsNodePredicate;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -602,6 +603,11 @@ public class ClusterGroupAdapter implements 
ClusterGroupEx, Externalizable {
 }
 
 /** {@inheritDoc} */
+@Override public ClusterGroup forIgfsMetadataDataNodes(@Nullable String 
igfsName, @Nullable String metaCacheName) {
+return forPredicate(new 
IgfsNodePredicate(igfsName)).forDataNodes(metaCacheName);
+}
+
+/** {@inheritDoc} */
 @Override public final ClusterGroup forHost(ClusterNode node) {
 A.notNull(node, "node");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd722a3/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
index 59da7cf..21533a0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
@@ -29,7 +29,7 @@ public interface ClusterGroupEx extends ClusterGroup {
  * Creates projection for specified subject ID.
  *
  * @param subjId Subject ID.
- * @return Internal projection.
+ * @return Cluster group.
  */
 public ClusterGroupEx forSubjectId(UUID subjId);
 
@@ -40,5 +40,15 @@ public interface ClusterGroupEx extends ClusterGroup {
  * @param clientNodes Flag to include client nodes.
  * @return Cluster group.
  */
-public ClusterGroup forCacheNodes(@Nullable String cacheName, boolean 
affNodes, boolean nearNodes, boolean clientNodes);
+public ClusterGroup forCacheNodes(@Nullable String cacheName, boolean 
affNodes, boolean nearNodes,
+boolean clientNodes);
+
+/**
+ * Create projection for IGFS server nodes.
+ *
+ * @param igfsName IGFS name.
+ * @param metaCacheName Metadata cache name.
+ * @return Cluster group.
+ */
+public ClusterGroup forIgfsMetadataDataNodes(@Nullable String igfsName, 
@Nullable String metaCacheName);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd722a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
--
diff --git