mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Fix inconsistent code around H3
This commit is contained in:
parent
7986dbdfc7
commit
d966bb939e
@ -6,24 +6,6 @@ add_headers_and_sources(clickhouse_functions .)
|
|||||||
list(REMOVE_ITEM clickhouse_functions_sources IFunctionImpl.cpp FunctionFactory.cpp FunctionHelpers.cpp)
|
list(REMOVE_ITEM clickhouse_functions_sources IFunctionImpl.cpp FunctionFactory.cpp FunctionHelpers.cpp)
|
||||||
list(REMOVE_ITEM clickhouse_functions_headers IFunctionImpl.h FunctionFactory.h FunctionHelpers.h)
|
list(REMOVE_ITEM clickhouse_functions_headers IFunctionImpl.h FunctionFactory.h FunctionHelpers.h)
|
||||||
|
|
||||||
if (NOT USE_H3)
|
|
||||||
list (REMOVE_ITEM clickhouse_functions_sources
|
|
||||||
geoToH3.cpp
|
|
||||||
h3EdgeAngle.cpp
|
|
||||||
h3EdgeLengthM.cpp
|
|
||||||
h3GetBaseCell.cpp
|
|
||||||
h3GetResolution.cpp
|
|
||||||
h3HexAreaM2.cpp
|
|
||||||
h3IndexesAreNeighbors.cpp
|
|
||||||
h3IsValid.cpp
|
|
||||||
h3kRing.cpp
|
|
||||||
h3ToChildren.cpp
|
|
||||||
h3ToParent.cpp
|
|
||||||
h3ToString.cpp
|
|
||||||
stringToH3.cpp
|
|
||||||
)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
add_library(clickhouse_functions ${clickhouse_functions_sources})
|
add_library(clickhouse_functions ${clickhouse_functions_sources})
|
||||||
|
|
||||||
target_link_libraries(clickhouse_functions
|
target_link_libraries(clickhouse_functions
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
@ -94,3 +100,5 @@ void registerFunctionGeoToH3(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -77,3 +83,5 @@ void registerFunctionH3EdgeAngle(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -81,3 +87,5 @@ void registerFunctionH3EdgeLengthM(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -70,3 +76,5 @@ void registerFunctionH3GetBaseCell(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -70,3 +76,5 @@ void registerFunctionH3GetResolution(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -76,3 +82,5 @@ void registerFunctionH3HexAreaM2(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -78,3 +84,5 @@ void registerFunctionH3IndexesAreNeighbors(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -70,3 +76,5 @@ void registerFunctionH3IsValid(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnArray.h>
|
#include <Columns/ColumnArray.h>
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypeArray.h>
|
#include <DataTypes/DataTypeArray.h>
|
||||||
@ -111,3 +117,5 @@ void registerFunctionH3ToChildren(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -85,3 +91,5 @@ void registerFunctionH3ToParent(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnString.h>
|
#include <Columns/ColumnString.h>
|
||||||
#include <DataTypes/DataTypeString.h>
|
#include <DataTypes/DataTypeString.h>
|
||||||
#include <Functions/FunctionFactory.h>
|
#include <Functions/FunctionFactory.h>
|
||||||
@ -86,3 +92,5 @@ void registerFunctionH3ToString(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <Columns/ColumnArray.h>
|
#include <Columns/ColumnArray.h>
|
||||||
#include <Columns/ColumnsNumber.h>
|
#include <Columns/ColumnsNumber.h>
|
||||||
@ -108,3 +114,5 @@ void registerFunctionH3KRing(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
#if !defined(ARCADIA_BUILD)
|
||||||
|
# include "config_functions.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if USE_H3
|
||||||
|
|
||||||
#include <Columns/ColumnString.h>
|
#include <Columns/ColumnString.h>
|
||||||
#include <DataTypes/DataTypeString.h>
|
#include <DataTypes/DataTypeString.h>
|
||||||
#include <DataTypes/DataTypesNumber.h>
|
#include <DataTypes/DataTypesNumber.h>
|
||||||
@ -101,3 +107,5 @@ void registerFunctionStringToH3(FunctionFactory & factory)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user