fix compil;e

ByConity · Jul 27, 2023 · 0140cc4 · 0140cc4
1 parent 79aa344
commit 0140cc4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/Analyzers/QueryRewriter.cpp b/src/Analyzers/QueryRewriter.cpp
@@ -195,16 +195,13 @@ namespace
         CheckAliasVisitor().visit(query);
     }
 
-<<<<<<< HEAD
     void simpleFunctions(ASTPtr & query, ContextMutablePtr context)
     {
         if (context->getSettingsRef().rewrite_like_function)
             SimpleFunctionVisitor().visit(query);
     }
 
-    void expandView(ASTPtr & query, ContextMutablePtr context, int & graphviz_index)
-=======
-    void expandUdf(ASTPtr & query, ContextMutablePtr context)
+    void expandUdf(ASTPtr & query, ContextMutablePtr context, int & graphviz_index)
     {
         if (!UserDefinedSQLFunctionFactory::instance().empty())
         {
@@ -214,8 +211,7 @@ namespace
         }
     }
 
-    void expandView(ASTPtr & query, ContextMutablePtr context)
->>>>>>> 6a91de6389 (sql udf init commit)
+    void expandView(ASTPtr & query, ContextMutablePtr context, int & graphviz_index)
     {
         ReplaceViewWithSubquery data{context};
         ReplaceViewWithSubqueryVisitor(data).visit(query);
@@ -553,7 +549,7 @@ ASTPtr QueryRewriter::rewrite(ASTPtr query, ContextMutablePtr context, bool enab
         rewriteInTableExpression(query);
         normalizeFunctions(query, context, graphviz_index);
         implementFunctions(query, context, graphviz_index);
-        expandUdf(query, context);
+        expandUdf(query, context, graphviz_index);
     }
     else
     {
@@ -563,7 +559,7 @@ ASTPtr QueryRewriter::rewrite(ASTPtr query, ContextMutablePtr context, bool enab
         normalizeUnion(query, context);
         simpleFunctions(query, context);
 
-        expandUdf(query, context);
+        expandUdf(query, context, graphviz_index);
         markTupleLiteralsAsLegacy(query, context);
 
         // select query level rewriter, top down rewrite each subquery.

diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
@@ -281,12 +281,9 @@ using WorkerStatusManagerPtr = std::shared_ptr<WorkerStatusManager>;
 
 class WorkerGroupStatus;
 using WorkerGroupStatusPtr = std::shared_ptr<WorkerGroupStatus>;
-<<<<<<< HEAD
 struct QeueueThrottlerDeleter;
 using QueueThrottlerDeleterPtr = std::shared_ptr<QeueueThrottlerDeleter>;
-=======
 class IUserDefinedSQLObjectsLoader;
->>>>>>> 6a91de6389 (sql udf init commit)
 
 enum class ServerType
 {

diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.cpp b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
@@ -63,7 +63,7 @@ BlockIO InterpreterCreateFunctionQuery::executeForHostServer(const ASTCreateFunc
     auto & database_name = create_function_query.database_name;
 
     if (!is_internal)
-        DatabaseCatalog::instance().assertDatabaseExists(database_name);
+        DatabaseCatalog::instance().assertDatabaseExists(database_name, current_context);
 
     IntentLockPtr udf_lock;
     TransactionCnchPtr txn = current_context->getCurrentTransaction();