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

[sergi]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 a0cdb5964 -> da24df995


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
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 

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

Branch: refs/heads/ignite-1.5.1-2
Commit: 9f1f6601e3b77010c57186fb6e041a58a0fce550
Parents: 0482316 d4687d9
Author: Anton Vinogradov 
Authored: Mon Dec 21 11:51:36 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Dec 21 11:51:36 2015 +0300

--
 .../discovery/GridDiscoveryManager.java |   4 +-
 .../processors/cache/CacheObjectAdapter.java|   3 +
 .../dht/preloader/GridDhtPreloader.java |  29 --
 .../ignite/spi/discovery/tcp/ClientImpl.java|  48 +-
 .../IgniteClientReconnectCacheTest.java |  26 +-
 .../cache/IgniteCachePutAllRestartTest.java |   2 +-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  68 ++-
 modules/platforms/cpp/core/impl/doxygen.h   |  53 --
 .../cpp/core/include/ignite/binary/binary.h |   5 +
 .../core/include/ignite/binary/binary_consts.h  |   5 +
 .../include/ignite/binary/binary_containers.h   |   5 +
 .../include/ignite/binary/binary_raw_reader.h   |   5 +
 .../include/ignite/binary/binary_raw_writer.h   |   5 +
 .../core/include/ignite/binary/binary_reader.h  |   5 +
 .../core/include/ignite/binary/binary_type.h|  17 +
 .../core/include/ignite/binary/binary_writer.h  |   5 +
 .../cpp/core/include/ignite/cache/cache.h   |   5 +
 .../cpp/core/include/ignite/cache/cache_entry.h |   5 +
 .../core/include/ignite/cache/cache_peek_mode.h |   5 +
 .../cpp/core/include/ignite/cache/query/query.h |   5 +
 .../include/ignite/cache/query/query_argument.h |   6 +
 .../include/ignite/cache/query/query_cursor.h   |   5 +
 .../ignite/cache/query/query_fields_cursor.h|   5 +
 .../ignite/cache/query/query_fields_row.h   |   5 +
 .../include/ignite/cache/query/query_scan.h |   5 +
 .../core/include/ignite/cache/query/query_sql.h |   5 +
 .../ignite/cache/query/query_sql_fields.h   |   5 +
 .../include/ignite/cache/query/query_text.h |   5 +
 .../platforms/cpp/core/include/ignite/guid.h|   5 +
 .../platforms/cpp/core/include/ignite/ignite.h  |   5 +
 .../core/include/ignite/ignite_configuration.h  |   5 +
 .../cpp/core/include/ignite/ignite_error.h  |   5 +
 .../cpp/core/include/ignite/ignition.h  |   5 +
 modules/platforms/cpp/core/namespaces.dox   |  53 ++
 .../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 +-
 40 files changed, 1119 insertions(+), 129 deletions(-)
--

[7/8] 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/ignite-1.5.1-2
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 @@ 

[6/8] 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/ignite-1.5.1-2
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
+ *
+ *  

[4/8] 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/ignite-1.5.1-2
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;

[3/8] 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/ignite-1.5.1-2
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(-)
--

[1/8] ignite git commit: Fixed a single query test.

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 0482316e4 -> 9f1f6601e


Fixed a single query test.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 10bb798d11fe806657412b5f1ae8a917d13f6ee8
Parents: d391daa
Author: vozerov-gridgain 
Authored: Fri Dec 18 15:54:29 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 15:54:29 2015 +0300

--
 .../IgniteCacheAbstractFieldsQuerySelfTest.java | 54 
 1 file changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/10bb798d/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 07e44da..4c952fc 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
@@ -41,6 +41,7 @@ import 
org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import 
org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
 import 
org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongValue;
@@ -84,6 +85,9 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest 
extends GridCommonA
 /** Flag indicating if starting node should have cache. */
 protected boolean hasCache;
 
+/** Whether BinaryMarshaller is set. */
+protected boolean binaryMarshaller;
+
 /** {@inheritDoc} */
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -206,6 +210,11 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 }
 
 /** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+binaryMarshaller = grid(0).configuration().getMarshaller() instanceof 
BinaryMarshaller;
+}
+
+/** {@inheritDoc} */
 @Override protected void afterTestsStopped() throws Exception {
 stopAllGrids();
 }
@@ -249,31 +258,56 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 assert types.contains("String");
 assert types.contains("Integer");
 
-assert 
AffinityKey.class.getName().equals(meta.keyClass("Person"));
+if (binaryMarshaller) {
+assert 
Object.class.getName().equals(meta.keyClass("Person"));
+assert 
Object.class.getName().equals(meta.valueClass("Person"));
+assert 
Object.class.getName().equals(meta.valueClass("Organization"));
+}
+else {
+assert 
AffinityKey.class.getName().equals(meta.keyClass("Person"));
+assert 
Person.class.getName().equals(meta.valueClass("Person"));
+assert 
Organization.class.getName().equals(meta.valueClass("Organization"));
+}
+
 assert 
String.class.getName().equals(meta.keyClass("Organization"));
 assert 
String.class.getName().equals(meta.keyClass("String"));
-
-assert 
Person.class.getName().equals(meta.valueClass("Person"));
-assert 
Organization.class.getName().equals(meta.valueClass("Organization"));
 assert 
String.class.getName().equals(meta.valueClass("String"));
 
 Map fields = meta.fields("Person");
 
 assert fields != null;
 assert fields.size() == 5;
-assert 
AffinityKey.class.getName().equals(fields.get("_KEY"));
-assert Person.class.getName().equals(fields.get("_VAL"));
+
+

[5/8] ignite git commit: IGNITE-2187: CPP: Added documentation for files.

[av]

IGNITE-2187: CPP: Added documentation for files.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 0c7dfec5d802832b0798c1982a543fd85af50acc
Parents: a34bcc8
Author: isapego 
Authored: Fri Dec 18 18:04:46 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 18:04:46 2015 +0300

--
 modules/platforms/cpp/core/impl/doxygen.h   | 53 
 .../cpp/core/include/ignite/binary/binary.h |  5 ++
 .../core/include/ignite/binary/binary_consts.h  |  5 ++
 .../include/ignite/binary/binary_containers.h   |  5 ++
 .../include/ignite/binary/binary_raw_reader.h   |  5 ++
 .../include/ignite/binary/binary_raw_writer.h   |  5 ++
 .../core/include/ignite/binary/binary_reader.h  |  5 ++
 .../core/include/ignite/binary/binary_type.h| 17 +++
 .../core/include/ignite/binary/binary_writer.h  |  5 ++
 .../cpp/core/include/ignite/cache/cache.h   |  5 ++
 .../cpp/core/include/ignite/cache/cache_entry.h |  5 ++
 .../core/include/ignite/cache/cache_peek_mode.h |  5 ++
 .../cpp/core/include/ignite/cache/query/query.h |  5 ++
 .../include/ignite/cache/query/query_argument.h |  6 +++
 .../include/ignite/cache/query/query_cursor.h   |  5 ++
 .../ignite/cache/query/query_fields_cursor.h|  5 ++
 .../ignite/cache/query/query_fields_row.h   |  5 ++
 .../include/ignite/cache/query/query_scan.h |  5 ++
 .../core/include/ignite/cache/query/query_sql.h |  5 ++
 .../ignite/cache/query/query_sql_fields.h   |  5 ++
 .../include/ignite/cache/query/query_text.h |  5 ++
 .../platforms/cpp/core/include/ignite/guid.h|  5 ++
 .../platforms/cpp/core/include/ignite/ignite.h  |  5 ++
 .../core/include/ignite/ignite_configuration.h  |  5 ++
 .../cpp/core/include/ignite/ignite_error.h  |  5 ++
 .../cpp/core/include/ignite/ignition.h  |  5 ++
 modules/platforms/cpp/core/namespaces.dox   | 53 
 27 files changed, 191 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/impl/doxygen.h
--
diff --git a/modules/platforms/cpp/core/impl/doxygen.h 
b/modules/platforms/cpp/core/impl/doxygen.h
deleted file mode 100644
index ed237f6..000
--- a/modules/platforms/cpp/core/impl/doxygen.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \mainpage Apache Ignite C++
- *
- * Apache Ignite In-Memory Data Fabric is a high-performance, integrated and 
distributed in-memory platform for
- * computing and transacting on large-scale data sets in real-time, orders of 
magnitude faster than possible with
- * traditional disk-based or flash-based technologies.
- */
- 
- /**
-  * Apache %Ignite API.
-  */
- namespace ignite
- {
-/**
- * %Ignite Binary Objects API.
- */
-namespace binary
-{
-// Empty.
-}
-
-/**
- * %Ignite %Cache API.
- */
-namespace cache
-{
-/**
- * Contains APIs for creating and executing cache queries.
- */
-namespace query
-{
-// Empty.
-}
-}
- }
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary.h
--
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary.h 
b/modules/platforms/cpp/core/include/ignite/binary/binary.h
index 15476fe..1ffa3e5 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary.h
@@ -15,6 +15,11 @@
  

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

[av]

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/ignite-1.5.1-2
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));
+}
 }
 
 /**

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 f1e3939ad -> 896ff6cd6


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


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

Branch: refs/heads/ignite-1537
Commit: 896ff6cd657b96c41757865ce5b89bde086a89e4
Parents: f1e3939
Author: sboikov 
Authored: Mon Dec 21 16:30:41 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 16:30:41 2015 +0300

--
 .../java/org/apache/ignite/cache/websession/WebSessionFilter.java | 3 ++-
 .../org/apache/ignite/cache/websession/WebSessionListener.java| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/896ff6cd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
--
diff --git 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index d060884..c3a3b32 100644
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -38,6 +38,7 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
@@ -433,7 +434,7 @@ public class WebSessionFilter implements Filter {
 
 break;
 }
-catch (CacheException e) {
+catch (CacheException | BinaryObjectException e) {
 if (log.isDebugEnabled())
 log.debug(e.getMessage());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/896ff6cd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
--
diff --git 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
index 89e56bd..a1c1106 100644
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
@@ -32,6 +32,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -120,7 +121,7 @@ class WebSessionListener {
 
 break;
 }
-catch (CacheException e) {
+catch (CacheException | BinaryObjectException e) {
 if (i == retries - 1) {
 U.warn(log, "Failed to apply updates for session 
(maximum number of retries exceeded) [sesId=" +
 sesId + ", retries=" + retries + ']');

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

[vozerov]

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


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

Branch: refs/heads/ignite-1.5
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 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(-)
--

[1/2] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 e58692375 -> 284868099


.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/ignite-1.5
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
 
 /// 
-/// 

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 7cceff4a3 -> fe9e6f099


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


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

Branch: refs/heads/ignite-1537
Commit: fe9e6f0996c96b7d561bb8fa3fe5b9b604200088
Parents: 7cceff4
Author: sboikov 
Authored: Mon Dec 21 17:00:06 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 17:00:06 2015 +0300

--
 .../cache/binary/CacheObjectBinaryProcessorImpl.java | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fe9e6f09/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 615b1a5..36558e7 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
@@ -286,7 +286,7 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 }
 
 for (Map.Entry e : metaBuf.entrySet())
-addMeta(e.getKey(), e.getValue().wrap(binaryCtx));
+addMeta(e.getKey(), e.getValue().wrap(binaryCtx), false);
 
 metaBuf.clear();
 
@@ -475,6 +475,15 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 
 /** {@inheritDoc} */
 @Override public void addMeta(final int typeId, final BinaryType newMeta) 
throws BinaryObjectException {
+addMeta(typeId, newMeta, true);
+}
+
+/**
+ * @param typeId Type ID.
+ * @param newMeta New meta data.
+ * @param tryInvoke If {@code true} uses {@link 
IgniteCacheProxy#tryInvoke} for metadata update.
+ */
+public void addMeta(final int typeId, final BinaryType newMeta, boolean 
tryInvoke) {
 assert newMeta != null;
 assert newMeta instanceof BinaryTypeImpl;
 
@@ -486,7 +495,9 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 BinaryMetadata oldMeta = metaDataCache.localPeek(key);
 BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(oldMeta, 
newMeta0);
 
-BinaryObjectException err = metaDataCache.tryInvoke(key, new 
MetadataProcessor(mergedMeta));
+BinaryObjectException err = tryInvoke ?
+metaDataCache.tryInvoke(key, new 
MetadataProcessor(mergedMeta)) :
+metaDataCache.invoke(key, new MetadataProcessor(mergedMeta));
 
 if (err != null)
 throw err;

ignite git commit: 1.5.1-final-SNAPSHOT

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 ad5bcec93 -> 524d72e2b


1.5.1-final-SNAPSHOT


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 524d72e2bcb4a813cad25ab6d96b2ddc7ff00c83
Parents: ad5bcec
Author: Ignite Teamcity 
Authored: Mon Dec 21 17:04:46 2015 +0300
Committer: Ignite Teamcity 
Committed: Mon Dec 21 17:04:46 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 | 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 +++---
 12 files changed, 26 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/524d72e2/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 79ac2a9..5c6743a 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.1.1], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.7761], 
