thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40958 from arenadata/ADQM-566

Browse Source 
stylecheck renewed and version in docker set explicitely
This commit is contained in:
Alexey Milovidov 2022-09-05 03:23:38 +03:00 committed by GitHub
commit d20d49f39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/glibc-compatibility/memcpy/memcpy.h
View File

@ -214,4 +214,3 @@ tail:
return ret;
}

2
docker/test/style/Dockerfile
View File

@ -17,7 +17,7 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
python3-pip \
shellcheck \
yamllint \
&& pip3 install black boto3 codespell dohq-artifactory PyGithub unidiff pylint==2.6.2 \
&& pip3 install black==22.8.0 boto3 codespell==2.2.1 dohq-artifactory PyGithub unidiff pylint==2.6.2 \
&& apt-get clean \
&& rm -rf /root/.cache/pip

1
src/Common/Stopwatch.h
View File

@ -152,4 +152,3 @@ private:
/// Most significant bit is a lock. When it is set, compareAndRestartDeferred method will return false.
UInt64 nanoseconds(UInt64 prev_time) const { return clock_gettime_ns_adjusted(prev_time, clock_type) & 0x7FFFFFFFFFFFFFFFULL; }
};

2
src/Storages/Kafka/StorageKafka.cpp
View File

@ -810,7 +810,7 @@ void registerStorageKafka(StorageFactory & factory)
/** Arguments of engine is following:
* - Kafka broker list
* - List of topics
* - Group ID (may be a constraint expression with a string result)
* - Group ID (may be a constant expression with a string result)
* - Message format (string)
* - Row delimiter
* - Schema (optional, if the format supports it)