thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build #1853

Browse Source
This commit is contained in:
Alexey Milovidov 2018-02-08 18:25:46 +03:00
parent 5a03f9e0fb
commit 777b4404bd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,7 +505,7 @@ void Set::executeArray(const ColumnArray * key_column, ColumnUInt8::Container &
}
}
bool MergeTreeSetIndex::PKTuplePositionMapping::operator<(const PKTuplePositionMapping & other)
bool MergeTreeSetIndex::PKTuplePositionMapping::operator< (const PKTuplePositionMapping & other) const
{
return std::forward_as_tuple(pk_index, tuple_index) < std::forward_as_tuple(other.pk_index, other.tuple_index);
}

4
dbms/src/Interpreters/Set.h
View File

@ -15,7 +15,7 @@ namespace DB
{
struct Range;
struct FieldWithInfinity;
class FieldWithInfinity;
using SetElements = std::vector<std::vector<Field>>;
using SetElementsPtr = std::unique_ptr<SetElements>;
@ -176,7 +176,7 @@ public:
std::vector<FunctionPtr> functions;
DataTypePtr data_type;
bool operator<(const PKTuplePositionMapping & other);
bool operator< (const PKTuplePositionMapping & other) const;
};
MergeTreeSetIndex(const SetElements & set_elements, std::vector<PKTuplePositionMapping> && indexes_mapping_);

6
dbms/src/Storages/MergeTree/PKCondition.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <sstream>
#include <optional>
#include <Interpreters/Context.h>
#include <Interpreters/ExpressionActions.h>
@ -186,7 +187,8 @@ public:
};
/// Class that extends arbitrary objects with infinities, like +-inf for floats
class FieldWithInfinity {
class FieldWithInfinity
{
public:
enum Type {
MINUS_INFINITY = -1,
@ -201,8 +203,8 @@ public:
static FieldWithInfinity getPlusinfinity();
bool operator<(const FieldWithInfinity & other) const;
bool operator==(const FieldWithInfinity & other) const;
private:
Field field;
Type type;