Merge pull request ClickHouse#77446 from ClickHouse/small-serialization-refactoring

Remove copy-paste code

Author: novikd

src/Core/Joins.cpp

@@ -97,6 +97,7 @@ JoinKind reverseJoinKind(JoinKind kind)
 void serializeJoinKind(JoinKind kind, WriteBuffer & out)
 {
     uint8_t val = uint8_t(kind);
+    chassert(val <= JoinKindMax);
     writeIntBinary(val, out);
 }
 
@@ -105,27 +106,16 @@ JoinKind deserializeJoinKind(ReadBuffer & in)
     uint8_t val;
     readIntBinary(val, in);
 
-    if (val == uint8_t(JoinKind::Inner))
-        return JoinKind::Inner;
-    if (val == uint8_t(JoinKind::Left))
-        return JoinKind::Left;
-    if (val == uint8_t(JoinKind::Right))
-        return JoinKind::Right;
-    if (val == uint8_t(JoinKind::Full))
-        return JoinKind::Full;
-    if (val == uint8_t(JoinKind::Cross))
-        return JoinKind::Cross;
-    if (val == uint8_t(JoinKind::Comma))
-        return JoinKind::Comma;
-    if (val == uint8_t(JoinKind::Paste))
-        return JoinKind::Paste;
-
-    throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinKind", UInt16(val));
+    if (val > JoinKindMax)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinKind", val);
+
+    return static_cast<JoinKind>(val);
 }
 
 void serializeJoinStrictness(JoinStrictness strictness, WriteBuffer & out)
 {
     uint8_t val = uint8_t(strictness);
+    chassert(val <= JoinStrictnessMax);
     writeIntBinary(val, out);
 }
 
@@ -134,43 +124,27 @@ JoinStrictness deserializeJoinStrictness(ReadBuffer & in)
     uint8_t val;
     readIntBinary(val, in);
 
-    if (val == uint8_t(JoinStrictness::Unspecified))
-        return JoinStrictness::Unspecified;
-    if (val == uint8_t(JoinStrictness::RightAny))
-        return JoinStrictness::RightAny;
-    if (val == uint8_t(JoinStrictness::Any))
-        return JoinStrictness::Any;
-    if (val == uint8_t(JoinStrictness::All))
-        return JoinStrictness::All;
-    if (val == uint8_t(JoinStrictness::Asof))
-        return JoinStrictness::Asof;
-    if (val == uint8_t(JoinStrictness::Semi))
-        return JoinStrictness::Semi;
-    if (val == uint8_t(JoinStrictness::Anti))
-        return JoinStrictness::Anti;
-
-    throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinStrictness", UInt16(val));
+    if (val > JoinStrictnessMax)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinStrictness", val);
+
+    return static_cast<JoinStrictness>(val);
 }
 
 void serializeJoinLocality(JoinLocality locality, WriteBuffer & out)
 {
     uint8_t val = uint8_t(locality);
+    chassert(val <= JoinLocalityMax);
     writeIntBinary(val, out);
 }
 JoinLocality deserializeJoinLocality(ReadBuffer & in)
 {
     uint8_t val;
     readIntBinary(val, in);
 
-    if (val == uint8_t(JoinLocality::Unspecified))
-        return JoinLocality::Unspecified;
-    if (val == uint8_t(JoinLocality::Local))
-        return JoinLocality::Local;
-    if (val == uint8_t(JoinLocality::Global))
-        return JoinLocality::Global;
-
+    if (val > JoinLocalityMax)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinLocality", UInt16(val));
 
-    throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot convert {} to JoinLocality", UInt16(val));
+    return static_cast<JoinLocality>(val);
 }
 
 }

src/Core/Joins.h

@@ -11,7 +11,7 @@ class WriteBuffer;
 /// Join method.
 enum class JoinKind : uint8_t
 {
-    Inner, /// Leave only rows that was JOINed.
+    Inner = 0, /// Leave only rows that was JOINed.
     Left, /// If in "right" table there is no corresponding rows, use default values instead.
     Right,
     Full,
@@ -20,6 +20,8 @@ enum class JoinKind : uint8_t
     Paste, /// Used to join parts without `ON` clause.
 };
 
+constexpr uint8_t JoinKindMax = static_cast<uint8_t>(JoinKind::Paste);
+
 void serializeJoinKind(JoinKind kind, WriteBuffer & out);
 JoinKind deserializeJoinKind(ReadBuffer & in);
 
@@ -41,7 +43,7 @@ JoinKind reverseJoinKind(JoinKind kind);
 /// Allows more optimal JOIN for typical cases.
 enum class JoinStrictness : uint8_t
 {
-    Unspecified,
+    Unspecified = 0,
     RightAny, /// Old ANY JOIN. If there are many suitable rows in right table, use any from them to join.
     Any, /// Semi Join with any value from filtering table. For LEFT JOIN with Any and RightAny are the same.
     All, /// If there are many suitable rows to join, use all of them and replicate rows of "left" table (usual semantic of JOIN).
@@ -50,6 +52,8 @@ enum class JoinStrictness : uint8_t
     Anti, /// LEFT or RIGHT. Same as SEMI JOIN but filter values that are NOT exists in other table.
 };
 
+constexpr uint8_t JoinStrictnessMax = static_cast<uint8_t>(JoinStrictness::Anti);
+
 void serializeJoinStrictness(JoinStrictness strictness, WriteBuffer & out);
 JoinStrictness deserializeJoinStrictness(ReadBuffer & in);
 
@@ -58,11 +62,13 @@ const char * toString(JoinStrictness strictness);
 /// Algorithm for distributed query processing.
 enum class JoinLocality : uint8_t
 {
-    Unspecified,
+    Unspecified = 0,
     Local, /// Perform JOIN, using only data available on same servers (co-located data).
-    Global /// Collect and merge data from remote servers, and broadcast it to each server.
+    Global, /// Collect and merge data from remote servers, and broadcast it to each server.
 };
 
+constexpr uint8_t JoinLocalityMax = static_cast<uint8_t>(JoinLocality::Global);
+
 void serializeJoinLocality(JoinLocality locality, WriteBuffer & out);
 JoinLocality deserializeJoinLocality(ReadBuffer & in);