[ignite] branch master updated: IGNITE-11431: SQL: Added "SCHEMAS" system view. This closes #6237.

[vo...@apache.org]

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

vozerov 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 4c3c2e5  IGNITE-11431: SQL: Added "SCHEMAS" system view. This closes #6237.
4c3c2e5 is described below

commit 4c3c2e5a7171cd4a26ab841d39ed27e8f5f410a1
Author: Yuriy Gerzhedovich <yg...@gridgain.com>
AuthorDate: Thu Mar 28 12:05:04 2019 +0300

    IGNITE-11431: SQL: Added "SCHEMAS" system view. This closes #6237.
---
 .../processors/query/h2/SchemaManager.java         |  2 +
 .../query/h2/sys/view/SqlSystemViewSchemas.java    | 73 ++++++++++++++++++++++
 .../processors/query/SqlSystemViewsSelfTest.java   | 32 ++++++++++
 3 files changed, 107 insertions(+)

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 7bc78b7..885fa7a 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
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewNode
 import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewNodes;
 import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewQueryHistoryMetrics;
 import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewRunningQueries;
+import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewSchemas;
 import org.apache.ignite.internal.processors.query.h2.sys.view.SqlSystemViewTables;
 import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitor;
 import org.apache.ignite.internal.util.typedef.F;
@@ -175,6 +176,7 @@ public class SchemaManager {
         views.add(new SqlSystemViewQueryHistoryMetrics(ctx));
         views.add(new SqlSystemViewTables(ctx, this));
         views.add(new SqlSystemViewIndexes(ctx, this));
+        views.add(new SqlSystemViewSchemas(ctx, this));
 
         return views;
     }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sys/view/SqlSystemViewSchemas.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sys/view/SqlSystemViewSchemas.java
new file mode 100644
index 0000000..395e56c
--- /dev/null
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sys/view/SqlSystemViewSchemas.java
@@ -0,0 +1,73 @@
+/*
+ * 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.query.h2.sys.view;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.query.h2.SchemaManager;
+import org.h2.engine.Session;
+import org.h2.result.Row;
+import org.h2.result.SearchRow;
+
+/**
+ * View that contains information about all the sql tables in the cluster.
+ */
+public class SqlSystemViewSchemas extends SqlAbstractLocalSystemView {
+    /** Schema manager. */
+    private final SchemaManager schemaMgr;
+
+    /**
+     * Creates view with columns.
+     *
+     * @param ctx kernal context.
+     */
+    public SqlSystemViewSchemas(GridKernalContext ctx, SchemaManager schemaMgr) {
+        super("SCHEMAS", "Ignite SQL schemas", ctx,
+            newColumn("SCHEMA_NAME")
+        );
+
+        this.schemaMgr = schemaMgr;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Iterator<Row> getRows(Session ses, SearchRow first, SearchRow last) {
+        Set<String> schemaNames = schemaMgr.schemaNames();
+
+        List<Row> rows = new ArrayList<>(schemaNames.size());
+
+        for (String schemaName : schemaNames)
+            rows.add(createRow(ses, schemaName));
+
+        return rows.iterator();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean canGetRowCount() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override public long getRowCount() {
+        return schemaMgr.schemaNames().size();
+    }
+}
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 02936b5..901f827 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
@@ -172,6 +172,38 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
     }
 
     /**
+     * Test schemas system view.
+     * @throws Exception in case of failure.
+     */
+    @Test
+    public void testSchemasView() throws Exception {
+        IgniteEx srv = startGrid(getConfiguration().setSqlSchemas("PREDIFINED_SCHEMA_1"));
+
+        IgniteEx client = startGrid(getConfiguration().setClientMode(true).setIgniteInstanceName("CLIENT").setSqlSchemas("PREDIFINED_SCHEMA_2"));
+
+        srv.createCache(cacheConfiguration("TST1"));
+
+        String schemasSql = "SELECT * FROM IGNITE.SCHEMAS";
+
+        List<List<?>> srvNodeSchemas = execSql(schemasSql);
+
+        List<List<?>> clientNodeSchemas = execSql(client, schemasSql);
+
+        String[] expSchemasSrv = new String[] {"PREDIFINED_SCHEMA_1", "IGNITE", "PUBLIC", "TST1"};
+
+        String[] schemasSrv = srvNodeSchemas.stream().map(f -> f.get(0)).map(String.class::cast).toArray(String[]::new);
+
+        Assert.assertArrayEquals(expSchemasSrv, schemasSrv);
+
+        String[] expSchemasCli = new String[] {"PREDIFINED_SCHEMA_2", "IGNITE", "PUBLIC", "TST1"};
+
+        String[] schemasCli = clientNodeSchemas.stream().map(f -> f.get(0)).map(String.class::cast).toArray(String[]::new);
+
+        Assert.assertArrayEquals(expSchemasCli, schemasCli);
+    }
+
+
+    /**
      * Test indexes system view.
      *
      * @throws Exception in case of failure.