Fixes

al13n321 · al13n321 · commit 67c6e75191a4 · 2023-05-02T02:02:38.000Z
diff --git a/src/IO/ParallelReadBuffer.cpp b/src/IO/ParallelReadBuffer.cpp
@@ -178,7 +178,7 @@ bool ParallelReadBuffer::nextImpl()
             return false;
         }
 
-        auto w = read_workers.front().get();
+        auto * w = read_workers.front().get();
 
         std::unique_lock lock{w->worker_mutex};
 
@@ -293,7 +293,7 @@ void ParallelReadBuffer::finishAndWait()
 
 std::unique_ptr<ParallelReadBuffer> wrapInParallelReadBufferIfSupported(ReadBuffer & buf, size_t max_working_readers, size_t range_step, size_t file_size)
 {
-    auto seekable = dynamic_cast<SeekableReadBuffer*>(&buf);
+    auto * seekable = dynamic_cast<SeekableReadBuffer*>(&buf);
     if (!seekable || !seekable->supportsReadAt())
         return nullptr;
 
diff --git a/src/IO/ReadWriteBufferFromHTTP.cpp b/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -48,9 +48,9 @@ static Poco::URI getUriAfterRedirect(const Poco::URI & prev_uri, Poco::Net::HTTP
 
 template <typename TSessionFactory>
 UpdatableSession<TSessionFactory>::UpdatableSession(const Poco::URI & uri, UInt64 max_redirects_, std::shared_ptr<TSessionFactory> session_factory_)
-    : max_redirects{max_redirects_}
+    : session_factory(std::move(session_factory_))
+    , max_redirects{max_redirects_}
     , initial_uri(uri)
-    , session_factory(std::move(session_factory_))
 {
     session = session_factory->buildNewSession(uri);
 }
@@ -108,7 +108,7 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::prepareRequest(Poco::Net:
     else if (method == Poco::Net::HTTPRequest::HTTP_POST)
         request.setContentLength(0);    /// No callback - no body
 
-    for (auto & [header, value] : http_header_entries)
+    for (const auto & [header, value] : http_header_entries)
         request.set(header, value);
 
     if (range)
@@ -635,7 +635,7 @@ size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::readBigAt(char * to, si
             if (e.code() == POCO_EMFILE)
                 throw;
 
-            if (auto h = dynamic_cast<const HTTPException*>(&e);
+            if (const auto h = dynamic_cast<const HTTPException*>(&e);
                 h && !isRetriableError(static_cast<Poco::Net::HTTPResponse::HTTPStatus>(h->getHTTPStatus())))
                 throw;
 
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
@@ -48,11 +48,11 @@ class UpdatableSession
     std::shared_ptr<UpdatableSession<TSessionFactory>> clone(const Poco::URI & uri);
 
 private:
+    std::shared_ptr<TSessionFactory> session_factory;
     SessionPtr session;
     UInt64 redirects{0};
     UInt64 max_redirects;
     Poco::URI initial_uri;
-    std::shared_ptr<TSessionFactory> session_factory;
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ bool ParallelReadBuffer::nextImpl()`
`178`	`178`	`return false;`
`179`	`179`	`}`
`180`	`180`
`181`		`- auto w = read_workers.front().get();`
	`181`	`+ auto * w = read_workers.front().get();`
`182`	`182`
`183`	`183`	`std::unique_lock lock{w->worker_mutex};`
`184`	`184`
`@@ -293,7 +293,7 @@ void ParallelReadBuffer::finishAndWait()`
`293`	`293`
`294`	`294`	`std::unique_ptr<ParallelReadBuffer> wrapInParallelReadBufferIfSupported(ReadBuffer & buf, size_t max_working_readers, size_t range_step, size_t file_size)`
`295`	`295`	`{`
`296`		`- auto seekable = dynamic_cast<SeekableReadBuffer*>(&buf);`
	`296`	`+ auto * seekable = dynamic_cast<SeekableReadBuffer*>(&buf);`
`297`	`297`	`if (!seekable \|\| !seekable->supportsReadAt())`
`298`	`298`	`return nullptr;`
`299`	`299`