Skip to content

Conversation

@PingLiuPing
Copy link
Collaborator

This PR means to temporally holding all iceberg code changes that are not been merged to upstream velox repository.
This is because some of the PRs are dependent each other and we cannot pick them one by one.

@PingLiuPing PingLiuPing self-assigned this Aug 7, 2025
@PingLiuPing
Copy link
Collaborator Author

alchemy merge

@prestodb-ci
Copy link
Collaborator

alchemy link e951481,8cb17fb19e24290cf03924e2e4501c844646d7e9,c188f8700bff198ca0c9fad7784ea8401d844f8b

@prestodb-ci
Copy link
Collaborator

Added new rebase item:

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit e951481 in rebase request #426:

exit status 1
error: could not apply e95148181... refactor: Move toValues from InPredicate.cpp to Filter.h

Auto-merging velox/type/Filter.h
CONFLICT (content): Merge conflict in velox/type/Filter.h

Please:

  1. Rebase your branch with staging/staging-a417b2b45-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
  2. Comment on this issue:
alchemy link [updated comma-separated commit SHAs for this issue] @2025-08-07T06:40:22Z
  1. Re-open Rebase branch staging-a417b2b45-rebase with staging-a417b2b45-head (a417b2b) #426 to retry the cherry-pick.

@PingLiuPing PingLiuPing changed the base branch from oss-main to staging/staging-a417b2b45-rebase August 7, 2025 10:07
@zhouyuan zhouyuan changed the base branch from staging/staging-a417b2b45-rebase to oss-main August 7, 2025 10:20
@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit e951481 in rebase request #427:

exit status 1
error: could not apply e95148181... refactor: Move toValues from InPredicate.cpp to Filter.h

Auto-merging velox/type/Filter.h
CONFLICT (content): Merge conflict in velox/type/Filter.h

Please:

  1. Rebase your branch with staging/staging-a417b2b45-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
  2. Comment on this issue:
alchemy link [updated comma-separated commit SHAs for this issue] @2025-08-07T06:40:22Z
  1. Re-open Rebase branch staging-a417b2b45-rebase with staging-a417b2b45-head (a417b2b) #427 to retry the cherry-pick.

@PingLiuPing
Copy link
Collaborator Author

alchemy merge @2025-10-22T05:35:01Z

@prestodb-ci
Copy link
Collaborator

alchemy link 44c99a6,813d750e26f513dd1af1c4eb2b1929e9a637bae7,662374d422fb23a818cc4bf7ba8ef09580e1e14a,1b67eb898866b84630eac5d9b1615a846a4a0066,0acd427f38f3b0ae6e0e5f0edb8849900482303e,b1b6bf9bd4780a5154e7fc44ce20b73dc5ded5e1,b65a48f269933ea2af338b3e634c85ee6f1cf3c5,4b89b2e43953279f895777c0e1b47a57962e28e9,87541a9512ff4873e8ebf3fae3a448a4cb7c617d,39e063c34ee86c6a8efb710c16ea9a12ef22fda4,81c0c28dea63f3c67f3b15604ca594759175aee6,c616b14a7254f9b6e20a8f19e5faa4421a926484,a3328ef6619eaa9f88dc6d7f9eb7799982afbed5 @2025-10-22T05:35:01Z

@prestodb-ci
Copy link
Collaborator

The following unexpired item was removed at 2025-10-22T05:35:01Z by @prestodb-ci via #425 (comment):

Added new rebase item:

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit 813d750 in rebase request #1196:

exit status 1
error: could not apply 813d750e2... feat(connector): Support reading Iceberg split with equality deletes

Auto-merging velox/connectors/hive/SplitReader.cpp
Auto-merging velox/connectors/hive/SplitReader.h
Auto-merging velox/connectors/hive/iceberg/IcebergSplitReader.cpp
Auto-merging velox/connectors/hive/iceberg/IcebergSplitReader.h
Auto-merging velox/connectors/hive/iceberg/tests/IcebergReadTest.cpp
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/IcebergReadTest.cpp
Auto-merging velox/dwio/common/ScanSpec.h
Auto-merging velox/dwio/dwrf/reader/ReaderBase.h
Auto-merging velox/type/Filter.h

Please:

  1. Rebase your branch with staging/staging-c78385daf-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
  2. Comment on this issue:
alchemy link [updated comma-separated commit SHAs for this issue] @2025-10-24T02:39:32Z
  1. Re-open Rebase branch staging-c78385daf-rebase with staging-c78385daf-head (c78385d) #1196 to retry the cherry-pick.

yingsu00 and others added 11 commits October 24, 2025 09:44
The function toValues removes duplicated values from the vector and
return them in a std::vector. It was used to build an InPredicate. It
will be needed for building NOT IN filters for Iceberg equality delete
read as well, therefore moving it from velox/functions/prestosql/InPred
icate.cpp to velox/type/Filter.h. This commit also renames it to
deDuplicateValues to make it easier to understand.
This commit introduces EqualityDeleteFileReader, which is used to read
Iceberg splits with equality delete files. The equality delete files
are read to construct domain filters or filter functions, which then
would be evaluated in the base file readers.

When there is only one equality delete field, and when that field is
an Iceberg identifier field, i.e. non-floating point primitive types,
the values would be converted to a list as a NOT IN domain filter,
with the NULL treated separately. This domain filter would then be
pushed to the ColumnReaders to filter our unwanted rows before they
are read into Velox vectors. When the equality delete column is a
nested column, e.g. a sub-column in a struct, or the key in a map,
such column may not be in the base file ScanSpec. We need to add/remove
these subfields to/from the SchemaWithId and ScanSpec recursively if
they were not in the ScanSpec already. A test is also added for such
case.

If there are more than one equality delete field, or the field is not
an Iceberg identifier field, the values would be converted to a typed
expression in the conjunct of disconjunts form. This expression would
be evaluated as the remaining filter function after the rows are read
into the Velox vectors. Note that this only works for Presto now as
the "neq" function is not registered by Spark. See https://github.com/
facebookincubator/issues/12667

Note that this commit only supports integral types. VARCHAR and
VARBINARY need to be supported in future commits (see
facebookincubator#12664).

Co-authored-by: Naveen Kumar Mahadevuni <[email protected]>

# Conflicts:
#	velox/connectors/hive/iceberg/tests/IcebergReadTest.cpp
@PingLiuPing
Copy link
Collaborator Author

alchemy merge @2025-10-24T02:39:32Z

@prestodb-ci
Copy link
Collaborator

alchemy link 4aa9c1f,0b21ca2ffafab0295dc2ba7d5fb2901deabed171,cdcd1dc1a133b81a778301c2fec261e2afd4be37,a48a3cf463e1e02b4057c9c405279c974f956877,0608c689c201ed01e6686f46dd449cd222841b67,e8a838601f9d9ccb9dc13f2f5697847063180977,6bf461fe36cd66a6798235327a06dfbac050d419,b9bf7f3e181995df679f7aa6dc8fcd5e57f3f9e7,5178cf81e2796c4d00e66bf491ca69cb42bf2f1b,8fa166f6648f7f8559536b08dd3c649937b342f0,fa08c07b98a5afa4a89a297e26aa15db30be71d8 @2025-10-24T02:39:32Z

@prestodb-ci
Copy link
Collaborator

The following unexpired item was removed at 2025-10-24T02:39:32Z by @prestodb-ci via #425 (comment):

Added new rebase item:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants