Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions velox/connectors/Connector.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "velox/common/file/TokenProvider.h"
#include "velox/common/future/VeloxPromise.h"
#include "velox/core/ExpressionEvaluator.h"
#include "velox/core/QueryConfig.h"
#include "velox/type/Filter.h"
#include "velox/vector/ComplexVector.h"

Expand Down Expand Up @@ -517,11 +518,11 @@ class ConnectorQueryCtx {
selectiveNimbleReaderEnabled_ = value;
}

bool rowSizeTrackingEnabled() const {
core::QueryConfig::RowSizeTrackingMode rowSizeTrackingMode() const {
return rowSizeTrackingEnabled_;
}

void setRowSizeTrackingEnabled(bool value) {
void setRowSizeTrackingMode(core::QueryConfig::RowSizeTrackingMode value) {
rowSizeTrackingEnabled_ = value;
}

Expand All @@ -547,7 +548,8 @@ class ConnectorQueryCtx {
const folly::CancellationToken cancellationToken_;
const std::shared_ptr<filesystems::TokenProvider> fsTokenProvider_;
bool selectiveNimbleReaderEnabled_{false};
bool rowSizeTrackingEnabled_{true};
core::QueryConfig::RowSizeTrackingMode rowSizeTrackingEnabled_{
core::QueryConfig::RowSizeTrackingMode::ENABLED_FOR_ALL};
};

class Connector;
Expand Down
3 changes: 2 additions & 1 deletion velox/connectors/hive/SplitReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ void SplitReader::createRowReader(
baseRowReaderOpts_.setTrackRowSize(
rowSizeTrackingEnabled.has_value()
? *rowSizeTrackingEnabled
: connectorQueryCtx_->rowSizeTrackingEnabled());
: connectorQueryCtx_->rowSizeTrackingMode() !=
core::QueryConfig::RowSizeTrackingMode::DISABLED);
baseRowReader_ = baseReader_->createRowReader(baseRowReaderOpts_);
}

Expand Down
19 changes: 19 additions & 0 deletions velox/core/QueryConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -716,18 +716,37 @@ class QueryConfig {
/// username.
static constexpr const char* kClientTags = "client_tags";

#ifdef VELOX_ENABLE_BACKWARD_COMPATIBILITY
/// Enable (reader) row size tracker as a fallback to file level row size
/// estimates.
static constexpr const char* kRowSizeTrackingEnabled =
"row_size_tracking_enabled";
#endif

/// Enable (reader) row size tracker as a fallback to file level row size
/// estimates.
static constexpr const char* kRowSizeTrackingMode = "row_size_tracking_mode";

enum class RowSizeTrackingMode {
DISABLED = 0,
EXCLUDE_DELTA_SPLITS = 1,
ENABLED_FOR_ALL = 2,
};

bool selectiveNimbleReaderEnabled() const {
return get<bool>(kSelectiveNimbleReaderEnabled, false);
}

#ifdef VELOX_ENABLE_BACKWARD_COMPATIBILITY
bool rowSizeTrackingEnabled() const {
return get<bool>(kRowSizeTrackingEnabled, true);
}
#endif

RowSizeTrackingMode rowSizeTrackingMode() const {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HuamengJiang : It would be great to expose std::string getters and setters as well for this value.

It is exposed as a session property by Prestissimo and it will be better for engines to not have to reimplement the string conversions for this enum.

return get<RowSizeTrackingMode>(
kRowSizeTrackingMode, RowSizeTrackingMode::ENABLED_FOR_ALL);
}

bool debugDisableExpressionsWithPeeling() const {
return get<bool>(kDebugDisableExpressionWithPeeling, false);
Expand Down
4 changes: 2 additions & 2 deletions velox/exec/Operator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ OperatorCtx::createConnectorQueryCtx(
task->queryCtx()->fsTokenProvider());
connectorQueryCtx->setSelectiveNimbleReaderEnabled(
driverCtx_->queryConfig().selectiveNimbleReaderEnabled());
connectorQueryCtx->setRowSizeTrackingEnabled(
driverCtx_->queryConfig().rowSizeTrackingEnabled());
connectorQueryCtx->setRowSizeTrackingMode(
driverCtx_->queryConfig().rowSizeTrackingMode());
return connectorQueryCtx;
}

Expand Down
Loading