From ad6ba24efdee505613217fedb8dd1be09440b648 Mon Sep 17 00:00:00 2001 From: taiyang-li <654010905@qq.com> Date: Tue, 30 Nov 2021 10:49:57 +0800 Subject: [PATCH] fix ArrowColumnToCHColumn --- contrib/base64 | 2 +- contrib/libhdfs3 | 2 +- contrib/replxx | 2 +- contrib/sysroot | 2 +- src/IO/RemoteReadBufferCache.cpp | 2 +- src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp | 5 ++++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/contrib/base64 b/contrib/base64 index 9499e0c4945..af9b331f2b4 160000 --- a/contrib/base64 +++ b/contrib/base64 @@ -1 +1 @@ -Subproject commit 9499e0c4945589973b9ea1bc927377cfbc84aa46 +Subproject commit af9b331f2b4f30b41c70f3a571ff904a8251c1d3 diff --git a/contrib/libhdfs3 b/contrib/libhdfs3 index 9194af44588..a8c37ee001a 160000 --- a/contrib/libhdfs3 +++ b/contrib/libhdfs3 @@ -1 +1 @@ -Subproject commit 9194af44588633c1b2dae44bf945804401ff883e +Subproject commit a8c37ee001af1ae88e5dfa637ae5b31b087c96d3 diff --git a/contrib/replxx b/contrib/replxx index f019cba7ea1..68410ac01df 160000 --- a/contrib/replxx +++ b/contrib/replxx @@ -1 +1 @@ -Subproject commit f019cba7ea1bcd1b4feb7826f28ed57fb581b04c +Subproject commit 68410ac01dfb4f09ea76120ac5a2cecda3943aaf diff --git a/contrib/sysroot b/contrib/sysroot index 4ef348b7f30..1a64956aa7c 160000 --- a/contrib/sysroot +++ b/contrib/sysroot @@ -1 +1 @@ -Subproject commit 4ef348b7f30f2ad5b02b266268b3c948e51ad457 +Subproject commit 1a64956aa7c280448be6526251bb2b8e6d380ab1 diff --git a/src/IO/RemoteReadBufferCache.cpp b/src/IO/RemoteReadBufferCache.cpp index 904b2c0335c..d628cc7a460 100644 --- a/src/IO/RemoteReadBufferCache.cpp +++ b/src/IO/RemoteReadBufferCache.cpp @@ -473,7 +473,7 @@ RemoteReadBufferCache::createReader(const RemoteFileMetadata & remote_file_meta, // If something is wrong on startup, rollback to read from the original ReadBuffer if (!isInitialized()) { - LOG_ERROR(log, "RemoteReadBufferCache not initialized yet"); + LOG_ERROR(log, "RemoteReadBufferCache has not been initialized"); return {nullptr, RemoteReadBufferCacheError::NOT_INIT}; } diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp index 5d6f0ca0e96..5cedce4365d 100644 --- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp +++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp @@ -530,7 +530,10 @@ void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptrsecond->length(); columns_list.reserve(header.rows());