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

Renamed constraints getter and setter

Browse Source
This commit is contained in:
Gleb Novikov 2019-05-17 08:05:19 +03:00
parent 3c905e24e2
commit 07abed6d31
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -400,7 +400,7 @@ ColumnsDescription InterpreterCreateQuery::setColumns(
{
columns = as_storage->getColumns();
indices = as_storage->getIndices();
constraints = as_storage->getConstraintsDescription();
constraints = as_storage->getConstraints();
}
else if (create.select)
{

2
dbms/src/Storages/ITableDeclaration.cpp
View File

@ -46,7 +46,7 @@ void ITableDeclaration::setIndices(IndicesDescription indices_)
indices = std::move(indices_);
}
void ITableDeclaration::setConstraintsDescription(ConstraintsDescription constraints_)
void ITableDeclaration::setConstraints(ConstraintsDescription constraints_)
{
constraints = std::move(constraints_);
}

4
dbms/src/Storages/ITableDeclaration.h
View File

@ -20,8 +20,8 @@ public:
const IndicesDescription & getIndices() const;
void setIndices(IndicesDescription indices_);
virtual const ConstraintsDescription & getConstraintsDescription() const { return constraints; }
virtual void setConstraintsDescription(ConstraintsDescription constraints_);
virtual const ConstraintsDescription & getConstraints() const { return constraints; }
virtual void setConstraints(ConstraintsDescription constraints_);
/// NOTE: These methods should include virtual columns, but should NOT include ALIAS columns
/// (they are treated separately).

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

@ -32,8 +32,8 @@ public:
std::string getDatabaseName() const override { return database_name; }
bool supportsIndexForIn() const override { return true; }
virtual const ConstraintsDescription & getConstraintsDescription() const override { return data.getConstraintsDescription(); }
virtual void setConstraintsDescription(ConstraintsDescription constraints_) override { data.setConstraintsDescription(constraints_); }
virtual const ConstraintsDescription & getConstraints() const override { return data.getConstraints(); }
virtual void setConstraints(ConstraintsDescription constraints_) override { data.setConstraints(constraints_); }
BlockInputStreams read(
const Names & column_names,