svn commit: r1804479 - /ignite/site/trunk/index.html

2017-08-08 Thread vkulichenko 
Author: vkulichenko
Date: Wed Aug  9 00:55:47 2017
New Revision: 1804479

URL: http://svn.apache.org/viewvc?rev=1804479=rev
Log:
changed banner message

Modified:
ignite/site/trunk/index.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1804479=1804478=1804479=diff
==
Binary files - no diff available.

svn commit: r1804478 - /ignite/site/trunk/index.html

2017-08-08 Thread vkulichenko 
Author: vkulichenko
Date: Wed Aug  9 00:49:31 2017
New Revision: 1804478

URL: http://svn.apache.org/viewvc?rev=1804478=rev
Log:
changed banner message

Modified:
ignite/site/trunk/index.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1804478=1804477=1804478=diff
==
Binary files - no diff available.

[ignite] Git Push Summary

2017-08-08 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-5993 [deleted] 7684dfd15

ignite git commit: IGNITE-5993: Done.

2017-08-08 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-5993 [created] 7684dfd15


IGNITE-5993: Done.


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

Branch: refs/heads/ignite-5993
Commit: 7684dfd1597ab8aa675f28e2f77dddc81f9832a1
Parents: 870ecf8
Author: devozerov 
Authored: Tue Aug 8 17:30:36 2017 +0300
Committer: devozerov 
Committed: Tue Aug 8 17:30:36 2017 +0300

--
 .../query/h2/opt/GridH2SpatialIndex.java|   7 -
 .../processors/query/h2/H2RowDescriptor.java|  11 -
 .../processors/query/h2/H2TableEngine.java  |   4 +-
 .../query/h2/database/H2PkHashIndex.java|   7 -
 .../query/h2/database/H2TreeIndex.java  |  26 -
 .../query/h2/opt/GridH2IndexBase.java   |  93 +--
 .../query/h2/opt/GridH2QueryContext.java|  59 --
 .../query/h2/opt/GridH2RowDescriptor.java   |   5 -
 .../processors/query/h2/opt/GridH2Table.java| 186 +-
 .../query/h2/opt/GridH2TreeIndex.java   | 602 ---
 .../query/h2/twostep/GridMapQueryExecutor.java  |  25 -
 .../query/h2/opt/GridH2TableSelfTest.java   | 172 --
 12 files changed, 7 insertions(+), 1190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7684dfd1/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
--
diff --git 
a/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
 
b/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
index 9389290..d83e860 100644
--- 
a/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
+++ 
b/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
@@ -31,7 +31,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.processors.query.h2.H2Cursor;
 import org.apache.ignite.internal.util.GridCursorIteratorWrapper;
-import org.apache.ignite.internal.util.IgniteTree;
 import org.apache.ignite.internal.util.lang.GridCursor;
 import org.h2.engine.Session;
 import org.h2.index.Cursor;
@@ -51,7 +50,6 @@ import org.h2.table.IndexColumn;
 import org.h2.table.TableFilter;
 import org.h2.value.Value;
 import org.h2.value.ValueGeometry;
-import org.jetbrains.annotations.Nullable;
 
 import static 
org.apache.ignite.internal.processors.query.h2.opt.GridH2AbstractKeyValueRow.KEY_COL;
 
@@ -158,11 +156,6 @@ public class GridH2SpatialIndex extends GridH2IndexBase 
implements SpatialIndex
 }
 
 /** {@inheritDoc} */
