Skip to content

HIVE-29776: Remove obsolete Java 8 detection #6649

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
ayushtkn merged 1 commit into from
Aug 1, 2026
Merged

HIVE-29776: Remove obsolete Java 8 detection #6649

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
61 changes: 23 additions & 38 deletions common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,44 +24,29 @@ private JavaVersionUtils() {
}

/**
* Returns the detected Java major version (e.g., 8, 11, 17).
* Returns JVM --add-opens flags for Tez/MR child processes.
*/
public static int getJavaMajorVersion() {
return Math.max(8, Integer.parseInt(
System.getProperty("java.specification.version").split("\\.")[0]));
}

/**
* Returns the full --add-opens string if Java 9, or an empty string if Java 8 or below.
*/
public static String getAddOpensFlagsIfNeeded() {
//TODO: Please remove this once the codebase has been migrated to JDK 9 or a higher version.
int javaVersion = getJavaMajorVersion();
if (javaVersion >= 9) {
return " --add-opens=java.base/java.net=ALL-UNNAMED" +
" --add-opens=java.base/java.util=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" +
" --add-opens=java.base/java.lang=ALL-UNNAMED" +
" --add-opens=java.base/java.io=ALL-UNNAMED" +
" --add-opens=java.base/java.lang=ALL-UNNAMED" +
" --add-opens=java.base/java.lang.invoke=ALL-UNNAMED" +
" --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" +
" --add-opens=java.base/java.math=ALL-UNNAMED" +
" --add-opens=java.base/java.nio=ALL-UNNAMED" +
" --add-opens=java.base/java.text=ALL-UNNAMED" +
" --add-opens=java.base/java.time=ALL-UNNAMED" +
" --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED" +
" --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED" +
" --add-opens=java.sql/java.sql=ALL-UNNAMED" +
" --add-opens=java.base/sun.nio.ch=ALL-UNNAMED" +
" --add-opens=java.base/sun.nio.cs=ALL-UNNAMED" +
" --add-opens=java.base/java.util.regex=ALL-UNNAMED" +
" --add-opens=java.base/java.security=ALL-UNNAMED" +
" --add-opens=java.base/sun.security.provider=ALL-UNNAMED";
} else {
return ""; // Java 8 or lower does not need add-opens
}
public static String getAddOpensFlags() {
return " --add-opens=java.base/java.net=ALL-UNNAMED" +
" --add-opens=java.base/java.util=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" +
" --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" +
" --add-opens=java.base/java.lang=ALL-UNNAMED" +
" --add-opens=java.base/java.io=ALL-UNNAMED" +
" --add-opens=java.base/java.lang.invoke=ALL-UNNAMED" +
" --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" +
" --add-opens=java.base/java.math=ALL-UNNAMED" +
" --add-opens=java.base/java.nio=ALL-UNNAMED" +
" --add-opens=java.base/java.text=ALL-UNNAMED" +
" --add-opens=java.base/java.time=ALL-UNNAMED" +
" --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED" +
" --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED" +
" --add-opens=java.sql/java.sql=ALL-UNNAMED" +
" --add-opens=java.base/sun.nio.ch=ALL-UNNAMED" +
" --add-opens=java.base/sun.nio.cs=ALL-UNNAMED" +
" --add-opens=java.base/java.util.regex=ALL-UNNAMED" +
" --add-opens=java.base/java.security=ALL-UNNAMED" +
" --add-opens=java.base/sun.security.provider=ALL-UNNAMED";
}
}
2 changes: 1 addition & 1 deletion ...cat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public int run(String[] args) throws IOException, InterruptedException, ClassNot
conf.set(AppConfig.HADOOP_MR_AM_MEMORY_MB, amMemoryMB);
}
String amJavaOpts = StringUtils.defaultString(appConf.controllerAMChildOpts());
amJavaOpts += JavaVersionUtils.getAddOpensFlagsIfNeeded();
amJavaOpts += JavaVersionUtils.getAddOpensFlags();
if (!amJavaOpts.isEmpty()) {
conf.set(AppConfig.HADOOP_MR_AM_JAVA_OPTS, amJavaOpts);
}
Expand Down
14 changes: 6 additions & 8 deletions ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ public int execute() {
}
}

addOpensFlagsIfNeeded(job);
addOpensFlags(job);
jc = new JobClient(job);
// make this client wait if job tracker is not behaving well.
Throttle.checkJobTracker(job, LOG);
Expand Down Expand Up @@ -493,13 +493,11 @@ public int execute() {
return (returnVal);
}

private static void addOpensFlagsIfNeeded(JobConf job) {
String addOpens = JavaVersionUtils.getAddOpensFlagsIfNeeded();
if(!addOpens.isEmpty()) {
addJavaOpts(job, "mapreduce.map.java.opts", addOpens);
addJavaOpts(job, "mapreduce.reduce.java.opts", addOpens);
addJavaOpts(job, "yarn.app.mapreduce.am.command-opts", addOpens);
}
private static void addOpensFlags(JobConf job) {
String addOpens = JavaVersionUtils.getAddOpensFlags();
addJavaOpts(job, "mapreduce.map.java.opts", addOpens);
addJavaOpts(job, "mapreduce.reduce.java.opts", addOpens);
addJavaOpts(job, "yarn.app.mapreduce.am.command-opts", addOpens);
}
private static void addJavaOpts(JobConf job, String conf, String extraOpts) {
String javaOpts = StringUtils.defaultString(job.get(conf));
Expand Down
2 changes: 1 addition & 1 deletion ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ private static String getContainerJavaOpts(Configuration conf) {
}
finalOpts = logLevel + " " + MRHelpers.getJavaOptsForMRMapper(conf);
}
finalOpts += JavaVersionUtils.getAddOpensFlagsIfNeeded();
finalOpts += JavaVersionUtils.getAddOpensFlags();
LOG.debug("Tez container final opts: {}", finalOpts);
return finalOpts;
}
Expand Down
2 changes: 1 addition & 1 deletion ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ private void setupTezParamsBasedOnMR(TezConfiguration conf) {
}

String mrAmJavaOpts = conf.get(TezConfiguration.TEZ_AM_LAUNCH_CMD_OPTS, MRHelpers.getJavaOptsForMRAM(conf));
conf.set(TezConfiguration.TEZ_AM_LAUNCH_CMD_OPTS, mrAmJavaOpts + JavaVersionUtils.getAddOpensFlagsIfNeeded());
conf.set(TezConfiguration.TEZ_AM_LAUNCH_CMD_OPTS, mrAmJavaOpts + JavaVersionUtils.getAddOpensFlags());

String queueName = conf.get(JobContext.QUEUE_NAME, YarnConfiguration.DEFAULT_QUEUE_NAME);
conf.setIfUnset(TezConfiguration.TEZ_QUEUE_NAME, queueName);
Expand Down
Loading