Merge pull request #374 from alex268/table_type_support

Added support of StoreType and not null columns

Author: alex268

table/pom.xml

@@ -47,7 +47,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
                 <configuration>
                     <environmentVariables>
                         <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>

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

@@ -24,7 +24,12 @@
  * @author Sergey Polovko
  */
 public class TableDescription {
+    public enum StoreType {
+        ROW,
+        COLUMN
+    }
 
+    private final StoreType storeType;
     private final List<String> primaryKeys;
     private final List<TableColumn> columns;
     private final List<TableIndex> indexes;
@@ -42,6 +47,7 @@ public class TableDescription {
     private final TableTtl tableTtl;
 
     private TableDescription(Builder builder) {
+        this.storeType = builder.storeType;
         this.primaryKeys = ImmutableList.copyOf(builder.primaryKeys);
         this.columns = builder.buildColumns();
         this.indexes = ImmutableList.copyOf(builder.indexes);
@@ -59,6 +65,10 @@ public static Builder newBuilder() {
         return new Builder();
     }
 
+    public StoreType getStoreType() {
+        return storeType;
+    }
+
     public List<String> getPrimaryKeys() {
         return primaryKeys;
     }
@@ -105,7 +115,7 @@ public List<ChangefeedDescription> getChangefeeds() {
      * BUILDER
      */
     public static class Builder {
-
+        private StoreType storeType = StoreType.ROW;
         private List<String> primaryKeys = Collections.emptyList();
         private final LinkedHashMap<String, TypeAndFamily> columns = new LinkedHashMap<>();
         private final List<TableIndex> indexes = new ArrayList<>();
@@ -118,6 +128,11 @@ public static class Builder {
         private TableTtl ttlSettings = TableTtl.notSet();
         private final List<ChangefeedDescription> changefeeds = new ArrayList<>();
 
+        public Builder setStoreType(StoreType storeType) {
+            this.storeType = storeType;
+            return this;
+        }
+
         public Builder addNonnullColumn(String name, Type type) {
             return addNonnullColumn(name, type, null);
         }

table/src/main/java/tech/ydb/table/impl/BaseSession.java

@@ -91,6 +91,7 @@
 import tech.ydb.table.values.ListValue;
 import tech.ydb.table.values.StructValue;
 import tech.ydb.table.values.TupleValue;
+import tech.ydb.table.values.Type;
 import tech.ydb.table.values.Value;
 import tech.ydb.table.values.proto.ProtoType;
 import tech.ydb.table.values.proto.ProtoValue;
@@ -208,6 +209,9 @@ private static YdbTable.ColumnMeta buildColumnMeta(TableColumn column) {
         if (column.getFamily() != null) {
             builder.setFamily(column.getFamily());
         }
+        if (column.getType().getKind() != Type.Kind.OPTIONAL) {
+            builder.setNotNull(true);
+        }
         return builder.build();
     }
 
@@ -362,6 +366,17 @@ public CompletableFuture<Status> createTable(
                 .setOperationParams(Operation.buildParams(settings.toOperationSettings()))
                 .addAllPrimaryKey(description.getPrimaryKeys());
 
+        switch (description.getStoreType()) {
+            case ROW:
+                request.setStoreType(YdbTable.StoreType.STORE_TYPE_ROW);
+                break;
+            case COLUMN:
+                request.setStoreType(YdbTable.StoreType.STORE_TYPE_COLUMN);
+                break;
+            default:
+                break;
+        }
+
         for (ColumnFamily family: description.getColumnFamilies()) {
             request.addColumnFamilies(buildColumnFamity(family));
         }
@@ -726,6 +741,19 @@ private static TableDescription mapDescribeTable(
             DescribeTableSettings describeTableSettings
     ) {
         TableDescription.Builder description = TableDescription.newBuilder();
+        switch (result.getStoreType()) {
+            case STORE_TYPE_ROW:
+                description = description.setStoreType(TableDescription.StoreType.ROW);
+                break;
+            case STORE_TYPE_COLUMN:
+                description = description.setStoreType(TableDescription.StoreType.COLUMN);
+                break;
+            case UNRECOGNIZED:
+            case STORE_TYPE_UNSPECIFIED:
+            default:
+                break;
+        }
+
         for (int i = 0; i < result.getColumnsCount(); i++) {
             YdbTable.ColumnMeta column = result.getColumns(i);
             description.addNonnullColumn(column.getName(), ProtoType.fromPb(column.getType()), column.getFamily());

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

@@ -74,6 +74,7 @@ public void alterTableTest() {
 
         TableDescription description = describeResult.getValue();
 
+        Assert.assertEquals(TableDescription.StoreType.ROW, description.getStoreType());
         Assert.assertEquals(1, description.getColumnFamilies().size());
         Assert.assertEquals(DEFAULT_FAMILY, description.getColumnFamilies().get(0).getName());
 

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

@@ -1,12 +1,13 @@
 package tech.ydb.table.integration;
 
 import java.util.Arrays;
+
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
+
 import tech.ydb.core.Result;
 import tech.ydb.core.Status;
-
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.description.TableColumn;
 import tech.ydb.table.description.TableDescription;
@@ -53,8 +54,8 @@ public class RenameTablesTest {
     public void testRenameTables() {
         TableDescription tableDescription = TableDescription.newBuilder()
                 .addNullableColumn("id", PrimitiveType.Uint64)
-                .addNullableColumn("code", PrimitiveType.Text)
-                .addNullableColumn("size", PrimitiveType.Float)
+                .addNonnullColumn("code", PrimitiveType.Text)
+                .addNonnullColumn("size", PrimitiveType.Float)
                 .addNullableColumn("created", PrimitiveType.Timestamp)
                 .addNullableColumn("data", PrimitiveType.Json)
                 .setPrimaryKey("id")