Skip to content

fix: Revert Add support for evaluating Iceberg partition transforms" #15475

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

Closed
wants to merge 1 commit into from
Closed

fix: Revert Add support for evaluating Iceberg partition transforms" #15475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions velox/connectors/hive/HiveConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "velox/connectors/hive/HiveDataSource.h"
#include "velox/connectors/hive/HivePartitionFunction.h"
#include "velox/connectors/hive/iceberg/IcebergDataSink.h"
#include "velox/functions/iceberg/Register.h"

#include <boost/lexical_cast.hpp>
#include <memory>
Expand All @@ -43,7 +42,6 @@ HiveConnector::HiveConnector(
: nullptr,
std::make_unique<FileHandleGenerator>(hiveConfig_->config())),
ioExecutor_(ioExecutor) {
iceberg::registerIcebergFunctions();
if (hiveConfig_->isFileHandleCacheEnabled()) {
LOG(INFO) << "Hive connector " << connectorId()
<< " created with maximum of "
Expand Down
9 changes: 0 additions & 9 deletions velox/connectors/hive/iceberg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ velox_add_library(
IcebergSplitReader.cpp
PartitionSpec.cpp
PositionalDeleteFileReader.cpp
TransformEvaluator.cpp
TransformExprBuilder.cpp
)

velox_link_libraries(
velox_hive_iceberg_splitreader
velox_connector
velox_functions_iceberg
Folly::folly
)

velox_link_libraries(velox_hive_iceberg_splitreader velox_connector Folly::folly)
Expand Down
9 changes: 0 additions & 9 deletions velox/connectors/hive/iceberg/PartitionSpec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "velox/connectors/hive/iceberg/PartitionSpec.h"

#include "velox/functions/iceberg/Register.h"
#include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"

namespace facebook::velox::connector::hive::iceberg {
Expand Down Expand Up @@ -103,14 +102,6 @@ VELOX_DEFINE_ENUM_NAME(TransformType, transformTypeNames);

VELOX_DEFINE_ENUM_NAME(TransformCategory, transformCategoryNames);

void registerIcebergFunctions() {
static std::once_flag registerFlag;

std::call_once(registerFlag, []() {
functions::iceberg::registerFunctions(kIcebergFunctionPrefix);
});
}

void IcebergPartitionSpec::checkCompatibility() const {
folly::F14FastMap<std::string_view, std::vector<TransformType>>
columnTransforms;
Expand Down
20 changes: 0 additions & 20 deletions velox/connectors/hive/iceberg/PartitionSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,6 @@

namespace facebook::velox::connector::hive::iceberg {

inline constexpr char const* kIcebergFunctionPrefix{"iceberg_"};

inline const std::string kBucketFunction =
std::string(kIcebergFunctionPrefix) + "bucket";
inline const std::string kTruncateFunction =
std::string(kIcebergFunctionPrefix) + "truncate";
inline const std::string kYearFunction =
std::string(kIcebergFunctionPrefix) + "years";
inline const std::string kMonthFunction =
std::string(kIcebergFunctionPrefix) + "months";
inline const std::string kDayFunction =
std::string(kIcebergFunctionPrefix) + "days";
inline const std::string kHourFunction =
std::string(kIcebergFunctionPrefix) + "hours";

/// Registers Iceberg partition transform functions with prefix
/// kIcebergFunctionPrefix.
void registerIcebergFunctions();

/// Partition transform types.
/// Defines how source column values are converted into partition keys.
/// See https://iceberg.apache.org/spec/#partition-transforms.
Expand Down Expand Up @@ -132,7 +113,6 @@ struct IcebergPartitionSpec {
case TransformType::kTruncate:
return type;
}
VELOX_UNREACHABLE("Unknown transform type");
}
};

Expand Down
47 changes: 0 additions & 47 deletions velox/connectors/hive/iceberg/TransformEvaluator.cpp
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions velox/connectors/hive/iceberg/TransformEvaluator.h
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions velox/connectors/hive/iceberg/TransformExprBuilder.cpp
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions velox/connectors/hive/iceberg/TransformExprBuilder.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion velox/connectors/hive/iceberg/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ if(NOT VELOX_DISABLE_GOOGLETEST)
IcebergTestBase.cpp
Main.cpp
PartitionSpecTest.cpp
TransformTest.cpp
)

add_test(velox_hive_iceberg_insert_test velox_hive_iceberg_insert_test)
Expand Down
Loading
Loading