diff --git a/dbms/cmake/version.cmake b/dbms/cmake/version.cmake index 332fa51ab26..a2decdff605 100644 --- a/dbms/cmake/version.cmake +++ b/dbms/cmake/version.cmake @@ -1,11 +1,11 @@ # This strings autochanged from release_lib.sh: -set(VERSION_REVISION 54425) +set(VERSION_REVISION 54426) set(VERSION_MAJOR 19) -set(VERSION_MINOR 14) +set(VERSION_MINOR 15) set(VERSION_PATCH 1) -set(VERSION_GITHASH adfc36917222bdb03eba069f0cad0f4f5b8f1c94) -set(VERSION_DESCRIBE v19.14.1.1-prestable) -set(VERSION_STRING 19.14.1.1) +set(VERSION_GITHASH 6f1a8c37abe6ee4e7ee74c0b5cb9c05a87417b61) +set(VERSION_DESCRIBE v19.15.1.1-prestable) +set(VERSION_STRING 19.15.1.1) # end of autochange set(VERSION_EXTRA "" CACHE STRING "") diff --git a/debian/changelog b/debian/changelog index f1db1b81185..563be7c48eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (19.13.1.1) unstable; urgency=low +clickhouse (19.15.1.1) unstable; urgency=low * Modified source code - -- clickhouse-release Tue, 23 Jul 2019 11:20:49 +0300 + -- clickhouse-release Fri, 06 Sep 2019 17:58:30 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index 68cdf3f0204..9fde85b9fb0 100644 --- a/docker/client/Dockerfile +++ b/docker/client/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=19.13.1.* +ARG version=19.15.1.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 934c1921a67..c65a0ddb550 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=19.13.1.* +ARG version=19.15.1.* ARG gosu_ver=1.10 RUN apt-get update \ diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 5c2bd25b48c..0106d877feb 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=19.13.1.* +ARG version=19.15.1.* RUN apt-get update && \ apt-get install -y apt-transport-https dirmngr && \ diff --git a/utils/github/__main__.py b/utils/github/__main__.py index d5de241f25f..dd8ed692e1d 100644 --- a/utils/github/__main__.py +++ b/utils/github/__main__.py @@ -171,3 +171,8 @@ print(f'{CHECK_MARK} - good') print(f'{CROSS_MARK} - bad') print(f'{LABEL_MARK} - backport is detected via label') print(f'{CLOCK_MARK} - backport is waiting to merge') + +# print API costs +print('\nGitHub API total costs per query:') +for name, value in github.api_costs.items(): + print(f'{name} : {value}') diff --git a/utils/github/query.py b/utils/github/query.py index dae4fd062d5..5810e3bb40a 100644 --- a/utils/github/query.py +++ b/utils/github/query.py @@ -11,9 +11,9 @@ class Query: self._token = token self._max_page_size = max_page_size self._min_page_size = min_page_size + self.api_costs = {} _MEMBERS = ''' - {{ organization(login: "{organization}") {{ team(slug: "{team}") {{ members(first: {max_page_size} {next}) {{ @@ -27,7 +27,6 @@ class Query: }} }} }} - }} ''' def get_members(self, organization, team): '''Get all team members for organization @@ -58,7 +57,6 @@ class Query: return logins _LABELS = ''' - {{ repository(owner: "yandex" name: "ClickHouse") {{ pullRequest(number: {number}) {{ labels(first: {max_page_size} {next}) {{ @@ -73,7 +71,6 @@ class Query: }} }} }} - }} ''' def get_labels(self, pull_request): '''Fetchs all labels for given pull-request @@ -102,7 +99,6 @@ class Query: return labels _TIMELINE = ''' - {{ repository(owner: "yandex" name: "ClickHouse") {{ pullRequest(number: {number}) {{ timeline(first: {max_page_size} {next}) {{ @@ -140,7 +136,6 @@ class Query: }} }} }} - }} ''' def get_timeline(self, pull_request): '''Fetchs all cross-reference events from pull-request's timeline @@ -169,7 +164,6 @@ class Query: return events _PULL_REQUESTS = ''' - {{ repository(owner: "yandex" name: "ClickHouse") {{ defaultBranchRef {{ name @@ -248,7 +242,6 @@ class Query: }} }} }} - }} ''' def get_pull_requests(self, before_commit, login): '''Get all merged pull-requests from the HEAD of default branch to the last commit (excluding) @@ -294,13 +287,11 @@ class Query: return pull_requests _DEFAULT = ''' - { repository(owner: "yandex", name: "ClickHouse") { defaultBranchRef { name } } - } ''' def get_default_branch(self): '''Get short name of the default branch @@ -334,11 +325,27 @@ class Query: return session headers = {'Authorization': f'bearer {self._token}'} + query = f''' + {{ + {query} + rateLimit {{ + cost + remaining + }} + }} + ''' request = requests_retry_session().post('https://api.github.com/graphql', json={'query': query}, headers=headers) if request.status_code == 200: result = request.json() if 'errors' in result: raise Exception(f'Errors occured: {result["errors"]}') + + import inspect + caller = inspect.getouterframes(inspect.currentframe(), 2)[1][3] + if caller not in self.api_costs.keys(): + self.api_costs[caller] = 0 + self.api_costs[caller] += result['data']['rateLimit']['cost'] + return result['data'] else: import json