[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/524d72e2/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 cbd47ff..29ddd15 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.1.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.1.7761], [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/524d72e2/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index d028aa1..8fe1017 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.1.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.1.7761], [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/524d72e2/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index 79fc0b4..79555bd 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.1.1],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.1.7761],[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/524d72e2/modules/platforms/cpp/ignite/configure.ac

[6/6] ignite git commit: Merge branch 'ignite-1.5' into ignite-2213-1

[vozerov]

Merge branch 'ignite-1.5' into ignite-2213-1


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

Branch: refs/heads/ignite-2213-1
Commit: 65acdf4940b1cb1d41731982595b3e3faf131c56
Parents: 12c8c2c 2848680
Author: vozerov-gridgain 
Authored: Mon Dec 21 17:37:34 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 17:37:34 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 +-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Binary/IBinaryRawReader.cs  |  4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  | 25 +---
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |  2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs|  2 +-
 .../Cache/Query/Continuous/Package-Info.cs  |  2 +-
 .../Cache/Query/Package-Info.cs |  2 +-
 .../Cache/Store/Package-Info.cs |  2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |  2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |  2 +-
 .../Datastream/Package-Info.cs  |  2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |  2 +-
 .../Impl/Binary/BinaryReader.cs | 13 +++---
 .../Impl/Binary/BinaryUtils.cs  |  4 +-
 .../Lifecycle/Package-Info.cs   |  2 +-
 .../Messaging/Package-Info.cs   |  2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |  2 +-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |  2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |  2 +-
 .../Transactions/Package-Info.cs|  2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 pom.xml | 42 ++--
 32 files changed, 74 insertions(+), 89 deletions(-)
--

[2/2] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: a4ae7ed750b736a0c8580388f9bada0bc47c7f12
Parents: 02140e6
Author: sboikov 
Authored: Mon Dec 21 14:03:59 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 14:03:59 2015 +0300

--
 .../processors/cache/GridCacheAdapter.java  | 41 +---
 .../processors/cache/GridCacheProxyImpl.java| 26 +
 .../cache/GridCacheSharedContext.java   |  5 +--
 .../processors/cache/IgniteCacheProxy.java  | 32 +++
 .../processors/cache/IgniteInternalCache.java   | 24 
 .../binary/CacheObjectBinaryProcessorImpl.java  |  2 +-
 .../GridDistributedTxRemoteAdapter.java |  2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |  2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  2 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  7 +++-
 .../near/GridNearOptimisticTxPrepareFuture.java |  7 +++-
 ...ridNearOptimisticTxPrepareFutureAdapter.java | 22 ++-
 .../cache/distributed/near/GridNearTxLocal.java | 16 ++--
 .../cache/transactions/IgniteInternalTx.java|  3 +-
 .../cache/transactions/IgniteTxAdapter.java |  2 +-
 .../cache/transactions/IgniteTxHandler.java |  2 +-
 .../transactions/IgniteTxLocalAdapter.java  | 22 +++
 .../cache/transactions/IgniteTxLocalEx.java |  1 +
 .../cache/transactions/IgniteTxManager.java |  5 ++-
 ...niteBinaryMetadataUpdateNodeRestartTest.java | 13 ++-
 .../IgniteCacheRestartTestSuite2.java   |  3 ++
 .../cache/websession/WebSessionListener.java| 24 ++--
 23 files changed, 215 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a4ae7ed7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index cc4e962..9bb3f55 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2077,8 +2077,31 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache entryProcessor,
+Object... args) throws IgniteCheckedException {
+return invoke0(false, key, entryProcessor, args);
+}
+
+/** {@inheritDoc} */
 @Override public  EntryProcessorResult invoke(final K key,
 final EntryProcessor entryProcessor,
+final Object... args) throws IgniteCheckedException {
+return invoke0(true, key, entryProcessor, args);
+}
+
+/**
+ * @param waitTopFut If {@code false} does not wait for affinity change 
future.
+ * @param key Key.
+ * @param entryProcessor Entry processor.
+ * @param args Entry processor arguments.
+ * @return Invoke result.
+ * @throws IgniteCheckedException If failed.
+ */
+private  EntryProcessorResult invoke0(
+final boolean waitTopFut,
+final K key,
+final EntryProcessor entryProcessor,
 final Object... args)
 throws IgniteCheckedException {
 A.notNull(key, "key", entryProcessor, "entryProcessor");
@@ -2090,7 +2113,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache)entryProcessor, args);
+tx.invokeAsync(ctx, waitTopFut, key, (EntryProcessor)entryProcessor, args);
 
 Map resMap = fut.get().value();
 
@@ -2324,16 +2347,8 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

[1/2] ignite git commit: ignite-1.5 Added test.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 e97a96c7e -> a4ae7ed75


ignite-1.5 Added test.


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

Branch: refs/heads/ignite-1537
Commit: 02140e6f98f0d4f4615e3ef81e82fa6617b92c84
Parents: e97a96c
Author: sboikov 
Authored: Mon Dec 21 11:53:26 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 11:53:26 2015 +0300

--
 ...yMetadataUpdateChangingTopologySelfTest.java |   7 +-
 ...niteBinaryMetadataUpdateNodeRestartTest.java | 397 +++
 2 files changed, 402 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/02140e6f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
index e53650c..c95c586 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
@@ -152,7 +152,7 @@ public class 
IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
 private List recordedMsgs = new ArrayList<>();
 
 /** {@inheritDoc} */
-@Override public void sendMessage(ClusterNode node, Message msg, 
IgniteInClosure ackClosure)
+@Override public void sendMessage(ClusterNode node, Message msg, 
IgniteInClosure ackC)
 throws IgniteSpiException {
 if (msg instanceof GridIoMessage) {
 Object msg0 = ((GridIoMessage)msg).message();
@@ -174,7 +174,7 @@ public class 
IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
 }
 }
 
-super.sendMessage(node, msg, ackClosure);
+super.sendMessage(node, msg, ackC);
 }
 
 /**
@@ -238,6 +238,9 @@ public class 
IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
 }
 }
 
+/**
+ *
+ */
 private static class TestValue {
 /** Field1. */
 private String field1;

http://git-wip-us.apache.org/repos/asf/ignite/blob/02140e6f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
new file mode 100644
index 000..b06ec35
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
@@ -0,0 +1,397 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.CacheException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheEntryProcessor;

[3/4] 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/ignite-1.5.1-2
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 

[4/4] 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

Conflicts:
modules/platforms/cpp/common/configure.ac
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac
modules/platforms/cpp/ignite/configure.ac


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

Branch: refs/heads/ignite-1.5.1-2
Commit: ad5bcec935b20421effb4ad5886e39549921fe99
Parents: 9f1f660 e586923
Author: Anton Vinogradov 
Authored: Mon Dec 21 16:40:55 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Dec 21 16:40:55 2015 +0300

--
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Binary/IBinaryRawReader.cs  |  4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  | 25 +---
 .../Impl/Binary/BinaryReader.cs | 13 +++---
 .../Impl/Binary/BinaryUtils.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 .../Properties/AssemblyInfo.cs  |  5 ++-
 pom.xml | 42 ++--
 12 files changed, 54 insertions(+), 69 deletions(-)
--


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

[2/4] 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/ignite-1.5.1-2
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
+++ 

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

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 9f1f6601e -> ad5bcec93


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/ignite-1.5.1-2
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
 }
 
 /** 

[3/6] ignite git commit: 1.5.0-final-SNAPSHOT

[vozerov]

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/ignite-2213-1
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 

[2/6] ignite git commit: IGNITE-2184: Updated .NET/CPP version update procedure.

[vozerov]

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/ignite-2213-1
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
+++ 

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

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2213-1 12c8c2ca2 -> 65acdf494


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/ignite-2213-1
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
 }
 
 /**  

[4/6] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

[vozerov]

.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/ignite-2213-1
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 

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

[vozerov]

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


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

Branch: refs/heads/ignite-2213-1
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 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(-)
--

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 896ff6cd6 -> 7cceff4a3


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


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

Branch: refs/heads/ignite-1537
Commit: 7cceff4a33fb6bd7037299959dc6d18d41c4f36e
Parents: 896ff6c
Author: sboikov 
Authored: Mon Dec 21 16:45:01 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 16:45:01 2015 +0300

--
 .../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7cceff4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 9d8f4c8..3d63f8f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -47,7 +47,6 @@ import 
org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache;
 import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
-import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;

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

[akuznetsov]

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-843-rc2
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
  

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

[akuznetsov]

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


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

Branch: refs/heads/ignite-843-rc2
Commit: 2ee4b59c982727463e60c71e818f49d828a1443a
Parents: 48944be d8576b8
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:30:13 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 11:30:13 2015 +0700

--
 .../configuration/CacheConfiguration.java   |  44 ++-
 .../internal/binary/BinaryObjectImpl.java   |  20 +-
 .../discovery/GridDiscoveryManager.java |   4 +-
 .../processors/cache/IgniteCacheProxy.java  |   5 +-
 .../dht/preloader/GridDhtPreloader.java |  29 --
 .../cache/query/GridCacheQueryManager.java  |   8 +-
 .../processors/query/GridQueryProcessor.java|  10 +-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../internal/visor/query/VisorQueryJob.java |   6 +
 .../ignite/spi/discovery/tcp/ClientImpl.java|  48 +--
 .../IgniteClientReconnectCacheTest.java |  26 +-
 .../IgniteCacheBinaryObjectsScanSelfTest.java   | 137 +
 .../cache/IgniteCachePutAllRestartTest.java |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++--
 .../processors/query/h2/sql/GridSqlQuery.java   |   3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 113 ---
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +--
 .../IgniteCacheReplicatedQuerySelfTest.java |  10 +-
 .../local/IgniteCacheLocalQuerySelfTest.java|   2 +-
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../query/IgniteSqlSplitterSelfTest.java|  52 
 .../query/h2/sql/GridQueryParsingTest.java  |   9 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   2 +
 .../IgniteCacheQuerySelfTestSuite.java  |   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  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Binary/IBinaryRawReader.cs  |   4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  |  25 +-
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |   2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs|   2 +-
 .../Cache/Query/Continuous/Package-Info.cs  |   2 +-
 .../Cache/Query/Package-Info.cs |   2 +-
 .../Cache/Store/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |   2 +-
 .../Datastream/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |   2 +-
 .../Impl/Binary/BinaryReader.cs |  13 +-
 .../Impl/Binary/BinaryUtils.cs  |   4 +-
 .../Lifecycle/Package-Info.cs   |   2 +-
 .../Messaging/Package-Info.cs   |   2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |   2 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |   2 +-
 .../Transactions/Package-Info.cs|   2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../commands/cache/VisorCacheCommand.scala  |  13 +-
 pom.xml |  42 +--
 58 files changed, 1031 insertions(+), 352 deletions(-)
--


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

[03/11] ignite git commit: IGNITE-2184: Updated .NET/CPP version update procedure.

[akuznetsov]

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/ignite-843-rc2
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
+++ 

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

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 48944beef -> 2ee4b59c9


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/ignite-843-rc2
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 : 

[07/11] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

[akuznetsov]

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/ignite-843-rc2
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 

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

[akuznetsov]

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


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

Branch: refs/heads/ignite-843-rc2
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 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(-)
--

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

[akuznetsov]

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-843-rc2
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++)  // 

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

[akuznetsov]

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-843-rc2
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

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

[akuznetsov]

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/ignite-843-rc2
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 

[05/11] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

[akuznetsov]

.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/ignite-843-rc2
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 

[04/11] ignite git commit: 1.5.0-final-SNAPSHOT

[akuznetsov]

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/ignite-843-rc2
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 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: 95b51335f197ffd14765da9f838189278b620c03
Parents: f2b1285 d8576b8
Author: sboikov 
Authored: Tue Dec 22 09:28:19 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 09:28:19 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  44 ++-
 .../internal/binary/BinaryObjectImpl.java   |  20 +-
 .../processors/cache/IgniteCacheProxy.java  |   5 +-
 .../cache/query/GridCacheQueryManager.java  |   8 +-
 .../processors/query/GridQueryProcessor.java|  10 +-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../internal/visor/query/VisorQueryJob.java |   6 +
 .../IgniteCacheBinaryObjectsScanSelfTest.java   | 137 +
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++--
 .../processors/query/h2/sql/GridSqlQuery.java   |   3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 113 ---
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +--
 .../IgniteCacheReplicatedQuerySelfTest.java |  10 +-
 .../local/IgniteCacheLocalQuerySelfTest.java|   2 +-
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../query/IgniteSqlSplitterSelfTest.java|  52 
 .../query/h2/sql/GridQueryParsingTest.java  |   9 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   2 +
 .../IgniteCacheQuerySelfTestSuite.java  |   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  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Binary/IBinaryRawReader.cs  |   4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  |  25 +-
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |   2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs|   2 +-
 .../Cache/Query/Continuous/Package-Info.cs  |   2 +-
 .../Cache/Query/Package-Info.cs |   2 +-
 .../Cache/Store/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |   2 +-
 .../Datastream/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |   2 +-
 .../Impl/Binary/BinaryReader.cs |  13 +-
 .../Impl/Binary/BinaryUtils.cs  |   4 +-
 .../Lifecycle/Package-Info.cs   |   2 +-
 .../Messaging/Package-Info.cs   |   2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |   2 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |   2 +-
 .../Transactions/Package-Info.cs|   2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../Properties/AssemblyInfo.cs  |   5 +-
 .../commands/cache/VisorCacheCommand.scala  |  13 +-
 pom.xml |  42 +--
 53 files changed, 978 insertions(+), 296 deletions(-)
--


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

[06/10] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

[sboikov]

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/ignite-1537
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 

ignite git commit: IGNITE-2225: Fixed unnecessary deserializations.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2225 [created] c234469d6


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

Branch: refs/heads/ignite-2225
Commit: c234469d6da3e0a253b4df30c0830720f48e7b78
Parents: d8576b8
Author: vozerov-gridgain 
Authored: Tue Dec 22 09:53:10 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 09:53:10 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/c234469d/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/c234469d/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;

ignite git commit: ignite-1.5 Minor javadocs.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 da24df995 -> d8576b8f9


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
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

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

[sboikov]

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-1537
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
  * 

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

[sboikov]

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-1537
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

[03/10] ignite git commit: 1.5.0-final-SNAPSHOT

[sboikov]

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/ignite-1537
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 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 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(-)
--

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

[sboikov]

.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/ignite-1537
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 

[02/10] ignite git commit: IGNITE-2184: Updated .NET/CPP version update procedure.

[sboikov]

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/ignite-1537
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
+++ 

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

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 f2b1285fb -> 95b51335f


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/ignite-1537
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
 }
 
 /**  */
