Skip to content

ARROW-9315: [Java] Fix the failure of testAllocationManagerType #7628

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

Closed
liyafan82 wants to merge 1 commit into from
Closed

ARROW-9315: [Java] Fix the failure of testAllocationManagerType #7628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ abstract static class Config {
*/
@Value.Default
AllocationManager.Factory getAllocationManagerFactory() {
return DefaultAllocationManagerOption.DEFAULT_ALLOCATION_MANAGER_FACTORY;
return DefaultAllocationManagerOption.getDefaultAllocationManagerFactory();
}

/**
Expand Down
17 changes: 11 additions & 6 deletions java/memory/src/main/java/org/apache/arrow/memory/DefaultAllocationManagerOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public class DefaultAllocationManagerOption {
/**
* The default allocation manager factory.
*/
public static final AllocationManager.Factory DEFAULT_ALLOCATION_MANAGER_FACTORY =
getDefaultAllocationManagerFactory();
private static AllocationManager.Factory DEFAULT_ALLOCATION_MANAGER_FACTORY = null;

/**
* The allocation manager type.
Expand Down Expand Up @@ -83,19 +82,25 @@ static AllocationManagerType getDefaultAllocationManagerType() {
}

static AllocationManager.Factory getDefaultAllocationManagerFactory() {
if (DEFAULT_ALLOCATION_MANAGER_FACTORY != null) {
return DEFAULT_ALLOCATION_MANAGER_FACTORY;
}
AllocationManagerType type = getDefaultAllocationManagerType();

switch (type) {
case Netty:
return getNettyFactory();
DEFAULT_ALLOCATION_MANAGER_FACTORY = getNettyFactory();
break;
case Unsafe:
return getUnsafeFactory();
DEFAULT_ALLOCATION_MANAGER_FACTORY = getUnsafeFactory();
break;
case Unknown:
LOGGER.info("allocation manager type not specified, using netty as the default type");
return getFactory(CheckAllocator.check());
DEFAULT_ALLOCATION_MANAGER_FACTORY = getFactory(CheckAllocator.check());
break;
default:
throw new IllegalStateException("Unknown allocation manager type: " + type);
}
return DEFAULT_ALLOCATION_MANAGER_FACTORY;
}

private static AllocationManager.Factory getFactory(String clazzName) {
Expand Down