You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ko...@apache.org on 2021/11/23 14:13:31 UTC
[ignite-3] branch main updated: IGNITE-15700 Rename tableName -> name function (#459)
This is an automated email from the ASF dual-hosted git repository.
korlov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 53ef6e3 IGNITE-15700 Rename tableName -> name function (#459)
53ef6e3 is described below
commit 53ef6e387a07d46af3f0b37841f44463c156de3e
Author: Vladimir Ermakov <85...@users.noreply.github.com>
AuthorDate: Tue Nov 23 17:13:23 2021 +0300
IGNITE-15700 Rename tableName -> name function (#459)
---
.../main/java/org/apache/ignite/table/Table.java | 2 +-
.../query/calcite/schema/SchemaHolderImpl.java | 2 +-
.../query/calcite/StopCalciteModuleTest.java | 2 +-
.../handler/requests/sql/JdbcMetadataCatalog.java | 26 +++++++++++-----------
.../requests/table/ClientTablesGetRequest.java | 2 +-
.../ignite/internal/client/table/ClientTable.java | 2 +-
.../apache/ignite/client/AbstractClientTest.java | 2 +-
.../org/apache/ignite/client/ClientTableTest.java | 2 +-
.../org/apache/ignite/client/ClientTablesTest.java | 10 ++++-----
.../org/apache/ignite/client/ReconnectTest.java | 6 ++---
.../ignite/client/fakes/FakeInternalTable.java | 2 +-
.../ignite/internal/calcite/ItIndexSpoolTest.java | 2 +-
.../runner/app/ItThinClientConnectionTest.java | 2 +-
.../ignite/internal/table/InternalTable.java | 2 +-
.../apache/ignite/internal/table/TableImpl.java | 4 ++--
.../internal/table/distributed/TableManager.java | 4 ++--
.../distributed/storage/InternalTableImpl.java | 2 +-
.../internal/table/event/TableEventParameters.java | 2 +-
.../table/impl/DummyInternalTableImpl.java | 2 +-
19 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/table/Table.java b/modules/api/src/main/java/org/apache/ignite/table/Table.java
index f0d108d..4148eab 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/Table.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/Table.java
@@ -36,7 +36,7 @@ public interface Table {
*
* @return Table name.
*/
- @NotNull String tableName();
+ @NotNull String name();
/**
* Creates record view of table for record class mapper provided.
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
index 58bd9ef..6a9dfab 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
@@ -93,7 +93,7 @@ public class SchemaHolderImpl implements SchemaHolder {
TableDescriptorImpl desc = new TableDescriptorImpl(colDescriptors);
- schema.addTable(removeSchema(schemaName, table.tableName()), new IgniteTableImpl(desc, table));
+ schema.addTable(removeSchema(schemaName, table.name()), new IgniteTableImpl(desc, table));
rebuild();
}
diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/StopCalciteModuleTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/StopCalciteModuleTest.java
index 22237c3..a828487 100644
--- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/StopCalciteModuleTest.java
+++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/StopCalciteModuleTest.java
@@ -118,7 +118,7 @@ public class StopCalciteModuleTest {
schemaReg = new SchemaRegistryImpl(0, (v) -> schemaDesc, () -> INITIAL_SCHEMA_VERSION);
- when(tbl.tableName()).thenReturn("PUBLIC.TEST");
+ when(tbl.name()).thenReturn("PUBLIC.TEST");
// Mock create table (notify on register listener).
doAnswer(invocation -> {
diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/JdbcMetadataCatalog.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/JdbcMetadataCatalog.java
index cc729ab..1b47336 100644
--- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/JdbcMetadataCatalog.java
+++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/JdbcMetadataCatalog.java
@@ -75,7 +75,7 @@ public class JdbcMetadataCatalog {
.thenComparingInt(o -> o.getSecond().schemaIndex());
/** Comparator for {@link JdbcTableMeta} by table type then schema then table name. */
- private static final Comparator<Table> byTblTypeThenSchemaThenTblName = Comparator.comparing(Table::tableName);
+ private static final Comparator<Table> byTblTypeThenSchemaThenTblName = Comparator.comparing(Table::name);
/**
* Initializes info.
@@ -102,8 +102,8 @@ public class JdbcMetadataCatalog {
String tlbNameRegex = translateSqlWildcardsToRegex(tblNamePtrn);
tables.tables().stream()
- .filter(t -> matches(getTblSchema(t.tableName()), schemaNameRegex))
- .filter(t -> matches(getTblName(t.tableName()), tlbNameRegex))
+ .filter(t -> matches(getTblSchema(t.name()), schemaNameRegex))
+ .filter(t -> matches(getTblName(t.name()), tlbNameRegex))
.forEach(tbl -> {
JdbcPrimaryKeyMeta meta = createPrimaryKeyMeta(tbl);
@@ -131,13 +131,13 @@ public class JdbcMetadataCatalog {
String tlbNameRegex = translateSqlWildcardsToRegex(tblNamePtrn);
List<Table> tblsMeta = tables.tables().stream()
- .filter(t -> matches(getTblSchema(t.tableName()), schemaNameRegex))
- .filter(t -> matches(getTblName(t.tableName()), tlbNameRegex))
+ .filter(t -> matches(getTblSchema(t.name()), schemaNameRegex))
+ .filter(t -> matches(getTblName(t.name()), tlbNameRegex))
.collect(Collectors.toList());
return tblsMeta.stream()
.sorted(byTblTypeThenSchemaThenTblName)
- .map(t -> new JdbcTableMeta(getTblSchema(t.tableName()), getTblName(t.tableName()), TBL_TYPE))
+ .map(t -> new JdbcTableMeta(getTblSchema(t.name()), getTblName(t.name()), TBL_TYPE))
.collect(Collectors.toList());
}
@@ -159,8 +159,8 @@ public class JdbcMetadataCatalog {
String colNameRegex = translateSqlWildcardsToRegex(colNamePtrn);
tables.tables().stream()
- .filter(t -> matches(getTblSchema(t.tableName()), schemaNameRegex))
- .filter(t -> matches(getTblName(t.tableName()), tlbNameRegex))
+ .filter(t -> matches(getTblSchema(t.name()), schemaNameRegex))
+ .filter(t -> matches(getTblName(t.name()), tlbNameRegex))
.flatMap(
tbl -> {
SchemaDescriptor schema = ((TableImpl) tbl).schemaView().schema();
@@ -168,11 +168,11 @@ public class JdbcMetadataCatalog {
List<Pair<String, Column>> tblColPairs = new ArrayList<>();
for (Column column : schema.keyColumns().columns()) {
- tblColPairs.add(new Pair<>(tbl.tableName(), column));
+ tblColPairs.add(new Pair<>(tbl.name(), column));
}
for (Column column : schema.valueColumns().columns()) {
- tblColPairs.add(new Pair<>(tbl.tableName(), column));
+ tblColPairs.add(new Pair<>(tbl.name(), column));
}
return tblColPairs.stream();
@@ -208,7 +208,7 @@ public class JdbcMetadataCatalog {
}
tables.tables().stream()
- .map(tbl -> getTblSchema(tbl.tableName()))
+ .map(tbl -> getTblSchema(tbl.name()))
.filter(schema -> matches(schema, schemaNameRegex))
.forEach(schemas::add);
@@ -222,8 +222,8 @@ public class JdbcMetadataCatalog {
* @return Jdbc primary key metadata.
*/
private JdbcPrimaryKeyMeta createPrimaryKeyMeta(Table tbl) {
- String schemaName = getTblSchema(tbl.tableName());
- String tblName = getTblName(tbl.tableName());
+ String schemaName = getTblSchema(tbl.name());
+ String tblName = getTblName(tbl.name());
final String keyName = PK + tblName;
diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientTablesGetRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientTablesGetRequest.java
index de7dca6..a4a8fda 100644
--- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientTablesGetRequest.java
+++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientTablesGetRequest.java
@@ -44,7 +44,7 @@ public class ClientTablesGetRequest {
var tableImpl = (TableImpl) table;
out.packIgniteUuid(tableImpl.tableId());
- out.packString(table.tableName());
+ out.packString(table.name());
}
});
}
diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
index a2172f8..8dcbe2b 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
@@ -87,7 +87,7 @@ public class ClientTable implements Table {
/** {@inheritDoc} */
@Override
- public @NotNull String tableName() {
+ public @NotNull String name() {
return name;
}
diff --git a/modules/client/src/test/java/org/apache/ignite/client/AbstractClientTest.java b/modules/client/src/test/java/org/apache/ignite/client/AbstractClientTest.java
index fbb41ed..3559300 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/AbstractClientTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/AbstractClientTest.java
@@ -89,7 +89,7 @@ public abstract class AbstractClientTest {
@BeforeEach
public void beforeEach() {
for (var t : server.tables().tables()) {
- server.tables().dropTable(t.tableName());
+ server.tables().dropTable(t.name());
}
}
diff --git a/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java b/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
index 658fac1..20b8819 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
@@ -112,7 +112,7 @@ public class ClientTableTest extends AbstractClientTableTest {
FakeSchemaRegistry.setLastVer(1);
try (var client2 = startClient()) {
- RecordView<Tuple> table2 = client2.tables().table(table.tableName()).recordView();
+ RecordView<Tuple> table2 = client2.tables().table(table.name()).recordView();
var tuple2 = tuple();
var resTuple = table2.get(tuple2);
diff --git a/modules/client/src/test/java/org/apache/ignite/client/ClientTablesTest.java b/modules/client/src/test/java/org/apache/ignite/client/ClientTablesTest.java
index 56c150d..2a6c114 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ClientTablesTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ClientTablesTest.java
@@ -44,9 +44,9 @@ public class ClientTablesTest extends AbstractClientTest {
var tables = client.tables().tables();
assertEquals(2, tables.size());
- tables.sort(Comparator.comparing(Table::tableName));
- assertEquals(DEFAULT_TABLE, tables.get(0).tableName());
- assertEquals("t", tables.get(1).tableName());
+ tables.sort(Comparator.comparing(Table::name));
+ assertEquals(DEFAULT_TABLE, tables.get(0).name());
+ assertEquals("t", tables.get(1).name());
}
@Test
@@ -60,13 +60,13 @@ public class ClientTablesTest extends AbstractClientTest {
@Disabled("IGNITE-15179")
public void testCreateTable() {
var clientTable = client.tables().createTable("t1", t -> t.changeReplicas(2));
- assertEquals("t1", clientTable.tableName());
+ assertEquals("t1", clientTable.name());
var serverTables = server.tables().tables();
assertEquals(1, serverTables.size());
var serverTable = serverTables.get(0);
- assertEquals("t1", serverTable.tableName());
+ assertEquals("t1", serverTable.name());
assertEquals(((TableImpl) serverTable).tableId(), ((ClientTable) clientTable).tableId());
}
diff --git a/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java b/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
index ab3ebb5..3054351 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
@@ -50,7 +50,7 @@ public class ReconnectTest {
.retryLimit(100)
.build();
- assertEquals("t", client.tables().tables().get(0).tableName());
+ assertEquals("t", client.tables().tables().get(0).name());
stop(srv);
@@ -62,7 +62,7 @@ public class ReconnectTest {
10,
ignite2);
- assertEquals("t2", client.tables().tables().get(0).tableName());
+ assertEquals("t2", client.tables().tables().get(0).name());
} finally {
stop(srv);
stop(srv2);
@@ -87,7 +87,7 @@ public class ReconnectTest {
.retryLimit(100)
.build();
- assertEquals("t", client.tables().tables().get(0).tableName());
+ assertEquals("t", client.tables().tables().get(0).name());
stop(srv);
diff --git a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
index 9946934..9c1dbd5 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
@@ -78,7 +78,7 @@ public class FakeInternalTable implements InternalTable {
/** {@inheritDoc} */
@Override
- public @NotNull String tableName() {
+ public @NotNull String name() {
return tableName;
}
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItIndexSpoolTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItIndexSpoolTest.java
index ca8ee01..ef4cb28 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItIndexSpoolTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItIndexSpoolTest.java
@@ -54,7 +54,7 @@ public class ItIndexSpoolTest extends AbstractBasicIntegrationTest {
}
CLUSTER_NODES.get(0).tables().tables().stream()
- .map(Table::tableName)
+ .map(Table::name)
.forEach(CLUSTER_NODES.get(0).tables()::dropTable);
if (LOG.isInfoEnabled()) {
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItThinClientConnectionTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItThinClientConnectionTest.java
index 7b677f1..979651b 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItThinClientConnectionTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItThinClientConnectionTest.java
@@ -136,7 +136,7 @@ public class ItThinClientConnectionTest extends IgniteAbstractTest {
assertEquals(1, tables.size());
Table table = tables.get(0);
- assertEquals(String.format("%s.%s", SCHEMA_NAME, TABLE_NAME), table.tableName());
+ assertEquals(String.format("%s.%s", SCHEMA_NAME, TABLE_NAME), table.name());
var tuple = Tuple.create().set(keyCol, 1).set(valCol, "Hello");
var keyTuple = Tuple.create().set(keyCol, 1);
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/InternalTable.java b/modules/table/src/main/java/org/apache/ignite/internal/table/InternalTable.java
index d3f152c..fea9ba3 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/InternalTable.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/InternalTable.java
@@ -52,7 +52,7 @@ public interface InternalTable extends AutoCloseable {
*
* @return Table name.
*/
- @NotNull String tableName();
+ @NotNull String name();
/**
* Asynchronously gets a row with same key columns values as given one from the table.
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
index 65d7187..03fd4b0 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
@@ -68,8 +68,8 @@ public class TableImpl implements Table {
}
/** {@inheritDoc} */
- @Override public @NotNull String tableName() {
- return tbl.tableName();
+ @Override public @NotNull String name() {
+ return tbl.name();
}
/**
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 eceb762..ab50292 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
@@ -406,7 +406,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
raftMgr.stopRaftGroup(raftGroupName(table.tableId(), p));
}
} catch (Exception e) {
- LOG.error("Failed to stop a table {}", e, table.tableName());
+ LOG.error("Failed to stop a table {}", e, table.name());
}
}
@@ -563,7 +563,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
assert table != null : "Table is undefined [tblId=" + tblId + ']';
- ExtendedTableConfiguration tblCfg = ((ExtendedTableConfiguration) tablesCfg.tables().get(table.tableName()));
+ ExtendedTableConfiguration tblCfg = ((ExtendedTableConfiguration) tablesCfg.tables().get(table.name()));
if (schemaVer <= table.schemaView().lastSchemaVersion()) {
return getSchemaDescriptorLocally(schemaVer, tblCfg);
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
index f00da16..72352a5 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
@@ -140,7 +140,7 @@ public class InternalTableImpl implements InternalTable {
/** {@inheritDoc} */
@Override
- public String tableName() {
+ public String name() {
return tableName;
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/event/TableEventParameters.java b/modules/table/src/main/java/org/apache/ignite/internal/table/event/TableEventParameters.java
index b22becc..89f9484 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/event/TableEventParameters.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/event/TableEventParameters.java
@@ -40,7 +40,7 @@ public class TableEventParameters implements EventParameters {
* @param table Table instance.
*/
public TableEventParameters(TableImpl table) {
- this(table.tableId(), table.tableName(), table);
+ this(table.tableId(), table.name(), table);
}
/**
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java b/modules/table/src/test/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
index 5de2605..129173d 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
@@ -114,7 +114,7 @@ public class DummyInternalTableImpl implements InternalTable {
/** {@inheritDoc} */
@Override
- public @NotNull String tableName() {
+ public @NotNull String name() {
return null;
}