Skip to content

Minor: Fix possible NPE. #36

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
takidau merged 4 commits into from
Aug 6, 2024
Merged

Minor: Fix possible NPE. #36

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d8ad73
Minor: Fix possible NPE.
nk1506 Jul 31, 2024
77c59c4
Addressed comment
nk1506 Aug 1, 2024
5939886
Addressed comments.
nk1506 Aug 2, 2024
bbf6ce1
Addressed comments.
nk1506 Aug 2, 2024
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: 2 additions & 0 deletions polaris-core/src/main/java/io/polaris/core/persistence/ResolvedPolarisEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.polaris.core.persistence;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import io.polaris.core.entity.PolarisEntity;
import io.polaris.core.entity.PolarisGrantRecord;
Expand Down Expand Up @@ -45,6 +46,7 @@ public ResolvedPolarisEntity(
}

public ResolvedPolarisEntity(EntityCacheEntry cacheEntry) {
Copy link
Member

@snazy snazy Aug 1, 2024

Choose a reason for hiding this comment

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

Suggested change
public ResolvedPolarisEntity(EntityCacheEntry cacheEntry) {
public ResolvedPolarisEntity(@NotNull EntityCacheEntry cacheEntry) {

Preconditions.checkNotNull(cacheEntry, "An entity cache can't be null.");
Copy link
Member

@snazy snazy Aug 1, 2024

Choose a reason for hiding this comment

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

The check is redundant, because recent JVMs throw meaningful NPEs telling that cacheEntry is null - the proposed message doesn't give any advice to users.

this.entity = PolarisEntity.of(cacheEntry.getEntity());
this.grantRecordsAsGrantee = ImmutableList.copyOf(cacheEntry.getGrantRecordsAsGrantee());
this.grantRecordsAsSecurable = ImmutableList.copyOf(cacheEntry.getGrantRecordsAsSecurable());
Expand Down
8 changes: 6 additions & 2 deletions ...is-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,11 @@ public PolarisResolvedPathWrapper getResolvedTopLevelEntity(
if (resolvedCacheEntry == null) {
return null;
}
return new PolarisResolvedPathWrapper(
List.of(getResolvedRootContainerEntity(), new ResolvedPolarisEntity(resolvedCacheEntry)));

ResolvedPolarisEntity resolvedRootContainerEntity = getResolvedRootContainerEntity();
Copy link
Member

@snazy snazy Aug 1, 2024

Choose a reason for hiding this comment

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

Looks like there are more calls to getResolvedRootContainerEntity() that can fail with a direct or indirect NPE.
@collado-mike WDYT?

return resolvedRootContainerEntity == null
? new PolarisResolvedPathWrapper(List.of(new ResolvedPolarisEntity(resolvedCacheEntry)))
: new PolarisResolvedPathWrapper(
List.of(resolvedRootContainerEntity, new ResolvedPolarisEntity(resolvedCacheEntry)));
}
}
2 changes: 1 addition & 1 deletion polaris-service/src/main/java/io/polaris/service/catalog/BasePolarisCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@ private void validateMetadataFileInTableDir(
return storageInfoEntity;
}

private class BasePolarisViewOperations extends BaseViewOperations {
protected class BasePolarisViewOperations extends BaseViewOperations {
Copy link
Member

@snazy snazy Aug 1, 2024

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

@nk1506 nk1506 Aug 2, 2024

Choose a reason for hiding this comment

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

It was violating the visibility of BasePolarisViewOperations .

private final TableIdentifier identifier;
private final String fullViewName;
private FileIO viewFileIO;
Expand Down