- 

[1/2] ignite git commit: IGNITE-843 DR minor fixes.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 2df87a87a -> 59a3dcef7


IGNITE-843 DR minor fixes.


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

Branch: refs/heads/ignite-843-rc2
Commit: 5ed89b70d26a997a2392c9d7f7af2a3db31dc589
Parents: e2fa634
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 17:04:30 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 17:04:30 2015 +0700

--
 .../src/main/js/helpers/generator/generator-java.js| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed89b70/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index dbcdd47..4ec98c1 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -99,6 +99,8 @@ $generatorJava.declareVariable = function (res, varName, 
varFullType, varFullAct
 
 if (!subClass)
 res.needEmptyLine = true;
+
+return varName;
 };
 
 /**

ignite git commit: IGNITE-843 Clean up.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 59a3dcef7 -> 0dfdaeb35


IGNITE-843 Clean up.


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

Branch: refs/heads/ignite-843-rc2
Commit: 0dfdaeb35bc6c39b410980387703fc59cd8deb23
Parents: 59a3dcef7
Author: Andrey 
Authored: Mon Dec 21 17:49:44 2015 +0700
Committer: Andrey 
Committed: Mon Dec 21 17:49:44 2015 +0700

--
 .../app/modules/states/configuration/index.js   |  20 +-
 .../src/main/js/app/modules/states/sql/index.js |   5 +-
 .../src/main/js/controllers/sql-controller.js   |   6 +-
 .../src/main/js/public/stylesheets/style.scss   |   7 +-
 .../src/main/js/views/sql/sql.jade  | 251 ++-
 5 files changed, 154 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0dfdaeb3/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
index e5a97fe..61b2d7e 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
@@ -35,19 +35,31 @@ angular
})
.state('base.configuration.clusters', {
url: '/clusters',
-   templateUrl: '/configuration/clusters.html' 
+   templateUrl: '/configuration/clusters.html',
+   data: {
+   loading: 'Loading clusters screen...'
+   }
})
.state('base.configuration.caches', {
url: '/caches',
-   templateUrl: '/configuration/caches.html'   
+   templateUrl: '/configuration/caches.html',
+   data: {
+   loading: 'Loading caches screen...'
+   }
})
.state('base.configuration.metadata', {
url: '/metadata',
-   templateUrl: '/configuration/metadata.html' 
+   templateUrl: '/configuration/metadata.html',
+   data: {
+   loading: 'Loading metadata screen...'
+   }
})
.state('base.configuration.igfs', {
url: '/igfs',
-   templateUrl: '/configuration/igfs.html' 
+   templateUrl: '/configuration/igfs.html',
+   data: {
+   loading: 'Loading IGFS screen...'
+   }
})
.state('base.configuration.summary', {
url: '/summary',

http://git-wip-us.apache.org/repos/asf/ignite/blob/0dfdaeb3/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js 
b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
index ea81343..fe09f33 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
@@ -26,6 +26,9 @@ angular
 $stateProvider
 .state('base.sql', {
 url: '/sql/{id}',
-   templateUrl: '/sql/sql.html'
+   templateUrl: '/sql/sql.html',
+   data: {
+   loading: 'Loading notebook screen...'
+   }
});
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/0dfdaeb3/modules/control-center-web/src/main/js/controllers/sql-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/sql-controller.js 
b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 4667640..ccc7689 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -247,7 +247,7 @@ consoleModule.controller('sqlController', function 
($animate, $scope, $controlle
 };
 
 var loadNotebook = function () {
-$loading.start('loadingNotebookScreen');
+$loading.start('loading');
 
 $http.post('/api/v1/notebooks/get', {noteId: $state.params.id})
 .success(function (notebook) {
@@ -280,9 +280,7 @@ consoleModule.controller('sqlController', function 
($animate, $scope, $controlle
 

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: IGNITE-843 Clean up.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 c1236b665 -> e2fa63493


IGNITE-843 Clean up.


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

Branch: refs/heads/ignite-843-rc2
Commit: e2fa63493c30ff4d143c9b2675c8df1eb38ebd4e
Parents: c1236b6
Author: Andrey 
Authored: Mon Dec 21 15:27:05 2015 +0700
Committer: Andrey 
Committed: Mon Dec 21 15:27:05 2015 +0700

--
 .../src/main/js/views/configuration/caches.jade | 20 +---
 .../main/js/views/configuration/clusters.jade   | 13 -
 .../src/main/js/views/configuration/igfs.jade   | 18 +-
 .../main/js/views/configuration/metadata.jade   | 18 +-
 .../main/js/views/configuration/summary.jade|  4 ++--
 5 files changed, 21 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/caches.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/configuration/caches.jade 
b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 113ea89..d10f3b3 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -28,23 +28,13 @@ include ../includes/controls
 ignite-dialog More info
 ignite-dialog-title Caches screen
 ignite-dialog-content 
-| Caches can be linked with specified
-a(href='/configuration/clusters') clusters
-| and
-a(href='/configuration/metadata') metadata
-| ,
-br
-| Generated cluster with caches configuration 
available on
-a(href='/configuration/summary') summary
-| screen.
+| Caches can be linked with specified 
#[a(ui-sref='base.configuration.clusters') clusters] and 
#[a(ui-sref='base.configuration.metadata') metadata].#[br]
+| Generated cluster with caches configuration 
available on #[a(ui-sref='base.configuration.summary') summary] screen.
 
 ignite-callout-cel(data-title='Next Steps')
-li Continue to
-a(ui-sref='base.configuration.metadata') Metadata
-li Continue to
-a(ui-sref='base.configuration.summary') Summary
-li Back to
-a(ui-sref='base.configuration.clusters') Clusters
+li Continue to #[a(ui-sref='base.configuration.metadata') Metadata]
+li Continue to #[a(ui-sref='base.configuration.summary') Summary]
+li Back to #[a(ui-sref='base.configuration.clusters') Clusters]
 
 div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading 
caches screen...", className: "page-loading-overlay"}')
 div(ng-show='ui.ready')

http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/clusters.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/configuration/clusters.jade 
b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index d18fcca..90b3249 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -27,17 +27,12 @@ include ../includes/controls
 ignite-dialog More info
 ignite-dialog-title Clusters screen
 ignite-dialog-content 
-| Manage your clusters on current screen.
-br
-| Generated clusters configuration available on
-a(href='/configuration/summary') summary
-| screen.
+| Manage your clusters on current screen.#[br]
+| Generated clusters configuration available on 
#[a(ui-sref='base.configuration.summary') summary] screen.
 
 ignite-callout-cel(data-title='Next Steps')
-li Continue to
-a(ui-sref='base.configuration.caches') Caches
-li Continue to
-a(ui-sref='base.configuration.summary') Summary
+li Continue to 

ignite git commit: IGNITE-843 Clean up.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 e2fa63493 -> 2df87a87a


IGNITE-843 Clean up.


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

Branch: refs/heads/ignite-843-rc2
Commit: 2df87a87a75d93f14ac6654376b18523163ff4f4
Parents: e2fa634
Author: Andrey 
Authored: Mon Dec 21 16:30:25 2015 +0700
Committer: Andrey 
Committed: Mon Dec 21 16:30:25 2015 +0700

--
 .../configuration/summary/summary.controller.js |  5 ++---
 .../main/js/views/configuration/summary.jade| 21 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2df87a87/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index f58e95b..0fc6736 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -35,7 +35,6 @@ export default [
 
 $scope.panelExpanded = $common.panelExpanded;
 $scope.tableVisibleRow = $table.tableVisibleRow;
-$scope.joinTip = $common.joinTip;
 $scope.widthIsSufficient = $common.widthIsSufficient;
 
 $scope.tabsServer = { activeTab: 0 };
@@ -65,10 +64,10 @@ export default [
 
 $scope.$watch('cluster', updateTab);
 
-// TODO IGNITE-2114: implemented as indendent logic for download.
+// TODO IGNITE-2114: implemented as independent logic for download.
 $scope.downloadConfiguration = function () {
 var cluster = $scope.cluster;
-var clientNearCfg = $scope.backupItem.nearConfiguration;
+var clientNearCfg = cluster.clientNearCfg;
 
 var zip = new JSZip();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2df87a87/modules/control-center-web/src/main/js/views/configuration/summary.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/configuration/summary.jade 
b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index e27572d..59f10bf 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -85,12 +85,15 @@ mixin ignite-form-field-tooltip(message)
 
 .panel-collapse(id='client' role='tabpanel' 
bs-collapse-target)
 form(name='clientForm')
+- var nearCfg = 'ctrl.cluster.clientNearCfg'
+- var nearCfgEvictionPolicy = nearCfg + 
'.nearEvictionPolicy[' + nearCfg + '.nearEvictionPolicy.kind]'
+
 .details-row
 ignite-form-field(data-label='Near cache 
start size')
 +ignite-form-field-tooltip("Initial 
cache size for near cache which will be used to pre-create internal hash table 
after start")
 ignite-form-field-input-number(
 data-name='nearStartSize'
-
data-ng-model='ctrl.cluster.cfg.nearStartSize'
+
data-ng-model='#{nearCfg}.nearStartSize'
 data-placeholder='375000'
 )
 
@@ -105,9 +108,9 @@ mixin ignite-form-field-tooltip(message)
 {value: 'SORTED', label: 
'Sorted'},\
 {value: undefined, label: 'Not 
set'}\
 ]"
-
data-ng-model='ctrl.cluster.cfg.nearEvictionPolicy.kind'
+
data-ng-model='#{nearCfg}.nearEvictionPolicy.kind'
 )
-
span(ng-if='ctrl.cluster.cfg.nearEvictionPolicy.kind')
+
span(ng-if='#{nearCfg}.nearEvictionPolicy.kind')
 a.customize(
 ng-show='ctrl.__form.expanded' 
   

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 a4ae7ed75 -> 6447fa96d


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


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

Branch: refs/heads/ignite-1537
Commit: 6447fa96d5cfd79bef802bdd6de22f635679
Parents: a4ae7ed
Author: sboikov 
Authored: Mon Dec 21 14:06:53 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 14:06:53 2015 +0300

--
 modules/core/src/test/config/websession/example-cache.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6447fa96/modules/core/src/test/config/websession/example-cache.xml
--
diff --git a/modules/core/src/test/config/websession/example-cache.xml 
b/modules/core/src/test/config/websession/example-cache.xml
index d5bfeb7..0cc0e1e 100644
--- a/modules/core/src/test/config/websession/example-cache.xml
+++ b/modules/core/src/test/config/websession/example-cache.xml
@@ -130,14 +130,7 @@
 
 
 
-
-
-
-
+
 
 
 

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

[sboikov]

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


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/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
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(-)
--

[1/2] ignite git commit: ignite-1.5 Fixed benchmark configuration.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 c5ed0d0e2 -> 6a91996e3


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
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,\

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 95b51335f -> 7fd645373


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


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

Branch: refs/heads/ignite-1537
Commit: 7fd645373b9caa51dbfd0fdd82d29c6bfa12a62f
Parents: 95b5133
Author: sboikov 
Authored: Tue Dec 22 10:24:42 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:24:42 2015 +0300

--
 .../internal/processors/cache/GridCacheAdapter.java | 12 ++--
 .../processors/datastreamer/DataStreamProcessor.java| 12 +---
 2 files changed, 19 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7fd64537/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9bb3f55..1d097b7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2112,8 +2112,16 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(true) {
 @Nullable @Override public EntryProcessorResult 
op(IgniteTxLocalAdapter tx)
 throws IgniteCheckedException {
-IgniteInternalFuture fut =
-tx.invokeAsync(ctx, waitTopFut, key, (EntryProcessor)entryProcessor, args);
+assert !waitTopFut || tx.implicit();
+
+if (!waitTopFut)
+
tx.topologyVersion(ctx.shared().exchange().readyAffinityVersion());
+
+IgniteInternalFuture fut = tx.invokeAsync(ctx,
+waitTopFut,
+key,
+(EntryProcessor)entryProcessor,
+args);
 
 Map resMap = fut.get().value();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7fd64537/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index a2aab77..32f2ff5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -62,6 +62,9 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 /** Marshaller. */
 private final Marshaller marsh;
 
