This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 5d1ecd863 [ISSUE-3823]fix spelling mistakes (#3824)
5d1ecd863 is described below
commit 5d1ecd8632c2f4ff2e05c1d6b759d9c54e30f997
Author: aiceflower <[email protected]>
AuthorDate: Tue Nov 15 17:10:43 2022 +0800
[ISSUE-3823]fix spelling mistakes (#3824)
* fix spelling mistakes
* update pipeline config key
* add configuration update record
---
docs/configuration/pipeline.md | 14 +++++++-------
docs/info-1.3.1.md | 5 +++++
.../helm/charts/linkis/templates/configmap-init-sql.yaml | 2 +-
linkis-dist/package/db/linkis_dml.sql | 2 +-
linkis-dist/package/db/module/linkis_configuration_dml.sql | 2 +-
.../package/db/upgrade/1.3.1_schema/mysql/linkis_dml.sql | 5 ++++-
.../src/main/resources/linkis-engineconn.properties | 2 +-
.../engineplugin/pipeline/constant/PipeLineConstant.scala | 2 +-
.../pipeline/constant/TestPipeLineConstant.scala | 2 +-
9 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/docs/configuration/pipeline.md b/docs/configuration/pipeline.md
index d80b6dc94..f80dded7f 100644
--- a/docs/configuration/pipeline.md
+++ b/docs/configuration/pipeline.md
@@ -1,10 +1,10 @@
## pipeline configure
-| Module Name (Service Name) | Parameter Name | Default Value | Description |
-| -------- | -------- | ----- |----- |
-|pipeline| pipeline.output.isoverwtite | true | isoverwtite |
-|pipeline|pipeline.output.charset|UTF-8|charset|
-|pipeline|pipeline.field.split| , |split|
-|pipeline|wds.linkis.engine.pipeline.field.quote.retoch.enable|false |
field.quote.retoch.enable |
-|pipeline|wds.linkis.pipeline.export.excel.auto_format.enable| false |
auto_format.enable
+| Module Name (Service Name) | Parameter Name
| Default Value | Description |
+| -------- |------------------------------------------------------| -----
|---------------------------|
+|pipeline| pipeline.output.isoverwrite | true |
isoverwrite |
+|pipeline| pipeline.output.charset |UTF-8|
charset |
+|pipeline| pipeline.field.split | , | split
|
+|pipeline| wds.linkis.engine.pipeline.field.quote.retoch.enable |false |
field.quote.retoch.enable |
+|pipeline| wds.linkis.pipeline.export.excel.auto_format.enable | false |
auto_format.enable
diff --git a/docs/info-1.3.1.md b/docs/info-1.3.1.md
new file mode 100644
index 000000000..85e94f984
--- /dev/null
+++ b/docs/info-1.3.1.md
@@ -0,0 +1,5 @@
+## 参数变化
+
+| 模块名(服务名) | 类型 | 参数名
| 默认值 | 描述
|
+|------------------| -----
|----------------------------------------------------------------------|------|
------------------------------------------------------- |
+| ps-linkismanager | 修改 | pipeline.output.isoverwtite <br/>-><br/>
pipeline.output.isoverwrite | true |取值范围：true或false|
diff --git a/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml
b/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml
index 8b76c0ae6..7f47f06f6 100644
--- a/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml
+++ b/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml
@@ -1034,7 +1034,7 @@ data:
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
('pipeline.output.mold', '取值范围：csv或excel', '结果集导出类型','csv', 'OFT',
'[\"csv\",\"excel\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.field.split', '取值范围：，或\\t', 'csv分隔符',',', 'OFT',
'[\",\",\"\\\\t\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.output.charset', '取值范围：utf-8或gbk', '结果集导出字符集','gbk', 'OFT',
'[\"utf-8\",\"gbk\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
- 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
('pipeline.output.isoverwtite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
+ 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
('pipeline.output.isoverwrite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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-3，单位：个', 'pipeline引擎最大并发数','3', 'NumInterval',
'[1,3]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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',
'pipeline引擎初始化内存大小','2g', 'Regex', '^([1-9]|10)(G|g)$', '0', '0', '1',
'pipeline资源设置', 'pipeline');
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
('pipeline.output.shuffle.null.type', '取值范围：NULL或者BLANK', '空值替换','NULL', 'OFT',
'[\"NULL\",\"BLANK\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
diff --git a/linkis-dist/package/db/linkis_dml.sql
b/linkis-dist/package/db/linkis_dml.sql
index 7412aceda..fd5020269 100644
--- a/linkis-dist/package/db/linkis_dml.sql
+++ b/linkis-dist/package/db/linkis_dml.sql
@@ -96,7 +96,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
('pipeline.output.mold', '取值范围：csv或excel', '结果集导出类型','csv', 'OFT',
'[\"csv\",\"excel\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.field.split', '取值范围：，或\\t', 'csv分隔符',',', 'OFT',
'[\",\",\"\\\\t\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.output.charset', '取值范围：utf-8或gbk', '结果集导出字符集','gbk', 'OFT',
'[\"utf-8\",\"gbk\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
-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
('pipeline.output.isoverwtite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
+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
('pipeline.output.isoverwrite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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-3，单位：个', 'pipeline引擎最大并发数','3', 'NumInterval',
'[1,3]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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',
'pipeline引擎初始化内存大小','2g', 'Regex', '^([1-9]|10)(G|g)$', '0', '0', '1',
'pipeline资源设置', 'pipeline');
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
('pipeline.output.shuffle.null.type', '取值范围：NULL或者BLANK', '空值替换','NULL', 'OFT',
'[\"NULL\",\"BLANK\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
diff --git a/linkis-dist/package/db/module/linkis_configuration_dml.sql
b/linkis-dist/package/db/module/linkis_configuration_dml.sql
index 556f4dbc5..3e71eaeba 100644
--- a/linkis-dist/package/db/module/linkis_configuration_dml.sql
+++ b/linkis-dist/package/db/module/linkis_configuration_dml.sql
@@ -83,7 +83,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
('pipeline.output.mold', '取值范围：csv或excel', '结果集导出类型','csv', 'OFT',
'[\"csv\",\"excel\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.field.split', '取值范围：，或\\t', 'csv分隔符',',', 'OFT',
'[\",\",\"\\\\t\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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
('pipeline.output.charset', '取值范围：utf-8或gbk', '结果集导出字符集','gbk', 'OFT',
'[\"utf-8\",\"gbk\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
-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
('pipeline.output.isoverwtite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
+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
('pipeline.output.isoverwrite', '取值范围：true或false', '是否覆写','true', 'OFT',
'[\"true\",\"false\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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-3，单位：个', 'pipeline引擎最大并发数','3', 'NumInterval',
'[1,3]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
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',
'pipeline引擎初始化内存大小','2g', 'Regex', '^([1-9]|10)(G|g)$', '0', '0', '1',
'pipeline资源设置', 'pipeline');
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
('pipeline.output.shuffle.null.type', '取值范围：NULL或者BLANK', '空值替换','NULL', 'OFT',
'[\"NULL\",\"BLANK\"]', '0', '0', '1', 'pipeline引擎设置', 'pipeline');
diff --git a/linkis-dist/package/db/upgrade/1.3.1_schema/mysql/linkis_dml.sql
b/linkis-dist/package/db/upgrade/1.3.1_schema/mysql/linkis_dml.sql
index b56959a16..0670a9d53 100644
--- a/linkis-dist/package/db/upgrade/1.3.1_schema/mysql/linkis_dml.sql
+++ b/linkis-dist/package/db/upgrade/1.3.1_schema/mysql/linkis_dml.sql
@@ -16,4 +16,7 @@
*/
-- Update field for linkis_ps_dm_datasource_type_key
-UPDATE `linkis_ps_dm_datasource_type_key` SET `require`=0 WHERE
`data_source_type_id` = 1;
\ No newline at end of file
+UPDATE `linkis_ps_dm_datasource_type_key` SET `require`=0 WHERE
`data_source_type_id` = 1;
+
+-- update pipeline config key
+UPDATE `linkis_ps_configuration_config_key` SET `key` =
'pipeline.output.isoverwrite' WHERE `key` = 'pipeline.output.isoverwtite';
\ No newline at end of file
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/resources/linkis-engineconn.properties
b/linkis-engineconn-plugins/pipeline/src/main/resources/linkis-engineconn.properties
index ead632ccd..f5fcb9ac3 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/resources/linkis-engineconn.properties
+++
b/linkis-engineconn-plugins/pipeline/src/main/resources/linkis-engineconn.properties
@@ -14,7 +14,7 @@
#
#
-wds.linkis.engine.pipeline.output.isoverwtite=true
+wds.linkis.engine.pipeline.output.isoverwrite=true
wds.linkis.server.version=v1
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/PipeLineConstant.scala
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/PipeLineConstant.scala
index 86eed7321..77c2a3a8a 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/PipeLineConstant.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/PipeLineConstant.scala
@@ -21,7 +21,7 @@ object PipeLineConstant {
val DEFAULTC_HARSET = "utf-8"
val DEFAULT_SHEETNAME = "result"
val DEFAULT_DATEFORMATE = "yyyy-MM-dd HH:mm:ss"
- val PIPELINE_OUTPUT_ISOVERWRITE = "pipeline.output.isoverwtite"
+ val PIPELINE_OUTPUT_ISOVERWRITE = "pipeline.output.isoverwrite"
val PIPELINE_OUTPUT_SHUFFLE_NULL_TYPE = "pipeline.output.shuffle.null.type"
val PIPELINE_OUTPUT_CHARSET = "pipeline.output.charset"
val PIPELINE_FIELD_SPLIT = "pipeline.field.split"
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/test/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/TestPipeLineConstant.scala
b/linkis-engineconn-plugins/pipeline/src/main/test/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/TestPipeLineConstant.scala
index 4dfb87b1f..bd356061c 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/test/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/TestPipeLineConstant.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/test/scala/org/apache/linkis/manager/engineplugin/pipeline/constant/TestPipeLineConstant.scala
@@ -28,7 +28,7 @@ class TestPipeLineConstant {
Assertions.assertEquals("utf-8", PipeLineConstant.DEFAULTC_HARSET)
Assertions.assertEquals("result", PipeLineConstant.DEFAULT_SHEETNAME)
Assertions.assertEquals("yyyy-MM-dd HH:mm:ss",
PipeLineConstant.DEFAULT_DATEFORMATE)
- Assertions.assertEquals("pipeline.output.isoverwtite",
PipeLineConstant.PIPELINE_OUTPUT_ISOVERWRITE)
+ Assertions.assertEquals("pipeline.output.isoverwrite",
PipeLineConstant.PIPELINE_OUTPUT_ISOVERWRITE)
Assertions.assertEquals("pipeline.output.shuffle.null.type",
PipeLineConstant.PIPELINE_OUTPUT_SHUFFLE_NULL_TYPE)
Assertions.assertEquals("pipeline.output.charset",
PipeLineConstant.PIPELINE_OUTPUT_CHARSET)
Assertions.assertEquals("pipeline.field.split",
PipeLineConstant.PIPELINE_FIELD_SPLIT)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
