feat(TableService): CreateTable with default value options

Author: KirillKurdyukov

table/src/main/java/tech/ydb/table/description/TableDescription.java

@@ -159,6 +159,34 @@ public Builder addColumn(String name, Type type, String family, PrimitiveValue d
             return this;
         }
 
+        public Builder addSequenceColumn(String name, Type type) {
+            return addSequenceColumn(name, type, null, SequenceDescription.newBuilder().build());
+        }
+
+        public Builder addSequenceColumn(String name, Type type, String family) {
+            return addSequenceColumn(name, type, family, SequenceDescription.newBuilder().build());
+        }
+
+        public Builder addSequenceColumn(String name, Type type, String family, SequenceDescription sequenceDescription) {
+            if (type instanceof PrimitiveType) {
+                PrimitiveType primitiveType = (PrimitiveType) type;
+
+                switch (primitiveType) {
+                    case Int16:
+                        columns.put(name, new TableColumn(name, PrimitiveType.Int16, family, sequenceDescription));
+                        return this;
+                    case Int32:
+                        columns.put(name, new TableColumn(name, PrimitiveType.Int32, family, sequenceDescription));
+                        return this;
+                    case Int64:
+                        columns.put(name, new TableColumn(name, PrimitiveType.Int64, family, sequenceDescription));
+                        return this;
+                }
+            }
+
+            throw new IllegalArgumentException("Type " + type + " cannot be used as a sequence column");
+        }
+
         public Builder addSmallSerialColumn(String name) {
             return addSmallSerialColumn(name, null, SequenceDescription.newBuilder().build());
         }
