Skip to content

GH-859: Fix ARROW_STRUCT_CONFLICT_POLICY env var #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 2 commits into from
Sep 26, 2025
Merged

GH-859: Fix ARROW_STRUCT_CONFLICT_POLICY env var #860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c52adc2
Fix ARROW_STRUCT_CONFLICT_POLICY env not work
wForget Sep 25, 2025
db2dc19
address comment
wForget Sep 25, 2025
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
10 changes: 6 additions & 4 deletions vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ public abstract class AbstractStructVector extends AbstractContainerVector {
private ConflictPolicy conflictPolicy;

static {
String conflictPolicyStr =
System.getProperty(STRUCT_CONFLICT_POLICY_JVM, ConflictPolicy.CONFLICT_REPLACE.toString());
String conflictPolicyStr = System.getProperty(STRUCT_CONFLICT_POLICY_JVM);
if (conflictPolicyStr == null) {
conflictPolicyStr = System.getenv(STRUCT_CONFLICT_POLICY_ENV);
}
if (conflictPolicyStr == null) {
conflictPolicyStr = ConflictPolicy.CONFLICT_REPLACE.toString();
}
ConflictPolicy conflictPolicy;
try {
conflictPolicy = ConflictPolicy.valueOf(conflictPolicyStr.toUpperCase(Locale.ROOT));
Expand All @@ -62,11 +64,11 @@ public abstract class AbstractStructVector extends AbstractContainerVector {

/** Policy to determine how to react when duplicate columns are encountered. */
public enum ConflictPolicy {
// Ignore the conflict and append the field. This is the default behaviour
// Ignore the conflict and append the field.
CONFLICT_APPEND,
// Keep the existing field and ignore the newer one.
CONFLICT_IGNORE,
// Replace the existing field with the newer one.
// Replace the existing field with the newer one. This is the default behaviour
CONFLICT_REPLACE,
// Refuse the new field and error out.
CONFLICT_ERROR
Expand Down
Loading