-
Notifications
You must be signed in to change notification settings - Fork 463
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 2024_03_14_decimal_avg
- Loading branch information
Showing
35 changed files
with
976 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| CH_ORG=Kyligence | ||
| CH_BRANCH=rebase_ch/20240314 | ||
| CH_COMMIT=3ddade3ed79 | ||
| CH_BRANCH=rebase_ch/20240315 | ||
| CH_COMMIT=1240fda3f62 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "IcebergPlanConverter.h" | ||
|
|
||
| namespace gluten { | ||
|
|
||
| std::shared_ptr<IcebergSplitInfo> IcebergPlanConverter::parseIcebergSplitInfo( | ||
| substrait::ReadRel_LocalFiles_FileOrFiles file, | ||
| std::shared_ptr<SplitInfo> splitInfo) { | ||
| using SubstraitFileFormatCase = ::substrait::ReadRel_LocalFiles_FileOrFiles::IcebergReadOptions::FileFormatCase; | ||
| using SubstraitDeleteFileFormatCase = | ||
| ::substrait::ReadRel_LocalFiles_FileOrFiles::IcebergReadOptions::DeleteFile::FileFormatCase; | ||
| auto icebergSplitInfo = std::dynamic_pointer_cast<IcebergSplitInfo>(splitInfo) | ||
| ? std::dynamic_pointer_cast<IcebergSplitInfo>(splitInfo) | ||
| : std::make_shared<IcebergSplitInfo>(*splitInfo); | ||
| auto icebergReadOption = file.iceberg(); | ||
| switch (icebergReadOption.file_format_case()) { | ||
| case SubstraitFileFormatCase::kParquet: | ||
| icebergSplitInfo->format = dwio::common::FileFormat::PARQUET; | ||
| break; | ||
| case SubstraitFileFormatCase::kOrc: | ||
| icebergSplitInfo->format = dwio::common::FileFormat::ORC; | ||
| break; | ||
| default: | ||
| icebergSplitInfo->format = dwio::common::FileFormat::UNKNOWN; | ||
| break; | ||
| } | ||
| if (icebergReadOption.delete_files_size() > 0) { | ||
| auto deleteFiles = icebergReadOption.delete_files(); | ||
| std::vector<IcebergDeleteFile> deletes; | ||
| deletes.reserve(icebergReadOption.delete_files_size()); | ||
| for (auto i = 0; i < icebergReadOption.delete_files_size(); i++) { | ||
| auto deleteFile = icebergReadOption.delete_files().Get(i); | ||
| dwio::common::FileFormat format; | ||
| FileContent fileContent; | ||
| switch (deleteFile.file_format_case()) { | ||
| case SubstraitDeleteFileFormatCase::kParquet: | ||
| format = dwio::common::FileFormat::PARQUET; | ||
| break; | ||
| case SubstraitDeleteFileFormatCase::kOrc: | ||
| format = dwio::common::FileFormat::ORC; | ||
| break; | ||
| default: | ||
| format = dwio::common::FileFormat::UNKNOWN; | ||
| } | ||
| switch (deleteFile.filecontent()) { | ||
| case ::substrait::ReadRel_LocalFiles_FileOrFiles_IcebergReadOptions_FileContent_POSITION_DELETES: | ||
| fileContent = FileContent::kPositionalDeletes; | ||
| break; | ||
| case ::substrait::ReadRel_LocalFiles_FileOrFiles_IcebergReadOptions_FileContent_EQUALITY_DELETES: | ||
| fileContent = FileContent::kEqualityDeletes; | ||
| break; | ||
| default: | ||
| fileContent = FileContent::kData; | ||
| break; | ||
| } | ||
| deletes.emplace_back(IcebergDeleteFile( | ||
| fileContent, deleteFile.filepath(), format, deleteFile.recordcount(), deleteFile.filesize())); | ||
| } | ||
| icebergSplitInfo->deleteFilesVec.emplace_back(deletes); | ||
| } else { | ||
| // Add an empty delete files vector to indicate that this data file has no delete file. | ||
| icebergSplitInfo->deleteFilesVec.emplace_back(std::vector<IcebergDeleteFile>{}); | ||
| } | ||
|
|
||
| return icebergSplitInfo; | ||
| } | ||
|
|
||
| } // namespace gluten |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "substrait/SubstraitToVeloxPlan.h" | ||
| #include "velox/connectors/hive/iceberg/IcebergDeleteFile.h" | ||
|
|
||
| using namespace facebook::velox::connector::hive::iceberg; | ||
|
|
||
| namespace gluten { | ||
| struct IcebergSplitInfo : SplitInfo { | ||
| std::vector<std::vector<IcebergDeleteFile>> deleteFilesVec; | ||
|
|
||
| IcebergSplitInfo(const SplitInfo& splitInfo) : SplitInfo(splitInfo) { | ||
| // Reserve the actual size of the deleteFilesVec. | ||
| deleteFilesVec.reserve(splitInfo.paths.capacity()); | ||
| } | ||
| }; | ||
|
|
||
| class IcebergPlanConverter { | ||
| public: | ||
| static std::shared_ptr<IcebergSplitInfo> parseIcebergSplitInfo( | ||
| substrait::ReadRel_LocalFiles_FileOrFiles file, | ||
| std::shared_ptr<SplitInfo> splitInfo); | ||
| }; | ||
|
|
||
| } // namespace gluten |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.