@@ -184,18 +212,15 @@ public Builder addBigSerialColumn(String name, SequenceDescription sequenceDescr
         }
 
         public Builder addSmallSerialColumn(String name, String family, SequenceDescription sequenceDescription) {
-            columns.put(name, new TableColumn(name, PrimitiveType.Int16, family, sequenceDescription));
-            return this;
+            return addSequenceColumn(name, PrimitiveType.Int16, family, sequenceDescription);
         }
 
         public Builder addSerialColumn(String name, String family, SequenceDescription sequenceDescription) {
-            columns.put(name, new TableColumn(name, PrimitiveType.Int32, family, sequenceDescription));
-            return this;
+            return addSequenceColumn(name, PrimitiveType.Int32, family, sequenceDescription);
         }
 
         public Builder addBigSerialColumn(String name, String family, SequenceDescription sequenceDescription) {
-            columns.put(name, new TableColumn(name, PrimitiveType.Int64, family, sequenceDescription));
-            return this;
+            return addSequenceColumn(name, PrimitiveType.Int64, family, sequenceDescription);
         }
 
         public Builder addKeyRange(KeyRange value) {

table/src/test/java/tech/ydb/table/integration/CreateTableTest.java

@@ -17,6 +17,8 @@
 import tech.ydb.table.values.PrimitiveValue;
 import tech.ydb.test.junit4.GrpcTransportRule;
 
+import java.util.stream.Collectors;
+
 /**
  * @author Kirill Kurdyukov
  */
@@ -86,15 +88,13 @@ public void bigSerialTest() {
         Status createStatus = ctx.supplyStatus(session ->
                 session.createTable(tablePath, tableDescription)).join();
         Assert.assertTrue("Create table with big serial " + createStatus, createStatus.isSuccess());
-
         Result<TableDescription> describeResult = ctx.supplyResult(session -> session.describeTable(tablePath)).join();
         Assert.assertTrue("Describe table with big serial " + describeResult.getStatus(), describeResult.isSuccess());
         TableDescription description = describeResult.getValue();
         TableColumn tableColumn = description.getColumns().get(0);
         Assert.assertNotNull(tableColumn.getSequenceDescription());
         Assert.assertEquals("sequence_default", tableColumn.getSequenceDescription().getName());
         Assert.assertEquals(PrimitiveType.Int64, tableColumn.getType());
-
         ctx.supplyStatus(session -> session.dropTable(tablePath)).join();
     }
 
@@ -115,7 +115,6 @@ public void defaultValueTest() {
         Assert.assertNull(tableColumn.getSequenceDescription());
         Assert.assertEquals("text", tableColumn.getLiteralDefaultValue().getText());
         Assert.assertEquals(PrimitiveType.Text, tableColumn.getType());
-
         ctx.supplyStatus(session -> session.dropTable(tablePath)).join();
     }
 
@@ -154,4 +153,96 @@ public void customSequenceDescriptionTest() {
         Assert.assertEquals(12L, (long) sequenceDescription.getStartValue());
         ctx.supplyStatus(session -> session.dropTable(tablePath)).join();
     }
+
+    @Test
+    public void copyTableWithSequenceAndDefaultValue() {
+        String tablePath = ydbTransport.getDatabase() + "/copy_table";
+
+        TableDescription tableDescription = TableDescription.newBuilder()
+                .addBigSerialColumn("id", SequenceDescription.newBuilder()
+                        .setCache(5L)
+                        .setMaxValue((long) Integer.MAX_VALUE)
+                        .setMinValue(10L)
+                        .setName("custom_sequence_description")
+                        .setCycle(true)
+                        .setIncrement(2L)
+                        .setStartValue(12L)
+                        .build()
+                )
+                .addColumn("name", PrimitiveType.Text, PrimitiveValue.newText("new_name"))
+                .addNonnullColumn("another_name", PrimitiveType.Bool)
+                .setPrimaryKey("id")
+                .build();
+        Status createStatus = ctx.supplyStatus(session -> session.createTable(tablePath, tableDescription)).join();
+        Assert.assertTrue("Create table " + createStatus, createStatus.isSuccess());
+        Result<TableDescription> describeResult = ctx.supplyResult(session -> session.describeTable(tablePath)).join();
+        Assert.assertTrue("Describe table " + describeResult.getStatus(),
+                describeResult.isSuccess());
+        TableDescription description = describeResult.getValue();
+        Assert.assertEquals(3, description.getColumns().size());
+        SequenceDescription sequenceDescription = description.getColumns().get(0).getSequenceDescription();
+        Assert.assertNotNull(sequenceDescription);
+        Assert.assertEquals("custom_sequence_description", sequenceDescription.getName());
+        Assert.assertEquals(Integer.MAX_VALUE, sequenceDescription.getMaxValue().intValue());
+        Assert.assertEquals(10L, (long) sequenceDescription.getMinValue());
+        Assert.assertEquals(5L, (long) sequenceDescription.getCache());
+        Assert.assertEquals(true, sequenceDescription.getCycle());
+        Assert.assertEquals(2L, (long) sequenceDescription.getIncrement());
+        Assert.assertEquals(12L, (long) sequenceDescription.getStartValue());
+        TableColumn tableColumn = describeResult.getValue().getColumns().get(1);
+        Assert.assertNull(tableColumn.getSequenceDescription());
+        Assert.assertEquals("new_name", tableColumn.getLiteralDefaultValue().getText());
+        Assert.assertEquals(PrimitiveType.Text, tableColumn.getType());
+        TableColumn anotherTableColumn = describeResult.getValue().getColumns().get(2);
+        Assert.assertNull(anotherTableColumn.getSequenceDescription());
+        Assert.assertNull(anotherTableColumn.getLiteralDefaultValue());
+        Assert.assertEquals("new_name", tableColumn.getLiteralDefaultValue().getText());
+        Assert.assertEquals(PrimitiveType.Text, tableColumn.getType());
+
+        TableDescription.Builder copyTableDescription = TableDescription.newBuilder();
+
+        for (TableColumn columnTable : description.getColumns()) {
+            if (columnTable.getSequenceDescription() != null) {
+                copyTableDescription.addSequenceColumn("copy_" + columnTable.getName(),
+                        columnTable.getType(), columnTable.getFamily(), columnTable.getSequenceDescription());
+
+                continue;
+            }
+
+            copyTableDescription.addColumn(columnTable.getName(), columnTable.getType(), columnTable.getFamily(),
+                    columnTable.getLiteralDefaultValue());
+
+        }
+
+        copyTableDescription.setPrimaryKeys(description.getPrimaryKeys().stream()
+                .map(key -> "copy_" + key).collect(Collectors.toList()));
+
+        createStatus = ctx.supplyStatus(session -> session.createTable(tablePath + "_copy", tableDescription)).join();
+        Assert.assertTrue("Create copy table " + createStatus, createStatus.isSuccess());
+        describeResult = ctx.supplyResult(session -> session.describeTable(tablePath + "_copy")).join();
+        Assert.assertTrue("Describe copy table " + describeResult.getStatus(),
+                describeResult.isSuccess());
+        description = describeResult.getValue();
+        Assert.assertEquals(3, description.getColumns().size());
+        sequenceDescription = description.getColumns().get(0).getSequenceDescription();
+        Assert.assertNotNull(sequenceDescription);
+        Assert.assertEquals("custom_sequence_description", sequenceDescription.getName());
+        Assert.assertEquals(Integer.MAX_VALUE, sequenceDescription.getMaxValue().intValue());
+        Assert.assertEquals(10L, (long) sequenceDescription.getMinValue());
+        Assert.assertEquals(5L, (long) sequenceDescription.getCache());
+        Assert.assertEquals(true, sequenceDescription.getCycle());
+        Assert.assertEquals(2L, (long) sequenceDescription.getIncrement());
+        Assert.assertEquals(12L, (long) sequenceDescription.getStartValue());
+        tableColumn = describeResult.getValue().getColumns().get(1);
+        Assert.assertNull(tableColumn.getSequenceDescription());
+        Assert.assertEquals("new_name", tableColumn.getLiteralDefaultValue().getText());
+        Assert.assertEquals(PrimitiveType.Text, tableColumn.getType());
+        anotherTableColumn = describeResult.getValue().getColumns().get(2);
+        Assert.assertNull(anotherTableColumn.getSequenceDescription());
+        Assert.assertNull(anotherTableColumn.getLiteralDefaultValue());
+        Assert.assertEquals("new_name", tableColumn.getLiteralDefaultValue().getText());
+        Assert.assertEquals(PrimitiveType.Text, tableColumn.getType());
+
+        ctx.supplyStatus(session -> session.dropTable(tablePath)).join();
+    }
 }