thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into libzookeeper-rewrite

Browse Source
This commit is contained in:
Alexey Milovidov 2018-03-19 20:02:22 +03:00
commit 7ca8b82ed1
8 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Server/Server.cpp
View File

@ -465,12 +465,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
}
catch (const Poco::Net::NetException & e)
{
const auto code = e.code();
if (listen_try && (code == POCO_EPROTONOSUPPORT || code == POCO_EADDRNOTAVAIL || code == EAI_FAMILY
#if defined(EAI_ADDRFAMILY)
|| code == EAI_ADDRFAMILY
#endif
))
if (listen_try)
LOG_ERROR(log, "Listen [" << listen_host << "]: " << e.code() << ": " << e.what() << ": " << e.message()
<< " If it is an IPv6 or IPv4 address and your host has disabled IPv6 or IPv4, then consider to "
"specify not disabled IPv4 or IPv6 address to listen in <listen_host> element of configuration "

1
dbms/src/Storages/StorageMaterializedView.h
View File

@ -27,6 +27,7 @@ public:
bool supportsPrewhere() const override { return getTargetTable()->supportsPrewhere(); }
bool supportsFinal() const override { return getTargetTable()->supportsFinal(); }
bool supportsIndexForIn() const override { return getTargetTable()->supportsIndexForIn(); }
bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand) const override { return getTargetTable()->mayBenefitFromIndexForIn(left_in_operand); }
BlockOutputStreamPtr write(const ASTPtr & query, const Settings & settings) override;
void drop() override;

8
dbms/src/Storages/StorageMergeTree.h
View File

@ -32,9 +32,12 @@ public:
}
std::string getTableName() const override { return table_name; }
bool supportsSampling() const override { return data.supportsSampling(); }
bool supportsFinal() const override { return data.supportsFinal(); }
bool supportsPrewhere() const override { return data.supportsPrewhere(); }
bool supportsFinal() const override { return data.supportsFinal(); }
bool supportsIndexForIn() const override { return true; }
bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand) const override { return data.mayBenefitFromIndexForIn(left_in_operand); }
const ColumnsDescription & getColumns() const override { return data.getColumns(); }
void setColumns(ColumnsDescription columns_) override { return data.setColumns(std::move(columns_)); }
@ -74,9 +77,6 @@ public:
void alter(const AlterCommands & params, const String & database_name, const String & table_name, const Context & context) override;
bool supportsIndexForIn() const override { return true; }
bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand) const override { return data.mayBenefitFromIndexForIn(left_in_operand); }
bool checkTableCanBeDropped() const override;
MergeTreeData & getData() { return data; }

3
dbms/tests/queries/0_stateless/00609_mv_index_in_in.reference Normal file
View File

@ -0,0 +1,3 @@
1 2000-01-01
1 2000-01-01
1 2000-01-01

16
dbms/tests/queries/0_stateless/00609_mv_index_in_in.sql Normal file
View File

@ -0,0 +1,16 @@
USE test;
DROP TABLE IF EXISTS test;
DROP TABLE IF EXISTS test_mv;
create table test (a Int8) engine=Memory;
insert into test values (1);
create materialized view test_mv Engine=MergeTree(date, (a), 8192) populate as select a, toDate('2000-01-01') date from test;
select * from test_mv; -- OK
select * from test_mv where a in (select a from test_mv); -- EMPTY (bug)
select * from ".inner.test_mv" where a in (select a from test_mv); -- OK
DROP TABLE test;
DROP TABLE test_mv;

4
debian/.pbuilderrc vendored
View File

@ -164,11 +164,11 @@ esac
case "$DIST" in
"bionic" )
EXTRAPACKAGES+=" liblld-6.0-dev libclang-6.0-dev liblld-6.0 "
export CMAKE_FLAGS="-DUSE_EMBEDDED_COMPILER=1 -DLLVM_VERSION_POSTFIX=-6.0 $CMAKE_FLAGS"
export CMAKE_FLAGS="-DENABLE_EMBEDDED_COMPILER=1 -DLLVM_VERSION_POSTFIX=-6.0 $CMAKE_FLAGS"
;;
"artful" | "experimental" | "unstable" | "testing" )
EXTRAPACKAGES+=" liblld-5.0-dev libclang-5.0-dev liblld-5.0 "
export CMAKE_FLAGS="-DUSE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"
export CMAKE_FLAGS="-DENABLE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"
;;
esac

2
docker/server/docker_related_config.xml
View File

@ -1,4 +1,6 @@
<yandex>
<!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
<listen_host>0.0.0.0</listen_host>
<listen_host>::</listen_host>
<listen_try>1</listen_try>
</yandex>

7
libs/libdaemon/src/BaseDaemon.cpp
View File

@ -372,12 +372,19 @@ private:
case BUS_OBJERR:
LOG_ERROR(log, "Object specific hardware error.");
break;
// Linux specific
#if defined(BUS_MCEERR_AR)
case BUS_MCEERR_AR:
LOG_ERROR(log, "Hardware memory error: action required.");
break;
#endif
#if defined(BUS_MCEERR_AO)
case BUS_MCEERR_AO:
LOG_ERROR(log, "Hardware memory error: action optional.");
break;
#endif
default:
LOG_ERROR(log, "Unknown si_code.");
break;