-@Nullable @Override protected IgniteTree doTakeSnapshot() {
-return null; // TODO We do not support snapshots, but probably this is 
possible.
-}
-
-/** {@inheritDoc} */
 @Override public GridH2Row put(GridH2Row row) {
 assert row instanceof GridH2AbstractKeyValueRow : "requires key to be 
at 0";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7684dfd1/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
index dab83d1..31f0e69 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
@@ -107,9 +107,6 @@ public class H2RowDescriptor implements GridH2RowDescriptor 
{
 private final GridUnsafeGuard guard;
 
 /** */
-private final boolean snapshotableIdx;
-
-/** */
 private final GridQueryProperty[] props;
 
 /** Id of user-defined key column */
@@ -170,9 +167,6 @@ public class H2RowDescriptor implements GridH2RowDescriptor 
{
 
 valueAliasColumnId =
 (type.valueFieldName() != null) ? DEFAULT_COLUMNS_COUNT + 
fieldsList.indexOf(type.valueFieldAlias()) : -1;
-
-// Index is not snapshotable in db-x.
-snapshotableIdx = false;
 }
 
 /** {@inheritDoc} */
@@ -382,11 +376,6 @@ public class H2RowDescriptor implements 
GridH2RowDescriptor {
 }
 
 /** {@inheritDoc} */
-@Override public boolean snapshotableIndex() {
-return

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

2017-08-08 Thread vozerov 
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 870ecf89d94c108c62442263e0ac298697d341d1
Parents: e28d0d6 c141ded
Author: devozerov 
Authored: Tue Aug 8 15:17:18 2017 +0300
Committer: devozerov 
Committed: Tue Aug 8 15:17:18 2017 +0300

--
 .../processors/cache/GridCacheAbstractLocalStoreSelfTest.java | 7 +++
 1 file changed, 7 insertions(+)
--

[1/2] ignite git commit: IGNITE-5982: GridMapQueryExecutor was split into several pieces.

2017-08-08 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/master c141ded25 -> 870ecf89d


IGNITE-5982: GridMapQueryExecutor was split into several pieces.


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

Branch: refs/heads/master
Commit: e28d0d6cc617a4b0c7b0e4c4a5197b69f0c3e4bc
Parents: 9da6938
Author: devozerov 
Authored: Tue Aug 8 15:16:58 2017 +0300
Committer: devozerov 
Committed: Tue Aug 8 15:16:58 2017 +0300

--
 .../query/h2/twostep/GridMapQueryExecutor.java  | 501 ++-
 .../query/h2/twostep/MapNodeResults.java| 108 
 .../query/h2/twostep/MapQueryResult.java| 258 ++
 .../query/h2/twostep/MapQueryResults.java   | 155 ++
 .../h2/twostep/MapReplicatedReservation.java|  38 ++
 .../query/h2/twostep/MapRequestKey.java |  65 +++
 .../query/h2/twostep/MapReservationKey.java |  73 +++
 7 files changed, 730 insertions(+), 468 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e28d0d6c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index fcf5f10..19b628b 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.query.h2.twostep;
 
-import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.util.AbstractCollection;
@@ -31,7 +30,6 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicReferenceArray;
 import javax.cache.CacheException;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
@@ -39,7 +37,6 @@ import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.cache.query.QueryCancelledException;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.events.CacheQueryExecutedEvent;
-import org.apache.ignite.events.CacheQueryReadEvent;
 import org.apache.ignite.events.DiscoveryEvent;
 import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
@@ -57,35 +54,29 @@ import 
org.apache.ignite.internal.processors.cache.query.CacheQueryType;
 import 
org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
 import org.apache.ignite.internal.processors.cache.query.QueryTable;
-import org.apache.ignite.internal.processors.query.GridQueryCancel;
 import org.apache.ignite.internal.processors.query.h2.H2Utils;
 import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
 import org.apache.ignite.internal.processors.query.h2.opt.DistributedJoinMode;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryContext;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2RetryException;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
-import 
org.apache.ignite.internal.processors.query.h2.opt.GridH2ValueCacheObject;
 import 
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest;
 import 
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse;
 import 
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest;
 import 
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse;
 import 
org.apache.ignite.internal.processors.query.h2.twostep.msg.GridH2QueryRequest;
-import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
 import org.apache.ignite.internal.util.GridSpinBusyLock;
 import org.apache.ignite.internal.util.typedef.CI1;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.h2.jdbc.JdbcResultSet;
-import org.h2.result.ResultInterface;
 import

ignite git commit: IGNITE-5984 - Test fix: scan for a test key only after late affinity assignment changes

2017-08-08 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/master 9da69389e -> c141ded25


IGNITE-5984 - Test fix: scan for a test key only after late affinity assignment 
changes


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

Branch: refs/heads/master
Commit: c141ded2565b0b277add5007f73a6fa7e97b3372
Parents: 9da6938
Author: Alexey Goncharuk 
Authored: Tue Aug 8 14:53:34 2017 +0300
Committer: Alexey Goncharuk 
Committed: Tue Aug 8 14:53:34 2017 +0300

--
 .../processors/cache/GridCacheAbstractLocalStoreSelfTest.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c141ded2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index ae9986d..328cde8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.store.CacheLocalStore;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.G;
@@ -294,6 +295,12 @@ public abstract class GridCacheAbstractLocalStoreSelfTest 
extends GridCommonAbst
 
 awaitPartitionMapExchange();
 
+// We need a backup key on grid 1, so we must wait for late affinity 
assignment to change.
+AffinityTopologyVersion waitTopVer = new AffinityTopologyVersion(2, 1);
+
+
grid(1).context().cache().context().exchange().affinityReadyFuture(waitTopVer).get();
+
grid(2).context().cache().context().exchange().affinityReadyFuture(waitTopVer).get();
+
 final String name = BACKUP_CACHE_2;
 
 int key1 = -1;

ignite git commit: IGNITETE-5872 - Fixing tests

2017-08-08 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/ignite-5872 ee6f76965 -> cfbd3275d


IGNITETE-5872 - Fixing tests


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

Branch: refs/heads/ignite-5872
Commit: cfbd3275d8d760a82a9fc3b7a4a8759bdcedfc4f
Parents: ee6f769
Author: Alexey Goncharuk 
Authored: Tue Aug 8 12:24:11 2017 +0300
Committer: Alexey Goncharuk 
Committed: Tue Aug 8 12:24:11 2017 +0300

--
 .../cache/GridCachePartitionExchangeManager.java | 19 +++
 .../dht/GridClientPartitionTopology.java |  2 +-
 .../dht/GridDhtPartitionTopology.java|  2 +-
 .../dht/GridDhtPartitionTopologyImpl.java|  6 --
 .../CachePartitionPartialCountersMap.java| 12 
 .../GridDhtPartitionsExchangeFuture.java |  3 ++-
 .../continuous/GridContinuousProcessor.java  |  4 ++--
 .../schema/SchemaIndexCacheVisitorImpl.java  |  7 +++
 ...eContinuousQueryFailoverAbstractSelfTest.java |  3 ++-
 .../ignite/testsuites/IgniteBasicTestSuite.java  |  3 +--
 10 files changed, 43 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cfbd3275/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 12b313a..27fda14 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -670,7 +670,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
 CacheGroupDescriptor grpDesc = 
cctx.cache().cacheGroupDescriptors().get(grpId);
 
-assert grpDesc != null;
+assert grpDesc != null: "Failed for exchange: " + exchFut;
 
 CacheConfiguration ccfg = grpDesc.config();
 
@@ -1077,7 +1077,8 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 GridDhtPartitionsSingleMessage m = createPartitionsSingleMessage(node,
 id,
 cctx.kernalContext().clientNode(),
-false);
+false,
+null);
 
 if (log.isDebugEnabled())
 log.debug("Sending local partitions [nodeId=" + node.id() + ", 
msg=" + m + ']');
@@ -1102,11 +1103,13 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
  * @param sndCounters {@code True} if need send partition update counters.
  * @return Message.
  */
-public GridDhtPartitionsSingleMessage 
createPartitionsSingleMessage(ClusterNode targetNode,
+public GridDhtPartitionsSingleMessage createPartitionsSingleMessage(
+ClusterNode targetNode,
 @Nullable GridDhtPartitionExchangeId exchangeId,
 boolean clientOnlyExchange,
-boolean sndCounters)
-{
+boolean sndCounters,
+ExchangeActions exchActions
+) {
 GridDhtPartitionsSingleMessage m = new 
GridDhtPartitionsSingleMessage(exchangeId,
 clientOnlyExchange,
 cctx.versions().last(),
@@ -1115,7 +1118,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 Map> dupData = new 
HashMap<>();
 
 for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
-if (!grp.isLocal()) {
+if (!grp.isLocal() && (exchActions == null || 
!exchActions.cacheGroupStopping(grp.groupId( {
 GridDhtPartitionMap locMap = 
grp.topology().localPartitionMap();
 
 addPartitionMap(m,
@@ -1126,7 +1129,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 grp.affinity().similarAffinityKey());
 
 if (sndCounters)
-m.partitionUpdateCounters(grp.groupId(), 
grp.topology().localUpdateCounters());
+m.partitionUpdateCounters(grp.groupId(), 
grp.topology().localUpdateCounters(true));
 }
 }
 
@@ -1144,7 +1147,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 top.similarAffinityKey());
 
 if (sndCounters)
-

ignite git commit: IGNITE-5211: Added new constructor: QueryEntity(Class keyCls, Class valCls). This closes #2371. This closes #2388. This closes #2407.

2017-08-08 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/master 488a6d271 -> 9da69389e


IGNITE-5211: Added new constructor: QueryEntity(Class keyCls, Class valCls). 
This closes #2371. This closes #2388. This closes #2407.


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

Branch: refs/heads/master
Commit: 9da69389ed307357391e4eb87ae077751f30a58e
Parents: 488a6d2
Author: tledkov-gridgain 
Authored: Tue Aug 8 12:05:36 2017 +0300
Committer: devozerov 
Committed: Tue Aug 8 12:05:36 2017 +0300

--
 .../org/apache/ignite/cache/QueryEntity.java| 229 +++
 .../configuration/CacheConfiguration.java   | 615 +--
 .../cache/query/QueryEntityClassProperty.java   | 116 
 .../cache/query/QueryEntityIndexDescriptor.java | 121 
 .../cache/query/QueryEntityTypeDescriptor.java  | 219 +++
 .../h2/sql/AbstractH2CompareQueryTest.java  |   4 +-
 6 files changed, 693 insertions(+), 611 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9da69389/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 955e7d2..5180100 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -18,7 +18,9 @@
 package org.apache.ignite.cache;
 
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,10 +29,20 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import javax.cache.CacheException;
+import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cache.query.annotations.QueryTextField;
+import 
org.apache.ignite.internal.processors.cache.query.QueryEntityClassProperty;
+import 
org.apache.ignite.internal.processors.cache.query.QueryEntityTypeDescriptor;
+import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
+import org.apache.ignite.internal.processors.query.QueryUtils;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Query entity is a description of {@link org.apache.ignite.IgniteCache 
cache} entry (composed of key and value)
@@ -111,6 +123,16 @@ public class QueryEntity implements Serializable {
 }
 
 /**
+ * Creates a query entity with the given key and value types.
+ *
+ * @param keyCls Key type.
+ * @param valCls Value type.
+ */
+public QueryEntity(Class keyCls, Class valCls) {
+this(convert(processKeyAndValueClasses(keyCls,valCls)));
+}
+
+/**
  * Gets key type for this query pair.
  *
  * @return Key type.
@@ -351,6 +373,213 @@ public class QueryEntity implements Serializable {
 return this;
 }
 
+/**
+ * @param desc Type descriptor.
+ * @return Type metadata.
+ */
+private static QueryEntity convert(QueryEntityTypeDescriptor desc) {
+QueryEntity entity = new QueryEntity();
+
+// Key and val types.
+entity.setKeyType(desc.keyClass().getName());
+entity.setValueType(desc.valueClass().getName());
+
+for (QueryEntityClassProperty prop : desc.properties().values())
+entity.addQueryField(prop.fullName(), 
U.box(prop.type()).getName(), prop.alias());
+
+entity.setKeyFields(desc.keyProperties());
+
+QueryIndex txtIdx = null;
+
+Collection idxs = new ArrayList<>();
+
+for (Map.Entry idxEntry : 
desc.indexes().entrySet()) {
+GridQueryIndexDescriptor idx = idxEntry.getValue();
+
+if (idx.type() == QueryIndexType.FULLTEXT) {
+assert txtIdx == null;
+
+txtIdx = new QueryIndex();
+
+txtIdx.setIndexType(QueryIndexType.FULLTEXT);
+
+txtIdx.setFieldNames(idx.fields(), true);
+txtIdx.setName(idxEntry.getKey());
+}
+

[ignite] Git Push Summary

2017-08-08 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/gridgain-web-console-2.1.3 [deleted] 2e5c343d9

ignite git commit: IGNITE-5950 incorrect assertion fixed

2017-08-08 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/gridgain-web-console-2.1.3 [created] 2e5c343d9


IGNITE-5950 incorrect assertion fixed


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

Branch: refs/heads/gridgain-web-console-2.1.3
Commit: 2e5c343d911e353c6d82630d09562664cc5e89e2
Parents: 0eedf46
Author: Sergey Chugunov 
Authored: Mon Aug 7 11:34:01 2017 +0300
Committer: Sergey Chugunov 
Committed: Mon Aug 7 11:34:01 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/2e5c343d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PagePartitionCountersIO.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PagePartitionCountersIO.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PagePartitionCountersIO.java
index 9bd806f..d5b81c1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PagePartitionCountersIO.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PagePartitionCountersIO.java
@@ -129,7 +129,7 @@ public class PagePartitionCountersIO extends PageIO {
 long cacheSize = PageUtils.getLong(pageAddr, off);
 off += 8;
 
-assert cacheSize > 0 : cacheSize;
+assert cacheSize >= 0 : cacheSize;
 
 Long old = res.put(cacheId, cacheSize);