You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/11/01 11:04:21 UTC
[ignite-3] branch ignite-15699 created (now 25ae609)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-15699
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
at 25ae609 Rename TableSchemaBuilder. Fix styles.
This branch includes the following new commits:
new 25ae609 Rename TableSchemaBuilder. Fix styles.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite-3] 01/01: Rename TableSchemaBuilder. Fix styles.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-15699
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 25ae609a3fc0338e3442104ee5f2d83c69e47431
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Nov 1 14:03:27 2021 +0300
Rename TableSchemaBuilder. Fix styles.
---
...emaBuilder.java => TableDefinitionBuilder.java} | 25 +++++++++++-----------
.../schema/configuration/TableValidatorImpl.java | 4 ++--
...erImpl.java => TableDefinitionBuilderImpl.java} | 20 ++++++++---------
.../org/apache/ignite/schema/SchemaBuilders.java | 8 +++----
.../internal/schema/SchemaConfigurationTest.java | 4 ++--
.../schema/builder/TableDefinitionBuilderTest.java | 4 ++--
.../SchemaConfigurationConverterTest.java | 4 ++--
.../SchemaDescriptorConverterTest.java | 10 ++++-----
8 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableSchemaBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java
similarity index 71%
rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableSchemaBuilder.java
rename to modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java
index e49e251..ef00f6a 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableSchemaBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java
@@ -24,24 +24,24 @@ import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.schema.definition.index.IndexDefinition;
/**
- * Table descriptor builder.
+ * Table definition builder.
*/
-public interface TableSchemaBuilder extends SchemaObjectBuilder {
+public interface TableDefinitionBuilder extends SchemaObjectBuilder {
/**
* Adds columns to the table.
*
- * @param columns Table columns.
+ * @param columns Table columns definitions.
* @return {@code This} for chaining.
*/
- TableSchemaBuilder columns(ColumnDefinition... columns);
+ TableDefinitionBuilder columns(ColumnDefinition... columns);
/**
* Adds an index.
*
- * @param indexDefinition Table index.
+ * @param indexDefinition Table index definition.
* @return {@code This} for chaining.
*/
- TableSchemaBuilder withIndex(IndexDefinition indexDefinition);
+ TableDefinitionBuilder withIndex(IndexDefinition indexDefinition);
/**
* Shortcut method for adding {@link PrimaryKeyDefinition} of single column.
@@ -49,24 +49,23 @@ public interface TableSchemaBuilder extends SchemaObjectBuilder {
* @param colName Key column name.
* @return {@code This} for chaining.
*/
- TableSchemaBuilder withPrimaryKey(String colName);
+ TableDefinitionBuilder withPrimaryKey(String colName);
/**
* Adds primary key constraint to the table.
*
- * @param primaryKeyDefinition Primary key.
+ * @param primaryKeyDefinition Primary key definition.
* @return {@code This} for chaining.
*/
- TableSchemaBuilder withPrimaryKey(PrimaryKeyDefinition primaryKeyDefinition);
+ TableDefinitionBuilder withPrimaryKey(PrimaryKeyDefinition primaryKeyDefinition);
/** {@inheritDoc} */
- @Override TableSchemaBuilder withHints(Map<String, String> hints);
+ @Override TableDefinitionBuilder withHints(Map<String, String> hints);
/**
- * Builds table.
+ * Builds table definition.
*
- * @return Table.
+ * @return Table definition.
*/
@Override TableDefinition build();
-
}
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/TableValidatorImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/TableValidatorImpl.java
index 2b0446b..00e1998 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/TableValidatorImpl.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/TableValidatorImpl.java
@@ -28,7 +28,7 @@ import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.configuration.validation.ValidationIssue;
import org.apache.ignite.configuration.validation.Validator;
import org.apache.ignite.internal.schema.definition.TableDefinitionImpl;
-import org.apache.ignite.internal.schema.definition.builder.TableSchemaBuilderImpl;
+import org.apache.ignite.internal.schema.definition.builder.TableDefinitionBuilderImpl;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.configuration.schemas.store.DataStorageConfigurationSchema.DEFAULT_DATA_REGION_NAME;
@@ -54,7 +54,7 @@ public class TableValidatorImpl implements Validator<TableValidator, NamedListVi
assert !tbl.keyColumns().isEmpty();
assert !tbl.affinityColumns().isEmpty();
- TableSchemaBuilderImpl.validateIndices(tbl.indices(), tbl.columns(), tbl.affinityColumns());
+ TableDefinitionBuilderImpl.validateIndices(tbl.indices(), tbl.columns(), tbl.affinityColumns());
}
catch (IllegalArgumentException e) {
ctx.addIssue(new ValidationIssue("Validator works success by key " + ctx.currentKey() + ". Found "
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableSchemaBuilderImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java
similarity index 87%
rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableSchemaBuilderImpl.java
rename to modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java
index e26017f..f3c0799 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableSchemaBuilderImpl.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java
@@ -29,7 +29,7 @@ import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.schema.definition.ColumnDefinition;
import org.apache.ignite.schema.definition.PrimaryKeyDefinition;
import org.apache.ignite.schema.definition.TableDefinition;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
import org.apache.ignite.schema.definition.index.ColumnarIndexDefinition;
import org.apache.ignite.schema.definition.index.IndexColumnDefinition;
import org.apache.ignite.schema.definition.index.IndexDefinition;
@@ -37,17 +37,17 @@ import org.apache.ignite.schema.definition.index.IndexDefinition;
/**
* Table builder.
*/
-public class TableSchemaBuilderImpl implements TableSchemaBuilder {
+public class TableDefinitionBuilderImpl implements TableDefinitionBuilder {
/** Schema name. */
private final String schemaName;
/** Table name. */
private final String tableName;
- /** Columns. */
+ /** Columns definitions. */
private final LinkedHashMap<String, ColumnDefinition> columns = new LinkedHashMap<>();
- /** Indices. */
+ /** Indices definitions. */
private final Map<String, IndexDefinition> indices = new HashMap<>();
/** Table primary key. */
@@ -59,13 +59,13 @@ public class TableSchemaBuilderImpl implements TableSchemaBuilder {
* @param schemaName Schema name.
* @param tableName Table name.
*/
- public TableSchemaBuilderImpl(String schemaName, String tableName) {
+ public TableDefinitionBuilderImpl(String schemaName, String tableName) {
this.schemaName = schemaName;
this.tableName = tableName;
}
/** {@inheritDoc} */
- @Override public TableSchemaBuilderImpl columns(ColumnDefinition... columns) {
+ @Override public TableDefinitionBuilderImpl columns(ColumnDefinition... columns) {
for (ColumnDefinition column : columns) {
if (this.columns.put(column.name(), column) != null)
throw new IllegalArgumentException("Column with same name already exists: columnName=" + column.name());
@@ -75,7 +75,7 @@ public class TableSchemaBuilderImpl implements TableSchemaBuilder {
}
/** {@inheritDoc} */
- @Override public TableSchemaBuilder withIndex(IndexDefinition indexDefinition) {
+ @Override public TableDefinitionBuilder withIndex(IndexDefinition indexDefinition) {
if (indices.put(indexDefinition.name(), indexDefinition) != null)
throw new IllegalArgumentException("Index with same name already exists: " + indexDefinition.name());
@@ -83,21 +83,21 @@ public class TableSchemaBuilderImpl implements TableSchemaBuilder {
}
/** {@inheritDoc} */
- @Override public TableSchemaBuilder withPrimaryKey(String colName) {
+ @Override public TableDefinitionBuilder withPrimaryKey(String colName) {
primaryKeyDefinition = SchemaBuilders.primaryKey().withColumns(colName).build();
return this;
}
/** {@inheritDoc} */
- @Override public TableSchemaBuilder withPrimaryKey(PrimaryKeyDefinition primaryKeyDefinition) {
+ @Override public TableDefinitionBuilder withPrimaryKey(PrimaryKeyDefinition primaryKeyDefinition) {
this.primaryKeyDefinition = primaryKeyDefinition;
return this;
}
/** {@inheritDoc} */
- @Override public TableSchemaBuilder withHints(Map<String, String> hints) {
+ @Override public TableDefinitionBuilder withHints(Map<String, String> hints) {
// No op.
return this;
}
diff --git a/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java b/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java
index 7fba4b7..c89b220 100644
--- a/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java
+++ b/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.schema.definition.builder.HashIndexDefinitionB
import org.apache.ignite.internal.schema.definition.builder.PartialIndexDefinitionBuilderImpl;
import org.apache.ignite.internal.schema.definition.builder.PrimaryKeyDefinitionBuilderImpl;
import org.apache.ignite.internal.schema.definition.builder.SortedIndexDefinitionBuilderImpl;
-import org.apache.ignite.internal.schema.definition.builder.TableSchemaBuilderImpl;
+import org.apache.ignite.internal.schema.definition.builder.TableDefinitionBuilderImpl;
import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder;
@@ -30,7 +30,7 @@ import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder;
import org.apache.ignite.schema.definition.builder.PartialIndexDefinitionBuilder;
import org.apache.ignite.schema.definition.builder.PrimaryKeyDefinitionBuilder;
import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
/**
* Schema builder helper.
@@ -58,8 +58,8 @@ public final class SchemaBuilders {
* @param tableName Table name.
* @return Table descriptor builder.
*/
- public static TableSchemaBuilder tableBuilder(String schemaName, String tableName) {
- return new TableSchemaBuilderImpl(schemaName, tableName);
+ public static TableDefinitionBuilder tableBuilder(String schemaName, String tableName) {
+ return new TableDefinitionBuilderImpl(schemaName, tableName);
}
/**
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java
index abca1d7..78997fe 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.SchemaObject;
import org.apache.ignite.schema.definition.TableDefinition;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
import org.junit.jupiter.api.Test;
/**
@@ -34,7 +34,7 @@ public class SchemaConfigurationTest {
*/
@Test
public void testInitialSchema() {
- final TableSchemaBuilder builder = SchemaBuilders.tableBuilder(SchemaObject.DEFAULT_DATABASE_SCHEMA_NAME, "table1");
+ final TableDefinitionBuilder builder = SchemaBuilders.tableBuilder(SchemaObject.DEFAULT_DATABASE_SCHEMA_NAME, "table1");
builder
.columns(
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java
index e802818..e51c208 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.schema.builder;
import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,7 +34,7 @@ public class TableDefinitionBuilderTest {
*/
@Test
public void testBuild() {
- TableSchemaBuilder builder = SchemaBuilders.tableBuilder("SNAME","TNAME")
+ TableDefinitionBuilder builder = SchemaBuilders.tableBuilder("SNAME","TNAME")
.columns(
SchemaBuilders.column("COL1", ColumnType.DOUBLE).build(),
SchemaBuilders.column("COL2", ColumnType.DOUBLE).build())
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java
index 31fb497..446c89c 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder;
import org.apache.ignite.schema.definition.builder.PartialIndexDefinitionBuilder;
import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
import org.apache.ignite.schema.definition.index.HashIndexDefinition;
import org.apache.ignite.schema.definition.index.IndexColumnDefinition;
import org.apache.ignite.schema.definition.index.IndexDefinition;
@@ -59,7 +59,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SuppressWarnings("InstanceVariableMayNotBeInitialized")
public class SchemaConfigurationConverterTest {
/** Table builder. */
- private TableSchemaBuilder tblBuilder;
+ private TableDefinitionBuilder tblBuilder;
/** Configuration registry with one table for each test. */
private ConfigurationRegistry confRegistry;
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java
index cd66923..5a90a73 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.schema.definition.ColumnDefinition;
import org.apache.ignite.schema.definition.ColumnType;
import org.apache.ignite.schema.definition.TableDefinition;
import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder;
-import org.apache.ignite.schema.definition.builder.TableSchemaBuilder;
+import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -47,7 +47,7 @@ public class SchemaDescriptorConverterTest {
*/
@Test
public void testComplexPrimaryKey() {
- TableSchemaBuilder bldr = getBuilder(false, false);
+ TableDefinitionBuilder bldr = getBuilder(false, false);
TableDefinition tblSchm = bldr.withPrimaryKey(
SchemaBuilders.primaryKey()
.withColumns("INT8", "ID")
@@ -66,7 +66,7 @@ public class SchemaDescriptorConverterTest {
*/
@Test
public void testComplexPrimaryKeyWithAffinity() {
- TableSchemaBuilder bldr = getBuilder(false, false);
+ TableDefinitionBuilder bldr = getBuilder(false, false);
TableDefinition tblSchm = bldr.withPrimaryKey(
SchemaBuilders.primaryKey()
.withColumns("INT8", "ID")
@@ -171,7 +171,7 @@ public class SchemaDescriptorConverterTest {
* @param withPk If builder should contains primary key index.
* @return TableSchemaBuilder.
*/
- private TableSchemaBuilder getBuilder(boolean nullable, boolean withPk) {
+ private TableDefinitionBuilder getBuilder(boolean nullable, boolean withPk) {
Function<ColumnDefinitionBuilder, ColumnDefinition> postProcess = builder -> {
if (nullable)
builder.asNullable();
@@ -180,7 +180,7 @@ public class SchemaDescriptorConverterTest {
return builder.build();
};
- TableSchemaBuilder res = SchemaBuilders.tableBuilder("SCHEMA", "TABLE")
+ TableDefinitionBuilder res = SchemaBuilders.tableBuilder("SCHEMA", "TABLE")
.columns(
postProcess.apply(SchemaBuilders.column("ID", ColumnType.UUID)),
postProcess.apply(SchemaBuilders.column("INT8", ColumnType.INT8)),