Merge 83ff1f1 into d14df37

Author: qrort

ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp

@@ -1966,8 +1966,8 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
             {"Value3", "Pg('pgint2','',21,0,0)"}
         };
 
-        const THashMap<std::string_view, bool> columnNullability = {
-            {"Key1", true},
+        const THashMap<std::string_view, bool> columnNonNullability = {
+            {"Key1", false},
             {"Key2", false},
             {"Value1", false},
             {"Value2", false},
@@ -1977,7 +1977,12 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
         const auto& columns = describeTableResult.GetTableDescription().GetTableColumns();
         for (const auto& column : columns) {
             UNIT_ASSERT_VALUES_EQUAL_C(column.Type.ToString(), columnTypes.at(column.Name), column.Name);
-            UNIT_ASSERT_VALUES_EQUAL_C(column.NotNull.value(), columnNullability.at(column.Name), column.Name);
+            bool isNotNull = columnNonNullability.at(column.Name);
+            if (isNotNull) {
+                UNIT_ASSERT_VALUES_EQUAL_C(column.NotNull.value(), true, column.Name);
+            } else {
+                UNIT_ASSERT_C(!column.NotNull.has_value() || !column.NotNull.value(), column.Name);
+            }
         }
     }
 
@@ -1997,16 +2002,21 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
         }
         auto describeTableResult = session.DescribeTable("/Root/NotNullCheck").GetValueSync();
         UNIT_ASSERT_C(describeTableResult.IsSuccess(), describeTableResult.GetIssues().ToString());
-        const THashMap<std::string_view, bool> columnNullability = {
+        const THashMap<std::string_view, bool> columnNonNullability = {
             {"1", false},
-            {"2", true},
+            {"2", false},
             {"3", false},
             {"4", true},
         };
 
         const auto& columns = describeTableResult.GetTableDescription().GetTableColumns();
         for (const auto& column : columns) {
-            UNIT_ASSERT_VALUES_EQUAL_C(column.NotNull.value(), columnNullability.at(column.Name), column.Name);
+            bool isNotNull = columnNonNullability.at(column.Name);
+            if (isNotNull) {
+                UNIT_ASSERT_VALUES_EQUAL_C(column.NotNull.value(), true, column.Name);
+            } else {
+                UNIT_ASSERT_C(!column.NotNull.has_value() || !column.NotNull.value(), column.Name);
+            }
         }
 
         {

ydb/core/tx/schemeshard/ut_export/ut_export.cpp

@@ -364,7 +364,6 @@ Y_UNIT_TEST_SUITE(TExportToS3Tests) {
       }
     }
   }
-  not_null: false
   from_literal {
     type {
       optional_type {
@@ -389,7 +388,6 @@ columns {
       }
     }
   }
-  not_null: false
   from_literal {
     type {
       optional_type {

ydb/core/ydb_convert/table_description.cpp

@@ -367,13 +367,15 @@ static Ydb::Type* AddColumn(Ydb::Table::ColumnMeta* newColumn, const TColumn& co
         pg->set_oid(NPg::PgTypeIdFromTypeDesc(typeDesc));
         pg->set_typlen(0);
         pg->set_typmod(0);
+        if (column.GetNotNull()) {
+            newColumn->set_not_null(column.GetNotNull());
+        }
     } else {
         NYql::NProto::TypeIds protoType;
         if (!NYql::NProto::TypeIds_Parse(column.GetType(), &protoType)) {
             throw NYql::TErrorException(NKikimrIssues::TIssuesIds::DEFAULT_ERROR)
                 << "Got invalid type: " << column.GetType() << " for column: " << column.GetName();
         }
-
         if (column.GetNotNull()) {
             columnType = newColumn->mutable_type();
         } else {
@@ -389,7 +391,6 @@ static Ydb::Type* AddColumn(Ydb::Table::ColumnMeta* newColumn, const TColumn& co
             NMiniKQL::ExportPrimitiveTypeToProto(protoType, *columnType);
         }
     }
-    newColumn->set_not_null(column.GetNotNull());
     return columnType;
 }
 
@@ -407,13 +408,15 @@ Ydb::Type* AddColumn<NKikimrSchemeOp::TColumnDescription>(Ydb::Table::ColumnMeta
         pg->set_oid(NPg::PgTypeIdFromTypeDesc(typeDesc));
         pg->set_typlen(0);
         pg->set_typmod(0);
+        if (column.GetNotNull()) {
+            newColumn->set_not_null(column.GetNotNull());
+        }
     } else {
         NYql::NProto::TypeIds protoType;
         if (!NYql::NProto::TypeIds_Parse(column.GetType(), &protoType)) {
             throw NYql::TErrorException(NKikimrIssues::TIssuesIds::DEFAULT_ERROR)
                 << "Got invalid type: " << column.GetType() << " for column: " << column.GetName();
         }
-
         if (column.GetNotNull()) {
             columnType = newColumn->mutable_type();
         } else {
@@ -429,7 +432,6 @@ Ydb::Type* AddColumn<NKikimrSchemeOp::TColumnDescription>(Ydb::Table::ColumnMeta
             NMiniKQL::ExportPrimitiveTypeToProto(protoType, *columnType);
         }
     }
-    newColumn->set_not_null(column.GetNotNull());
     switch (column.GetDefaultValueCase()) {
         case NKikimrSchemeOp::TColumnDescription::kDefaultFromLiteral: {
             auto fromLiteral = newColumn->mutable_from_literal();

ydb/services/ydb/ydb_ut.cpp

@@ -1262,7 +1262,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 columns {
   name: "Value"
@@ -1273,7 +1272,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 primary_key: "Key"
 partitioning_settings {
@@ -1601,7 +1599,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 columns {
   name: "IValue"
@@ -1612,7 +1609,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 primary_key: "Key"
 indexes {