Remove outdated patches

aleexf · May 10, 2023 · c331b9b · c331b9b
1 parent 7572455
commit c331b9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/contrib/clickhouse/src/Common/ZooKeeper/TestKeeper.cpp b/contrib/clickhouse/src/Common/ZooKeeper/TestKeeper.cpp
@@ -396,15 +396,16 @@ std::pair<ResponsePtr, Undo> TestKeeperListRequest::process(TestKeeper::Containe
              child_it != container.end() && startsWith(child_it->first, path_prefix);
             ++child_it)
         {
+            using enum ListRequestType;
             if (parentPath(child_it->first) == path)
             {
-                ListRequestType list_request_type = ListRequestType::ALL;
+                ListRequestType list_request_type = ALL;
                 if (const auto * filtered_list = dynamic_cast<const TestKeeperFilteredListRequest *>(this))
                     list_request_type = filtered_list->list_request_type;
 
                 const auto is_ephemeral = child_it->second.stat.ephemeralOwner != 0;
-                if (list_request_type == ListRequestType::ALL || (is_ephemeral && list_request_type == ListRequestType::EPHEMERAL_ONLY)
-                    || (!is_ephemeral && list_request_type == ListRequestType::PERSISTENT_ONLY))
+                if (list_request_type == ALL || (is_ephemeral && list_request_type == EPHEMERAL_ONLY)
+                    || (!is_ephemeral && list_request_type == PERSISTENT_ONLY))
                     response.names.emplace_back(baseName(child_it->first));
             }
         }

diff --git a/contrib/clickhouse/src/Interpreters/SystemLog.h b/contrib/clickhouse/src/Interpreters/SystemLog.h
@@ -141,8 +141,6 @@ class SystemLog : public SystemLogBase<LogElement>, private boost::noncopyable,
 
     /// flushImpl can be executed only in saving_thread.
     void flushImpl(const std::vector<LogElement> & to_flush, uint64_t to_flush_end);
-
-public:
     ASTPtr getCreateTableQuery();
 };
-Original file line number
+Diff line change
@@ Expand Up @@
         /// flushImpl can be executed only in saving_thread.
         void flushImpl(const std::vector<LogElement> & to_flush, uint64_t to_flush_end);
-    public:
         ASTPtr getCreateTableQuery();
     };
@@ Expand Down @@