You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2020/11/18 12:58:29 UTC
[ignite] branch master updated: IGNITE-13701 Fixed content,
order and amount of columns in INDEXES, TABLES and SCHEMAS views.
This is an automated email from the ASF dual-hosted git repository.
agura 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 635dafb IGNITE-13701 Fixed content, order and amount of columns in INDEXES, TABLES and SCHEMAS views.
635dafb is described below
commit 635dafb7742673494efa6e8e91e236820156d38f
Author: Andrey Gura <ag...@apache.org>
AuthorDate: Wed May 6 19:16:03 2020 +0300
IGNITE-13701 Fixed content, order and amount of columns in INDEXES, TABLES and SCHEMAS views.
---
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 6 +-
.../apache/ignite/util/SystemViewCommandTest.java | 20 +--
.../processors/cache/GridCacheContextInfo.java | 9 ++
.../query/h2/H2IndexesSystemViewTest.java | 35 +++--
.../systemview/walker/SqlIndexViewWalker.java | 47 ++++---
.../systemview/walker/SqlSchemaViewWalker.java | 4 +-
.../systemview/walker/SqlTableViewWalker.java | 46 +++---
.../internal/processors/query/h2/H2Utils.java | 1 -
.../processors/query/h2/SchemaManager.java | 2 +-
.../ignite/spi/systemview/view/SqlIndexView.java | 155 ++++++++++++---------
.../ignite/spi/systemview/view/SqlSchemaView.java | 2 +-
.../ignite/spi/systemview/view/SqlTableView.java | 92 +++++++++---
.../cache/metric/SqlViewExporterSpiTest.java | 24 ++--
.../IgniteClusterSnapshotWithIndexesTest.java | 2 +-
.../processors/query/SqlSystemViewsSelfTest.java | 80 +++++------
15 files changed, 313 insertions(+), 212 deletions(-)
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index c9ee62a..5975eb0 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -720,6 +720,8 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
"SYS.CACHE_GROUPS.REBALANCE_DELAY.null.19",
"SYS.CACHE_GROUPS.REBALANCE_ORDER.null.10",
"SYS.CACHE_GROUPS.BACKUPS.null.10",
+ "SYS.INDEXES.CACHE_GROUP_ID.null.10",
+ "SYS.INDEXES.CACHE_GROUP_NAME.null.2147483647",
"SYS.INDEXES.CACHE_ID.null.10",
"SYS.INDEXES.CACHE_NAME.null.2147483647",
"SYS.INDEXES.SCHEMA_NAME.null.2147483647",
@@ -836,6 +838,8 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
"SYS.NODE_METRICS.RECEIVED_MESSAGES_COUNT.null.10",
"SYS.NODE_METRICS.RECEIVED_BYTES_COUNT.null.19",
"SYS.NODE_METRICS.OUTBOUND_MESSAGES_QUEUE.null.10",
+ "SYS.TABLES.CACHE_GROUP_ID.null.10",
+ "SYS.TABLES.CACHE_GROUP_NAME.null.2147483647",
"SYS.TABLES.CACHE_ID.null.10",
"SYS.TABLES.CACHE_NAME.null.2147483647",
"SYS.TABLES.SCHEMA_NAME.null.2147483647",
@@ -920,7 +924,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
"SYS.TRANSACTIONS.TOP_VER.null.2147483647",
"SYS.TRANSACTIONS.KEYS_COUNT.null.10",
"SYS.TRANSACTIONS.CACHE_IDS.null.2147483647",
- "SYS.SCHEMAS.NAME.null.2147483647",
+ "SYS.SCHEMAS.SCHEMA_NAME.null.2147483647",
"SYS.SCHEMAS.PREDEFINED.null.1",
"SYS.VIEWS.NAME.null.2147483647",
"SYS.VIEWS.DESCRIPTION.null.2147483647",
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
index a67ca87..e235549 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
@@ -469,15 +469,17 @@ public class SystemViewCommandTest extends GridCommandHandlerClusterByClassAbstr
List<String> row = sqlTablesView.get(0);
- assertEquals("T1", row.get(0)); // TABLE_NAME
- assertEquals(DFLT_SCHEMA, row.get(1)); // SCHEMA_NAME
- assertEquals("SQL_PUBLIC_T1", row.get(2)); // CACHE_NAME
- assertEquals(Integer.toString(cacheId("SQL_PUBLIC_T1")), row.get(3)); // CACHE_ID
- assertEquals("null", row.get(4)); // AFFINITY_KEY_COLUMN
- assertEquals("ID", row.get(5)); // KEY_ALIAS
- assertEquals("null", row.get(6)); // VALUE_ALIAS
- assertEquals("java.lang.Long", row.get(7)); // KEY_TYPE_NAME
- assertFalse("null".equals(row.get(8))); // VALUE_TYPE_NAME
+ assertEquals(Integer.toString(cacheId("SQL_PUBLIC_T1")), row.get(0)); // CACHE_GROUP_ID
+ assertEquals("SQL_PUBLIC_T1", row.get(1)); // CACHE_GROUP_NAME
+ assertEquals(Integer.toString(cacheId("SQL_PUBLIC_T1")), row.get(2)); // CACHE_ID
+ assertEquals("SQL_PUBLIC_T1", row.get(3)); // CACHE_NAME
+ assertEquals(DFLT_SCHEMA, row.get(4)); // SCHEMA_NAME
+ assertEquals("T1", row.get(5)); // TABLE_NAME
+ assertEquals("null", row.get(6)); // AFFINITY_KEY_COLUMN
+ assertEquals("ID", row.get(7)); // KEY_ALIAS
+ assertEquals("null", row.get(8)); // VALUE_ALIAS
+ assertEquals("java.lang.Long", row.get(9)); // KEY_TYPE_NAME
+ assertFalse("null".equals(row.get(10))); // VALUE_TYPE_NAME
executeSql(ignite0, "CREATE TABLE T2(ID LONG PRIMARY KEY, NAME VARCHAR)");
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContextInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContextInfo.java
index d1b5506..6a5f6c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContextInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContextInfo.java
@@ -93,6 +93,15 @@ public class GridCacheContextInfo<K, V> {
}
/**
+ * Returns name of cache group.
+ *
+ * @return Cache group name.
+ */
+ public String groupName() {
+ return CacheGroupContext.cacheOrGroupName(config);
+ }
+
+ /**
* @return Cache group id.
*/
public int groupId() {
diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexesSystemViewTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexesSystemViewTest.java
index b1dab6e..35b5847 100644
--- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexesSystemViewTest.java
+++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexesSystemViewTest.java
@@ -53,16 +53,16 @@ public class H2IndexesSystemViewTest extends GridCommonAbstractTest {
execSql("CREATE SPATIAL INDEX IDX_GEO_1 ON PUBLIC.AFF_CACHE(GEOM)");
String idxSql = "SELECT " +
- " CACHE_ID," +
- " CACHE_NAME," +
- " SCHEMA_NAME," +
- " TABLE_NAME," +
- " INDEX_NAME," +
- " INDEX_TYPE," +
- " COLUMNS," +
- " IS_PK," +
- " IS_UNIQUE," +
- " INLINE_SIZE" +
+ " CACHE_ID," +
+ " CACHE_NAME," +
+ " SCHEMA_NAME," +
+ " TABLE_NAME," +
+ " INDEX_NAME," +
+ " INDEX_TYPE," +
+ " COLUMNS," +
+ " IS_PK," +
+ " IS_UNIQUE," +
+ " INLINE_SIZE" +
" FROM SYS.INDEXES ORDER BY TABLE_NAME, INDEX_NAME";
List<List<?>> srvNodeIndexes = execSql(srv, idxSql);
@@ -72,23 +72,22 @@ public class H2IndexesSystemViewTest extends GridCommonAbstractTest {
for (List<?> idx : clientNodeNodeIndexes)
assertTrue(srvNodeIndexes.contains(idx));
- String[][] expectedResults = {
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "IDX_GEO_1", "SPATIAL", "\"GEOM\" ASC", "false", "false", "0"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC", "true", "true", "5"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC", "true", "true", "0"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK_proxy", "BTREE", "\"ID1\" ASC", "false", "false", "0"}
+ Object[][] expectedResults = {
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "IDX_GEO_1", "SPATIAL", "\"GEOM\" ASC", false, false, null},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "__SCAN_", "SCAN", null, false, false, null},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC", true, true, 5},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC", false, true, null}
};
for (int i = 0; i < srvNodeIndexes.size(); i++) {
List<?> resRow = srvNodeIndexes.get(i);
- String[] expRow = expectedResults[i];
+ Object[] expRow = expectedResults[i];
assertEquals(expRow.length, resRow.size());
for (int j = 0; j < expRow.length; j++)
- assertEquals(expRow[j], String.valueOf(resRow.get(j)));
+ assertEquals(expRow[j], resRow.get(j));
}
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java
index 4a2cdd51..6384c71 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.managers.systemview.walker;
-import org.apache.ignite.internal.processors.query.h2.database.H2IndexType;
import org.apache.ignite.spi.systemview.view.SqlIndexView;
import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
@@ -30,34 +29,38 @@ import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
public class SqlIndexViewWalker implements SystemViewRowAttributeWalker<SqlIndexView> {
/** {@inheritDoc} */
@Override public void visitAll(AttributeVisitor v) {
- v.accept(0, "indexName", String.class);
- v.accept(1, "indexType", H2IndexType.class);
- v.accept(2, "columns", String.class);
- v.accept(3, "schemaName", String.class);
- v.accept(4, "tableName", String.class);
- v.accept(5, "cacheName", String.class);
- v.accept(6, "cacheId", int.class);
- v.accept(7, "inlineSize", int.class);
- v.accept(8, "isPk", boolean.class);
- v.accept(9, "isUnique", boolean.class);
+ v.accept(0, "cacheGroupId", int.class);
+ v.accept(1, "cacheGroupName", String.class);
+ v.accept(2, "cacheId", int.class);
+ v.accept(3, "cacheName", String.class);
+ v.accept(4, "schemaName", String.class);
+ v.accept(5, "tableName", String.class);
+ v.accept(6, "indexName", String.class);
+ v.accept(7, "indexType", String.class);
+ v.accept(8, "columns", String.class);
+ v.accept(9, "isPk", boolean.class);
+ v.accept(10, "isUnique", boolean.class);
+ v.accept(11, "inlineSize", Integer.class);
}
/** {@inheritDoc} */
@Override public void visitAll(SqlIndexView row, AttributeWithValueVisitor v) {
- v.accept(0, "indexName", String.class, row.indexName());
- v.accept(1, "indexType", H2IndexType.class, row.indexType());
- v.accept(2, "columns", String.class, row.columns());
- v.accept(3, "schemaName", String.class, row.schemaName());
- v.accept(4, "tableName", String.class, row.tableName());
- v.accept(5, "cacheName", String.class, row.cacheName());
- v.acceptInt(6, "cacheId", row.cacheId());
- v.acceptInt(7, "inlineSize", row.inlineSize());
- v.acceptBoolean(8, "isPk", row.isPk());
- v.acceptBoolean(9, "isUnique", row.isUnique());
+ v.acceptInt(0, "cacheGroupId", row.cacheGroupId());
+ v.accept(1, "cacheGroupName", String.class, row.cacheGroupName());
+ v.acceptInt(2, "cacheId", row.cacheId());
+ v.accept(3, "cacheName", String.class, row.cacheName());
+ v.accept(4, "schemaName", String.class, row.schemaName());
+ v.accept(5, "tableName", String.class, row.tableName());
+ v.accept(6, "indexName", String.class, row.indexName());
+ v.accept(7, "indexType", String.class, row.indexType());
+ v.accept(8, "columns", String.class, row.columns());
+ v.acceptBoolean(9, "isPk", row.isPk());
+ v.acceptBoolean(10, "isUnique", row.isUnique());
+ v.accept(11, "inlineSize", Integer.class, row.inlineSize());
}
/** {@inheritDoc} */
@Override public int count() {
- return 10;
+ return 12;
}
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java
index d43a903..ca440e8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java
@@ -29,13 +29,13 @@ import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
public class SqlSchemaViewWalker implements SystemViewRowAttributeWalker<SqlSchemaView> {
/** {@inheritDoc} */
@Override public void visitAll(AttributeVisitor v) {
- v.accept(0, "name", String.class);
+ v.accept(0, "schemaName", String.class);
v.accept(1, "predefined", boolean.class);
}
/** {@inheritDoc} */
@Override public void visitAll(SqlSchemaView row, AttributeWithValueVisitor v) {
- v.accept(0, "name", String.class, row.name());
+ v.accept(0, "schemaName", String.class, row.schemaName());
v.acceptBoolean(1, "predefined", row.predefined());
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java
index 8fd2cb2..0826618 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java
@@ -29,34 +29,38 @@ import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
public class SqlTableViewWalker implements SystemViewRowAttributeWalker<SqlTableView> {
/** {@inheritDoc} */
@Override public void visitAll(AttributeVisitor v) {
- v.accept(0, "tableName", String.class);
- v.accept(1, "schemaName", String.class);
- v.accept(2, "cacheName", String.class);
- v.accept(3, "cacheId", int.class);
- v.accept(4, "affinityKeyColumn", String.class);
- v.accept(5, "keyAlias", String.class);
- v.accept(6, "valueAlias", String.class);
- v.accept(7, "keyTypeName", String.class);
- v.accept(8, "valueTypeName", String.class);
- v.accept(9, "isIndexRebuildInProgress", boolean.class);
+ v.accept(0, "cacheGroupId", int.class);
+ v.accept(1, "cacheGroupName", String.class);
+ v.accept(2, "cacheId", int.class);
+ v.accept(3, "cacheName", String.class);
+ v.accept(4, "schemaName", String.class);
+ v.accept(5, "tableName", String.class);
+ v.accept(6, "affinityKeyColumn", String.class);
+ v.accept(7, "keyAlias", String.class);
+ v.accept(8, "valueAlias", String.class);
+ v.accept(9, "keyTypeName", String.class);
+ v.accept(10, "valueTypeName", String.class);
+ v.accept(11, "isIndexRebuildInProgress", boolean.class);
}
/** {@inheritDoc} */
@Override public void visitAll(SqlTableView row, AttributeWithValueVisitor v) {
- v.accept(0, "tableName", String.class, row.tableName());
- v.accept(1, "schemaName", String.class, row.schemaName());
- v.accept(2, "cacheName", String.class, row.cacheName());
- v.acceptInt(3, "cacheId", row.cacheId());
- v.accept(4, "affinityKeyColumn", String.class, row.affinityKeyColumn());
- v.accept(5, "keyAlias", String.class, row.keyAlias());
- v.accept(6, "valueAlias", String.class, row.valueAlias());
- v.accept(7, "keyTypeName", String.class, row.keyTypeName());
- v.accept(8, "valueTypeName", String.class, row.valueTypeName());
- v.acceptBoolean(9, "isIndexRebuildInProgress", row.isIndexRebuildInProgress());
+ v.acceptInt(0, "cacheGroupId", row.cacheGroupId());
+ v.accept(1, "cacheGroupName", String.class, row.cacheGroupName());
+ v.acceptInt(2, "cacheId", row.cacheId());
+ v.accept(3, "cacheName", String.class, row.cacheName());
+ v.accept(4, "schemaName", String.class, row.schemaName());
+ v.accept(5, "tableName", String.class, row.tableName());
+ v.accept(6, "affinityKeyColumn", String.class, row.affinityKeyColumn());
+ v.accept(7, "keyAlias", String.class, row.keyAlias());
+ v.accept(8, "valueAlias", String.class, row.valueAlias());
+ v.accept(9, "keyTypeName", String.class, row.keyTypeName());
+ v.accept(10, "valueTypeName", String.class, row.valueTypeName());
+ v.acceptBoolean(11, "isIndexRebuildInProgress", row.isIndexRebuildInProgress());
}
/** {@inheritDoc} */
@Override public int count() {
- return 10;
+ return 12;
}
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
index 233b272..ecd8169 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
@@ -992,7 +992,6 @@ public class H2Utils {
*
* @return Array of key and affinity columns. Key's, if it possible, splitted into simple components.
*/
- @SuppressWarnings("ZeroLengthArrayAllocation")
@NotNull public static IndexColumn[] unwrapKeyColumns(GridH2Table tbl, IndexColumn[] idxCols) {
ArrayList<IndexColumn> keyCols = new ArrayList<>();
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
index 6091b4e..ad09200 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
@@ -169,7 +169,7 @@ public class SchemaManager {
ctx.systemView().registerInnerCollectionView(SQL_IDXS_VIEW, SQL_IDXS_VIEW_DESC,
new SqlIndexViewWalker(),
dataTables.values(),
- GridH2Table::getIndexes,
+ GridH2Table::indexesInformation,
SqlIndexView::new);
ctx.systemView().registerInnerArrayView(SQL_TBL_COLS_VIEW, SQL_TBL_COLS_VIEW_DESC,
diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
index 05eda7d..664be99 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
@@ -18,14 +18,8 @@
package org.apache.ignite.spi.systemview.view;
import org.apache.ignite.internal.managers.systemview.walker.Order;
-import org.apache.ignite.internal.processors.query.h2.H2Utils;
-import org.apache.ignite.internal.processors.query.h2.database.H2IndexType;
-import org.apache.ignite.internal.processors.query.h2.database.H2PkHashIndex;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2ProxyIndex;
+import org.apache.ignite.internal.processors.query.h2.database.IndexInformation;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
-import org.apache.ignite.internal.processors.query.h2.opt.H2TableScanIndex;
-import org.h2.index.Index;
/**
* Sql index representation for a {@link SystemView}.
@@ -35,103 +29,130 @@ public class SqlIndexView {
private final GridH2Table tbl;
/** Index. */
- private final Index idx;
-
- /** Index type. */
- private final H2IndexType type;
+ private final IndexInformation idx;
/** */
- public SqlIndexView(GridH2Table tbl, Index idx) {
+ public SqlIndexView(GridH2Table tbl, IndexInformation idx) {
this.tbl = tbl;
this.idx = idx;
- this.type = type(idx);
}
- /** @return Cache id. */
+ /**
+ * Returns cache group ID.
+ *
+ * @return Cache group ID.
+ */
+ @Order()
+ public int cacheGroupId() {
+ return tbl.cacheInfo().groupId();
+ }
+
+ /**
+ * Returns Cache group name.
+ *
+ * @return Cache group name.
+ */
+ @Order(1)
+ public String cacheGroupName() {
+ return tbl.cacheInfo().groupName();
+ }
+
+ /**
+ * Returns cache ID.
+ * @return Cache ID.
+ */
+ @Order(2)
public int cacheId() {
return tbl.cacheId();
}
- /** @return Cache name. */
- @Order(5)
+ /**
+ * Returns cache name.
+ *
+ * @return Cache name.
+ */
+ @Order(3)
public String cacheName() {
return tbl.cacheName();
}
- /** @return Schema name. */
- @Order(3)
+ /**
+ * Returns schema name.
+ *
+ * @return Schema name.
+ */
+ @Order(4)
public String schemaName() {
return tbl.getSchema().getName();
}
- /** @return Table name. */
- @Order(4)
+ /**
+ * Returns table name.
+ *
+ * @return Table name.
+ */
+ @Order(5)
public String tableName() {
return tbl.identifier().table();
}
- /** @return Index name. */
- @Order()
+ /**
+ * Returns index name.
+ *
+ * @return Index name.
+ */
+ @Order(6)
public String indexName() {
- return idx.getName();
+ return idx.name();
}
- /** @return Index type. */
- @Order(1)
- public H2IndexType indexType() {
- return type;
+ /**
+ * Returns index type.
+ *
+ * @return Index type.
+ */
+ @Order(7)
+ public String indexType() {
+ return idx.type();
}
- /** @return Indexed columns. */
- @Order(2)
+ /**
+ * Returns all columns on which index is built.
+ *
+ * @return Coma separated indexed columns.
+ */
+ @Order(8)
public String columns() {
- switch (type) {
- case HASH:
- case BTREE:
- return H2Utils.indexColumnsSql(H2Utils.unwrapKeyColumns(tbl, idx.getIndexColumns()));
-
- case SPATIAL:
- return H2Utils.indexColumnsSql(idx.getIndexColumns());
-
- case SCAN:
- return null;
-
- default:
- return "???";
- }
+ return idx.keySql();
}
- /** @return {@code True} if primary key index, {@code false} otherwise. */
+ /**
+ * Returns boolean value which indicates whether this index is for primary key or not.
+ *
+ * @return {@code True} if primary key index, {@code false} otherwise.
+ */
+ @Order(9)
public boolean isPk() {
- return idx.getIndexType().isPrimaryKey();
+ return idx.pk();
}
- /** @return {@code True} if unique index, {@code false} otherwise. */
+ /**
+ * Returns boolean value which indicates whether this index is unique or not.
+ *
+ * @return {@code True} if unique index, {@code false} otherwise.
+ */
+ @Order(10)
public boolean isUnique() {
- return idx.getIndexType().isUnique();
- }
-
- /** @return Inline size. */
- public int inlineSize() {
- return idx instanceof H2TreeIndexBase ? ((H2TreeIndexBase)idx).inlineSize() : 0;
+ return idx.unique();
}
/**
- * @param idx Inde.
- * @return Index type.
+ * Returns inline size in bytes.
+ *
+ * @return Inline size.
*/
- private static H2IndexType type(Index idx) {
- if (idx instanceof H2TreeIndexBase) {
- return H2IndexType.BTREE;
- } else if (idx instanceof H2PkHashIndex)
- return H2IndexType.HASH;
- else if (idx instanceof H2TableScanIndex)
- return H2IndexType.SCAN;
- else if (idx instanceof GridH2ProxyIndex)
- return type(((GridH2ProxyIndex)idx).underlyingIndex());
- else if (idx.getIndexType().isSpatial())
- return H2IndexType.SPATIAL;
-
- return null;
+ @Order(11)
+ public Integer inlineSize() {
+ return idx.inlineSize();
}
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlSchemaView.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlSchemaView.java
index f091632..7a1ecbd 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlSchemaView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlSchemaView.java
@@ -36,7 +36,7 @@ public class SqlSchemaView {
/** @return Schema name. */
@Order
- public String name() {
+ public String schemaName() {
return schema.schemaName();
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlTableView.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlTableView.java
index cc2a511..c2b8a89 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlTableView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlTableView.java
@@ -47,56 +47,112 @@ public class SqlTableView {
}
}
- /** @return Cache id. */
- @Order(3)
+ /**
+ * Returns cache group ID.
+ *
+ * @return Cache group ID.
+ */
+ @Order()
+ public int cacheGroupId() {
+ return tbl.cacheInfo().groupId();
+ }
+
+ /**
+ * Returns Cache group name.
+ *
+ * @return Cache group name.
+ */
+ @Order(1)
+ public String cacheGroupName() {
+ return tbl.cacheInfo().groupName();
+ }
+
+ /**
+ * Returns cache ID.
+ *
+ * @return Cache ID.
+ */
+ @Order(2)
public int cacheId() {
return tbl.cacheId();
}
- /** @return Cache name. */
- @Order(2)
+ /**
+ * Returns cache name.
+ *
+ * @return Cache name.
+ */
+ @Order(3)
public String cacheName() {
return tbl.cacheName();
}
- /** @return Schema name. */
- @Order(1)
+ /**
+ * Returns schema name.
+ *
+ * @return Schema name.
+ */
+ @Order(4)
public String schemaName() {
return tbl.getSchema().getName();
}
- /** @return Table name. */
- @Order
+ /**
+ * Returns table name.
+ *
+ * @return Table name.
+ */
+ @Order(5)
public String tableName() {
return tbl.identifier().table();
}
- /** @return Affinity key column. */
- @Order(4)
+ /**
+ * Returns name of affinity key column.
+ *
+ * @return Affinity key column name.
+ */
+ @Order(6)
public String affinityKeyColumn() {
return affColName;
}
- /** @return Key alias. */
- @Order(5)
+ /**
+ * Returns alias for key column.
+ *
+ * @return Key alias.
+ */
+ @Order(7)
public String keyAlias() {
return tbl.rowDescriptor().type().keyFieldAlias();
}
- /** @return Value alias. */
- @Order(6)
+ /**
+ * Returns alias for value column.
+ *
+ * @return Value alias.
+ */
+ @Order(8)
public String valueAlias() {
return tbl.rowDescriptor().type().valueFieldAlias();
}
- /** @return Key type name. */
- @Order(7)
+ /**
+ * Returns name of key type.
+ *
+ * @return Key type name.
+ */
+ @Order(9)
public String keyTypeName() {
return tbl.rowDescriptor().type().keyTypeName();
}
- /** @return Value type name. */
- @Order(8)
+ /**
+ * Returns name of value type.
+ *
+ * @return Value type name.
+ */
+ @Order(10)
public String valueTypeName() {
return tbl.rowDescriptor().type().valueTypeName();
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java
index b0ad058..eb87a1d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java
@@ -380,7 +380,7 @@ public class SqlViewExporterSpiTest extends AbstractExporterSpiTest {
Set<String> schemaFromSysView = new HashSet<>();
- schemasSysView.forEach(v -> schemaFromSysView.add(v.name()));
+ schemasSysView.forEach(v -> schemaFromSysView.add(v.schemaName()));
HashSet<String> expSchemas = new HashSet<>(asList("MY_SCHEMA", "ANOTHER_SCHEMA", "SYS", "PUBLIC"));
@@ -453,20 +453,22 @@ public class SqlViewExporterSpiTest extends AbstractExporterSpiTest {
assertEquals(1, res.size());
- List tbl = res.get(0);
+ List<?> tbl = res.get(0);
int cacheId = cacheId("SQL_PUBLIC_T1");
String cacheName = "SQL_PUBLIC_T1";
- assertEquals("T1", tbl.get(0)); // TABLE_NAME
- assertEquals(DFLT_SCHEMA, tbl.get(1)); // SCHEMA_NAME
- assertEquals(cacheName, tbl.get(2)); // CACHE_NAME
- assertEquals(cacheId, tbl.get(3)); // CACHE_ID
- assertNull(tbl.get(4)); // AFFINITY_KEY_COLUMN
- assertEquals("ID", tbl.get(5)); // KEY_ALIAS
- assertNull(tbl.get(6)); // VALUE_ALIAS
- assertEquals("java.lang.Long", tbl.get(7)); // KEY_TYPE_NAME
- assertNotNull(tbl.get(8)); // VALUE_TYPE_NAME
+ assertEquals(cacheId, tbl.get(0)); // CACHE_GROUP_ID
+ assertEquals(cacheName, tbl.get(1)); // CACHE_GROUP_NAME
+ assertEquals(cacheId, tbl.get(2)); // CACHE_ID
+ assertEquals(cacheName, tbl.get(3)); // CACHE_NAME
+ assertEquals(DFLT_SCHEMA, tbl.get(4)); // SCHEMA_NAME
+ assertEquals("T1", tbl.get(5)); // TABLE_NAME
+ assertNull(tbl.get(6)); // AFFINITY_KEY_COLUMN
+ assertEquals("ID", tbl.get(7)); // KEY_ALIAS
+ assertNull(tbl.get(8)); // VALUE_ALIAS
+ assertEquals("java.lang.Long", tbl.get(9)); // KEY_TYPE_NAME
+ assertNotNull(tbl.get(10)); // VALUE_TYPE_NAME
execute(ignite0, "CREATE TABLE T2(ID LONG PRIMARY KEY, NAME VARCHAR)");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
index 4f6663d..a263df8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
@@ -154,7 +154,7 @@ public class IgniteClusterSnapshotWithIndexesTest extends AbstractSnapshotSelfTe
IgniteEx snp = startGridsFromSnapshot(grids, SNAPSHOT_NAME);
List<String> currIdxNames = executeSql(snp, "SELECT * FROM SYS.INDEXES").stream().
- map(l -> (String)l.get(0))
+ map(l -> (String)l.get(6))
.collect(Collectors.toList());
assertTrue("Concurrently created indexes must not exist in the snapshot: " + currIdxNames,
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
index 5167651..a037e19 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
@@ -280,48 +280,46 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
//ToDo: As of now we can see duplicates columns within index due to https://issues.apache.org/jira/browse/IGNITE-11125
- String[][] expectedResults = {
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "AFFINITY_KEY", "BTREE", "\"ID2\" ASC, \"ID1\" ASC", "false", "false", "10"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", "true", "true", "10"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"-825022849", "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC, \"ID2\" ASC", "true", "true", "0"},
-
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "IDX_2", "BTREE", "\"ID\" DESC, \"ID\" ASC", "false", "false", "13"},
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "IDX_2_proxy", "BTREE", "\"ID\" DESC, \"ID\" ASC", "false", "false", "0"},
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK", "BTREE", "\"ID\" ASC", "true", "true", "5"},
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK_hash", "HASH", "\"ID\" ASC", "true", "true", "0"},
- {"707660652", "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK_proxy", "BTREE", "\"ID\" ASC", "false", "false", "0"},
-
- {"1374144180", "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "AFFINITY_KEY", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", "false", "false", "10"},
- {"1374144180", "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "IDX_AFF_1", "BTREE", "\"ID2\" DESC, \"ID1\" ASC, \"MY_VAL\" DESC", "false", "false", "10"},
- {"1374144180", "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", "true", "true", "10"},
- {"1374144180", "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"1374144180", "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC, \"ID1\" ASC", "true", "true", "0"},
-
- {"1102275506", "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "IDX_1", "BTREE", "\"ID2\" DESC, \"ID1\" ASC, \"MY_VAL\" DESC, \"ID1\" ASC, \"ID2\" ASC", "false", "false", "10"},
- {"1102275506", "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "IDX_3", "BTREE", "\"MY_VAL\" ASC, \"ID1\" ASC, \"ID2\" ASC, \"ID1\" ASC, \"ID2\" ASC", "false", "false", "10"},
- {"1102275506", "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", "true", "true", "10"},
- {"1102275506", "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"1102275506", "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC", "true", "true", "0"},
-
- {"2584860", "TST1", "TST1", "VALUECLASS", "TST1_INDEX", "BTREE", "\"KEY\" ASC, \"_KEY\" ASC", "false", "false", "10"},
- {"2584860", "TST1", "TST1", "VALUECLASS", "TST1_INDEX_proxy", "BTREE", "\"_KEY\" ASC, \"KEY\" ASC", "false", "false", "0"},
- {"2584860", "TST1", "TST1", "VALUECLASS", "_key_PK", "BTREE", "\"_KEY\" ASC", "true", "true", "5"},
- {"2584860", "TST1", "TST1", "VALUECLASS", "_key_PK__SCAN_", "SCAN", "null", "false", "false", "0"},
- {"2584860", "TST1", "TST1", "VALUECLASS", "_key_PK_hash", "HASH", "\"_KEY\" ASC", "true", "true", "0"},
- {"2584860", "TST1", "TST1", "VALUECLASS", "_key_PK_proxy", "BTREE", "\"KEY\" ASC", "false", "false", "0"}
+ Object[][] expectedResults = {
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "AFFINITY_KEY", "BTREE", "\"ID2\" ASC, \"ID1\" ASC", false, false, 10},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "__SCAN_", "SCAN", null, false, false, null},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", true, true, 10},
+ {-825022849, "SQL_PUBLIC_AFF_CACHE", "PUBLIC", "AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC, \"ID2\" ASC", false, true, null},
+
+ {707660652, "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "IDX_2", "BTREE", "\"ID\" DESC, \"ID\" ASC", false, false, 13},
+ {707660652, "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "__SCAN_", "SCAN", null, false, false, null},
+ {707660652, "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK", "BTREE", "\"ID\" ASC", true, true, 5},
+ {707660652, "SQL_PUBLIC_CACHE_SQL", "PUBLIC", "CACHE_SQL", "_key_PK_hash", "HASH", "\"ID\" ASC", false, true, null},
+
+ {1374144180, "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "AFFINITY_KEY", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", false, false, 10},
+ {1374144180, "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "IDX_AFF_1", "BTREE", "\"ID2\" DESC, \"ID1\" ASC, \"MY_VAL\" DESC", false, false, 10},
+ {1374144180, "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "__SCAN_", "SCAN", null, false, false, null},
+ {1374144180, "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", true, true, 10},
+ {1374144180, "SQL_PUBLIC_DFLT_AFF_CACHE", "PUBLIC", "DFLT_AFF_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC, \"ID1\" ASC", false, true, null},
+
+ {1102275506, "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "IDX_1", "BTREE", "\"ID2\" DESC, \"ID1\" ASC, \"MY_VAL\" DESC, \"ID1\" ASC, \"ID2\" ASC", false, false, 10},
+ {1102275506, "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "IDX_3", "BTREE", "\"MY_VAL\" ASC, \"ID1\" ASC, \"ID2\" ASC, \"ID1\" ASC, \"ID2\" ASC", false, false, 10},
+ {1102275506, "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "__SCAN_", "SCAN", null, false, false, null},
+ {1102275506, "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "_key_PK", "BTREE", "\"ID1\" ASC, \"ID2\" ASC", true, true, 10},
+ {1102275506, "SQL_PUBLIC_DFLT_CACHE", "PUBLIC", "DFLT_CACHE", "_key_PK_hash", "HASH", "\"ID1\" ASC, \"ID2\" ASC", false, true, null},
+
+ {2584860, "TST1", "TST1", "VALUECLASS", "TST1_INDEX", "BTREE", "\"KEY\" ASC, \"_KEY\" ASC", false, false, 10},
+ {2584860, "TST1", "TST1", "VALUECLASS", "__SCAN_", "SCAN", null, false, false, null},
+ {2584860, "TST1", "TST1", "VALUECLASS", "_key_PK", "BTREE", "\"_KEY\" ASC", true, true, 5},
+ {2584860, "TST1", "TST1", "VALUECLASS", "_key_PK_hash", "HASH", "\"_KEY\" ASC", false, true, null},
};
+ assertEquals(expectedResults.length, srvNodeIndexes.size());
+
for (int i = 0; i < srvNodeIndexes.size(); i++) {
List<?> resRow = srvNodeIndexes.get(i);
- String[] expRow = expectedResults[i];
+ Object[] expRow = expectedResults[i];
assertEquals(expRow.length, resRow.size());
for (int j = 0; j < expRow.length; j++)
- assertEquals(Integer.toString(i), expRow[j], String.valueOf(resRow.get(j)));
+ assertEquals(expRow[j], resRow.get(j));
}
}
@@ -1067,10 +1065,12 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
"TABLE_NAME = 'CACHE_SQL'");
List<?> expRow = asList(
- "CACHE_SQL", // TABLE_NAME
- "PUBLIC", // SCHEMA_NAME
- "cache_sql", // CACHE_NAME
+ cacheSqlId, // CACHE_GROUP_ID
+ "cache_sql", // CACHE_GROUP_NAME
cacheSqlId, // CACHE_ID
+ "cache_sql", // CACHE_NAME
+ "PUBLIC", // SCHEMA_NAME
+ "CACHE_SQL", // TABLE_NAME
null, // AFFINITY_KEY_COLUMN
"ID", // KEY_ALIAS
null, // VALUE_ALIAS
@@ -1089,10 +1089,12 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
List<?> allExpRows = asList(
expRow,
asList(
- "DFLT_CACHE", // TABLE_NAME
- "PUBLIC", // SCHEMA_NAME
- "SQL_PUBLIC_DFLT_CACHE", // CACHE_NAME
+ ddlTabId, // CACHE_GROUP_ID
+ "SQL_PUBLIC_DFLT_CACHE", // CACHE_GROUP_NAME
ddlTabId, // CACHE_ID
+ "SQL_PUBLIC_DFLT_CACHE", // CACHE_NAME
+ "PUBLIC", // SCHEMA_NAME
+ "DFLT_CACHE", // TABLE_NAME
"ID2", // AFFINITY_KEY_COLUMN
null, // KEY_ALIAS
"MY_VAL", // VALUE_ALIAS