Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build error when parquet is disabled #48879

Merged
merged 4 commits into from
Apr 19, 2023
Merged

Fix build error when parquet is disabled #48879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b929547
fix build without parquet
larryluogit Apr 18, 2023
fa366d1
Merge branch 'master' into noParquet
larryluogit Apr 18, 2023
58ca460
remove trailing spaces.
larryluogit Apr 18, 2023
5fc7a48
Merge branch 'master' into noParquet
larryluogit Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "config.h"
#include <set>

#if USE_AWS_S3
#if USE_AWS_S3 && USE_PARQUET
#include <Storages/DataLakes/S3MetadataReader.h>
#include <Storages/StorageS3.h>
#include <parquet/file_reader.h>
Expand Down
2 changes: 1 addition & 1 deletion src/Storages/DataLakes/StorageDeltaLake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct StorageDeltaLakeName
static constexpr auto name = "DeltaLake";
};

#if USE_AWS_S3
#if USE_AWS_S3 && USE_PARQUET
using StorageDeltaLakeS3 = IStorageDataLake<StorageS3, StorageDeltaLakeName, DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
#endif

Expand Down
3 changes: 2 additions & 1 deletion src/Storages/DataLakes/registerDataLakes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ namespace DB
.source_access_type = AccessType::S3, \
});


#if USE_PARQUET
void registerStorageDeltaLake(StorageFactory & factory)
{
REGISTER_DATA_LAKE_STORAGE(StorageDeltaLakeS3, StorageDeltaLakeName::name)
}
#endif

void registerStorageIceberg(StorageFactory & factory)
{
Expand Down
5 changes: 5 additions & 0 deletions src/Storages/registerStorages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ void registerStorageS3(StorageFactory & factory);
void registerStorageCOS(StorageFactory & factory);
void registerStorageOSS(StorageFactory & factory);
void registerStorageHudi(StorageFactory & factory);
#if USE_PARQUET
void registerStorageDeltaLake(StorageFactory & factory);
#endif
#if USE_AVRO
void registerStorageIceberg(StorageFactory & factory);
#endif
Expand Down Expand Up @@ -126,7 +128,10 @@ void registerStorages()
registerStorageCOS(factory);
registerStorageOSS(factory);
registerStorageHudi(factory);

#if USE_PARQUET
registerStorageDeltaLake(factory);
#endif

#if USE_AVRO
registerStorageIceberg(factory);
Expand Down
2 changes: 1 addition & 1 deletion src/TableFunctions/TableFunctionDeltaLake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "config.h"

#if USE_AWS_S3
#if USE_AWS_S3 && USE_PARQUET

#include <Storages/DataLakes/StorageDeltaLake.h>
#include <TableFunctions/ITableFunctionDataLake.h>
Expand Down
2 changes: 2 additions & 0 deletions src/TableFunctions/registerTableFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ void registerTableFunctions()
registerTableFunctionCOS(factory);
registerTableFunctionOSS(factory);
registerTableFunctionHudi(factory);
#if USE_PARQUET
registerTableFunctionDeltaLake(factory);
#endif
#if USE_AVRO
registerTableFunctionIceberg(factory);
#endif
Expand Down
2 changes: 2 additions & 0 deletions src/TableFunctions/registerTableFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ void registerTableFunctionS3Cluster(TableFunctionFactory & factory);
void registerTableFunctionCOS(TableFunctionFactory & factory);
void registerTableFunctionOSS(TableFunctionFactory & factory);
void registerTableFunctionHudi(TableFunctionFactory & factory);
#if USE_PARQUET
void registerTableFunctionDeltaLake(TableFunctionFactory & factory);
#endif
#if USE_AVRO
void registerTableFunctionIceberg(TableFunctionFactory & factory);
#endif
Expand Down