ClickHouse#58363 - fix formatting issues and change ON, OFF, AUTO to …

…0, 1, auto
myrrc · Jan 8, 2024 · a15b573 · a15b573
1 parent 4599460
commit a15b573
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
@@ -1041,7 +1041,7 @@ class IColumn;
     M(UInt64, output_format_pretty_max_rows, 10000, "Rows limit for Pretty formats.", 0) \
     M(UInt64, output_format_pretty_max_column_pad_width, 250, "Maximum width to pad all values in a column in Pretty formats.", 0) \
     M(UInt64, output_format_pretty_max_value_width, 10000, "Maximum width of value to display in Pretty formats. If greater - it will be cut.", 0) \
-    M(String, output_format_pretty_color, "AUTO", "Use ANSI escape sequences to paint colors in Pretty formats", 0) \
+    M(String, output_format_pretty_color, "auto", "Use ANSI escape sequences to paint colors in Pretty formats", 0) \
     M(String, output_format_pretty_grid_charset, "UTF-8", "Charset for printing grid borders. Available charsets: ASCII, UTF-8 (default one).", 0) \
     M(UInt64, output_format_parquet_row_group_size, 1000000, "Target row group size in rows.", 0) \
     M(UInt64, output_format_parquet_row_group_size_bytes, 512 * 1024 * 1024, "Target row group size in bytes, before compression.", 0) \

diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
@@ -143,11 +143,10 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.parquet.write_batch_size = settings.output_format_parquet_batch_size;
     format_settings.parquet.local_read_min_bytes_for_seek = settings.input_format_parquet_local_file_min_bytes_for_seek;
     format_settings.pretty.charset = settings.output_format_pretty_grid_charset.toString() == "ASCII" ? FormatSettings::Pretty::Charset::ASCII : FormatSettings::Pretty::Charset::UTF8;
-    format_settings.pretty.output_format_pretty_color = settings.output_format_pretty_color.toString() == "AUTO" 
-        ? FormatSettings::Pretty::PrettyColor::AUTO 
-	: settings.output_format_pretty_color.toString() == "ON" 
-	? FormatSettings::Pretty::PrettyColor::ON 
-	: FormatSettings::Pretty::PrettyColor::OFF;
+    format_settings.pretty.output_format_pretty_color = settings.output_format_pretty_color.toString() == "auto" ? FormatSettings::Pretty::PrettyColor::auto 
+																												 : settings.output_format_pretty_color.toString() == "1" 
+																												 ? FormatSettings::Pretty::PrettyColor::1 
+																												 : FormatSettings::Pretty::PrettyColor::0;
     format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
     format_settings.pretty.max_rows = settings.output_format_pretty_max_rows;
     format_settings.pretty.max_value_width = settings.output_format_pretty_max_value_width;

diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
@@ -271,13 +271,13 @@ struct FormatSettings
         UInt64 max_value_width = 10000;
         bool color = true;
 
-	enum class PrettyColor {
-	  ON,
-	  OFF,
-	  AUTO
-	};
-
-	PrettyColor output_format_pretty_color = PrettyColor::AUTO;
+		enum class PrettyColor {
+			0,
+	  		1,
+	  		auto
+		};	
+		PrettyColor output_format_pretty_color = PrettyColor::auto;
+
         bool output_format_pretty_row_numbers = false;
 
         enum class Charset

diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -73,20 +73,20 @@ void registerPrettyFormatWithNoEscapesAndMonoBlock(FormatFactory & factory, cons
             const Block & sample,
             const FormatSettings & format_settings)
         {
-	    FormatSettings changed_settings = format_settings;
-	    using PrettyColor = FormatSettings::Pretty::PrettyColor;
-	    switch(format_settings.pretty.output_format_pretty_color) 
-	    {
-	        case PrettyColor::OFF:
-		    changed_settings.pretty.color = false;
-		    break;
-		case PrettyColor::ON:
-	            no_escapes ? changed_settings.pretty.color = true : changed_settings.pretty.color = false;
-		    break;
-		case PrettyColor::AUTO:
-		    isatty(STDOUT_FILENO) ? changed_settings.pretty.color = true : changed_settings.pretty.color = false;
-		    break;
-	    }
+		    FormatSettings changed_settings = format_settings;
+	    	using PrettyColor = FormatSettings::Pretty::PrettyColor;
+	    	switch(format_settings.pretty.output_format_pretty_color) 
+	    	{
+	        	case PrettyColor::0:
+		    		changed_settings.pretty.color = false;
+		    		break;
+				case PrettyColor::1:
+	            	no_escapes ? changed_settings.pretty.color = true : changed_settings.pretty.color = false;
+		    		break;
+				case PrettyColor::auto:
+		    		isatty(STDOUT_FILENO) ? changed_settings.pretty.color = true : changed_settings.pretty.color = false;
+		    		break;
+	    	}
             if (format_settings.pretty.color != changed_settings.pretty.color)
             {
                 return std::make_shared<OutputFormat>(buf, sample, changed_settings, mono_block);