mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-26 09:32:01 +00:00
Fixed build
This commit is contained in:
parent
8fc6bad4f4
commit
8ba42876fc
@ -52,4 +52,28 @@ const char * toString(ASOFJoinInequality asof_join_inequality)
|
||||
}
|
||||
}
|
||||
|
||||
const char * toString(JoinAlgorithm join_algorithm)
|
||||
{
|
||||
switch (join_algorithm)
|
||||
{
|
||||
case JoinAlgorithm::DEFAULT: return "DEFAULT";
|
||||
case JoinAlgorithm::AUTO: return "AUTO";
|
||||
case JoinAlgorithm::HASH: return "HASH";
|
||||
case JoinAlgorithm::PARTIAL_MERGE: return "PARTIAL_MERGE";
|
||||
case JoinAlgorithm::PREFER_PARTIAL_MERGE: return "PREFER_PARTIAL_MERGE";
|
||||
case JoinAlgorithm::PARALLEL_HASH: return "PARALLEL_HASH";
|
||||
case JoinAlgorithm::DIRECT: return "DIRECT";
|
||||
case JoinAlgorithm::FULL_SORTING_MERGE: return "FULL_SORTING_MERGE";
|
||||
}
|
||||
}
|
||||
|
||||
const char * toString(JoinTableSide join_table_side)
|
||||
{
|
||||
switch (join_table_side)
|
||||
{
|
||||
case JoinTableSide::Left: return "LEFT";
|
||||
case JoinTableSide::Right: return "RIGHT";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -92,4 +92,26 @@ inline constexpr ASOFJoinInequality reverseASOFJoinInequality(ASOFJoinInequality
|
||||
return ASOFJoinInequality::None;
|
||||
}
|
||||
|
||||
enum class JoinAlgorithm
|
||||
{
|
||||
DEFAULT = 0,
|
||||
AUTO,
|
||||
HASH,
|
||||
PARTIAL_MERGE,
|
||||
PREFER_PARTIAL_MERGE,
|
||||
PARALLEL_HASH,
|
||||
DIRECT,
|
||||
FULL_SORTING_MERGE,
|
||||
};
|
||||
|
||||
const char * toString(JoinAlgorithm join_algorithm);
|
||||
|
||||
enum class JoinTableSide
|
||||
{
|
||||
Left,
|
||||
Right
|
||||
};
|
||||
|
||||
const char * toString(JoinTableSide join_table_side);
|
||||
|
||||
}
|
||||
|
@ -30,18 +30,6 @@ DECLARE_SETTING_ENUM(LoadBalancing)
|
||||
|
||||
DECLARE_SETTING_ENUM(JoinStrictness)
|
||||
|
||||
enum class JoinAlgorithm
|
||||
{
|
||||
DEFAULT = 0,
|
||||
AUTO,
|
||||
HASH,
|
||||
PARTIAL_MERGE,
|
||||
PREFER_PARTIAL_MERGE,
|
||||
PARALLEL_HASH,
|
||||
DIRECT,
|
||||
FULL_SORTING_MERGE,
|
||||
};
|
||||
|
||||
DECLARE_SETTING_MULTI_ENUM(JoinAlgorithm)
|
||||
|
||||
|
||||
|
@ -70,7 +70,7 @@ void replaceJoinedTable(const ASTSelectQuery & select_query)
|
||||
* ANY join behavior can also be different with this optimization,
|
||||
* but it's ok because we don't guarantee which row to choose for ANY, unlike ASOF, where we have to pick the closest one.
|
||||
*/
|
||||
if (table_join.strictness == ASTTableJoin::Strictness::Asof)
|
||||
if (table_join.strictness == JoinStrictness::Asof)
|
||||
return;
|
||||
|
||||
auto & table_expr = join->table_expression->as<ASTTableExpression &>();
|
||||
|
@ -1140,9 +1140,9 @@ bool MergeJoin::isSupported(const std::shared_ptr<TableJoin> & table_join)
|
||||
auto kind = table_join->kind();
|
||||
auto strictness = table_join->strictness();
|
||||
|
||||
bool is_any = (strictness == ASTTableJoin::Strictness::Any);
|
||||
bool is_all = (strictness == ASTTableJoin::Strictness::All);
|
||||
bool is_semi = (strictness == ASTTableJoin::Strictness::Semi);
|
||||
bool is_any = (strictness == JoinStrictness::Any);
|
||||
bool is_all = (strictness == JoinStrictness::All);
|
||||
bool is_semi = (strictness == JoinStrictness::Semi);
|
||||
|
||||
bool all_join = is_all && (isInner(kind) || isLeft(kind) || isRight(kind) || isFull(kind));
|
||||
bool special_left = isInnerOrLeft(kind) && (is_any || is_semi);
|
||||
|
@ -6,7 +6,6 @@
|
||||
#include <Parsers/ASTTablesInSelectQuery.h>
|
||||
#include <Interpreters/IJoin.h>
|
||||
#include <Interpreters/join_common.h>
|
||||
#include <Interpreters/asof.h>
|
||||
#include <QueryPipeline/SizeLimits.h>
|
||||
#include <DataTypes/getLeastSupertype.h>
|
||||
#include <Storages/IKVStorage.h>
|
||||
@ -42,12 +41,6 @@ struct Settings;
|
||||
class IVolume;
|
||||
using VolumePtr = std::shared_ptr<IVolume>;
|
||||
|
||||
enum class JoinTableSide
|
||||
{
|
||||
Left,
|
||||
Right
|
||||
};
|
||||
|
||||
class TableJoin
|
||||
{
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user