Fixed location passing

Author: GrigoriyPA

ydb/core/external_sources/object_storage.cpp

@@ -46,7 +46,6 @@ struct TObjectStorageExternalSource : public IExternalSource {
 
     virtual TString Pack(const NKikimrExternalSources::TSchema& schema,
                          const NKikimrExternalSources::TGeneral& general) const override {
-        TString location;
         NKikimrExternalSources::TObjectStorage objectStorage;
         for (const auto& [key, value]: general.attributes()) {
             auto lowerKey = to_lower(key);
@@ -63,14 +62,12 @@ struct TObjectStorageExternalSource : public IExternalSource {
                 }
             } else if (IsIn({"file_pattern"sv, "data.interval.unit"sv, "data.datetime.format_name"sv, "data.datetime.format"sv, "data.timestamp.format_name"sv, "data.timestamp.format"sv, "csv_delimiter"sv}, lowerKey)) {
                 objectStorage.mutable_format_setting()->insert({lowerKey, value});
-            } else if (lowerKey == "location") {
-                location = value;
             } else {
                 ythrow TExternalSourceException() << "Unknown attribute " << key;
             }
         }
 
-        if (auto issues = Validate(schema, objectStorage, PathsLimit, location)) {
+        if (auto issues = Validate(schema, objectStorage, PathsLimit, general.location())) {
             ythrow TExternalSourceException() << issues.ToString();
         }
 

ydb/core/external_sources/object_storage_ut.cpp

@@ -37,21 +37,21 @@ Y_UNIT_TEST_SUITE(ObjectStorageTest) {
 
         {  // location
             NKikimrExternalSources::TGeneral general;
-            general.mutable_attributes()->insert({"location", "}"});
+            general.set_location("}");
             UNIT_ASSERT_EXCEPTION_CONTAINS(source->Pack(schema, general), NExternalSource::TExternalSourceException, "Location '}' contains invalid wildcard:");
         }
 
         {  // file pattern
             NKikimrExternalSources::TGeneral general;
             general.mutable_attributes()->insert({"file_pattern", "}"});
             UNIT_ASSERT_EXCEPTION_CONTAINS(source->Pack(schema, general), NExternalSource::TExternalSourceException, "File pattern '}' contains invalid wildcard:");
-            general.mutable_attributes()->insert({"location", "/test_file"});
+            general.set_location("/test_file");
             UNIT_ASSERT_EXCEPTION_CONTAINS(source->Pack(schema, general), NExternalSource::TExternalSourceException, "Path pattern cannot be used with file_pattern");
         }
 
         {  // partitioned by
             NKikimrExternalSources::TGeneral general;
-            general.mutable_attributes()->insert({"location", "*"});
+            general.set_location("*");
             general.mutable_attributes()->insert({"partitioned_by", "[year]"});
             UNIT_ASSERT_EXCEPTION_CONTAINS(source->Pack(schema, general), NExternalSource::TExternalSourceException, "Location '*' contains wildcards");
         }

ydb/core/kqp/gateway/utils/scheme_helpers.cpp

@@ -88,11 +88,11 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
         columnDesc.SetNotNull(columnIt->second.NotNull);
     }
     NKikimrExternalSources::TGeneral general;
+    general.set_location(settings.Location);
     auto& attributes = *general.mutable_attributes();
     for (const auto& [key, value]: settings.SourceTypeParameters) {
         attributes.insert({key, value});
     }
-    attributes.insert({"location", settings.Location});
     externalTableDesc.SetContent(general.SerializeAsString());
 }
 

ydb/core/protos/external_sources.proto

@@ -11,6 +11,7 @@ message TSchema {
 
 message TGeneral {
     map<string, string> attributes = 1 [(Ydb.size).le = 100];
+    optional string location = 2;
 }
 
 message TObjectStorage {