xtern commented on code in PR #5210:
URL: https://github.com/apache/ignite-3/pull/5210#discussion_r1953106926
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java:
##########
@@ -226,21 +226,28 @@ public CompletableFuture<QueryPlan> prepareAsync(
assert schemaName != null;
- SchemaPlus schema =
schemaManager.schema(operationContext.operationTime().longValue())
- .getSubSchema(schemaName);
-
- if (schema == null) {
- return CompletableFuture.failedFuture(new
SchemaNotFoundException(schemaName));
Review Comment:
I believe this was the last place where this exception
(SchemaNotFoundException) and code (SCHEMA_NOT_FOUND_ERR) was used.
So it might be worth removing them.
##########
modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSchemaTest.java:
##########
@@ -181,4 +181,56 @@ public void schemaQuoted() {
);
}
}
+
+ @Test
+ public void accessTheSameObject() {
+ sql("CREATE SCHEMA s1");
+ sql("CREATE TABLE s1.t1 (id INT PRIMARY KEY, val INT)");
+
+ // Works fine
+ assertQuery("SELECT count(*) FROM s1.t1")
+ .returns(0L)
+ .check();
+
+ // Works fine
+ assertQuery("SELECT count(*) FROM t1")
+ .withDefaultSchema("S1")
+ .returns(0L)
+ .check();
+
+ // Should work as wee, because we do not access the MISSING schema,
+ // but we get Schema not found instead.
Review Comment:
```suggestion
// Works fine, because we do not access the MISSING schema.
```
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchemas.java:
##########
@@ -0,0 +1,59 @@
+/*
+ * 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.sql.engine.schema;
+
+import org.apache.calcite.schema.SchemaPlus;
+
+/**
+ * Schema container.
+ */
+public final class IgniteSchemas {
+
+ private final SchemaPlus rootSchema;
+
+ private final int catalogVersion;
+
+ /**
+ * Constructor.
+ *
+ * @param rootSchema Root schema.
+ * @param catalogVersion Catalog version.
+ */
+ public IgniteSchemas(SchemaPlus rootSchema, int catalogVersion) {
+ this.rootSchema = rootSchema;
+ this.catalogVersion = catalogVersion;
+ }
+
+ /**
+ * Returns a {@link SchemaPlus} that contains all catalog schemas.
+ *
+ * @return Root schema.
+ */
+ public SchemaPlus root() {
+ return rootSchema;
+ }
+
+ /**
+ * Returns catalog version this schemas belong to.
Review Comment:
```suggestion
* Returns catalog version these schemas belong to.
```
or... "this schema container belong**s** to." :thinking:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
