This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new d34909372 modify the default python version to python3 (#4786)
d34909372 is described below
commit d349093722131424356866dbb69df553b614b132
Author: aiceflower <[email protected]>
AuthorDate: Wed Jul 19 17:34:11 2023 +0800
modify the default python version to python3 (#4786)
---
linkis-dist/package/db/linkis_dml.sql | 2 +-
linkis-dist/package/db/linkis_dml_pg.sql | 2 +-
linkis-dist/package/db/upgrade/1.4.0_schema/mysql/linkis_dml.sql | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/linkis-dist/package/db/linkis_dml.sql
b/linkis-dist/package/db/linkis_dml.sql
index 7ad1fcc72..0a15f31ca 100644
--- a/linkis-dist/package/db/linkis_dml.sql
+++ b/linkis-dist/package/db/linkis_dml.sql
@@ -88,7 +88,7 @@ INSERT INTO `linkis_ps_configuration_config_key` (`key`,
`description`, `name`,
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('spark.tispark.tidb.password', NULL, NULL, NULL, 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('spark.tispark.tidb.port', NULL, NULL, '4000', 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('spark.tispark.tidb.user', NULL, NULL, 'root', 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('spark.python.version', '取值范围：python2,python3', 'python版本','python2', 'OFT',
'[\"python3\",\"python2\"]', '0', '0', '1', 'spark引擎设置', 'spark');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('spark.python.version', '取值范围：python2,python3', 'python版本','python3', 'OFT',
'[\"python3\",\"python2\"]', '0', '0', '1', 'spark引擎设置', 'spark');
-- hive
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('wds.linkis.rm.instance', '范围：1-20，单位：个', 'hive引擎最大并发数', '20', 'NumInterval',
'[1,20]', '0', '0', '1', '队列资源', 'hive');
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES
('wds.linkis.engineconn.java.driver.memory', '取值范围：1-10，单位：G',
'hive引擎初始化内存大小','1g', 'Regex', '^([1-9]|10)(G|g)$', '0', '0', '1', 'hive引擎设置',
'hive');
diff --git a/linkis-dist/package/db/linkis_dml_pg.sql
b/linkis-dist/package/db/linkis_dml_pg.sql
index 012008e46..ad1064aa3 100644
--- a/linkis-dist/package/db/linkis_dml_pg.sql
+++ b/linkis-dist/package/db/linkis_dml_pg.sql
@@ -52,7 +52,7 @@ INSERT INTO "linkis_ps_configuration_config_key" ("key",
"description", "name",
INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('spark.tispark.tidb.password', NULL, NULL, NULL, 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('spark.tispark.tidb.port', NULL, NULL, '4000', 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('spark.tispark.tidb.user', NULL, NULL, 'root', 'None', NULL, '0', '0', '1',
'tidb设置', 'spark');
-INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('spark.python.version', '取值范围：python2,python3', 'python版本','python2', 'OFT',
'["python3","python2"]', '0', '0', '1', 'spark引擎设置', 'spark');
+INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('spark.python.version', '取值范围：python2,python3', 'python版本','python3', 'OFT',
'["python3","python2"]', '0', '0', '1', 'spark引擎设置', 'spark');
-- hive
INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('wds.linkis.rm.instance', '范围：1-20，单位：个', 'hive引擎最大并发数', '20', 'NumInterval',
'[1,20]', '0', '0', '1', '队列资源', 'hive');
INSERT INTO "linkis_ps_configuration_config_key" ("key", "description",
"name", "default_value", "validate_type", "validate_range", "is_hidden",
"is_advanced", "level", "treeName", "engine_conn_type") VALUES
('wds.linkis.engineconn.java.driver.memory', '取值范围：1-10，单位：G',
'hive引擎初始化内存大小','1g', 'Regex', '^([1-9]|10)(G|g)$', '0', '0', '1', 'hive引擎设置',
'hive');
diff --git a/linkis-dist/package/db/upgrade/1.4.0_schema/mysql/linkis_dml.sql
b/linkis-dist/package/db/upgrade/1.4.0_schema/mysql/linkis_dml.sql
index b5692e000..b2d1cde19 100644
--- a/linkis-dist/package/db/upgrade/1.4.0_schema/mysql/linkis_dml.sql
+++ b/linkis-dist/package/db/upgrade/1.4.0_schema/mysql/linkis_dml.sql
@@ -70,3 +70,6 @@ VALUES (@data_source_type_id, 'address', '地址', 'Address',
NULL, 'TEXT', NULL
(@data_source_type_id, 'username', '用户名(Username)', 'Username', NULL,
'TEXT', NULL, 1, '用户名(Username)', 'Username', '^[0-9A-Za-z_-]+$', NULL, NULL,
NULL, now(), now()),
(@data_source_type_id, 'password', '密码(Password)', 'Password', NULL,
'PASSWORD', NULL, 1, '密码(Password)', 'Password', '', NULL, NULL, NULL, now(),
now()),
(@data_source_type_id, 'instance', '实例名(instance)', 'Instance', NULL,
'TEXT', NULL, 1, '实例名(instance)', 'Instance', NULL, NULL, NULL, NULL, now(),
now());
+
+-- Change the default python version to python3
+UPDATE linkis_ps_configuration_config_key SET default_value = 'python3' WHERE
`key` = 'spark.python.version';
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
