-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
[feat] upgrade hadoop\spark\hive default vertion to 3.x #4263
Changes from 5 commits
9aa26e9
9241fd7
1f3c76f
ac30c55
12c5eb7
97ab86d
c53b7ec
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ public static void main(String[] args) { | |
SubmittableInteractiveJob job = | ||
LinkisJobClient.interactive() | ||
.builder() | ||
.setEngineType("hive-2.3.3") | ||
.setEngineType("hive-3.1.3") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should use org.apache.linkis.manager.label.conf.LabelCommonConfig#HIVE_ENGINE_VERSION |
||
.setRunTypeStr("sql") | ||
.setCreator("IDE") | ||
.setCode("show tables") | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,9 +23,9 @@ object GovernanceCommonConf { | |
|
||
val CONF_FILTER_RM = "wds.linkis.rm" | ||
|
||
val SPARK_ENGINE_VERSION = CommonVars("wds.linkis.spark.engine.version", "2.4.3") | ||
val SPARK_ENGINE_VERSION = CommonVars("wds.linkis.spark.engine.version", "3.2.1") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should use LabelCommonConfig:HIVE_ENGINE_VERSION and SPARK_ENGINE_VERSION |
||
|
||
val HIVE_ENGINE_VERSION = CommonVars("wds.linkis.hive.engine.version", "1.2.1") | ||
val HIVE_ENGINE_VERSION = CommonVars("wds.linkis.hive.engine.version", "3.1.3") | ||
|
||
val PYTHON_ENGINE_VERSION = CommonVars("wds.linkis.python.engine.version", "python2") | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,7 +134,7 @@ class CommonEntranceParser(val persistenceManager: PersistenceManager) | |
private def checkEngineTypeLabel(labels: util.Map[String, Label[_]]): Unit = { | ||
val engineTypeLabel = labels.getOrDefault(LabelKeyConstant.ENGINE_TYPE_KEY, null) | ||
if (null == engineTypeLabel) { | ||
val msg = s"You need to specify engineTypeLabel in labels, such as spark-2.4.3" | ||
val msg = s"You need to specify engineTypeLabel in labels, such as spark-3.2.1" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should use org.apache.linkis.manager.label.conf.LabelCommonConfig#SPARK_ENGINE_VERSION |
||
throw new EntranceIllegalParamException( | ||
EntranceErrorCode.LABEL_PARAMS_INVALID.getErrCode, | ||
EntranceErrorCode.LABEL_PARAMS_INVALID.getDesc + msg | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,7 @@ public class TestLabelBuilder { | |
|
||
public static void main(String[] args) throws LabelErrorException { | ||
LabelBuilderFactory labelBuilderFactory = LabelBuilderFactoryContext.getLabelBuilderFactory(); | ||
Label<?> engineType = labelBuilderFactory.createLabel("engineType", "hive-1.2.1"); | ||
Label<?> engineType = labelBuilderFactory.createLabel("engineType", "hive-3.1.3"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should use org.apache.linkis.manager.label.conf.LabelCommonConfig#HIVE_ENGINE_VERSION |
||
System.out.println(engineType.getFeature()); | ||
|
||
AliasServiceInstanceLabel emInstanceLabel = | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ object ManagerCommonConf { | |
|
||
val DEFAULT_ENGINE_TYPE = CommonVars("wds.linkis.default.engine.type", "spark") | ||
|
||
val DEFAULT_ENGINE_VERSION = CommonVars("wds.linkis.default.engine.version", "2.4.3") | ||
val DEFAULT_ENGINE_VERSION = CommonVars("wds.linkis.default.engine.version", "3.2.1") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can remove |
||
|
||
val DEFAULT_ADMIN = CommonVars("wds.linkis.manager.admin", "hadoop") | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can remove