You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sd...@apache.org on 2022/02/24 13:41:35 UTC
[ignite-3] branch ignite-15655-tc updated: Fix styles
This is an automated email from the ASF dual-hosted git repository.
sdanilov pushed a commit to branch ignite-15655-tc
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-15655-tc by this push:
new 83759db Fix styles
83759db is described below
commit 83759db8715ae31b9bb47ef32141a88750120ea7
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Thu Feb 24 16:41:25 2022 +0300
Fix styles
---
.../app/jdbc/ItJdbcComplexQuerySelfTest.java | 2 --
.../app/jdbc/ItJdbcDeleteStatementSelfTest.java | 2 --
.../app/jdbc/ItJdbcInsertStatementSelfTest.java | 2 --
.../jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java | 1 -
.../runner/app/jdbc/ItJdbcResultSetSelfTest.java | 2 --
.../app/jdbc/ItJdbcUpdateStatementSelfTest.java | 1 -
.../internal/sql/engine/ItAggregatesTest.java | 2 --
.../internal/sql/engine/ItFunctionsTest.java | 2 --
.../internal/sql/engine/ItIndexSpoolTest.java | 2 --
.../ignite/internal/sql/engine/ItJoinTest.java | 2 --
.../ignite/internal/sql/engine/ItMetadataTest.java | 2 --
.../internal/sql/engine/ItSortAggregateTest.java | 2 --
.../internal/sql/engine/ItSqlExtensionTest.java | 2 --
.../ignite/internal/sql/engine/RootQuery.java | 3 +-
.../internal/table/distributed/TableManager.java | 35 +++++++++++-----------
15 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcComplexQuerySelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcComplexQuerySelfTest.java
index 547398a..1e9e2e4 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcComplexQuerySelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcComplexQuerySelfTest.java
@@ -30,13 +30,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Tests for complex queries (joins, etc.).
*/
-
public class ItJdbcComplexQuerySelfTest extends AbstractJdbcSelfTest {
@BeforeAll
public static void createTable() throws Exception {
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcDeleteStatementSelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcDeleteStatementSelfTest.java
index 98e03fe..62ab992 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcDeleteStatementSelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcDeleteStatementSelfTest.java
@@ -24,13 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.sql.SQLException;
import org.apache.ignite.table.KeyValueView;
import org.apache.ignite.table.Tuple;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Delete functional statement self test.
*/
-
public class ItJdbcDeleteStatementSelfTest extends ItJdbcAbstractStatementSelfTest {
/**
* Execute delete query test.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcInsertStatementSelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcInsertStatementSelfTest.java
index b55d3c9..ff9a386 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcInsertStatementSelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcInsertStatementSelfTest.java
@@ -29,13 +29,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Statement test.
*/
-
public class ItJdbcInsertStatementSelfTest extends ItJdbcAbstractStatementSelfTest {
/** SQL SELECT query for verification. */
private static final String SQL_SELECT = "select sid, id, firstName, lastName, age from PUBLIC.PERSON";
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
index 3f6cf6f..2c1c9ef 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcResultSetSelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcResultSetSelfTest.java
index 7e634aa..0765b17 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcResultSetSelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcResultSetSelfTest.java
@@ -52,13 +52,11 @@ import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Tuple;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Result set test.
*/
-
public class ItJdbcResultSetSelfTest extends AbstractJdbcSelfTest {
/** SQL static query. */
private static final String STATIC_SQL =
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcUpdateStatementSelfTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcUpdateStatementSelfTest.java
index 99e5d56..8027e84 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcUpdateStatementSelfTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/jdbc/ItJdbcUpdateStatementSelfTest.java
@@ -25,7 +25,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.function.Consumer;
import org.apache.ignite.table.KeyValueView;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItAggregatesTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItAggregatesTest.java
index 773e529..c425718 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItAggregatesTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItAggregatesTest.java
@@ -24,13 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.ignite.lang.IgniteException;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Group of tests to verify aggregation functions.
*/
-
public class ItAggregatesTest extends AbstractBasicIntegrationTest {
/**
* Before all.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItFunctionsTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItFunctionsTest.java
index 17c9146..15cfab7 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItFunctionsTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItFunctionsTest.java
@@ -36,13 +36,11 @@ import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Tuple;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Test Ignite SQL functions.
*/
-
public class ItFunctionsTest extends AbstractBasicIntegrationTest {
private static final Object[] NULL_RESULT = new Object[] { null };
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexSpoolTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexSpoolTest.java
index f0fcbf9..e5a3305 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexSpoolTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexSpoolTest.java
@@ -31,14 +31,12 @@ import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.table.Table;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
/**
* Index spool test.
*/
-
public class ItIndexSpoolTest extends AbstractBasicIntegrationTest {
private static final IgniteLogger LOG = IgniteLogger.forClass(AbstractBasicIntegrationTest.class);
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java
index d237880..a6de04f 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java
@@ -24,14 +24,12 @@ import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.schema.definition.ColumnType;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
/**
* Check JOIN on basic cases.
*/
-
public class ItJoinTest extends AbstractBasicIntegrationTest {
@BeforeAll
public static void beforeTestsStarted() {
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
index bd4e29a..c87a6a1 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
@@ -25,13 +25,11 @@ import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Group of tests to verify the query metadata returned alongside the query result.
*/
-
public class ItMetadataTest extends AbstractBasicIntegrationTest {
/**
* Before all.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSortAggregateTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSortAggregateTest.java
index d6bdf62..450751f 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSortAggregateTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSortAggregateTest.java
@@ -28,13 +28,11 @@ import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Sort aggregate integration test.
*/
-
public class ItSortAggregateTest extends AbstractBasicIntegrationTest {
public static final int ROWS = 103;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlExtensionTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlExtensionTest.java
index f056398..340bd7a 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlExtensionTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlExtensionTest.java
@@ -21,13 +21,11 @@ import java.util.stream.Collectors;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.sql.engine.extension.TestExtension;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Test cases for SQL Extension API.
*/
-
public class ItSqlExtensionTest extends AbstractBasicIntegrationTest {
/**
* Before all.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/RootQuery.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/RootQuery.java
index d5f1cae..cb4f54d 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/RootQuery.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/RootQuery.java
@@ -111,8 +111,7 @@ public class RootQuery<RowT> extends Query<RowT> {
* @param schema new schema.
*/
public RootQuery<RowT> childQuery(SchemaPlus schema) {
-// return new RootQuery<>(sql, schema, params, cancel, exchangeService, unregister, log);
- return null;
+ return new RootQuery<>(sql, schema, ctx, params, cancel, exchangeService, unregister, log);
}
public BaseQueryContext context() {
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 22a0153..1dc8e50 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -54,6 +54,7 @@ import org.apache.ignite.configuration.schemas.table.TablesConfiguration;
import org.apache.ignite.configuration.validation.ConfigurationValidationException;
import org.apache.ignite.internal.affinity.AffinityUtils;
import org.apache.ignite.internal.baseline.BaselineManager;
+import org.apache.ignite.internal.configuration.direct.DirectConfigurationProxy;
import org.apache.ignite.internal.configuration.schema.ExtendedTableChange;
import org.apache.ignite.internal.configuration.schema.ExtendedTableConfiguration;
import org.apache.ignite.internal.configuration.schema.ExtendedTableView;
@@ -1018,7 +1019,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
* Collects a list of direct table ids.
*
* @return A list of direct table ids.
- * @see DirectConfigurationProperty
+ * @see DirectConfigurationProxy
*/
private List<UUID> directTableIds() {
NamedListView<TableView> views = directProxy(tablesCfg.tables()).value();
@@ -1039,7 +1040,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
*
* @param tblName Name of the table.
* @return Direct id of the table, or {@code null} if the table with the {@code tblName} has not been found.
- * @see DirectConfigurationProperty
+ * @see DirectConfigurationProxy
*/
@Nullable
private UUID directTableId(String tblName) {
@@ -1105,34 +1106,34 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
/** {@inheritDoc} */
@Override
public CompletableFuture<Table> tableAsync(String name) {
- return tableAsync0(IgniteObjectName.parseCanonicalName(name));
+ return (CompletableFuture) tableAsync0(IgniteObjectName.parseCanonicalName(name));
}
- private CompletableFuture<Table> tableAsync0(String name) {
+ /** {@inheritDoc} */
+ @Override
+ public CompletableFuture<TableImpl> tableAsync(UUID id) throws NodeStoppingException {
if (!busyLock.enterBusy()) {
- throw new IgniteException(new NodeStoppingException());
+ throw new NodeStoppingException();
}
try {
- UUID tableId = directTableId(name);
-
- if (tableId == null) {
- return CompletableFuture.completedFuture(null);
- }
-
- return (CompletableFuture) tableAsyncInternal(tableId, false);
+ return tableAsyncInternal(id, true);
} finally {
busyLock.leaveBusy();
}
}
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<TableImpl> tableAsync(UUID id) throws NodeStoppingException {
+ private CompletableFuture<TableImpl> tableAsync0(String name) {
if (!busyLock.enterBusy()) {
- throw new NodeStoppingException();
+ throw new IgniteException(new NodeStoppingException());
}
try {
- return tableAsyncInternal(id, true);
+ UUID tableId = directTableId(name);
+
+ if (tableId == null) {
+ return CompletableFuture.completedFuture(null);
+ }
+
+ return tableAsyncInternal(tableId, false);
} finally {
busyLock.leaveBusy();
}