From 562ea03ce70c5fe0b44298b18f898e87d9ab44a5 Mon Sep 17 00:00:00 2001
From: Mikhail Koviazin <mikhail.koviazin@aiven.io>
Date: Mon, 17 Jul 2023 12:54:34 +0300
Subject: [PATCH] FunctionsURL.h to StringHelpers.h and move out of URL/

---
 src/Functions/{URL/FunctionsURL.h => StringHelpers.h}   | 8 ++++----
 src/Functions/URL/FirstSignificantSubdomainCustomImpl.h | 2 +-
 src/Functions/URL/basename.cpp                          | 2 +-
 src/Functions/URL/fragment.h                            | 2 +-
 src/Functions/URL/netloc.cpp                            | 3 +--
 src/Functions/URL/path.cpp                              | 2 +-
 src/Functions/URL/path.h                                | 2 +-
 src/Functions/URL/pathFull.cpp                          | 2 +-
 src/Functions/URL/protocol.h                            | 3 +--
 src/Functions/URL/queryString.h                         | 2 +-
 src/Functions/URL/queryStringAndFragment.h              | 3 +--
 11 files changed, 14 insertions(+), 17 deletions(-)
 rename src/Functions/{URL/FunctionsURL.h => StringHelpers.h} (93%)

diff --git a/src/Functions/URL/FunctionsURL.h b/src/Functions/StringHelpers.h
similarity index 93%
rename from src/Functions/URL/FunctionsURL.h
rename to src/Functions/StringHelpers.h
index 362042e31e1..a0f4d18aa80 100644
--- a/src/Functions/URL/FunctionsURL.h
+++ b/src/Functions/StringHelpers.h
@@ -7,8 +7,8 @@
 namespace DB
 {
 
-/** URL processing functions. See implementation in separate .cpp files.
-  * All functions are not strictly follow RFC, instead they are maximally simplified for performance reasons.
+/** These helpers are used by URL processing functions. See implementation in separate .cpp files.
+  * All functions do not strictly follow RFC, instead they are maximally simplified for performance reasons.
   *
   * Functions for extraction parts of URL.
   * If URL has nothing like, then empty string is returned.
@@ -101,7 +101,7 @@ struct ExtractSubstringImpl
 
     static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by URL functions");
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by this function");
     }
 };
 
@@ -156,7 +156,7 @@ struct CutSubstringImpl
 
     static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by URL functions");
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported this function");
     }
 };
 
diff --git a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
index 5862265ce7d..93691e35741 100644
--- a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
+++ b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Functions/FunctionFactory.h>
-#include <Functions/URL/FunctionsURL.h>
 #include <Functions/FunctionHelpers.h>
+#include <Functions/StringHelpers.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Functions/URL/basename.cpp b/src/Functions/URL/basename.cpp
index 6992f924ef2..bc747e2595f 100644
--- a/src/Functions/URL/basename.cpp
+++ b/src/Functions/URL/basename.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
+#include <Functions/StringHelpers.h>
 #include <base/find_symbols.h>
-#include "FunctionsURL.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/fragment.h b/src/Functions/URL/fragment.h
index 6c11d0fbb34..0414c4f64a2 100644
--- a/src/Functions/URL/fragment.h
+++ b/src/Functions/URL/fragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FunctionsURL.h"
 #include <base/find_symbols.h>
+#include <Functions/StringHelpers.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/netloc.cpp b/src/Functions/URL/netloc.cpp
index bc34e34a40d..bf3e8a471ef 100644
--- a/src/Functions/URL/netloc.cpp
+++ b/src/Functions/URL/netloc.cpp
@@ -1,7 +1,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/FunctionsURL.h>
+#include <Functions/StringHelpers.h>
 
 
 namespace DB
@@ -154,4 +154,3 @@ REGISTER_FUNCTION(Netloc)
 }
 
 }
-
diff --git a/src/Functions/URL/path.cpp b/src/Functions/URL/path.cpp
index ccc7dedb724..8d609f43191 100644
--- a/src/Functions/URL/path.cpp
+++ b/src/Functions/URL/path.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include "FunctionsURL.h"
+#include <Functions/StringHelpers.h>
 #include "path.h"
 #include <base/find_symbols.h>
 
diff --git a/src/Functions/URL/path.h b/src/Functions/URL/path.h
index 89244659088..a0dd5eea2d3 100644
--- a/src/Functions/URL/path.h
+++ b/src/Functions/URL/path.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <base/find_symbols.h>
-#include <Functions/URL/FunctionsURL.h>
+#include <Functions/StringHelpers.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/pathFull.cpp b/src/Functions/URL/pathFull.cpp
index 002770e812a..9aacee21fed 100644
--- a/src/Functions/URL/pathFull.cpp
+++ b/src/Functions/URL/pathFull.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include "FunctionsURL.h"
+#include <Functions/StringHelpers.h>
 #include "path.h"
 #include <base/find_symbols.h>
 
diff --git a/src/Functions/URL/protocol.h b/src/Functions/URL/protocol.h
index 74c0bb820b4..c1d83192835 100644
--- a/src/Functions/URL/protocol.h
+++ b/src/Functions/URL/protocol.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FunctionsURL.h"
 #include <Common/StringUtils/StringUtils.h>
+#include <Functions/StringHelpers.h>
 
 
 namespace DB
@@ -54,4 +54,3 @@ struct ExtractProtocol
 };
 
 }
-
diff --git a/src/Functions/URL/queryString.h b/src/Functions/URL/queryString.h
index a0777a5c9a1..603450d102b 100644
--- a/src/Functions/URL/queryString.h
+++ b/src/Functions/URL/queryString.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FunctionsURL.h"
 #include <base/find_symbols.h>
+#include <Functions/StringHelpers.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/queryStringAndFragment.h b/src/Functions/URL/queryStringAndFragment.h
index ed19cd14b74..27008388e4d 100644
--- a/src/Functions/URL/queryStringAndFragment.h
+++ b/src/Functions/URL/queryStringAndFragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FunctionsURL.h"
 #include <base/find_symbols.h>
+#include <Functions/StringHelpers.h>
 
 
 namespace DB
@@ -34,4 +34,3 @@ struct ExtractQueryStringAndFragment
 };
 
 }
-