Fix parameter substitution in Package pragma

commit_hash:df3312c03f97d33ee57c7ffd11a489097eb3c2d4

Author: antoniox

yql/essentials/ast/yql_expr.cpp

@@ -1324,21 +1324,21 @@ namespace {
             packageModuleName << Sep << part;
         }
 
-        auto queue = TVector<std::pair<TString, THttpURL>> {
-            {packageModuleName, ParseURL(url)}
+        auto queue = TVector<std::pair<TString, TString>> {
+            {packageModuleName, url}
         };
 
         while (queue) {
-            auto [prefix, httpUrl] = queue.back();
+            auto [prefix, url] = queue.back();
             queue.pop_back();
 
             TVector<TUrlListEntry> urlListEntries;
             try {
-                urlListEntries = ctx.UrlListerManager->ListUrl(httpUrl, token);
+                urlListEntries = ctx.UrlListerManager->ListUrl(url, token);
             } catch (const std::exception& e) {
                 ctx.AddError(*nameNode,
                     TStringBuilder()
-                        << "UrlListerManager: failed to list URL \"" << httpUrl.PrintS()
+                        << "UrlListerManager: failed to list URL \"" << url
                         << "\", details: " << e.what()
                 );
 
@@ -1356,7 +1356,7 @@ namespace {
                     }
 
                     if (!ctx.ModuleResolver->AddFromUrl(
-                        moduleName, urlListEntry.Url.PrintS(), token, ctx.Expr,
+                        moduleName, urlListEntry.Url, token, ctx.Expr,
                         ctx.SyntaxVersion, 0, nameNode->GetPosition()
                     )) {
                         return false;
@@ -3320,7 +3320,7 @@ ui64 MakePgExtensionMask(ui32 extensionIndex) {
     if (!extensionIndex) {
         return 0;
     }
-    
+
     YQL_ENSURE(extensionIndex <= 64);
     return 1ull << (extensionIndex - 1);
 }

yql/essentials/core/url_lister/interface/url_lister.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <library/cpp/uri/http_url.h>
-
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
 #include <util/generic/vector.h>
@@ -16,16 +14,16 @@ enum class EUrlListEntryType {
 
 
 struct TUrlListEntry {
-    THttpURL Url;
+    TString Url;
     TString Name;
     EUrlListEntryType Type;
 };
 
 
 class IUrlLister : public TThrRefBase {
 public:
-    virtual bool Accept(const THttpURL& url) const = 0;
-    virtual TVector<TUrlListEntry> ListUrl(const THttpURL& url, const TString& token) const = 0;
+    virtual bool Accept(const TString& url) const = 0;
+    virtual TVector<TUrlListEntry> ListUrl(const TString& url, const TString& token) const = 0;
 };
 using IUrlListerPtr = TIntrusivePtr<IUrlLister>;
 

yql/essentials/core/url_lister/interface/url_lister_manager.h

@@ -14,7 +14,7 @@ namespace NYql {
 
 class IUrlListerManager: public TThrRefBase {
 public:
-    virtual TVector<TUrlListEntry> ListUrl(const THttpURL& url, const TString& tokenName) const = 0;
+    virtual TVector<TUrlListEntry> ListUrl(const TString& url, const TString& tokenName) const = 0;
 
 public:
     virtual TIntrusivePtr<IUrlListerManager> Clone() const = 0;

yql/essentials/core/url_lister/interface/ya.make

@@ -6,7 +6,6 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/uri
     library/cpp/yson/node
     yql/essentials/core/credentials
     yql/essentials/core/url_preprocessing/interface

yql/essentials/core/url_lister/url_lister_manager.cpp

@@ -16,16 +16,14 @@ class TUrlListerManager: public IUrlListerManager {
     }
 
 public:
-    TVector<TUrlListEntry> ListUrl(const THttpURL& url, const TString& tokenName) const override {
-        auto urlString = SubstParameters(url.PrintS(), Parameters, nullptr);
+    TVector<TUrlListEntry> ListUrl(const TString& url, const TString& tokenName) const override {
+        auto urlWithoutParameters = SubstParameters(url, Parameters, nullptr);
+        auto preprocessedUrl = urlWithoutParameters;
 
         if (UrlPreprocessing) {
-            auto [preprocessedUrlString, alias] = UrlPreprocessing->Preprocess(urlString);
-            urlString = preprocessedUrlString;
+            preprocessedUrl = UrlPreprocessing->Preprocess(urlWithoutParameters).first;
         }
 
-        auto patchedUrl = ParseURL(urlString);
-
         TString token;
         if (tokenName) {
             if (!Credentials) {
@@ -41,12 +39,12 @@ class TUrlListerManager: public IUrlListerManager {
         }
 
         for (const auto& urlLister: UrlListers) {
-            if (urlLister->Accept(patchedUrl)) {
-                return urlLister->ListUrl(patchedUrl, token);
+            if (urlLister->Accept(preprocessedUrl)) {
+                return urlLister->ListUrl(preprocessedUrl, token);
             }
         }
 
-        ythrow yexception() << "Unsupported package url: " << urlString;
+        ythrow yexception() << "Unsupported package url: " << url;
     }
 
 public:

yql/essentials/core/url_lister/ya.make

@@ -7,7 +7,6 @@ SRCS(
 PEERDIR(
     yql/essentials/ast
     yql/essentials/core/url_lister/interface
-    yql/essentials/utils/fetch
 )
 
 END()