Skip to content

Commit 190fe80

Browse files
gruuyagruuya
authored
Merge pull request #613 from splitgraph/multicorn-agg-pushdown-v2-cu-1z461e4
Multicorn agg pushdown v2
2 parents a36d64c + fa8dacc commit 190fe80

11 files changed

Lines changed: 1465 additions & 394 deletions

File tree

‎engine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ENV LC_ALL C.UTF-8
4949

5050
# Fix taken from https://github.com/f-secure-foundry/usbarmory-debian-base_image/issues/9
5151
RUN mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && \
52-
apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com --recv-keys 5072E1F5 && \
52+
apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
5353
echo "deb http://repo.mysql.com/apt/debian/ buster mysql-8.0" > /etc/apt/sources.list.d/mysql.list && \
5454
apt-get update -qq && apt-get install -y libmysqlclient-dev && rm -rf /var/lib/apt/lists/*
5555

@@ -143,7 +143,7 @@ RUN --mount=type=cache,id=pip-cache,target=/root/.cache/pip /build/build_splitgr
143143

144144

145145
RUN mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && \
146-
apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com --recv-keys 5072E1F5 && \
146+
apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
147147
echo "deb http://repo.mysql.com/apt/debian/ buster mysql-8.0" > /etc/apt/sources.list.d/mysql.list && \
148148
apt-get update -qq && apt-get install -y libmysqlclient-dev && rm -rf /var/lib/apt/lists/*
149149

‎engine/src/Multicorn‎

‎engine/src/postgres-elasticsearch-fdw‎

test/splitgraph/commands/snapshots/test_aggregation_pushdown/test_elasticsearch_aggregations_join_combinations/account_join_sub_aggs.yml renamed to test/splitgraph/commands/snapshots/test_es_fdw_queries/test_aggregations_join_combinations/account_join_sub_aggs.yml

File renamed without changes.

test/splitgraph/commands/snapshots/test_aggregation_pushdown/test_elasticsearch_grouping_and_aggregations_bare/account_count_by_age.yml renamed to test/splitgraph/commands/snapshots/test_es_fdw_queries/test_grouping_and_aggregations_bare/account_count_by_age.yml

File renamed without changes.

0 commit comments

Comments
 (0)