Skip to content

Changes made by argmarco@ to resolve issues with the merge to main. - #225

Merged
argmarco-tkd merged 10 commits into
merge_all_the_thingsfrom
ma_merge_all_things
Dec 19, 2025
Merged

Changes made by argmarco@ to resolve issues with the merge to main.#225
argmarco-tkd merged 10 commits into
merge_all_the_thingsfrom
ma_merge_all_things

Conversation

@argmarco-tkd

Copy link
Copy Markdown

Changes made by argmarco@ to resolve issues with the merge to main.

  • Each commit message describes the specific change.

@github-actions

Copy link
Copy Markdown

Thanks for opening a pull request!

If this is not a minor PR. Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose

Opening GitHub issues ahead of time contributes to the Openness of the Apache Arrow project.

Then could you also rename the pull request title in the following format?

GH-${GITHUB_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}

or

MINOR: [${COMPONENT}] ${SUMMARY}

See also:


#pragma once

#include <cstddef>

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Do we really need these two imports just to switch to size_t?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Good catch. Let me double check.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

done.

: ciphertext_data_(std::move(data)), success_(success),
error_message_(std::move(error_msg)), error_fields_(std::move(error_fields)) {}
error_message_(std::move(error_msg)), error_fields_(std::move(error_fields)),
metadata_(std::move(metadata)) {}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why was this needed? I thought only size_t issues were coming up.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

One of the earlier commits in this PR was to update the DBPA interface. This change is part of that (DBPA Result objets have a new virtual method that I was forced to implement here). It has nothing to do with size_t errors.

const std::map<std::string, std::string>& GetLastEncryptEncodingAttrs() const {
return last_encrypt_encoding_attrs_;
}
const std::map<std::string, std::string>& GetLastDecryptEncodingAttrs() const {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Same question with the failures

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

This is part of the updates to DBPA.

std::string column_name = "employee_name";
std::string key_id = "employee_name_key";
Type::type data_type = Type::BYTE_ARRAY;
Compression::type compression_type = Compression::UNCOMPRESSED;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why was this test added now?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

basically, regression testing. We added new code in external_dbpa_encryption.cc to ensure that no memcpy happened with zero-sized arrays (one of the things that the Sanitizer complained about). Decided to add a test to validate the new behavior.

@sofia-tekdatum sofia-tekdatum left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Thanks for this!!

@argmarco-tkd
argmarco-tkd merged commit b63ada7 into merge_all_the_things Dec 19, 2025
32 of 101 checks passed
@argmarco-tkd
argmarco-tkd deleted the ma_merge_all_things branch December 19, 2025 04:57
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.

2 participants