Drop internal v0 deps

commit_hash:d5e60311a1b50570d1c9eb4a7a1620e9881c1a4e

8 files changed, 5 insertions, 86 deletions

diff --git a/yql/essentials/core/ya.make b/yql/essentials/core/ya.make
index 6b468aea16c..d1142fe083b 100644
--- a/yql/essentials/core/ya.make
+++ b/yql/essentials/core/ya.make
@@ -75,6 +75,7 @@ PEERDIR(
     yql/essentials/public/udf
     yql/essentials/public/udf/tz
     yql/essentials/sql/settings
+    yql/essentials/sql
     yql/essentials/utils
     yql/essentials/utils/log
     yql/essentials/core/expr_nodes
diff --git a/yql/essentials/core/yql_library_compiler.cpp b/yql/essentials/core/yql_library_compiler.cpp
index 90824e19cf4..9bb9fcdd00f 100644
--- a/yql/essentials/core/yql_library_compiler.cpp
+++ b/yql/essentials/core/yql_library_compiler.cpp
@@ -225,8 +225,4 @@ bool CompileLibraries(const NSQLTranslation::TTranslators& translators, const TU
     return LinkLibraries(libs, ctx, ctx);
 }
 
-bool CompileLibraries(const TUserDataTable& userData, TExprContext& ctx, TModulesTable& modules, bool optimize) {
-    return CompileLibraries(NSQLTranslation::MakeAllTranslators(), userData, ctx, modules, optimize);
-}
-
 }
diff --git a/yql/essentials/core/yql_library_compiler.h b/yql/essentials/core/yql_library_compiler.h
index f44c5b42556..36546db9c10 100644
--- a/yql/essentials/core/yql_library_compiler.h
+++ b/yql/essentials/core/yql_library_compiler.h
@@ -15,6 +15,4 @@ bool LinkLibraries(THashMap<TString, TLibraryCohesion>& libs, TExprContext& ctx,
 
 bool CompileLibraries(const NSQLTranslation::TTranslators& translators, const TUserDataTable& userData,
     TExprContext& ctx, TModulesTable& modules, bool optimize = true);
-//FIXME remove
-bool CompileLibraries(const TUserDataTable& userData, TExprContext& ctx, TModulesTable& modules, bool optimize = true);
 }
diff --git a/yql/essentials/core/yql_type_annotation.h b/yql/essentials/core/yql_type_annotation.h
index 96dfcb971d3..08931a5d9ef 100644
--- a/yql/essentials/core/yql_type_annotation.h
+++ b/yql/essentials/core/yql_type_annotation.h
@@ -56,13 +56,6 @@ public:
         }
     }
 
