database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[JDK] Support OpenJDK (#2804)

Browse Source 
Support compile and running Frontend process and Broker process with OpenJDK.
OpenJDK 13 is tested.
This commit is contained in:
Mingyu Chen
2020-02-20 23:47:02 +08:00
committed by GitHub
parent ccc3412f13
commit 35b09ecd66
18 changed files with 289 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
fe/src/test/java/org/apache/doris/common/JdkUtilsTest.java Normal file
View File

@ -0,0 +1,48 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.doris.common;
import org.apache.doris.common.util.JdkUtils;
import org.junit.Assert;
import org.junit.Test;
public class JdkUtilsTest {
@Test
public void testNormal() {
Assert.assertTrue(JdkUtils.checkJavaVersion());
}
@Test
public void testFunctions() {
String versionStr = JdkUtils.getJavaVersionFromFullVersion("java full version \"1.8.0_131-b11\"");
Assert.assertEquals("1.8.0_131-b11", versionStr);
versionStr = JdkUtils.getJavaVersionFromFullVersion("openjdk full version \"13.0.1+9\"");
Assert.assertEquals("13.0.1+9", versionStr);
int version = JdkUtils.getJavaVersionAsInteger("1.8.0_131-b11");
Assert.assertEquals(8, version);
version = JdkUtils.getJavaVersionAsInteger("1.7.0_79-b15");
Assert.assertEquals(7, version);
version = JdkUtils.getJavaVersionAsInteger("13.0.1+9");
Assert.assertEquals(13, version);
version = JdkUtils.getJavaVersionAsInteger("11.0.0+7");
Assert.assertEquals(11, version);
}
}

12
fe/src/test/java/org/apache/doris/common/jmockit/FieldReflection.java
View File

@ -5,14 +5,11 @@
package org.apache.doris.common.jmockit;
import sun.reflect.FieldAccessor;
import sun.reflect.ReflectionFactory;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@ -225,7 +222,7 @@ public final class FieldReflection {
}
try {
if (Modifier.isStatic(field.getModifiers()) && Modifier.isFinal(field.getModifiers())) {
setStaticFinalField(field, value);
throw new IllegalArgumentException("Do not allow to set static final field");
} else {
makeAccessible(field);
field.set(targetObject, value);
@ -236,6 +233,7 @@ public final class FieldReflection {
}
}
/*
private static void setStaticFinalField(Field field, Object value) throws IllegalAccessException {
if (field == null) {
throw new IllegalStateException();
@ -246,13 +244,14 @@ public final class FieldReflection {
} catch (NoSuchFieldException e) {
throw new RuntimeException(e);
}
modifiersField.setAccessible(true);
int nonFinalModifiers = modifiersField.getInt(field) - 16;
modifiersField.setInt(field, nonFinalModifiers);
FieldAccessor accessor = ReflectionFactory.getReflectionFactory().newFieldAccessor(field, false);
accessor.set((Object)null, value);
}
*/
public static Class<?> getClassType(Type declaredType) {
while(!(declaredType instanceof Class)) {
@ -285,3 +284,4 @@ public final class FieldReflection {
}
}

3
fe/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java
View File

@ -21,6 +21,7 @@ import org.apache.doris.catalog.Catalog;
import org.apache.doris.common.util.Util;
import org.apache.doris.deploy.impl.AmbariDeployManager;
import org.apache.commons.codec.binary.Base64;
import org.junit.Before;
import org.junit.Test;
@ -44,7 +45,7 @@ public class AmbariDeployManagerTest {
Field encodedAuthInfoF = manager.getClass().getDeclaredField("encodedAuthInfo");
encodedAuthInfoF.setAccessible(true);
encodedAuthInfoF.set(manager, new sun.misc.BASE64Encoder().encode("admin:admin".getBytes()));
encodedAuthInfoF.set(manager, Base64.encodeBase64String("admin:admin".getBytes()));
Field ambariUrlF = manager.getClass().getDeclaredField("ambariUrl");
ambariUrlF.setAccessible(true);