[ignite] branch master updated: IGNITE-11988 control.sh validate_indexes SQL Index issue add information about group and cache id - Fixes #6698.

[dgovorukhin]

This is an automated email from the ASF dual-hosted git repository.

dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 99fbecd  IGNITE-11988 control.sh validate_indexes SQL Index issue add 
information about group and cache id - Fixes #6698.
99fbecd is described below

commit 99fbecd078b27aa19db45eaaa38135043f36bb4e
Author: Kirill Tkalenko <tkalkir...@yandex.ru>
AuthorDate: Mon Jul 22 22:32:16 2019 +0300

    IGNITE-11988 control.sh validate_indexes SQL Index issue add information 
about group and cache id - Fixes #6698.
    
    Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
---
 .../internal/visor/verify/ValidateIndexesClosure.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
index 71bdb2e..c7fa349 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
@@ -64,9 +64,9 @@ import 
org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
 import org.apache.ignite.internal.processors.query.QueryTypeDescriptorImpl;
 import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
 import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.H2CacheRow;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2RowDescriptor;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
+import org.apache.ignite.internal.processors.query.h2.opt.H2CacheRow;
 import org.apache.ignite.internal.util.lang.GridIterator;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -738,7 +738,16 @@ public class ValidateIndexesClosure implements 
IgniteCallable<VisorValidateIndex
             }
         }
 
-        String uniqueIdxName = "[cacheGroup=" + ctx.group().name() + ", 
cache=" + ctx.name() + ", idx=" + idx.getName() + "]";
+        CacheGroupContext group = ctx.group();
+
+        String uniqueIdxName = String.format(
+            "[cacheGroup=%s, cacheGroupId=%s, cache=%s, cacheId=%s, idx=%s]",
+            group.name(),
+            group.groupId(),
+            ctx.name(),
+            ctx.cacheId(),
+            idx.getName()
+        );
 
         processedIndexes.incrementAndGet();