-    //FIXME remove
-    TModuleResolver(TModulesTable&& modules,
-        ui64 nextUniqueId, const THashMap<TString, TString>& clusterMapping,
-        const THashSet<TString>& sqlFlags, bool optimizeLibraries = true, THolder<TExprContext> ownedCtx = {})
-        : TModuleResolver(NSQLTranslation::MakeAllTranslators(), std::move(modules), nextUniqueId, clusterMapping, sqlFlags, optimizeLibraries, std::move(ownedCtx))
-    {}
-
     TModuleResolver(const NSQLTranslation::TTranslators& translators, const TModulesTable* parentModules,
         ui64 nextUniqueId, const THashMap<TString, TString>& clusterMapping,
         const THashSet<TString>& sqlFlags, bool optimizeLibraries, const TSet<TString>& knownPackages, const THashMap<TString,
@@ -79,15 +72,6 @@ public:
     {
     }
 
-    //FIXME remove
-    TModuleResolver(const TModulesTable* parentModules,
-        ui64 nextUniqueId, const THashMap<TString, TString>& clusterMapping,
-        const THashSet<TString>& sqlFlags, bool optimizeLibraries, const TSet<TString>& knownPackages, const THashMap<TString,
-        THashMap<int, TLibraryCohesion>>& libs, const TString& fileAliasPrefix)
-        : TModuleResolver(NSQLTranslation::MakeAllTranslators(), parentModules, nextUniqueId,
-            clusterMapping, sqlFlags, optimizeLibraries, knownPackages, libs, fileAliasPrefix)
-    {}
-
     static TString NormalizeModuleName(const TString& path);
 
     void AttachUserData(TUserDataStorage::TPtr userData) {
diff --git a/yql/essentials/providers/common/provider/ya.make b/yql/essentials/providers/common/provider/ya.make
index 13dadb92d66..dfcf35befe4 100644
--- a/yql/essentials/providers/common/provider/ya.make
+++ b/yql/essentials/providers/common/provider/ya.make
@@ -11,7 +11,6 @@ SRCS(
 PEERDIR(
     yql/essentials/minikql
     yql/essentials/public/udf
-    yql/essentials/sql # fixme
     yql/essentials/core
     yql/essentials/parser/pg_catalog
 )
diff --git a/yql/essentials/sql/sql.cpp b/yql/essentials/sql/sql.cpp
index 4d768852c66..cf7c91bc844 100644
--- a/yql/essentials/sql/sql.cpp
+++ b/yql/essentials/sql/sql.cpp
@@ -1,27 +1,12 @@
 #include "sql.h"
 
 #include <yql/essentials/core/issue/yql_issue.h>
-#include <yql/essentials/sql/v0/sql.h>
-#include <yql/essentials/sql/v0/lexer/lexer.h>
-#include <yql/essentials/sql/v1/sql.h>
-#include <yql/essentials/sql/v1/lexer/lexer.h>
-#include <yql/essentials/sql/v1/proto_parser/proto_parser.h>
-#include <yql/essentials/parser/pg_wrapper/interface/parser.h>
-
 #include <google/protobuf/arena.h>
 
 #include <util/string/builder.h>
 
 namespace NSQLTranslation {
 
-    TTranslators MakeAllTranslators() {
-        return TTranslators(
-            NSQLTranslationV0::MakeTranslator(),
-            NSQLTranslationV1::MakeTranslator(),
-            NSQLTranslationPG::MakeTranslator()
-        );
-    }
-
     NYql::TAstParseResult SqlToYql(const TTranslators& translators, const TString& query, const TTranslationSettings& settings,
         NYql::TWarningRules* warningRules, NYql::TStmtParseInfo* stmtParseInfo, TTranslationSettings* effectiveSettings)
     {
@@ -80,11 +65,6 @@ namespace NSQLTranslation {
         }
     }
 
-    NYql::TAstParseResult SqlToYql(const TString& query, const TTranslationSettings& settings,
-        NYql::TWarningRules* warningRules, NYql::TStmtParseInfo* stmtParseInfo, TTranslationSettings* effectiveSettings) {
-        return SqlToYql(MakeAllTranslators(), query, settings, warningRules, stmtParseInfo, effectiveSettings);
-    }
-
     google::protobuf::Message* SqlAST(const TTranslators& translators, const TString& query, const TString& queryName, NYql::TIssues& issues,
         size_t maxErrors, const TTranslationSettings& settings, ui16* actualSyntaxVersion)
     {
@@ -121,11 +101,6 @@ namespace NSQLTranslation {
         }
     }
 
-    google::protobuf::Message* SqlAST(const TString& query, const TString& queryName, NYql::TIssues& issues,
-        size_t maxErrors, const TTranslationSettings& settings, ui16* actualSyntaxVersion) {
-        return SqlAST(MakeAllTranslators(), query, queryName, issues, maxErrors, settings, actualSyntaxVersion);
-    }
-
     ILexer::TPtr SqlLexer(const TTranslators& translators, const TString& query, NYql::TIssues& issues, const TTranslationSettings& settings, ui16* actualSyntaxVersion)
     {
         TTranslationSettings parsedSettings(settings);
@@ -161,10 +136,6 @@ namespace NSQLTranslation {
         }
     }
 
-    ILexer::TPtr SqlLexer(const TString& query, NYql::TIssues& issues, const TTranslationSettings& settings, ui16* actualSyntaxVersion) {
-        return SqlLexer(MakeAllTranslators(), query, issues, settings, actualSyntaxVersion);
-    }
-
     NYql::TAstParseResult SqlASTToYql(const TTranslators& translators, const TString& query,
         const google::protobuf::Message& protoAst, const TSQLHints& hints, const TTranslationSettings& settings) {
         NYql::TAstParseResult result;
@@ -192,11 +163,6 @@ namespace NSQLTranslation {
         }
     }
 
-    NYql::TAstParseResult SqlASTToYql(const TString& query, const google::protobuf::Message& protoAst,
-        const TSQLHints& hints, const TTranslationSettings& settings) {
-        return SqlASTToYql(MakeAllTranslators(), query, protoAst, hints, settings);
-    }
-
     TVector<NYql::TAstParseResult> SqlToAstStatements(const TTranslators& translators, const TString& query,
         const TTranslationSettings& settings, NYql::TWarningRules* warningRules, ui16* actualSyntaxVersion,
         TVector<NYql::TStmtParseInfo>* stmtParseInfo)
@@ -247,11 +213,6 @@ namespace NSQLTranslation {
         }
     }
 
-    TVector<NYql::TAstParseResult> SqlToAstStatements(const TString& query, const TTranslationSettings& settings,
-        NYql::TWarningRules* warningRules, ui16* actualSyntaxVersion, TVector<NYql::TStmtParseInfo>* stmtParseInfo) {
-        return SqlToAstStatements(MakeAllTranslators(), query, settings, warningRules, actualSyntaxVersion, stmtParseInfo);
-    }
-
     TTranslators::TTranslators(TTranslatorPtr v0, TTranslatorPtr v1, TTranslatorPtr pg)
         : V0(v0 ? v0 : MakeDummyTranslator("v0"))
         , V1(v1 ? v1 : MakeDummyTranslator("v1"))
diff --git a/yql/essentials/sql/sql.h b/yql/essentials/sql/sql.h
index 250cefc2b18..ebeca9629cf 100644
--- a/yql/essentials/sql/sql.h
+++ b/yql/essentials/sql/sql.h
@@ -9,11 +9,6 @@
 #include <yql/essentials/sql/settings/translation_settings.h>
 #include <yql/essentials/sql/settings/translator.h>
 
-#include <util/generic/hash.h>
-#include <util/generic/hash_set.h>
-
-#include <google/protobuf/message.h>
-
 namespace NSQLTranslation {
 
     struct TTranslators {
@@ -24,29 +19,17 @@ namespace NSQLTranslation {
         TTranslators(TTranslatorPtr v0, TTranslatorPtr v1, TTranslatorPtr pg);
     };
 
-    //FIXME drop this function and overloads without translators
-    TTranslators MakeAllTranslators();
-
-    NYql::TAstParseResult SqlToYql(const TString& query, const TTranslationSettings& settings,
-        NYql::TWarningRules* warningRules = nullptr, NYql::TStmtParseInfo* stmtParseInfo = nullptr,
-        TTranslationSettings* effectiveSettings = nullptr);
     NYql::TAstParseResult SqlToYql(const TTranslators& translators, const TString& query, const TTranslationSettings& settings,
         NYql::TWarningRules* warningRules = nullptr, NYql::TStmtParseInfo* stmtParseInfo = nullptr,
         TTranslationSettings* effectiveSettings = nullptr);
 
-    google::protobuf::Message* SqlAST(const TString& query, const TString& queryName, NYql::TIssues& issues, size_t maxErrors,
-        const TTranslationSettings& settings = {}, ui16* actualSyntaxVersion = nullptr);
     google::protobuf::Message* SqlAST(const TTranslators& translators, const TString& query, const TString& queryName, NYql::TIssues& issues, size_t maxErrors,
         const TTranslationSettings& settings = {}, ui16* actualSyntaxVersion = nullptr);
 
-    ILexer::TPtr SqlLexer(const TString& query, NYql::TIssues& issues, const TTranslationSettings& settings = {}, ui16* actualSyntaxVersion = nullptr);
     ILexer::TPtr SqlLexer(const TTranslators& translators, const TString& query, NYql::TIssues& issues, const TTranslationSettings& settings = {}, ui16* actualSyntaxVersion = nullptr);
 
-    NYql::TAstParseResult SqlASTToYql(const TString& query, const google::protobuf::Message& protoAst, const TSQLHints& hints, const TTranslationSettings& settings);
     NYql::TAstParseResult SqlASTToYql(const TTranslators& translators, const TString& query, const google::protobuf::Message& protoAst, const TSQLHints& hints, const TTranslationSettings& settings);
 
-    TVector<NYql::TAstParseResult> SqlToAstStatements(const TString& query, const TTranslationSettings& settings,
-        NYql::TWarningRules* warningRules = nullptr, ui16* actualSyntaxVersion = nullptr, TVector<NYql::TStmtParseInfo>* stmtParseInfo = nullptr);
     TVector<NYql::TAstParseResult> SqlToAstStatements(const TTranslators& translators, const TString& query, const TTranslationSettings& settings,
         NYql::TWarningRules* warningRules = nullptr, ui16* actualSyntaxVersion = nullptr, TVector<NYql::TStmtParseInfo>* stmtParseInfo = nullptr);
 }  // namespace NSQLTranslation
diff --git a/yql/essentials/sql/ya.make b/yql/essentials/sql/ya.make
index 3d7760614cb..bd73aab9f1d 100644
--- a/yql/essentials/sql/ya.make
+++ b/yql/essentials/sql/ya.make
@@ -2,14 +2,11 @@ LIBRARY()
 
 PEERDIR(
     library/cpp/deprecated/split
-    yql/essentials/parser/pg_wrapper/interface
+    yql/essentials/ast
+    yql/essentials/parser/proto_ast
+    yql/essentials/parser/lexer_common
+    yql/essentials/public/issue
     yql/essentials/sql/settings
-    yql/essentials/sql/v0
-    yql/essentials/sql/v0/lexer
-    yql/essentials/sql/v1
-    yql/essentials/sql/v1/format
-    yql/essentials/sql/v1/lexer
-    yql/essentials/sql/v1/proto_parser
     yql/essentials/utils
 )