+/** */
+private byte[] marshErrBytes;
+
 /**
  * @param ctx Kernal context.
  */
@@ -86,6 +89,9 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 if (ctx.config().isDaemon())
 return;
 
+marshErrBytes = marsh.marshal(new IgniteCheckedException("Failed to 
marshal response error, " +
+"see log for details."));
+
 flusher = new IgniteThread(new GridWorker(ctx.gridName(), 
"grid-data-loader-flusher", log) {
 @Override protected void body() throws InterruptedException {
 while (!isCancelled()) {
@@ -324,10 +330,10 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 try {
 errBytes = err != null ? marsh.marshal(err) : null;
 }
-catch (IgniteCheckedException e) {
-U.error(log, "Failed to marshal message.", e);
+catch (Exception e) {
+U.error(log, "Failed to marshal error [err=" + err + ", marshErr=" 
+ e + ']', e);
 
-return;
+errBytes = marshErrBytes;
 }
 
 DataStreamerResponse res = new DataStreamerResponse(reqId, errBytes, 
forceLocDep);

ignite git commit: IGNITE-843 Fixed missing setter for near cache configuration.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 38c17d6b6 -> 48944beef


IGNITE-843 Fixed missing setter for near cache configuration.


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

Branch: refs/heads/ignite-843-rc2
Commit: 48944beef34d116a014796cf9f95473c5f21ec48
Parents: 38c17d6
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:19:13 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 22 11:19:13 2015 +0700

--
 .../src/main/js/helpers/generator/generator-java.js  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/48944bee/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index ef43466..9487401 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1103,6 +1103,10 @@ $generatorJava.cacheServerNearCache = function (cache, 
varName, res) {
 
 res.needEmptyLine = true;
 }
+
+res.line(varName + '.setNearConfiguration(nearCfg);');
+
+res.needEmptyLine = true;
 }
 }
 

ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 d8576b8f9 -> c5ed0d0e2


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
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()))
 

[5/5] ignite git commit: IGNITE-2213: Tests.

[vozerov]

IGNITE-2213: Tests.


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

Branch: refs/heads/ignite-2213-1
Commit: 12c8c2ca221e96a27bcccb6db09f8bfaf1dde28a
Parents: 94103ec
Author: vozerov-gridgain 
Authored: Mon Dec 21 14:41:42 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 14:41:42 2015 +0300

--
 .../ignite/internal/binary/BinaryUtils.java | 1920 --
 1 file changed, 1920 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/12c8c2ca/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
deleted file mode 100644
index 62a9d26..000
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ /dev/null
@@ -1,1920 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.binary;
-
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.binary.BinaryCollectionFactory;
-import org.apache.ignite.binary.BinaryInvalidTypeException;
-import org.apache.ignite.binary.BinaryMapFactory;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.Binarylizable;
-import org.apache.ignite.internal.binary.builder.BinaryLazyValue;
-import org.apache.ignite.internal.binary.streams.BinaryInputStream;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.jetbrains.annotations.Nullable;
-import org.jsr166.ConcurrentHashMap8;
-
-import java.io.ByteArrayInputStream;
-import java.io.Externalizable;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-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.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Binary utils.
- */
-public class BinaryUtils {
-/** */
-public static final Map PLAIN_CLASS_TO_FLAG = new 
HashMap<>();
-
-/** */
-public static final Map FLAG_TO_CLASS = new HashMap<>();
-
-/** {@code true} if serialized value of this type cannot contain 
references to objects. */
-private static final boolean[] PLAIN_TYPE_FLAG = new boolean[102];
-
-/** Binary classes. */
-private static final Collection BINARY_CLS = new HashSet<>();
-
-/** Flag: user type. */
-public static final short FLAG_USR_TYP = 0x0001;
-
-/** Flag: only raw data exists. */
-public static final short FLAG_HAS_SCHEMA = 0x0002;
-
-/** Flag indicating that object has raw data. */
-public static final short FLAG_HAS_RAW = 0x0004;
-
-/** Flag: offsets take 1 byte. */
-public static final short FLAG_OFFSET_ONE_BYTE = 0x0008;
-
-/** Flag: offsets take 2 bytes. */
-public static final short FLAG_OFFSET_TWO_BYTES = 0x0010;
-
-/** Flag: compact footer, no field IDs. */
-public static final short FLAG_COMPACT_FOOTER = 0x0020;
-
-

[4/5] ignite git commit: IGNITE-2213: Fix.

[vozerov]

IGNITE-2213: Fix.


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

Branch: refs/heads/ignite-2213-1
Commit: 94103ec901cff0d0348328c3e1d6a8abc06f016c
Parents: 59ed328
Author: vozerov-gridgain 
Authored: Mon Dec 21 14:41:07 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 14:41:07 2015 +0300

--
 .../org/apache/ignite/binary/BinaryUtils.java   |   41 +
 .../binary/BinaryCachingMetadataHandler.java|2 +-
 .../internal/binary/BinaryClassDescriptor.java  |3 +-
 .../ignite/internal/binary/BinaryContext.java   |2 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |2 +-
 .../internal/binary/BinaryFieldAccessor.java|4 +-
 .../ignite/internal/binary/BinaryMetadata.java  |2 +-
 .../binary/BinaryMetadataCollector.java |4 +-
 .../internal/binary/BinaryObjectImpl.java   |   10 +-
 .../binary/BinaryObjectOffheapImpl.java |   10 +-
 .../internal/binary/BinaryReaderExImpl.java |  166 +-
 .../ignite/internal/binary/BinarySchema.java|4 +-
 .../ignite/internal/binary/BinaryUtilsEx.java   | 1909 ++
 .../internal/binary/BinaryWriterExImpl.java |   22 +-
 .../binary/BinaryWriterSchemaHolder.java|   12 +-
 .../internal/binary/GridBinaryMarshaller.java   |4 +-
 .../binary/builder/BinaryBuilderReader.java |4 +-
 .../binary/builder/BinaryBuilderSerializer.java |6 +-
 .../binary/builder/BinaryLazyArrayList.java |8 +-
 .../binary/builder/BinaryLazyLinkedList.java|   14 +-
 .../internal/binary/builder/BinaryLazyMap.java  |   10 +-
 .../internal/binary/builder/BinaryLazySet.java  |4 +-
 .../binary/builder/BinaryObjectBuilderImpl.java |   46 +-
 .../processors/cache/CacheObjectContext.java|6 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |   18 +-
 .../BinaryDuplicateFieldsQuerySelfTest.java |  225 +++
 .../IgniteBinaryCacheQueryTestSuite.java|5 +-
 27 files changed, 2360 insertions(+), 183 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/94103ec9/modules/core/src/main/java/org/apache/ignite/binary/BinaryUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryUtils.java 
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryUtils.java
new file mode 100644
index 000..bdbe1da
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.binary;
+
+/**
+ * Utility methods for binary objects.
+ */
+public class BinaryUtils {
+/**
+ * Create qualified field name.
+ *
+ * @param cls Class.
+ * @param fieldName Field name.
+ * @return Qualified field name.
+ */
+public static String qualifiedFieldName(Class cls, String fieldName) {
+return (cls.getName() + "." + fieldName).replace('.', 
'_').replace("$", "__");
+}
+
+/**
+ * Private constructor.
+ */
+private BinaryUtils() {
+// No-op.
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/94103ec9/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
index 39189f0..419976b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
@@ -54,7 +54,7 @@ public class BinaryCachingMetadataHandler implements 

ignite git commit: 1.5.0-final-SNAPSHOT

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 359bf2142 -> e58692375


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/ignite-1.5
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

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

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: 8b4175ddafc304b0c14cd122337d28a2be73c516
Parents: 39b68d0 0dfdaeb
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 18:25:59 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 18:25:59 2015 +0700

--
 .../app/modules/states/configuration/index.js   |  20 +-
 .../src/main/js/app/modules/states/sql/index.js |   5 +-
 .../src/main/js/controllers/sql-controller.js   |   6 +-
 .../src/main/js/public/stylesheets/style.scss   |   7 +-
 .../src/main/js/views/sql/sql.jade  | 251 ++-
 5 files changed, 154 insertions(+), 135 deletions(-)
--

[1/2] ignite git commit: IGNITE-843 WIP BinaryConfiguration.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 0dfdaeb35 -> 8b4175dda


IGNITE-843 WIP BinaryConfiguration.


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

Branch: refs/heads/ignite-843-rc2
Commit: 39b68d01d037fd391acb16399d911c55316265e4
Parents: 59a3dcef7
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 18:25:25 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 18:25:25 2015 +0700

--
 .../main/js/controllers/models/clusters.json| 53 
 modules/control-center-web/src/main/js/db.js|  6 +++
 2 files changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/39b68d01/modules/control-center-web/src/main/js/controllers/models/clusters.json
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/models/clusters.json 
b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 9c5d0a5..da7b23b 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -397,6 +397,59 @@
   ]
 },
 {
+  "label": "Binary configuration",
+  "group": "atomics",
+  "tip": [
+"Configuration for Ignite Binary Objects"
+  ],
+  "fields": [
+{
+  "label": "ID mapper",
+  "id": "idMapper",
+  "type": "text",
+  "path": "binaryConfiguration",
+  "model": "idMapper",
+  "placeholder": "Enter fully qualified class name",
+  "tip": [
+"Type and field ID mapper for binary objects",
+"Ignite never writes full strings for field or type names. 
Instead, for performance reasons, Ignite writes integer hash codes for type and 
field names. It has been tested that hash code conflicts for the type names or 
the field names within the same type are virtually non-existent and, to gain 
performance, it is safe to work with hash codes. For the cases when hash codes 
for different types or fields actually do collide BinaryIdMapper allows 
to override the automatically generated hash code IDs for the type and field 
names"
+  ]
+},
+{
+  "label": "Serializer",
+  "id": "serializer",
+  "type": "text",
+  "path": "binaryConfiguration",
+  "model": "serializer",
+  "placeholder": "Enter fully qualified class name",
+  "tip": [
+"Class with custom serialization logic for binary objects"
+  ]
+},
+{
+  "label": "Type configurations",
+  "id": "typeConfigurations",
+  "type": "text",
+  "path": "binaryConfiguration",
+  "model": "typeConfigurations",
+  "placeholder": "TODO table",
+  "tip": [
+"Configuration properties for binary types"
+  ]
+},
+{
+  "label": "Compact footer",
+  "id": "compactFooter",
+  "type": "check",
+  "path": "binaryConfiguration",
+  "model": "compactFooter",
+  "tip": [
+"When enabled, Ignite will not write fields metadata when 
serializing objects(this will increase serialization performance), because 
internally BinaryMarshaller already distribute metadata inside cluster"
+  ]
+}
+  ]
+},
+{
   "label": "Communication",
   "group": "communication",
   "tip": [

http://git-wip-us.apache.org/repos/asf/ignite/blob/39b68d01/modules/control-center-web/src/main/js/db.js
--
diff --git a/modules/control-center-web/src/main/js/db.js 
b/modules/control-center-web/src/main/js/db.js
index be1f59e..8d57cf8 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -331,6 +331,12 @@ var ClusterSchema = new Schema({
 cacheMode: {type: String, enum: ['LOCAL', 'REPLICATED', 
'PARTITIONED']},
 atomicSequenceReserveSize: Number
 },
+binaryConfiguration: {
+idMapper: String,
+serializer: String,
+typeConfigurations: [{typeName: String, idMapper: String, serializer: 
String, enum: Boolean}],
+compactFooter: Boolean
+},
 caches: [{type: ObjectId, ref: 'Cache'}],
 clockSyncSamples: Number,
 clockSyncFrequency: Number,

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

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 d4687d9f6 -> 6edeccde2


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/ignite-1.5
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
 }
 
 /**  */
-   

ignite git commit: IGNITE-2214 Fixed java code generation.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 8b4175dda -> 38c17d6b6


IGNITE-2214 Fixed java code generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: 38c17d6b6d6a1602d7d6658a588cafc1cf90
Parents: 8b4175d
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 19:26:27 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 19:26:27 2015 +0700

--
 .../main/js/helpers/generator/generator-java.js | 21 +---
 1 file changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/38c17d6b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 4ec98c1..ef43466 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1087,16 +1087,23 @@ $generatorJava.cacheServerNearCache = function (cache, 
varName, res) {
 if (cache.cacheMode === 'PARTITIONED' && cache.nearCacheEnabled) {
 res.needEmptyLine = true;
 
-
res.importClass('org.apache.ignite.configuration.NearCacheConfiguration');
+if (cache.nearConfiguration) {
+$generatorJava.declareVariable(res, 'nearCfg', 
'org.apache.ignite.configuration.NearCacheConfiguration');
 
-$generatorJava.beanProperty(res, varName, cache.nearConfiguration, 
'nearConfiguration', 'nearConfiguration',
-'NearCacheConfiguration', {nearStartSize: null}, true);
+res.needEmptyLine = true;
 
-if (cache.nearConfiguration && 
cache.nearConfiguration.nearEvictionPolicy && 
cache.nearConfiguration.nearEvictionPolicy.kind) {
-$generatorJava.evictionPolicy(res, 'nearConfiguration', 
cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');
-}
+if (cache.nearConfiguration.nearStartSize) {
+$generatorJava.property(res, 'nearCfg', 
cache.nearConfiguration, 'nearStartSize');
 
-res.needEmptyLine = true;
+res.needEmptyLine = true;
+}
+
+if (cache.nearConfiguration.nearEvictionPolicy && 
cache.nearConfiguration.nearEvictionPolicy.kind) {
+$generatorJava.evictionPolicy(res, 'nearCfg', 
cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');
+
+res.needEmptyLine = true;
+}
+}
 }
 
 return res;

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

[akuznetsov]

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/ignite-gg-10889
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 

[04/17] ignite git commit: Failed test IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a ticket.

[akuznetsov]

Failed test IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a 
ticket.


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

Branch: refs/heads/ignite-gg-10889
Commit: 7ff47599911617485e3562b8de73e943bd78
Parents: 301e7a1
Author: vozerov-gridgain 
Authored: Fri Dec 18 12:43:55 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 12:43:55 2015 +0300

--
 .../internal/processors/query/IgniteSqlSplitterSelfTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ff47599/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 865a0fd..5702649 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -230,7 +230,8 @@ public class IgniteSqlSplitterSelfTest extends 
GridCommonAbstractTest {
  *
  */
 public void testFunctionNpe() {
-// TODO IGNITE-1886
+assert false : "https://issues.apache.org/jira/browse/IGNITE-1886;;
+
 IgniteCache userCache = ignite(0).createCache(
 cacheConfig("UserCache", true, Integer.class, User.class));
 IgniteCache userOrderCache = ignite(0).createCache(

[17/17] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889

[akuznetsov]

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


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

Branch: refs/heads/ignite-gg-10889
Commit: 192762b25dae9cc1757593b18d58789943ed5d09
Parents: 71de23a 6edeccd
Author: Alexey Kuznetsov 
Authored: Mon Dec 21 19:29:59 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 21 19:29:59 2015 +0700

--
 RELEASE_NOTES.txt   |   1 +
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  10 +-
 .../datagrid/CacheEntryProcessorExample.java| 157 ++
 .../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 +
 .../datagrid/CacheEntryProcessorExample.java| 147 ++
 .../ScalarCacheEntryProcessorExample.scala  | 125 +
 .../ignite/examples/CacheExamplesSelfTest.java  |   8 +
 .../java8/examples/CacheExamplesSelfTest.java   |   8 +
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 +
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../internal/binary/BinaryClassDescriptor.java  |   5 +-
 .../ignite/internal/binary/BinaryContext.java   |  16 +-
 .../ignite/internal/binary/BinaryWriteMode.java |   3 +
 .../internal/cluster/ClusterGroupAdapter.java   |  10 +-
 .../discovery/GridDiscoveryManager.java |   4 +-
 .../processors/cache/CacheObjectAdapter.java|   3 +
 .../dht/preloader/GridDhtPreloader.java |  31 +-
 .../processors/task/GridTaskWorker.java |   8 +-
 .../internal/util/lang/GridNodePredicate.java   |  13 +-
 .../ignite/internal/util/nio/GridNioServer.java |  11 +-
 .../util/nio/GridSelectorNioSessionImpl.java|   7 +
 .../ignite/spi/discovery/tcp/ClientImpl.java|  48 +-
 .../TcpDiscoveryMulticastIpFinder.java  |  12 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  32 +-
 .../IgniteClientReconnectCacheTest.java |  33 +-
 .../ignite/internal/TaskNodeRestartTest.java| 230 +
 ...IgniteCacheBinaryEntryProcessorSelfTest.java |   4 +-
 .../cache/IgniteCachePutAllRestartTest.java |   2 +-
 .../IgniteCacheSizeFailoverTest.java|   4 +-
 .../random/RandomEvictionPolicySelfTest.java|   4 +-
 .../GridServiceProcessorStopSelfTest.java   |  18 +-
 .../IgniteMessagingWithClientTest.java  |   2 -
 .../GridSessionCheckpointAbstractSelfTest.java  |   3 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |   2 +
 .../cache/BinarySerializationQuerySelfTest.java |   2 +-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  68 ++-
 .../query/IgniteSqlSplitterSelfTest.java|   3 +-
 modules/platforms/cpp/core/impl/doxygen.h   |  53 --
 .../cpp/core/include/ignite/binary/binary.h |   5 +
 .../core/include/ignite/binary/binary_consts.h  |   5 +
 .../include/ignite/binary/binary_containers.h   |   5 +
 .../include/ignite/binary/binary_raw_reader.h   |   5 +
 .../include/ignite/binary/binary_raw_writer.h   |   5 +
 .../core/include/ignite/binary/binary_reader.h  |   5 +
 .../core/include/ignite/binary/binary_type.h|  17 +
 .../core/include/ignite/binary/binary_writer.h  |   5 +
 .../cpp/core/include/ignite/cache/cache.h   |   5 +
 .../cpp/core/include/ignite/cache/cache_entry.h |   5 +
 .../core/include/ignite/cache/cache_peek_mode.h |   5 +
 .../cpp/core/include/ignite/cache/query/query.h |   5 +
 .../include/ignite/cache/query/query_argument.h |   6 +
 .../include/ignite/cache/query/query_cursor.h   |   5 +
 .../ignite/cache/query/query_fields_cursor.h|   5 +
 .../ignite/cache/query/query_fields_row.h   |   5 +
 .../include/ignite/cache/query/query_scan.h |   5 +
 .../core/include/ignite/cache/query/query_sql.h |   5 +
 .../ignite/cache/query/query_sql_fields.h   |   5 +
 .../include/ignite/cache/query/query_text.h |   5 +
 

[02/17] ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse. Use correct 'initialRebalanceFuture' for client nodes.

[akuznetsov]

ignite-1.5 Properly handle duplicated job responses in 
GridTaskWorker.onResponse. Use correct 'initialRebalanceFuture' for client 
nodes.


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

Branch: refs/heads/ignite-gg-10889
Commit: b1f906555cea8990dd39e8050ca4348f09da7f7f
Parents: 301e7a1
Author: sboikov 
Authored: Fri Dec 18 12:08:20 2015 +0300
Committer: sboikov 
Committed: Fri Dec 18 12:08:20 2015 +0300

--
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  10 +-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../processors/task/GridTaskWorker.java |   8 +-
 .../internal/util/lang/GridNodePredicate.java   |  13 +-
 .../ignite/internal/util/nio/GridNioServer.java |  11 +-
 .../util/nio/GridSelectorNioSessionImpl.java|   7 +
 .../TcpDiscoveryMulticastIpFinder.java  |  12 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  32 ++-
 .../IgniteClientReconnectCacheTest.java |   7 +-
 .../ignite/internal/TaskNodeRestartTest.java| 230 +++
 .../IgniteCacheSizeFailoverTest.java|   4 +-
 .../random/RandomEvictionPolicySelfTest.java|   4 +-
 .../GridServiceProcessorStopSelfTest.java   |  18 +-
 .../IgniteMessagingWithClientTest.java  |   2 -
 .../GridSessionCheckpointAbstractSelfTest.java  |   3 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |   2 +
 18 files changed, 340 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
index ef18a29..8207ccf 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -134,7 +134,7 @@ public abstract class ClientAbstractConnectivitySelfTest 
extends GridCommonAbstr
 
 /**
  * Simple test of address list filtering.
- * @throws Exception
+ * @throws Exception If failed.
  */
 public void testResolveReachableOneAddress() throws Exception {
 InetAddress addr = InetAddress.getByAddress(new byte[] {127, 0, 0, 1} 
);

http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/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 9039ed8..75168a1 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
@@ -626,7 +626,15 @@ public class ClusterGroupAdapter implements 
ClusterGroupEx, Externalizable {
 
 /** {@inheritDoc} */
 @Override public final ClusterGroup forRandom() {
-return ids != null ? forNodeId(F.rand(ids)) : forNode(F.rand(nodes()));
+if (!F.isEmpty(ids))
+return forNodeId(F.rand(ids));
+
+Collection nodes = nodes();
+
+if (nodes.isEmpty())
+return new ClusterGroupAdapter(ctx, null, 
Collections.emptySet());
+
+return forNode(F.rand(nodes));
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/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 9a6246f..c46a66c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ 

[13/17] ignite git commit: IGNITE-2187: CPP: Added documentation for files.

[akuznetsov]

IGNITE-2187: CPP: Added documentation for files.


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

Branch: refs/heads/ignite-gg-10889
Commit: 0c7dfec5d802832b0798c1982a543fd85af50acc
Parents: a34bcc8
Author: isapego 
Authored: Fri Dec 18 18:04:46 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 18:04:46 2015 +0300

--
 modules/platforms/cpp/core/impl/doxygen.h   | 53 
 .../cpp/core/include/ignite/binary/binary.h |  5 ++
 .../core/include/ignite/binary/binary_consts.h  |  5 ++
 .../include/ignite/binary/binary_containers.h   |  5 ++
 .../include/ignite/binary/binary_raw_reader.h   |  5 ++
 .../include/ignite/binary/binary_raw_writer.h   |  5 ++
 .../core/include/ignite/binary/binary_reader.h  |  5 ++
 .../core/include/ignite/binary/binary_type.h| 17 +++
 .../core/include/ignite/binary/binary_writer.h  |  5 ++
 .../cpp/core/include/ignite/cache/cache.h   |  5 ++
 .../cpp/core/include/ignite/cache/cache_entry.h |  5 ++
 .../core/include/ignite/cache/cache_peek_mode.h |  5 ++
 .../cpp/core/include/ignite/cache/query/query.h |  5 ++
 .../include/ignite/cache/query/query_argument.h |  6 +++
 .../include/ignite/cache/query/query_cursor.h   |  5 ++
 .../ignite/cache/query/query_fields_cursor.h|  5 ++
 .../ignite/cache/query/query_fields_row.h   |  5 ++
 .../include/ignite/cache/query/query_scan.h |  5 ++
 .../core/include/ignite/cache/query/query_sql.h |  5 ++
 .../ignite/cache/query/query_sql_fields.h   |  5 ++
 .../include/ignite/cache/query/query_text.h |  5 ++
 .../platforms/cpp/core/include/ignite/guid.h|  5 ++
 .../platforms/cpp/core/include/ignite/ignite.h  |  5 ++
 .../core/include/ignite/ignite_configuration.h  |  5 ++
 .../cpp/core/include/ignite/ignite_error.h  |  5 ++
 .../cpp/core/include/ignite/ignition.h  |  5 ++
 modules/platforms/cpp/core/namespaces.dox   | 53 
 27 files changed, 191 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/impl/doxygen.h
--
diff --git a/modules/platforms/cpp/core/impl/doxygen.h 
b/modules/platforms/cpp/core/impl/doxygen.h
deleted file mode 100644
index ed237f6..000
--- a/modules/platforms/cpp/core/impl/doxygen.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \mainpage Apache Ignite C++
- *
- * Apache Ignite In-Memory Data Fabric is a high-performance, integrated and 
distributed in-memory platform for
- * computing and transacting on large-scale data sets in real-time, orders of 
magnitude faster than possible with
- * traditional disk-based or flash-based technologies.
- */
- 
- /**
-  * Apache %Ignite API.
-  */
- namespace ignite
- {
-/**
- * %Ignite Binary Objects API.
- */
-namespace binary
-{
-// Empty.
-}
-
-/**
- * %Ignite %Cache API.
- */
-namespace cache
-{
-/**
- * Contains APIs for creating and executing cache queries.
- */
-namespace query
-{
-// Empty.
-}
-}
- }
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary.h
--
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary.h 
b/modules/platforms/cpp/core/include/ignite/binary/binary.h
index 15476fe..1ffa3e5 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary.h
@@ -15,6 +15,11 @@
 

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

[akuznetsov]

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


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

Branch: refs/heads/ignite-gg-10889
Commit: 24eccb87f7657703390caefe00b06b5a6db08506
Parents: 7ff4759 1a2ebdd
Author: vozerov-gridgain 
Authored: Fri Dec 18 12:44:15 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 12:44:15 2015 +0300

--
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  10 +-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../processors/task/GridTaskWorker.java |   8 +-
 .../internal/util/lang/GridNodePredicate.java   |  13 +-
 .../ignite/internal/util/nio/GridNioServer.java |  11 +-
 .../util/nio/GridSelectorNioSessionImpl.java|   7 +
 .../TcpDiscoveryMulticastIpFinder.java  |  12 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  32 ++-
 .../IgniteClientReconnectCacheTest.java |   7 +-
 .../ignite/internal/TaskNodeRestartTest.java| 230 +++
 ...IgniteCacheBinaryEntryProcessorSelfTest.java |   4 +-
 .../IgniteCacheSizeFailoverTest.java|   4 +-
 .../random/RandomEvictionPolicySelfTest.java|   4 +-
 .../GridServiceProcessorStopSelfTest.java   |  18 +-
 .../IgniteMessagingWithClientTest.java  |   2 -
 .../GridSessionCheckpointAbstractSelfTest.java  |   3 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |   2 +
 19 files changed, 342 insertions(+), 31 deletions(-)
--

[08/17] ignite git commit: IGNITE-2201 - Fixed affinity collocation with AffinityKey and examples model

[akuznetsov]

IGNITE-2201 - Fixed affinity collocation with AffinityKey and examples model


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

Branch: refs/heads/ignite-gg-10889
Commit: bda0b19c7f4af8f51823ddeb2e23583a3217dd5a
Parents: d391daa
Author: Alexey Goncharuk 
Authored: Fri Dec 18 15:29:09 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Dec 18 15:30:23 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(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
index d839c96..aced78c 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.Ignition;
-import org.apache.ignite.examples.model.binary.Address;
-import org.apache.ignite.examples.model.binary.Employee;
+import org.apache.ignite.examples.model.Address;
+import org.apache.ignite.examples.model.Employee;
 import org.apache.ignite.binary.BinaryObject;
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
index b6fc455..f0f57af 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
@@ -28,9 +28,9 @@ import org.apache.ignite.Ignition;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.examples.model.binary.Address;
-import org.apache.ignite.examples.model.binary.Organization;
-import org.apache.ignite.examples.model.binary.OrganizationType;
+import org.apache.ignite.examples.model.Address;
+import org.apache.ignite.examples.model.Organization;
+import org.apache.ignite.examples.model.OrganizationType;
 import org.apache.ignite.binary.BinaryObject;
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
index b05cbb5..11c00e9 100644
--- 

[09/17] ignite git commit: Fixed a single query test.

[akuznetsov]

Fixed a single query test.


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

Branch: refs/heads/ignite-gg-10889
Commit: 10bb798d11fe806657412b5f1ae8a917d13f6ee8
Parents: d391daa
Author: vozerov-gridgain 
Authored: Fri Dec 18 15:54:29 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 15:54:29 2015 +0300

--
 .../IgniteCacheAbstractFieldsQuerySelfTest.java | 54 
 1 file changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/10bb798d/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 07e44da..4c952fc 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
@@ -41,6 +41,7 @@ import 
org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import 
org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
 import 
org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongValue;
@@ -84,6 +85,9 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest 
extends GridCommonA
 /** Flag indicating if starting node should have cache. */
 protected boolean hasCache;
 
+/** Whether BinaryMarshaller is set. */
+protected boolean binaryMarshaller;
+
 /** {@inheritDoc} */
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -206,6 +210,11 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 }
 
 /** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+binaryMarshaller = grid(0).configuration().getMarshaller() instanceof 
BinaryMarshaller;
+}
+
+/** {@inheritDoc} */
 @Override protected void afterTestsStopped() throws Exception {
 stopAllGrids();
 }
@@ -249,31 +258,56 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 assert types.contains("String");
 assert types.contains("Integer");
 
-assert 
AffinityKey.class.getName().equals(meta.keyClass("Person"));
+if (binaryMarshaller) {
+assert 
Object.class.getName().equals(meta.keyClass("Person"));
+assert 
Object.class.getName().equals(meta.valueClass("Person"));
+assert 
Object.class.getName().equals(meta.valueClass("Organization"));
+}
+else {
+assert 
AffinityKey.class.getName().equals(meta.keyClass("Person"));
+assert 
Person.class.getName().equals(meta.valueClass("Person"));
+assert 
Organization.class.getName().equals(meta.valueClass("Organization"));
+}
+
 assert 
String.class.getName().equals(meta.keyClass("Organization"));
 assert 
String.class.getName().equals(meta.keyClass("String"));
-
-assert 
Person.class.getName().equals(meta.valueClass("Person"));
-assert 
Organization.class.getName().equals(meta.valueClass("Organization"));
 assert 
String.class.getName().equals(meta.valueClass("String"));
 
 Map fields = meta.fields("Person");
 
 assert fields != null;
 assert fields.size() == 5;
-assert 
AffinityKey.class.getName().equals(fields.get("_KEY"));
-assert Person.class.getName().equals(fields.get("_VAL"));
+
+if (binaryMarshaller) {
+assert 

[06/17] ignite git commit: IGNITE-2123: Need to add EntryProcessorExample to cache examples

[akuznetsov]

IGNITE-2123: Need to add EntryProcessorExample to cache examples


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

Branch: refs/heads/ignite-gg-10889
Commit: 32cec99465e667e98010da87140a9eb80bfca743
Parents: 24eccb8
Author: Roman Shtykh 
Authored: Fri Dec 18 15:09:00 2015 +0300
Committer: Denis Magda 
Committed: Fri Dec 18 15:09:00 2015 +0300

--
 RELEASE_NOTES.txt   |   1 +
 .../datagrid/CacheEntryProcessorExample.java| 157 +++
 .../datagrid/CacheEntryProcessorExample.java| 147 +
 .../ScalarCacheEntryProcessorExample.scala  | 125 +++
 .../ignite/examples/CacheExamplesSelfTest.java  |   8 +
 .../java8/examples/CacheExamplesSelfTest.java   |   8 +
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 +
 7 files changed, 451 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 243ec18..b0822c9 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -18,6 +18,7 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Fixed and improved cache types configuration.
 * Fixed cache rebalancing.
 * Many stability and fault-tolerance fixes.
+* Added example to demonstrate the usage of EntryProcessor.
 
 Complete list of closed issues: 
https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20fixVersion%20%3D%201.5%20AND%20status%20%3D%20closed
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
new file mode 100644
index 000..38d9631
--- /dev/null
+++ 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.datagrid;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+
+/**
+ * This example demonstrates the simplest code that populates the distributed 
cache
+ * and co-locates simple closure execution with each key. The goal of this 
particular
+ * example is to provide the simplest code example of this logic using 
EntryProcessor.
+ * 
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat} 
examples/config/example-ignite.xml'}.
+ * 
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which 
will
+ * start node with {@code examples/config/example-ignite.xml} configuration.
+ */
+public class CacheEntryProcessorExample {
+/** Cache name. */
+private static final String CACHE_NAME = 
CacheEntryProcessorExample.class.getSimpleName();
+
+/** Number of keys. */
+private static final int KEY_CNT = 20;
+
+/** Keys predefined set. */
+private static final Set KEYS_SET;
+
+/**
+ * Initializes keys set that is used in bulked operations in the example.
+ */
+static {
+KEYS_SET = new HashSet<>();
+
+for (int i = 0; i < KEY_CNT; i++)
+KEYS_SET.add(i);
+}
+
+/**
+ * Executes 

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 6447fa96d -> 111e44743


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


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

Branch: refs/heads/ignite-1537
Commit: 111e44743c1f5ebef5a75d92c030b68ed22bea1b
Parents: 6447fa9
Author: sboikov 
Authored: Mon Dec 21 14:27:20 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 14:27:20 2015 +0300

--
 ...NearOptimisticSerializableTxPrepareFuture.java |  8 +++-
 .../near/GridNearOptimisticTxPrepareFuture.java   |  8 +++-
 .../GridNearOptimisticTxPrepareFutureAdapter.java | 18 ++
 .../near/GridNearPessimisticTxPrepareFuture.java  |  4 +++-
 .../cache/distributed/near/GridNearTxLocal.java   |  6 +++---
 .../near/GridNearTxPrepareFutureAdapter.java  |  4 +++-
 6 files changed, 21 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/111e4474/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 7a1789d..afc2d6d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -83,12 +83,10 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
 /**
  * @param cctx Context.
  * @param tx Transaction.
- * @param waitTopFut If {@code false} does not wait for affinity change 
future.
  */
 public 
GridNearOptimisticSerializableTxPrepareFuture(GridCacheSharedContext cctx,
-GridNearTxLocal tx,
-boolean waitTopFut) {
-super(cctx, tx, waitTopFut);
+GridNearTxLocal tx) {
+super(cctx, tx);
 
 assert tx.optimistic() && tx.serializable() : tx;
 
@@ -859,7 +857,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture 
extends GridNearOptim
  * @param res Response.
  */
 private void remap(final GridNearTxPrepareResponse res) {
-prepareOnTopology(true, new Runnable() {
+prepareOnTopology(true, true, new Runnable() {
 @Override public void run() {
 onDone(res);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/111e4474/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 706f82c..773259e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -71,12 +71,10 @@ public class GridNearOptimisticTxPrepareFuture extends 
GridNearOptimisticTxPrepa
 /**
  * @param cctx Context.
  * @param tx Transaction.
- * @param waitTopFut If {@code false} does not wait for affinity change 
future.
  */
 public GridNearOptimisticTxPrepareFuture(GridCacheSharedContext cctx,
-GridNearTxLocal tx,
-boolean waitTopFut) {
-super(cctx, tx, waitTopFut);
+GridNearTxLocal tx) {
+super(cctx, tx);
 
 assert tx.optimistic() && !tx.serializable() : tx;
 }
@@ -751,7 +749,7 @@ public class GridNearOptimisticTxPrepareFuture extends 
GridNearOptimisticTxPrepa
  *
  */
 private void remap() {
-prepareOnTopology(true, new Runnable() {
+prepareOnTopology(true, true, new Runnable() {
 @Override public void run() {
 onDone((GridNearTxPrepareResponse)null);
 }

[1/5] ignite git commit: IGNITE-2213: Applied the fix.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2213-1 [created] 12c8c2ca2


IGNITE-2213: Applied the fix.


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

Branch: refs/heads/ignite-2213-1
Commit: 59ed328d2fbb0dd678f461276f022269d2ed1a9e
Parents: d4687d9
Author: vozerov-gridgain 
Authored: Mon Dec 21 13:13:42 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 13:13:42 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/59ed328d/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/59ed328d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java

[2/5] ignite git commit: IGNITE-2213: Fix.

[vozerov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/94103ec9/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 8353cdb..b221b30 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.binary.BinaryContext;
 import org.apache.ignite.internal.binary.BinarySchema;
 import org.apache.ignite.internal.binary.BinarySchemaRegistry;
 import org.apache.ignite.internal.binary.BinaryObjectOffheapImpl;
-import org.apache.ignite.internal.binary.BinaryUtils;
+import org.apache.ignite.internal.binary.BinaryUtilsEx;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
@@ -131,7 +131,7 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 
 byte ver = reader.readBytePositioned(start + 
GridBinaryMarshaller.PROTO_VER_POS);
 
-BinaryUtils.checkProtocolVersion(ver);
+BinaryUtilsEx.checkProtocolVersion(ver);
 
 int typeId = reader.readIntPositioned(start + 
GridBinaryMarshaller.TYPE_ID_POS);
 ctx = reader.binaryContext();
@@ -214,16 +214,16 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 assignedFldsById = Collections.emptyMap();
 
 // Get footer details.
-int fieldIdLen = BinaryUtils.fieldIdLength(flags);
-int fieldOffsetLen = BinaryUtils.fieldOffsetLength(flags);
+int fieldIdLen = BinaryUtilsEx.fieldIdLength(flags);
+int fieldOffsetLen = BinaryUtilsEx.fieldOffsetLength(flags);
 
-IgniteBiTuple footer = 
BinaryUtils.footerAbsolute(reader, start);
+IgniteBiTuple footer = 
BinaryUtilsEx.footerAbsolute(reader, start);
 
 int footerPos = footer.get1();
 int footerEnd = footer.get2();
 
 // Get raw position.
-int rawPos = BinaryUtils.rawOffsetAbsolute(reader, start);
+int rawPos = BinaryUtilsEx.rawOffsetAbsolute(reader, start);
 
 // Position reader on data.
 reader.position(start + hdrLen);
@@ -251,7 +251,7 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 else {
 int type = fieldLen != 0 ? reader.readByte(0) : 0;
 
-if (fieldLen != 0 && 
!BinaryUtils.isPlainArrayType(type) && BinaryUtils.isPlainType(type)) {
+if (fieldLen != 0 && 
!BinaryUtilsEx.isPlainArrayType(type) && BinaryUtilsEx.isPlainType(type)) {
 writer.writeFieldId(fieldId);
 
 writer.write(reader.array(), reader.position(), 
fieldLen);
@@ -314,19 +314,19 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 nullObjField = true;
 }
 else
-newFldTypeId = BinaryUtils.typeByClass(val.getClass());
+newFldTypeId = 
BinaryUtilsEx.typeByClass(val.getClass());
 
-String newFldTypeName = 
BinaryUtils.fieldTypeName(newFldTypeId);
+String newFldTypeName = 
BinaryUtilsEx.fieldTypeName(newFldTypeId);
 
 if (oldFldTypeName == null) {
 // It's a new field, we have to add it to metadata.
 if (fieldsMeta == null)
 fieldsMeta = new HashMap<>();
 
-fieldsMeta.put(name, 
BinaryUtils.fieldTypeId(newFldTypeName));
+fieldsMeta.put(name, 
BinaryUtilsEx.fieldTypeId(newFldTypeName));
 }
 else if (!nullObjField) {
-String objTypeName = 
BinaryUtils.fieldTypeName(GridBinaryMarshaller.OBJ);
+String objTypeName = 
BinaryUtilsEx.fieldTypeName(GridBinaryMarshaller.OBJ);
 
 if (!objTypeName.equals(oldFldTypeName) && 
!oldFldTypeName.equals(newFldTypeName)) {
 throw new BinaryObjectException(
@@ -343,8 +343,8 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 
 if (reader != null) {
 // Write raw data if any.
-int rawOff = BinaryUtils.rawOffsetAbsolute(reader, start);
-int footerStart = 

[3/5] ignite git commit: IGNITE-2213: Fix.

[vozerov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/94103ec9/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtilsEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtilsEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtilsEx.java
new file mode 100644
index 000..f11de91
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtilsEx.java
@@ -0,0 +1,1909 @@
+/*
+ * 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.binary;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.binary.BinaryCollectionFactory;
+import org.apache.ignite.binary.BinaryInvalidTypeException;
+import org.apache.ignite.binary.BinaryMapFactory;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.internal.binary.builder.BinaryLazyValue;
+import org.apache.ignite.internal.binary.streams.BinaryInputStream;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import java.io.ByteArrayInputStream;
+import java.io.Externalizable;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+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.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Binary utils.
+ */
+public class BinaryUtilsEx {
+/** */
+public static final Map PLAIN_CLASS_TO_FLAG = new 
HashMap<>();
+
+/** */
+public static final Map FLAG_TO_CLASS = new HashMap<>();
+
+/** {@code true} if serialized value of this type cannot contain 
references to objects. */
+private static final boolean[] PLAIN_TYPE_FLAG = new boolean[102];
+
+/** Binary classes. */
+private static final Collection BINARY_CLS = new HashSet<>();
+
+/** Flag: user type. */
+public static final short FLAG_USR_TYP = 0x0001;
+
+/** Flag: only raw data exists. */
+public static final short FLAG_HAS_SCHEMA = 0x0002;
+
+/** Flag indicating that object has raw data. */
+public static final short FLAG_HAS_RAW = 0x0004;
+
+/** Flag: offsets take 1 byte. */
+public static final short FLAG_OFFSET_ONE_BYTE = 0x0008;
+
+/** Flag: offsets take 2 bytes. */
+public static final short FLAG_OFFSET_TWO_BYTES = 0x0010;
+
+/** Flag: compact footer, no field IDs. */
+public static final short FLAG_COMPACT_FOOTER = 0x0020;
+
+/** Offset which fits into 1 byte. */
+public static final int OFFSET_1 = 1;
+
+/** Offset which fits into 2 bytes. */
+public static final int OFFSET_2 = 2;
+
+/** Offset which fits into 4 bytes. */
+public static final int OFFSET_4 = 4;
+
+/** Field ID length. */
+public static final int FIELD_ID_LEN = 4;
+
+/** Field type names. */
+private static final String[] FIELD_TYPE_NAMES;
+
+/** FNV1 hash offset basis. */
+private static final int FNV1_OFFSET_BASIS = 0x811C9DC5;
+
+/** FNV1 hash prime. */
+private static final int FNV1_PRIME = 0x01000193;
+
+/**
+ * Static class initializer.
+ */
+static {
+PLAIN_CLASS_TO_FLAG.put(Byte.class, GridBinaryMarshaller.BYTE);
+PLAIN_CLASS_TO_FLAG.put(Short.class, 

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 111e44743 -> 1e9d9cc17


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


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

Branch: refs/heads/ignite-1537
Commit: 1e9d9cc1785afc9050c2af936a0d165f7dbafd73
Parents: 111e447
Author: sboikov 
Authored: Mon Dec 21 15:24:20 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 15:24:20 2015 +0300

--
 .../processors/cache/GridCacheContext.java  | 12 +
 .../processors/cache/GridCacheMvccManager.java  | 51 +---
 .../dht/atomic/GridDhtAtomicCache.java  |  9 ++--
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 12 +++--
 5 files changed, 59 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9d9cc1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index c10ebf3..0c2f67c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -244,6 +244,9 @@ public class GridCacheContext implements 
Externalizable {
 /** */
 private boolean deferredDel;
 
+/** */
+private boolean marshallerCache;
+
 /**
  * Empty constructor required for {@link Externalizable}.
  */
@@ -361,6 +364,15 @@ public class GridCacheContext implements 
Externalizable {
 expiryPlc = null;
 
 itHolder = new CacheWeakQueryIteratorsHolder(log);
+
+marshallerCache = cacheType == CacheType.MARSHALLER;
+}
+
+/**
+ * @return {@code True} if marshaller cache.
+ */
+public boolean marshallerCache() {
+return marshallerCache;
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9d9cc1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index dbc6992..46bd093 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -106,6 +106,10 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
 private final ConcurrentMap 
atomicFuts =
 new ConcurrentHashMap8<>();
 
+/** Pending atomic futures. */
+private final ConcurrentMap 
sysCacheAtomicFuts =
+new ConcurrentHashMap8<>();
+
 /** */
 private final ConcurrentMap futs = new 
ConcurrentHashMap8<>();
 
@@ -215,18 +219,28 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
 for (GridCacheFuture fut : activeFutures())
 fut.onNodeLeft(discoEvt.eventNode().id());
 
-for (GridCacheAtomicFuture cacheFut : atomicFuts.values()) {
-cacheFut.onNodeLeft(discoEvt.eventNode().id());
+onNodeLeft(discoEvt.eventNode().id(), sysCacheAtomicFuts);
 
-if (cacheFut.isCancelled() || cacheFut.isDone()) {
-GridCacheVersion futVer = cacheFut.version();
+onNodeLeft(discoEvt.eventNode().id(), atomicFuts);
+}
+};
 
-if (futVer != null)
-atomicFuts.remove(futVer, cacheFut);
-}
+/**
+ * @param nodeId Failed node ID.
+ * @param atomicFuts Futures collection.
+ */
+private void onNodeLeft(UUID nodeId, ConcurrentMap atomicFuts) {
+for (GridCacheAtomicFuture cacheFut : atomicFuts.values()) {
+cacheFut.onNodeLeft(nodeId);
+
+if (cacheFut.isCancelled() || cacheFut.isDone()) {
+GridCacheVersion futVer = cacheFut.version();
+
+if (futVer 

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

[akuznetsov]

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


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/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/ignite-gg-10889
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(-)
--

[14/17] ignite git commit: IGNITE-2169 Fixed incorrect null schema generation.

[akuznetsov]

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/ignite-gg-10889
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
+ *
+ *  

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

[akuznetsov]

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/ignite-gg-10889
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 @@ 

[01/17] ignite git commit: IGNITE-2203: Fixed a bug in BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed for duplicate fields.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-10889 71de23ae5 -> 192762b25


IGNITE-2203: Fixed a bug in BinaryClassDescriptor causing Externalizable object 
to be mistakenly analyzed for duplicate fields.


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

Branch: refs/heads/ignite-gg-10889
Commit: 301e7a1af38a3d9ef8640e74070e8c6b558eb332
Parents: d5a56da
Author: vozerov-gridgain 
Authored: Fri Dec 18 11:46:50 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 11:46:50 2015 +0300

--
 .../apache/ignite/internal/binary/BinaryClassDescriptor.java| 5 -
 .../java/org/apache/ignite/internal/binary/BinaryWriteMode.java | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/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 eac1874..1eb3882 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
@@ -166,7 +166,7 @@ public class BinaryClassDescriptor {
 if (excluded)
 mode = BinaryWriteMode.EXCLUSION;
 else if (useOptMarshaller)
-mode = BinaryWriteMode.OBJECT; // Will not be used anywhere.
+mode = BinaryWriteMode.OPTIMIZED; // Will not be used anywhere.
 else {
 if (cls == BinaryEnumObjectImpl.class)
 mode = BinaryWriteMode.BINARY_ENUM;
@@ -225,6 +225,7 @@ public class BinaryClassDescriptor {
 case BINARY_ENUM:
 case ENUM_ARR:
 case CLASS:
+case OPTIMIZED:
 case EXCLUSION:
 ctor = null;
 fields = null;
@@ -395,6 +396,7 @@ public class BinaryClassDescriptor {
 void write(Object obj, BinaryWriterExImpl writer) throws 
BinaryObjectException {
 assert obj != null;
 assert writer != null;
+assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should 
not be used here: " + cls.getName();
 
 writer.typeId(typeId);
 
@@ -648,6 +650,7 @@ public class BinaryClassDescriptor {
  */
 Object read(BinaryReaderExImpl reader) throws BinaryObjectException {
 assert reader != null;
+assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should 
not be used here: " + cls.getName();
 
 Object res;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 30e0458..b037945 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -154,6 +154,9 @@ public enum BinaryWriteMode {
 OBJECT(GridBinaryMarshaller.OBJ),
 
 /** */
+OPTIMIZED(GridBinaryMarshaller.OBJ),
+
+/** */
 EXCLUSION(GridBinaryMarshaller.OBJ);
 
 /** Type ID. */

[03/17] ignite git commit: IGNITE-2199: Java 8 compile error fix (ambiguous reference to assertEquals) - Fixes #351.

[akuznetsov]

IGNITE-2199: Java 8 compile error fix (ambiguous reference to assertEquals) - 
Fixes #351.

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

Branch: refs/heads/ignite-gg-10889
Commit: 1a2ebdd0bef4a3dd68551ccda09111c1646c76c6
Parents: b1f9065
Author: shtykh_roman 
Authored: Fri Dec 18 12:27:40 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Dec 18 12:27:40 2015 +0300

--
 .../cache/IgniteCacheBinaryEntryProcessorSelfTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2ebdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
index 8e20c3e..a6c2b44 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
@@ -162,11 +162,11 @@ public class IgniteCacheBinaryEntryProcessorSelfTest 
extends GridCommonAbstractT
 assertEquals("updated-" + i, updated.stringValue());
 
 BinaryObject updatedBinary = nodeBinaryCache.get(i);
-assertEquals(i + 1, updatedBinary.field("val"));
+assertEquals(new Integer(i + 1), 
updatedBinary.field("val"));
 assertEquals("updated-" + i, 
updatedBinary.field("strVal"));
 
 updatedBinary = nodeBinaryCache.get(-(i + 1));
-assertEquals(i + 1, updatedBinary.field("val"));
+assertEquals(new Integer(i + 1), 
updatedBinary.field("val"));
 assertEquals("updated-" + i, 
updatedBinary.field("strVal"));
 }
 }

[12/17] ignite git commit: Minor fix.

[akuznetsov]

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/ignite-gg-10889
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;

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

[akuznetsov]

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/ignite-gg-10889
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));
+}
 }
 
 /**

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

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 6edeccde2 -> 359bf2142


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/ignite-1.5
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
--- 

[1/2] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 1e9d9cc17 -> f1e3939ad


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


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

Branch: refs/heads/ignite-1537
Commit: bbde85ceb77532d23fb1a229af34eb3693556d49
Parents: 1e9d9cc
Author: sboikov 
Authored: Mon Dec 21 15:56:00 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 15:56:00 2015 +0300

--
 .../org/apache/ignite/internal/websession/WebSessionSelfTest.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bbde85ce/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
--
diff --git 
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
 
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 4508edb..7a321d6 100644
--- 
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ 
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -142,7 +142,6 @@ public class WebSessionSelfTest extends 
GridCommonAbstractTest {
 }
 
 assert idx != -1;
-assert srv != null;
 
 stopServer(srv);
 
@@ -181,7 +180,6 @@ public class WebSessionSelfTest extends 
GridCommonAbstractTest {
 }
 
 assert idx != -1;
-assert srv != null;
 
 int port = TEST_JETTY_PORT + idx;
 

[2/2] ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: f1e3939ad6f6233237d48b3af33196b8f959232b
Parents: bbde85c
Author: sboikov 
Authored: Mon Dec 21 16:11:45 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 16:11:45 2015 +0300

--
 .../cache/websession/WebSessionFilter.java  | 82 
 1 file changed, 51 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f1e3939a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
--
diff --git 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index 77e2dae..d060884 100644
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -38,14 +38,16 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.cache.CachePartialUpdateException;
+import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.startup.servlet.ServletContextListenerStartup;
 import org.apache.ignite.transactions.Transaction;
 
@@ -191,6 +193,9 @@ public class WebSessionFilter implements Filter {
 /** Transactions enabled flag. */
 private boolean txEnabled;
 
+/** */
+private int retries;
+
 /** {@inheritDoc} */
 @Override public void init(FilterConfig cfg) throws ServletException {
 ctx = cfg.getServletContext();
@@ -207,8 +212,6 @@ public class WebSessionFilter implements Filter {
 cfg.getInitParameter(WEB_SES_MAX_RETRIES_ON_FAIL_NAME_PARAM),
 ctx.getInitParameter(WEB_SES_MAX_RETRIES_ON_FAIL_NAME_PARAM));
 
-int retries;
-
 try {
 retries = retriesStr != null ? Integer.parseInt(retriesStr) : 
DFLT_MAX_RETRIES_ON_FAIL;
 }
@@ -226,10 +229,6 @@ public class WebSessionFilter implements Filter {
 
 log = webSesIgnite.log();
 
-if (webSesIgnite == null)
-throw new IgniteException("Grid for web sessions caching is not 
started (is it configured?): " +
-gridName);
-
 cache = webSesIgnite.cache(cacheName);
 
 if (cache == null)
@@ -409,41 +408,62 @@ public class WebSessionFilter implements Filter {
 
 WebSession cached = new WebSession(ses, true);
 
-try {
-while (true) {
-try {
-IgniteCache cache0;
-
-if (cached.getMaxInactiveInterval() > 0) {
-long ttl = cached.getMaxInactiveInterval() * 1000;
+for (int i = 0; i < retries; i++) {
+try {
+IgniteCache cache0;
 
-ExpiryPolicy plc = new ModifiedExpiryPolicy(new 
Duration(MILLISECONDS, ttl));
+if (cached.getMaxInactiveInterval() > 0) {
+long ttl = cached.getMaxInactiveInterval() * 1000;
 
-cache0 = cache.withExpiryPolicy(plc);
-}
-else
-cache0 = cache;
+ExpiryPolicy plc = new ModifiedExpiryPolicy(new 
Duration(MILLISECONDS, ttl));
 
-WebSession old = cache0.getAndPutIfAbsent(sesId, cached);
+cache0 = cache.withExpiryPolicy(plc);
+}
+else
+cache0 = cache;
 
-if (old != null) {
-cached = old;
+WebSession old = cache0.getAndPutIfAbsent(sesId, cached);
 
-if (cached.isNew())
-cached = new WebSession(cached, false);
-  

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

[sergi]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 81458f51c -> a0cdb5964


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
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 

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

[agoncharuk]

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

Branch: refs/heads/ignite-1.5.1-2
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 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(-)
--

[3/4] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

[agoncharuk]

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/ignite-1.5.1-2
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 

ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 284868099 -> 81458f51c


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/ignite-1.5
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 

[1/4] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

[agoncharuk]

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


.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/ignite-1.5.1-2
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
 
 /// 

[4/4] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2

[agoncharuk]

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
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/b534c427
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b534c427
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b534c427

Branch: refs/heads/ignite-1.5.1-2
Commit: b534c42711d289408bacc9824300d6ec5fcc0fe7
Parents: 524d72e 81458f5
Author: Alexey Goncharuk 
Authored: Mon Dec 21 18:56:55 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 21 18:56:55 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 +
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |   2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs|   2 +-
 .../Cache/Query/Continuous/Package-Info.cs  |   2 +-
 .../Cache/Query/Package-Info.cs |   2 +-
 .../Cache/Store/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |   2 +-
 .../Datastream/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |   2 +-
 .../Lifecycle/Package-Info.cs   |   2 +-
 .../Messaging/Package-Info.cs   |   2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |   2 +-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |   2 +-
 .../Transactions/Package-Info.cs|   2 +-
 24 files changed, 394 insertions(+), 130 deletions(-)
--

[1/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 fe9e6f099 -> f2b1285fb


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


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

Branch: refs/heads/ignite-1537
Commit: a325e0e8c16aec028ac6ed824f436ada6fd55332
Parents: 184bc96 f5e9918
Author: sboikov 
Authored: Mon Nov 30 23:54:37 2015 +0300
Committer: sboikov 
Committed: Mon Nov 30 23:54:37 2015 +0300

--
 examples/pom.xml|   5 +-
 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   |   5 +-
 .../ignite/stream/camel/package-info.java   |  21 
 .../ignite/stream/camel/package-info.java   |  21 
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   9 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   3 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 .../GridCacheLocalIsolatedNodesSelfTest.java|   6 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   7 +-
 .../tcp/IgniteCacheSslStartStopSelfTest.java|   2 +-
 modules/extdata/p2p/pom.xml |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml |   4 +-
 modules/flume/pom.xml   |   5 +-
 .../ignite/stream/flume/package-info.java   |  21 
 .../ignite/stream/flume/package-info.java   |  21 
 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 +-
 .../ignite/stream/jms11/package-info.java   |  21 
 .../ignite/stream/jms11/package-info.java   |  21 
 modules/jta/pom.xml |   2 +-
 modules/kafka/pom.xml   |   2 +-
 .../ignite/stream/kafka/package-info.java   |  21 
 .../ignite/stream/kafka/package-info.java   |  21 
 modules/log4j/pom.xml   |   2 +-
 modules/log4j2/pom.xml  |   2 +-
 modules/mesos/pom.xml   |   2 +-
 modules/mqtt/pom.xml|   5 +-
 .../apache/ignite/stream/mqtt/package-info.java |  21 
 .../apache/ignite/stream/mqtt/package-info.java |  21 
 modules/platforms/cpp/common/configure.ac   |   2 +-
 modules/platforms/cpp/core-test/configure.ac|   2 +-
 modules/platforms/cpp/core/configure.ac |   2 +-
 modules/platforms/cpp/examples/configure.ac |   2 +-
 modules/platforms/cpp/ignite/configure.ac   |   2 +-
 .../Properties/AssemblyInfo.cs  |   4 +-
 .../Properties/AssemblyInfo.cs  |  12 +-
 .../Properties/AssemblyInfo.cs  |   4 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   4 +-
 .../Properties/AssemblyInfo.cs  |   4 +-
 .../Properties/AssemblyInfo.cs  |   4 +-
 modules/rest-http/pom.xml   |   2 +-
 modules/scalar-2.10/pom.xml |   2 +-
 modules/scalar/pom.xml  |   2 +-
 modules/schedule/pom.xml|   2 +-
 modules/schema-import/pom.xml   |   2 +-
 modules/slf4j/pom.xml   |   2 +-
 modules/spark-2.10/pom.xml  |   2 +-
 modules/spark/pom.xml   |   2 +-
 modules/spring/pom.xml  |   2 +-
 .../ignite/cache/store/spring/package-info.java |  21 
 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: 1901199f29c661b2639a2e6c46fc899b5d72798d
Parents: 4ff86c6 fe9e6f0
Author: sboikov 
Authored: Mon Dec 21 20:04:00 2015 +0300
Committer: sboikov 
Committed: Mon Dec 21 20:04:00 2015 +0300

--
 .gitignore  |1 +
 RELEASE_NOTES.txt   |1 +
 assembly/docfiles/ignite_logo.png   |  Bin 0 -> 24315 bytes
 assembly/release-fabric-base.xml|   31 +-
 bin/ignite.bat  |4 +-
 bin/ignitevisorcmd.bat  |1 +
 bin/include/parseargs.bat   |4 +-
 examples/pom.xml|2 +-
 examples/schema-import/README.txt   |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 |8 +-
 .../CacheClientBinaryPutGetExample.java |   14 +-
 .../datagrid/CacheClientBinaryQueryExample.java |   25 +-
 .../store/auto/CacheBinaryAutoStoreExample.java |   47 +-
 .../datagrid/CacheEntryProcessorExample.java|  157 +
 .../examples/datagrid/CacheQueryExample.java|   21 +-
 .../datagrid/CacheTransactionExample.java   |4 +-
 .../starschema/CacheStarSchemaExample.java  |9 +-
 .../store/auto/CacheAutoStoreExample.java   |   32 +-
 .../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 |   87 +-
 .../ignite/examples/model/OrganizationType.java |   32 +
 .../apache/ignite/examples/model/Person.java|   42 +-
 .../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 +-
 .../ignite/examples/util/DbH2ServerStartup.java |   31 +-
 .../datagrid/CacheEntryProcessorExample.java|  147 +
 .../ScalarCacheEntryProcessorExample.scala  |  125 +
 .../examples/ScalarSnowflakeSchemaExample.scala |   31 +-
 .../examples/CacheClientBinaryExampleTest.java  |   46 +
 .../CacheClientPortableExampleTest.java |   46 -
 .../ignite/examples/CacheExamplesSelfTest.java  |   18 +-
 .../ComputeClientBinaryExampleTest.java |   37 +
 .../ComputeClientPortableExampleTest.java   |   37 -
 .../testsuites/IgniteExamplesSelfTestSuite.java |   15 +-
 .../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 +-
 .../client/impl/ClientCacheFlagsCodecTest.java  |8 +-
 .../ClientAbstractConnectivitySelfTest.java |2 +-
 .../src/test/resources/spring-server-node.xml   |8 +-
 .../test/resources/spring-server-ssl-node.xml   |8 +-
 modules/cloud/pom.xml   |2 +-
 modules/codegen/pom.xml |2 +-
 modules/core/pom.xml|   15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   19 +
 .../java/org/apache/ignite/IgniteBinary.java|  124 +-
 .../java/org/apache/ignite/IgniteCache.java |   16 +-
 .../ignite/binary/BinaryCollectionFactory.java  |   33 +
 .../apache/ignite/binary/BinaryMapFactory.java  |   33 +
 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1537
Commit: 4ff86c62984075bddd1895700cc05f4dd21bef78
Parents: 6ce7fdf b0ad044
Author: sboikov 
Authored: Wed Dec 9 18:14:12 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 18:14:12 2015 +0300

--
 RELEASE_NOTES.txt   |   1 +
 bin/ignite.bat  |   5 +-
 bin/include/parseargs.bat   |   2 +-
 examples/config/example-default.xml |   7 +
 examples/pom.xml|   4 +-
 examples/schema-import/pom.xml  |   4 +-
 .../java/org/apache/ignite/schema/Demo.java |   6 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 
 .../datagrid/store/auto/package-info.java   |  22 +
 .../store/auto/CacheAutoStoreExample.java   |  94 ++-
 .../auto/CacheAutoStoreLoadDataExample.java |  85 --
 .../datagrid/store/auto/CacheConfig.java|  81 --
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 --
 .../messaging/MessagingPingPongExample.java |   4 -
 .../ignite/examples/util/DbH2ServerStartup.java |  79 ++
 .../ignite/examples/util/package-info.java  |  22 +
 .../examples/MessagingExamplesSelfTest.java |   2 -
 modules/aop/pom.xml |  14 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |  20 +-
 modules/camel/pom.xml   |  13 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 .../ignite/codegen/MessageCodeGenerator.java|   6 +-
 modules/core/pom.xml|  30 +-
 .../main/java/org/apache/ignite/Ignition.java   |  18 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |  17 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 +
 .../configuration/CacheConfiguration.java   |  39 +-
 .../configuration/IgniteConfiguration.java  |   6 +-
 .../configuration/TransactionConfiguration.java |  47 +-
 .../apache/ignite/internal/GridComponent.java   |   3 +-
 .../ignite/internal/GridPluginComponent.java|   4 +-
 .../apache/ignite/internal/IgniteKernal.java|  20 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  63 +-
 .../ignite/internal/MarshallerContextImpl.java  |  30 +-
 .../internal/managers/GridManagerAdapter.java   |   5 +-
 .../managers/communication/GridIoManager.java   |   3 +-
 .../communication/GridIoMessageFactory.java |   8 +-
 .../deployment/GridDeploymentManager.java   |   5 +-
 .../internal/portable/BinaryFieldAccessor.java  |  90 ++-
 .../internal/portable/BinaryReaderExImpl.java   |  32 +-
 .../internal/portable/BinaryWriterExImpl.java   |  24 +-
 .../portable/PortableClassDescriptor.java   |  46 +-
 .../internal/portable/PortableContext.java  |  46 +-
 .../processors/GridProcessorAdapter.java|   5 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|   2 +-
 .../processors/cache/GridCacheAdapter.java  |  65 +-
 .../cache/GridCacheConcurrentMap.java   | 734 +
 .../processors/cache/GridCacheContext.java  |  36 +-
 .../processors/cache/GridCacheIoManager.java|   2 +-
 .../processors/cache/GridCacheMapEntry.java |  44 +-
 .../cache/GridCacheMapEntryFactory.java |  13 +-
 .../GridCachePartitionExchangeManager.java  |  17 +-
 .../processors/cache/GridCachePreloader.java|  11 +-
 .../processors/cache/GridCacheProcessor.java|  28 +-
 .../CacheDataStructuresManager.java |  31 +-
 .../distributed/GridDistributedCacheEntry.java  |  14 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  13 +-
 .../distributed/dht/GridDhtCacheEntry.java  |  14 +-
 .../dht/GridDhtOffHeapCacheEntry.java   |  15 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  51 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  43 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java |  16 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java|  13 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |  14 +-
 .../GridDhtColocatedOffHeapCacheEntry.java  |  15 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  41 +-
 .../GridDhtPartitionsExchangeFuture.java|   9 +-