Skip to content

Commit 36aa52b

Browse files
committed
Rename tableStorageFormat in HiveInsertTableHandle
Each partition can have its own storage format, the format info in HiveInsertTableHandle is not necessarily table format
1 parent c3023b6 commit 36aa52b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

velox/connectors/hive/HiveDataSink.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1065,8 +1065,7 @@ void HiveInsertTableHandle::registerSerDe() {
10651065

10661066
std::string HiveInsertTableHandle::toString() const {
10671067
std::ostringstream out;
1068-
out << "HiveInsertTableHandle ["
1069-
<< dwio::common::toString(tableStorageFormat_);
1068+
out << "HiveInsertTableHandle [" << dwio::common::toString(storageFormat_);
10701069
if (compressionKind_.has_value()) {
10711070
out << " " << common::compressionKindToString(compressionKind_.value());
10721071
} else {

velox/connectors/hive/HiveDataSink.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,15 @@ class HiveInsertTableHandle : public ConnectorInsertTableHandle {
201201
HiveInsertTableHandle(
202202
std::vector<std::shared_ptr<const HiveColumnHandle>> inputColumns,
203203
std::shared_ptr<const LocationHandle> locationHandle,
204-
dwio::common::FileFormat tableStorageFormat =
205-
dwio::common::FileFormat::DWRF,
204+
dwio::common::FileFormat storageFormat = dwio::common::FileFormat::DWRF,
206205
std::shared_ptr<const HiveBucketProperty> bucketProperty = nullptr,
207206
std::optional<common::CompressionKind> compressionKind = {},
208207
const std::unordered_map<std::string, std::string>& serdeParameters = {},
209208
const std::shared_ptr<dwio::common::WriterOptions>& writerOptions =
210209
nullptr)
211210
: inputColumns_(std::move(inputColumns)),
212211
locationHandle_(std::move(locationHandle)),
213-
tableStorageFormat_(tableStorageFormat),
212+
storageFormat_(storageFormat),
214213
bucketProperty_(std::move(bucketProperty)),
215214
compressionKind_(compressionKind),
216215
serdeParameters_(serdeParameters),
@@ -237,8 +236,8 @@ class HiveInsertTableHandle : public ConnectorInsertTableHandle {
237236
return compressionKind_;
238237
}
239238

240-
dwio::common::FileFormat tableStorageFormat() const {
241-
return tableStorageFormat_;
239+
dwio::common::FileFormat storageFormat() const {
240+
return storageFormat_;
242241
}
243242

244243
const std::unordered_map<std::string, std::string>& serdeParameters() const {
@@ -272,7 +271,7 @@ class HiveInsertTableHandle : public ConnectorInsertTableHandle {
272271
private:
273272
const std::vector<std::shared_ptr<const HiveColumnHandle>> inputColumns_;
274273
const std::shared_ptr<const LocationHandle> locationHandle_;
275-
const dwio::common::FileFormat tableStorageFormat_;
274+
const dwio::common::FileFormat storageFormat_;
276275
const std::shared_ptr<const HiveBucketProperty> bucketProperty_;
277276
const std::optional<common::CompressionKind> compressionKind_;
278277
const std::unordered_map<std::string, std::string> serdeParameters_;

0 commit comments

Comments
 (0)