Skip to content
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

Build: Bump org.eclipse.jgit from 5.13.1.202206130422-r to 6.4.0.202211300538-r #14

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Build: Bump org.eclipse.jgit from 5.13.1.202206130422-r to 6.4.0.202211300538-r #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bbf8c8d
Make UGI current user the default owner of Hive db&tbl
Nov 30, 2022
e90ec2c
Remove alter tbl ownership changes
Dec 6, 2022
636c03e
Formatting
Dec 6, 2022
2afd824
Avoid UGI when owner is set
Dec 16, 2022
a641d7a
Setup util class for getting UGI
Jan 4, 2023
ed96589
Minor edit error message
Jan 4, 2023
db3d7bf
Minimize change
Jan 4, 2023
41e6393
Rename function
Jan 4, 2023
74dff6d
Rename param
Jan 4, 2023
40c2a1c
Default user to OS
Jan 11, 2023
a8f0262
Edit error message
Jan 12, 2023
c11a250
Build: Bump org.eclipse.jgit from 5.13.1.202206130422-r to 6.4.0.2022…
dependabot[bot] Jan 13, 2023
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
Prev Previous commit
Next Next commit
Default user to OS
  • Loading branch information
Haizhou Zhao committed Jan 12, 2023
commit 40c2a1c4eb48d3716247ea94d09c786e93f19a94
2 changes: 1 addition & 1 deletion hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ Database convertToDatabase(Namespace namespace, Map<String, String> meta) {
});

if (database.getOwnerName() == null) {
database.setOwnerName(HiveHadoopUtil.getUserName());
database.setOwnerName(HiveHadoopUtil.currentUser());
database.setOwnerType(PrincipalType.USER);
}

Expand Down
10 changes: 7 additions & 3 deletions hive-metastore/src/main/java/org/apache/iceberg/hive/HiveHadoopUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@
package org.apache.iceberg.hive;

import java.io.IOException;
import java.io.UncheckedIOException;
import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class HiveHadoopUtil {

private static final Logger LOG = LoggerFactory.getLogger(HiveHadoopUtil.class);

private HiveHadoopUtil() {}

public static String getUserName() {
public static String currentUser() {
try {
return UserGroupInformation.getCurrentUser().getUserName();
} catch (IOException e) {
throw new UncheckedIOException("Fail to obtain Hadoop UGI user", e);
LOG.warn("Fail to obtain Hadoop UGI user", e);
return System.getProperty("user.name");
}
}
}
2 changes: 1 addition & 1 deletion hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ private Table newHmsTable(TableMetadata metadata) {
new Table(
tableName,
database,
metadata.property(HiveCatalog.HMS_TABLE_OWNER, HiveHadoopUtil.getUserName()),
metadata.property(HiveCatalog.HMS_TABLE_OWNER, HiveHadoopUtil.currentUser()),
(int) currentTimeMillis / 1000,
(int) currentTimeMillis / 1000,
Integer.MAX_VALUE,
Expand Down