fix to use enum type

Author: bharatnc

src/Core/Settings.cpp

@@ -3651,9 +3651,9 @@ If enabled, functions 'least' and 'greatest' return NULL if one of their argumen
     DECLARE(Bool, h3togeo_lon_lat_result_order, false, R"(
 Function 'h3ToGeo' returns (lon, lat) if true, otherwise (lat, lon).
 )", 0) \
-    DECLARE(String, geotoh3_argument_order, "lat_lon", R"(
+    DECLARE(GeoToH3ArgumentOrder, geotoh3_argument_order, GeoToH3ArgumentOrder::LAT_LON, R"(
 Function 'geoToH3' accepts (lon, lat) if set to 'lon_lat' and (lat, lon) if set to 'lat_lon'.
-)", 0) \
+)", BETA) \
     DECLARE(UInt64, max_partitions_per_insert_block, 100, R"(
 Limits the maximum number of partitions in a single inserted block
 and an exception is thrown if the block contains too many partitions.

src/Core/Settings.h

@@ -104,7 +104,8 @@ class WriteBuffer;
     M(CLASS_NAME, UInt64) \
     M(CLASS_NAME, UInt64Auto) \
     M(CLASS_NAME, URI) \
-    M(CLASS_NAME, VectorSearchFilterStrategy)
+    M(CLASS_NAME, VectorSearchFilterStrategy) \
+    M(CLASS_NAME, GeoToH3ArgumentOrder)
 
 
 COMMON_SETTINGS_SUPPORTED_TYPES(Settings, DECLARE_SETTING_TRAIT)

src/Core/SettingsEnums.cpp

@@ -312,4 +312,10 @@ IMPLEMENT_SETTING_ENUM(
      {"prefilter", VectorSearchFilterStrategy::PREFILTER},
      {"postfilter", VectorSearchFilterStrategy::POSTFILTER}})
 
+IMPLEMENT_SETTING_ENUM(
+    GeoToH3ArgumentOrder,
+    ErrorCodes::BAD_ARGUMENTS,
+    {{"lat_lon", GeoToH3ArgumentOrder::LAT_LON},
+     {"lon_lat", GeoToH3ArgumentOrder::LON_LAT}})
+
 }

src/Core/SettingsEnums.h

@@ -405,4 +405,12 @@ enum class VectorSearchFilterStrategy : uint8_t
 
 DECLARE_SETTING_ENUM(VectorSearchFilterStrategy)
 
+enum class GeoToH3ArgumentOrder : uint8_t
+{
+    LAT_LON,
+    LON_LAT,
+};
+
+DECLARE_SETTING_ENUM(GeoToH3ArgumentOrder)
+
 }

src/Functions/geoToH3.cpp

@@ -10,6 +10,7 @@
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
 #include <Core/Settings.h>
+#include <Core/SettingsEnums.h>
 #include <base/range.h>
 
 #include <constants.h>
@@ -20,7 +21,7 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsString geotoh3_argument_order;
+    extern const SettingsGeoToH3ArgumentOrder geotoh3_argument_order;
 }
 namespace ErrorCodes
 {
@@ -37,7 +38,7 @@ namespace
 /// and returns h3 index of this point
 class FunctionGeoToH3 : public IFunction
 {
-    const String geotoh3_argument_order;
+    GeoToH3ArgumentOrder geotoh3_argument_order;
 public:
     static constexpr auto name = "geoToH3";
 
@@ -46,12 +47,6 @@ class FunctionGeoToH3 : public IFunction
     explicit FunctionGeoToH3(ContextPtr context)
     : geotoh3_argument_order(context->getSettingsRef()[Setting::geotoh3_argument_order])
     {
-        // Validate that the setting value is either "lat_lon" or "lon_lat".
-        if (geotoh3_argument_order != "lat_lon" || geotoh3_argument_order != "lon_lat")
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Invalid value for 'geotoh3_argument_order'. Must be 'lat_lon' or 'lon_lat'. Got: {}",
-                geotoh3_argument_order);
     }
 
     std::string getName() const override { return name; }
@@ -100,12 +95,12 @@ class FunctionGeoToH3 : public IFunction
         const ColumnFloat64 * col_lat = nullptr;
         const ColumnFloat64 * col_lon = nullptr;
 
-        if (geotoh3_argument_order == "lon_lat")
+        if (geotoh3_argument_order == GeoToH3ArgumentOrder::LON_LAT)
         {
             col_lon = checkAndGetColumn<ColumnFloat64>(non_const_arguments[0].column.get());
             col_lat = checkAndGetColumn<ColumnFloat64>(non_const_arguments[1].column.get());
         }
-        else // "lat_lon" (setting value is validated in the constructor)
+        else
         {
             col_lat = checkAndGetColumn<ColumnFloat64>(non_const_arguments[0].column.get());
             col_lon = checkAndGetColumn<ColumnFloat64>(non_const_arguments[1].column.get());

tests/queries/0_stateless/00937_test_use_header_tsv.sh

@@ -9,7 +9,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS tsv"
 $CLICKHOUSE_CLIENT --query="CREATE TABLE tsv (d Date, u UInt8, str String) ENGINE = TinyLog"
 
 INSERT_QUERY='$CLICKHOUSE_CLIENT --query="INSERT INTO tsv FORMAT TSVWithNames"'
-USE_HEADER='--input_format_with_names_use_header=1 --output_format_parallel_formatting=1'
+USE_HEADER='--input_format_with_names_use_header=1'
 SKIP_UNKNOWN='--input_format_skip_unknown_fields=1'
 
 # Simple check for parsing