This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin5-beta-temp in repository https://gitbox.apache.org/repos/asf/kylin.git
commit cd991fd430d4b981f41738c9b93cd22e39016326 Author: XiaoxiangYu <x...@apache.org> AuthorDate: Fri Aug 11 11:11:23 2023 +0800 Minor fix --- build/release/release-pipeline-docker/README.md | 31 ++++++++++++++-------- .../release-machine/Dockerfile | 7 ++++- .../release-machine/conf/setenv.sh | 6 ++--- .../release-machine/script/entrypoint.sh | 2 +- .../components/common/ProjectEditModal/locales.js | 2 +- kystudio/src/components/monitor/job_dialog.vue | 2 +- .../src/components/project/project_authority.vue | 4 +-- kystudio/src/components/query/query_tab.vue | 2 +- .../studio/StudioModel/ModelEdit/index.vue | 12 ++++----- .../StudioModel/ModelList/ModelActions/locales.js | 2 +- kystudio/src/locale/en.js | 4 +-- .../src/main/resources/config/config_library.csv | 12 ++++----- .../rest/request/CachedUserUpdateRequest.java | 2 +- .../org/apache/kylin/common/KylinConfigBase.java | 1 - .../apache/kylin/common/exception/ErrorCode.java | 9 +++---- .../org/apache/kylin/common/msg/MsgPicker.java | 6 ++--- .../kylin/metadata/model/BadModelException.java | 2 +- .../apache/kylin/metadata/model/UpdateImpact.java | 2 +- .../metadata/model/schema/ImportModelContext.java | 2 +- .../kylin/metadata/project/NProjectLoader.java | 1 - .../src/main/resources/config/config_library.csv | 12 ++++----- .../kylin/rest/service/SparkSourceService.java | 2 +- .../kylin/rest/service/SparkSourceServiceTest.java | 2 +- .../sql_computedcolumn_DateUDF/query01.sql.disable | 1 - .../query01.sql.expected.disable | 1 - .../query02.sql.disable | 2 -- .../query02.sql.expected.disable | 2 -- .../query03.sql.disable | 2 -- .../query03.sql.expected.disable | 2 -- .../query06.sql.disable | 2 -- .../query06.sql.expected.disable | 1 - .../query07.sql.disable | 2 -- .../query07.sql.expected.disable | 2 -- .../query00.sql.disable | 2 -- .../query/sql_function/query06.sql.expected | 1 - .../query/sql_function/query11.sql.expected | 1 - .../query/sql_function/query12.sql.expected | 1 - .../query/sql_function/query13.sql.expected | 1 - .../query/sql_function/query19.sql.expected | 1 - .../query/sql_function/query20.sql.expected | 1 - .../query/sql_function/query21.sql.expected | 1 - .../query/sql_function/query22.sql.expected | 1 - .../query/sql_function/query23.sql.expected | 1 - .../query/sql_function/query25.sql.expected | 1 - .../query/sql_function/query26.sql.expected | 1 - .../sql_function_DateUDF/query01.sql.disable | 1 - .../sql_function_formatUDF/query02.sql.expected | 1 - .../sql_function_formatUDF/query03.sql.expected | 1 - .../sql_function_formatUDF/query04.sql.disable | 2 -- .../query04.sql.excepted.disable | 2 -- .../sql_function_formatUDF/query05.sql.disable | 2 -- .../query05.sql.excepted.disable | 2 -- .../query/sql_percentile/query02.sql.disabled | 1 - .../test/resources/query/sql_powerbi/query01.sql | 2 +- .../test/resources/query/sql_subquery/query18.sql | 1 - .../test/resources/query/sql_subquery/query19.sql | 1 - .../test/resources/query/sql_subquery/query25.sql | 1 - .../test/resources/query/sql_tableau/query67.sql | 1 - .../test/resources/query/sql_udf/query01.sql.todo | 1 - .../kylin/rest/controller/NTableController.java | 4 +-- .../rest/controller/open/OpenTableController.java | 6 ++--- .../main/resources/bisync/tds/tableau.template.xml | 2 +- .../src/main/resources/config/config_library.csv | 12 ++++----- .../rest/controller/v2/NQueryMetaController.java | 6 ++--- .../src/test/resources/tdvt/inputs/untest.sql | 4 +-- .../src/main/resources/config/config_library.csv | 12 ++++----- .../kylin/engine/spark/job/TestUdfManager.scala | 2 +- .../apache/kylin/query/util/RuntimeHelper.scala | 1 - 68 files changed, 93 insertions(+), 132 deletions(-) diff --git a/build/release/release-pipeline-docker/README.md b/build/release/release-pipeline-docker/README.md index c8913c41e5..0a4289e73d 100644 --- a/build/release/release-pipeline-docker/README.md +++ b/build/release/release-pipeline-docker/README.md @@ -1,27 +1,35 @@ ## Background -These scripts and docker image are used to provide an **easy and standard way** for release manager to complete [apache release process](https://www.apache.org/legal/release-policy.html) . +The docker image is used to provide an **easy and standard way** +for [release manager](https://infra.apache.org/release-publishing.html#releasemanager) +to complete [apache release process](https://www.apache.org/legal/release-policy.html) +and obey [apache release policy](https://www.apache.org/legal/release-policy.html). Some source code are modified from [apache spark release](https://github.com/apache/spark/tree/master/dev/create-release) scripts. +Kylin project use [maven-release-plugin](https://maven.apache.org/maven-release/maven-release-plugin/) to release source code and maven artifacts + +It also provided a way to publish documentation for Kylin 5. ## How to release ### What you need to prepare -| Item | Used for | Reference | -|--------------------------------------------------------------------------|----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------| -| Apache Account<br/>(Should belongs to PMC member) <br> (id and password) | 1. Write access to ASF's Gitbox service and SVN service <br> 2. Send email | https://id.apache.org | -| GPG Key <br> (key files and GPG_PASSPHRASE) | Sign your released files(binary and compressed source files) | https://infra.apache.org/release-signing.html <br> https://infra.apache.org/release-distribution.html | -| Laptop which installed Docker | The place you run release scripts | N/A | +| Item | Used for | Reference | +|-------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------| +| Apache Account<br/>(Should belongs to Kylin PMC) <br> (id and password) | 1. Write access to ASF's Gitbox service and SVN service <br> 2. Send email for release announcement | https://id.apache.org | +| GPG Key <br> (key files and GPG_PASSPHRASE) | Sign and distribute your released files(binary and compressed source files) | https://infra.apache.org/release-signing.html <br> https://infra.apache.org/release-distribution.html | +| user and password for nexus server | upload artifacts to ASF's nexus server | | +| Laptop which installed Docker | The place you run release scripts, should install Docker Engine | N/A | + -- Update `CURRENT_KYLIN_VERSION` in `KylinVersion.java` . +-[ ] Update `CURRENT_KYLIN_VERSION` in `KylinVersion.java` . ### Step 1 : Configure Basic Info and Copy GPG Private Key - Start docker container ```bash -docker run --name release-machine --hostname release-machine -i -t apachekylin/release-machine:5-alpha bash +docker run --name release-machine --hostname release-machine -i -t apachekylin/release-machine:latest bash # docker ps -f name=release-machine ``` @@ -48,7 +56,6 @@ docker cp ~/XXX.private.key release-machine:/root | RELEASE_STEP | (default is **publish-rc**)<br/>Legal values are <br/> publish-rc : upload binary to release candidate folder <br> publish : publish release binary officially after vote passed | - #### Set user and password in **servers** of `~/.m2/settings.xml` Otherwise, you will fail in maven-deploy-plugin with http 401 error. @@ -82,10 +89,12 @@ bash release-publish.sh ``` - Prepare vote template for announcement -- Close maven repository +- Close maven repository in Web UI ### Step 7 : Remove Docker container ```bash docker rm release-machine -``` \ No newline at end of file +``` + +## Publish Official Documentation \ No newline at end of file diff --git a/build/release/release-pipeline-docker/release-machine/Dockerfile b/build/release/release-pipeline-docker/release-machine/Dockerfile index 355925443d..bb95bacd06 100644 --- a/build/release/release-pipeline-docker/release-machine/Dockerfile +++ b/build/release/release-pipeline-docker/release-machine/Dockerfile @@ -15,7 +15,12 @@ # limitations under the License. # -# Docker image for Kylin 5.X release +# This is the Docker Image for Kylin 5 release process +# +# For what is release policy and release process, please refer to following link: +# 1. https://www.apache.org/legal/release-policy.html +# 2. https://infra.apache.org/release-publishing.html + FROM openjdk:8-slim ENV M2_HOME /root/apache-maven-3.8.8 diff --git a/build/release/release-pipeline-docker/release-machine/conf/setenv.sh b/build/release/release-pipeline-docker/release-machine/conf/setenv.sh index a032e32b47..c69f508107 100644 --- a/build/release/release-pipeline-docker/release-machine/conf/setenv.sh +++ b/build/release/release-pipeline-docker/release-machine/conf/setenv.sh @@ -20,10 +20,10 @@ ## Basic Info export DRY_RUN=0 # use in maven-release-plugin -export RELEASE_VERSION=5.0.0-alpha -export NEXT_VERSION=5.0.0-beta +export RELEASE_VERSION= +export NEXT_VERSION= export GIT_BRANCH=kylin5 -export GIT_USERNAME=XiaoxiangYu +export GIT_USERNAME= export RC_NAME=rc1 # publish-rc / publish export RELEASE_STEP=publish-rc diff --git a/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh b/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh index 28c867fb18..8dc1ab4e32 100644 --- a/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh +++ b/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh @@ -20,4 +20,4 @@ # */ # -# Run release-publish.sh instead. \ No newline at end of file +# TODO:Run release-publish.sh instead. \ No newline at end of file diff --git a/kystudio/src/components/common/ProjectEditModal/locales.js b/kystudio/src/components/common/ProjectEditModal/locales.js index 14d4a49bea..7df981b9b6 100644 --- a/kystudio/src/components/common/ProjectEditModal/locales.js +++ b/kystudio/src/components/common/ProjectEditModal/locales.js @@ -16,6 +16,6 @@ export default { propertyEmptyKey: 'Project Configuration name is required.', propertyEmptyValue: 'Project Configuration value is required.', aiProjectTips: 'Projects could be based on business needs. User permissions and data are isolated by project.', - resourceGroupTips: 'Resource group mode is enabled in the Kyligence Manager. The added project needs to be allocated to a resource group in Kyligence Manager before using.' + resourceGroupTips: 'Resource group mode is enabled in the . The added project needs to be allocated to a resource group in N/A before using.' } } diff --git a/kystudio/src/components/monitor/job_dialog.vue b/kystudio/src/components/monitor/job_dialog.vue index 32eddcca9f..d09a55b4c1 100644 --- a/kystudio/src/components/monitor/job_dialog.vue +++ b/kystudio/src/components/monitor/job_dialog.vue @@ -2,7 +2,7 @@ <div> <el-alert show-icon :closable="false" :show-background="false" type="info" class="download-tips"> <span slot="title">{{$t('outputTips')}}<el-button size="mini" nobg-text @click="downloadLogs">{{$t('download')}}</el-button>{{$t('end')}}</span> - <!-- 只在 KC 中使用 --> + <!-- 只在 N/A 中使用 --> </el-alert> <!-- <el-alert show-icon :show-background="false" type="info" class="download-tips" v-else> <span slot="title">{{$t('outputTipsKC')}}</span> diff --git a/kystudio/src/components/project/project_authority.vue b/kystudio/src/components/project/project_authority.vue index 518c95fdd1..af54157876 100644 --- a/kystudio/src/components/project/project_authority.vue +++ b/kystudio/src/components/project/project_authority.vue @@ -208,12 +208,12 @@ import userAccess from './user_access' deleteAccessTitle: 'Delete Authorization', authorTips: 'Can\'t add System Admin to the list, as this role already has full access to all projects.', authorTips1: 'By default, the added user/user group would be granted full access to all the tables in the project.', - authorTips2: `<div class="ksd-mb-8">What roles does Kyligence Enterprise provide?</div> + authorTips2: `<div class="ksd-mb-8">What roles does Kylin 5 provide?</div> <p><span>Project Admin</span><span>For the project admin who needs all permission and could manage and maintain this project, including loading tables, authorizing user access permission, etc.</span></p> <p><span>Management</span><span>For the model designer who needs permission to load tables, design models and indexes, build indexes and monitor job status.</span></p> <p><span>Operation</span><span>For the operator who needs permission to build indexes and monitor job status.</span></p> <p><span>Query</span><span>For the business analyst who needs permission to query tables or indexes.</span></p>`, - authorTips3: `<div class="ksd-mb-8">What roles does Kyligence Enterprise provide?</div> + authorTips3: `<div class="ksd-mb-8">What roles does Kylin 5 provide?</div> <p><span>Project Admin</span><span>For the project admin who needs all permission and could manage and maintain this project, including loading tables, authorizing user access permission, etc.</span></p> <p><span>Management</span><span>For the model designer who needs permission to load tables, design models and indexes, build indexes and monitor job status.</span></p> <p><span>Operation</span><span>For the operator who needs permission to design indexes, build indexes and monitor job status.</span></p> diff --git a/kystudio/src/components/query/query_tab.vue b/kystudio/src/components/query/query_tab.vue index 51130e548c..b5c4f6f183 100644 --- a/kystudio/src/components/query/query_tab.vue +++ b/kystudio/src/components/query/query_tab.vue @@ -105,7 +105,7 @@ import { kylinConfirm, handleSuccess, handleError } from '../../util/business' htraceTips: 'Please make sure Zipkin server is properly deployed according to the manual of performance diagnose package.', queryError: 'The query fails.', queryTimeOut: 'The request timeout, please check the network situation and Kylin service instance status. If the resource group is turned on, please make sure that the project is bound to the query resource group and there are available query instances', - queryTimeOutInCloud: 'The request timeout, please check the network situation and Kyligence Engine service instance status.' + queryTimeOutInCloud: 'The request timeout, please check the network situation and Kylin 5 service instance status.' } } }) diff --git a/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue b/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue index 26fdd87402..ee17a8a4df 100644 --- a/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue +++ b/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue @@ -2211,7 +2211,7 @@ export default class ModelEdit extends Vue { if (localStorage.getItem('isFirstAddModel') === 'true') { await this.showFistAddModelGuide() } - const keVersion = this.$store.state.system.serverAboutKap['ke.version']?.match(/Kyligence Enterprise (\d+.\d+.\d+.\d+)-\w+/)[1] + const keVersion = this.$store.state.system.serverAboutKap['ke.version']?.match(/Kylin 5 (\d+.\d+.\d+.\d+)-\w+/)[1] if ((localStorage.getItem('isFirstUpdateModel') === 'true' || !localStorage.getItem('isFirstUpdateModel')) && (keVersion && +keVersion.split('.').join('') >= 45160) && localStorage.getItem('isFirstAddModel') === 'false') { await this.showUpdateGuide() } @@ -2531,7 +2531,7 @@ export default class ModelEdit extends Vue { color: @ke-color-primary; } } - + } .join-type-hide { display: none; @@ -2782,7 +2782,7 @@ export default class ModelEdit extends Vue { right: 20px; bottom: 20px; } - + .panel-box{ box-shadow: 0 2px 4px 0 @color-text-placeholder; position:relative; @@ -3107,7 +3107,7 @@ export default class ModelEdit extends Vue { background: @grey-2; } } - + .search-action-result { width:620px; // margin: 0 auto; @@ -3448,7 +3448,7 @@ export default class ModelEdit extends Vue { cursor: default; } ul { - li { + li { padding-left: 5px; cursor: move; border-top: solid 2px transparent; @@ -3640,4 +3640,4 @@ export default class ModelEdit extends Vue { } } } -</style> \ No newline at end of file +</style> diff --git a/kystudio/src/components/studio/StudioModel/ModelList/ModelActions/locales.js b/kystudio/src/components/studio/StudioModel/ModelList/ModelActions/locales.js index 805f28fdb0..6d6320c6e6 100644 --- a/kystudio/src/components/studio/StudioModel/ModelList/ModelActions/locales.js +++ b/kystudio/src/components/studio/StudioModel/ModelList/ModelActions/locales.js @@ -42,7 +42,7 @@ export default { exportTDSOptions2: 'Include the ones in both aggregate indexes and table indexes', exportTDSOptions3: 'Include all columns for dimension or measure, even if they are not included in any aggregate or table index', connectODBC: 'Other ODBC data sources(default)', - connectTableau: 'Tableau Kyligence Connector', + connectTableau: '', exportTDSOfflineTips: 'The exported TDS file can\'t be used for queries if the model is OFFLINE. Please make sure that the model goes online when using this TDS file.', delModelTip: 'Are you sure you want to drop the model {modelName}?', delModelTitle: 'Delete Model', diff --git a/kystudio/src/locale/en.js b/kystudio/src/locale/en.js index 0b860656db..1a9a4f48dd 100644 --- a/kystudio/src/locale/en.js +++ b/kystudio/src/locale/en.js @@ -169,7 +169,7 @@ exports.default = { streamingConnectHiveError: 'Join hive table with streaming table is not supported.', seeDetail: 'Details', notConnectServer: 'Cannot connect the Kylin server. Please check your network or Kylin server status.', - notConnectServerIframe: 'Cannot connect the Kyligence server. Please check your network or Kyligence server status.', + notConnectServerIframe: 'Cannot connect the Kylin server. Please check your network or Kylin server status.', timeOut: 'Request timed out!', willClose: 'Are you sure you want to continue closing the window?', overwriteWarnTip: 'Current action will overwrite existed results, are you sure you want to continue?', @@ -469,7 +469,7 @@ exports.default = { rangeInfoTip: 'The load range refers to the data from the start time(included) to end time(excluded).' }, login: { - signIn: 'Kyligence Account | Sign In' + signIn: 'N/A' }, menu: { studio: 'Data Asset', diff --git a/src/common-booter/src/main/resources/config/config_library.csv b/src/common-booter/src/main/resources/config/config_library.csv index 631c673653..b9ed887948 100644 --- a/src/common-booter/src/main/resources/config/config_library.csv +++ b/src/common-booter/src/main/resources/config/config_library.csv @@ -80,7 +80,7 @@ kylin.engine.global-dict-check-enabled,boolean,是否开启全局字典检查,Wh kylin.engine.index-column-flattable-enabled,boolean,是否开启平表中只包含索引列,Whether to open the flat watch contains only index columns,TRUE,TRUE kylin.engine.inferior-flattable-enabled,boolean,是否开启亚平表功能,Whether to enable inferior flat table,TRUE,TRUE kylin.engine.inferior-flattable-storage-level,String,亚平表数据的缓存级别,Storage level for inferior flat table,TRUE,TRUE -kylin.engine.log.local-working-directory,String,KC 环境中,日志的工作路径,"In the KC environment, the working path of the log",TRUE,TRUE +kylin.engine.log.local-working-directory,String,N/A 环境中,日志的工作路径,"In the N/A environment, the working path of the log",TRUE,TRUE kylin.engine.lookup-table-default-count-value,Long,维度表的默认行数,Default number of the dimension table,TRUE,TRUE kylin.engine.max-allocation-proportion,Double,yarn集群队列中的内存最大使用比例,Maximum use ratio in the Yarn cluster queue,TRUE,TRUE kylin.engine.max-retry-time,Int,spark构建作业的重试次数,SPARK to construct homework renewal times,TRUE,TRUE @@ -110,7 +110,7 @@ kylin.engine.spark.sampling-class-name,String,spark抽样作业实现类,SPARK s kylin.engine.spark.snapshot-build-class-name,String,构建 snapshot job 的类名,Build the name of Snapshot Job,TRUE,TRUE kylin.engine.spark.task-core-factor,Int,多少 spark 任务使用一个 core,How many spark tasks use a core,TRUE,TRUE kylin.engine.spark.task-impact-instance-enabled,boolean,spark 构建作业是否根据任务数量来计算core数量,Whether spark builds a job based on the number of tasks calculates the number of cores,TRUE,TRUE -kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,KC 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO. Kyligence.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE +kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,N/A 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE kylin.engine.streaming-base-ckeckpoint-location,String,实时OLAP构建作业的check point目录,Real -time OLAP CHCK POINT directory that builds homework,TRUE,TRUE kylin.engine.streaming-duration,Long,实时OLAP构建定时触发,单位毫秒,"Real -time OLAP builds regular triggers, the unit milliseconds",TRUE,TRUE kylin.engine.streaming-metrics-enabled,boolean,实时OLAP构建监控是否开启,Real -time OLAP Construction Monitoring Whether it is turned on,TRUE,TRUE @@ -233,8 +233,8 @@ kylin.kerberos.principal,String,kerberos prncipal配置,Kerberos PRNCIPAL config kylin.kerberos.project-level-enabled,boolean,项目级kerberous配置开关,Project -level Kerberous configuration switch,TRUE,TRUE kylin.kerberos.ticket-refresh-interval-minutes,Long,zk Kerberos ticket更新周期,ZK KERBEROS TICKET update cycle,TRUE,TRUE kylin.kerberos.zookeeper-server-principal,String,zk Kerberos principal,zk Kerberos principal,TRUE,TRUE -kylin.lightning.cluster-id,Long,KC 环境中,集群 id,"In the KC environment, cluster ID",TRUE,TRUE -kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the KC environment, the path of zookeeper",TRUE,TRUE +kylin.lightning.cluster-id,Long,N/A 环境中,集群 id,"In the N/A environment, cluster ID",TRUE,TRUE +kylin.lightning.server.zookeeper-node,String,N/A 环境中,zookeeper 的路径,"In the N/A environment, the path of zookeeper",TRUE,TRUE kylin.metadata.audit-log.batch-size,Int,读取audit log批次大小,Read the Audit Log batch size,TRUE,TRUE kylin.metadata.audit-log.batch-timeout,String,审计日志执行 sql 的超时时间,The audit log executes the timeout of SQL,TRUE,TRUE kylin.metadata.audit-log.catchup-interval,String,audit log同步频率,Audit log synchronous frequency,TRUE,TRUE @@ -558,8 +558,8 @@ kylin.engine.snapshot.specified-spark-conf-enabled,boolean,默认关闭,开启 kylin.source.hive.support-special-symbol-in-hive-column,boolean,默认关闭,开启后支持hive列包含特殊字符(#@-+等等),不开启只支持数值字符-,"Turn off by default. After opening, the HIVE column contains special characters (#@-+, etc.).",TRUE,TRUE kylin.streaming.job-meta-retained-time,String,默认2h,实时任务hdfs元数据的保留时间,超过则会被清理,"By default 2H, the retention time of real -time task HDFS metadata will be cleaned up if it exceeds",TRUE,TRUE kylin.streaming.meta-scheme,String,"可选""jdbc"",表示实时任务从jdbc读取还是从Hdfs读取元数据","Optional ""JDBC"", indicating that real -time tasks are read from JDBC or from HDFS read metadata",TRUE,TRUE -kylin.engine.cluster-manager-health-check-max-times,Int,"KC 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the KC environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE -kylin.engine.cluster-manager-heal-check-interval-second,Int,"KC 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the KC environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is t [...] +kylin.engine.cluster-manager-health-check-max-times,Int,"N/A 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the N/A environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE +kylin.engine.cluster-manager-heal-check-interval-second,Int,"N/A 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the N/A environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is [...] kylin.env.log-rotate-check-cron,String,日志滚动的 cron 表达式,cron for log rotate,FALSE,TRUE kylin.env.log-rotate-enabled,boolean,是否开启日志滚动,whether to enable log rotate,FALSE,TRUE kylin.model.measure-name-check-enabled,boolean,是否校验度量名称,whether to validate measure's name,FALSE,TRUE diff --git a/src/common-service/src/main/java/org/apache/kylin/rest/request/CachedUserUpdateRequest.java b/src/common-service/src/main/java/org/apache/kylin/rest/request/CachedUserUpdateRequest.java index e31060bd94..933639bc3c 100644 --- a/src/common-service/src/main/java/org/apache/kylin/rest/request/CachedUserUpdateRequest.java +++ b/src/common-service/src/main/java/org/apache/kylin/rest/request/CachedUserUpdateRequest.java @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; /** - * used by KC for refresh guava cache in static-user-manager + * used by N/A for refresh guava cache in static-user-manager */ @Getter diff --git a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index ac7d894ee4..23d53d3367 100644 --- a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -311,7 +311,6 @@ public abstract class KylinConfigBase implements Serializable { setProperty("kylin.log.spark-driver-properties-file", getLogSparkDriverPropertiesFile()); setProperty("kylin.log.spark-appmaster-properties-file", getLogSparkAppMasterPropertiesFile()); - // https://github.com/kyligence/kap/issues/12654 this.properties.put(WORKING_DIR_PROP, makeQualified(new Path(this.properties.getProperty(WORKING_DIR_PROP, KYLIN_ROOT))).toString()); if (this.properties.getProperty(DATA_WORKING_DIR_PROP) != null) { diff --git a/src/core-common/src/main/java/org/apache/kylin/common/exception/ErrorCode.java b/src/core-common/src/main/java/org/apache/kylin/common/exception/ErrorCode.java index 0c0f2cf767..171dc8c4f9 100644 --- a/src/core-common/src/main/java/org/apache/kylin/common/exception/ErrorCode.java +++ b/src/core-common/src/main/java/org/apache/kylin/common/exception/ErrorCode.java @@ -23,7 +23,6 @@ import java.net.URL; import java.util.Locale; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.util.FileUtils; import org.apache.kylin.common.util.ResourceUtils; @@ -68,11 +67,11 @@ public class ErrorCode implements Serializable { } public static void setMsg(String lang) { - if (StringUtils.equalsIgnoreCase(CN_LANG, lang)) { - FRONT_MAP.set(ZH_MAP); - } else { +// if (StringUtils.equalsIgnoreCase(CN_LANG, lang)) { +// FRONT_MAP.set(ZH_MAP); +// } else { FRONT_MAP.set(EN_MAP); - } +// } } private static ImmutableMap<String, String> getMap() { diff --git a/src/core-common/src/main/java/org/apache/kylin/common/msg/MsgPicker.java b/src/core-common/src/main/java/org/apache/kylin/common/msg/MsgPicker.java index 3211d47cf8..e69dd5f995 100644 --- a/src/core-common/src/main/java/org/apache/kylin/common/msg/MsgPicker.java +++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/MsgPicker.java @@ -22,9 +22,9 @@ public class MsgPicker { private static ThreadLocal<Message> msg = new ThreadLocal<Message>(); public static void setMsg(String lang) { - if ("cn".equals(lang)) - msg.set(CnMessage.getInstance()); - else + //if ("cn".equals(lang)) + //msg.set(CnMessage.getInstance()); + //else msg.set(Message.getInstance()); } diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/BadModelException.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/BadModelException.java index 43150778b9..48fb55ab1c 100644 --- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/BadModelException.java +++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/BadModelException.java @@ -33,7 +33,7 @@ public class BadModelException extends KylinException { SAME_EXPR_DIFF_NAME, // another model already has defined same expr but different cc name SELF_CONFLICT_WITH_SAME_NAME, // cc conflicts with self's other cc SELF_CONFLICT_WITH_SAME_EXPRESSION, // cc conflicts with self's other cc - LOOKUP_CC_NOT_REFERENCING_ITSELF // see io.kyligence.kap.metadata.model.KapModel.initComputedColumns() + LOOKUP_CC_NOT_REFERENCING_ITSELF } @JsonProperty diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/UpdateImpact.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/UpdateImpact.java index bc8b71ff5e..044252bfea 100644 --- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/UpdateImpact.java +++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/UpdateImpact.java @@ -30,7 +30,7 @@ import lombok.Setter; /** * Updating cc expression will cause change on both cc and measure. * This UpdateImpact records changed cc's and measure's id during cc modification in - * io.kyligence.kap.rest.service.ModelSemanticHelper#updateModelColumns. + * ModelSemanticHelper#updateModelColumns. */ @Getter diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ImportModelContext.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ImportModelContext.java index b0f7886335..821f242aea 100644 --- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ImportModelContext.java +++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ImportModelContext.java @@ -121,7 +121,7 @@ public class ImportModelContext implements AutoCloseable { importResourceStore.putResourceWithoutCheck(resPath, raw.getByteSource(), raw.getTimestamp(), 0); }); - // put target project into importResourceStore in case of broken io.kyligence.kap.metadata.cube.model.IndexPlan.initConfig4IndexPlan + // put target project into importResourceStore in case of broken IndexPlan.initConfig4IndexPlan importResourceStore.checkAndPutResource(ProjectInstance.concatResourcePath(targetProject), targetResourceStore.getResource(ProjectInstance.concatResourcePath(targetProject)).getByteSource(), -1); diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/project/NProjectLoader.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/project/NProjectLoader.java index 4f5572e70a..1b80aaf299 100644 --- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/project/NProjectLoader.java +++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/project/NProjectLoader.java @@ -140,7 +140,6 @@ public class NProjectLoader { // before parallel stream, should use outside KylinConfig.getInstanceFromEnv() // in case of load is executed in thread. - // eg. io.kyligence.kap.smart.query.AbstractQueryRunner.SUGGESTION_EXECUTOR_POOL KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); pi.getRealizationEntries().parallelStream().forEach(entry -> { IRealization realization = registry.getRealization(entry.getType(), entry.getRealization()); diff --git a/src/data-loading-booter/src/main/resources/config/config_library.csv b/src/data-loading-booter/src/main/resources/config/config_library.csv index 631c673653..b9ed887948 100644 --- a/src/data-loading-booter/src/main/resources/config/config_library.csv +++ b/src/data-loading-booter/src/main/resources/config/config_library.csv @@ -80,7 +80,7 @@ kylin.engine.global-dict-check-enabled,boolean,是否开启全局字典检查,Wh kylin.engine.index-column-flattable-enabled,boolean,是否开启平表中只包含索引列,Whether to open the flat watch contains only index columns,TRUE,TRUE kylin.engine.inferior-flattable-enabled,boolean,是否开启亚平表功能,Whether to enable inferior flat table,TRUE,TRUE kylin.engine.inferior-flattable-storage-level,String,亚平表数据的缓存级别,Storage level for inferior flat table,TRUE,TRUE -kylin.engine.log.local-working-directory,String,KC 环境中,日志的工作路径,"In the KC environment, the working path of the log",TRUE,TRUE +kylin.engine.log.local-working-directory,String,N/A 环境中,日志的工作路径,"In the N/A environment, the working path of the log",TRUE,TRUE kylin.engine.lookup-table-default-count-value,Long,维度表的默认行数,Default number of the dimension table,TRUE,TRUE kylin.engine.max-allocation-proportion,Double,yarn集群队列中的内存最大使用比例,Maximum use ratio in the Yarn cluster queue,TRUE,TRUE kylin.engine.max-retry-time,Int,spark构建作业的重试次数,SPARK to construct homework renewal times,TRUE,TRUE @@ -110,7 +110,7 @@ kylin.engine.spark.sampling-class-name,String,spark抽样作业实现类,SPARK s kylin.engine.spark.snapshot-build-class-name,String,构建 snapshot job 的类名,Build the name of Snapshot Job,TRUE,TRUE kylin.engine.spark.task-core-factor,Int,多少 spark 任务使用一个 core,How many spark tasks use a core,TRUE,TRUE kylin.engine.spark.task-impact-instance-enabled,boolean,spark 构建作业是否根据任务数量来计算core数量,Whether spark builds a job based on the number of tasks calculates the number of cores,TRUE,TRUE -kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,KC 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO. Kyligence.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE +kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,N/A 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE kylin.engine.streaming-base-ckeckpoint-location,String,实时OLAP构建作业的check point目录,Real -time OLAP CHCK POINT directory that builds homework,TRUE,TRUE kylin.engine.streaming-duration,Long,实时OLAP构建定时触发,单位毫秒,"Real -time OLAP builds regular triggers, the unit milliseconds",TRUE,TRUE kylin.engine.streaming-metrics-enabled,boolean,实时OLAP构建监控是否开启,Real -time OLAP Construction Monitoring Whether it is turned on,TRUE,TRUE @@ -233,8 +233,8 @@ kylin.kerberos.principal,String,kerberos prncipal配置,Kerberos PRNCIPAL config kylin.kerberos.project-level-enabled,boolean,项目级kerberous配置开关,Project -level Kerberous configuration switch,TRUE,TRUE kylin.kerberos.ticket-refresh-interval-minutes,Long,zk Kerberos ticket更新周期,ZK KERBEROS TICKET update cycle,TRUE,TRUE kylin.kerberos.zookeeper-server-principal,String,zk Kerberos principal,zk Kerberos principal,TRUE,TRUE -kylin.lightning.cluster-id,Long,KC 环境中,集群 id,"In the KC environment, cluster ID",TRUE,TRUE -kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the KC environment, the path of zookeeper",TRUE,TRUE +kylin.lightning.cluster-id,Long,N/A 环境中,集群 id,"In the N/A environment, cluster ID",TRUE,TRUE +kylin.lightning.server.zookeeper-node,String,N/A 环境中,zookeeper 的路径,"In the N/A environment, the path of zookeeper",TRUE,TRUE kylin.metadata.audit-log.batch-size,Int,读取audit log批次大小,Read the Audit Log batch size,TRUE,TRUE kylin.metadata.audit-log.batch-timeout,String,审计日志执行 sql 的超时时间,The audit log executes the timeout of SQL,TRUE,TRUE kylin.metadata.audit-log.catchup-interval,String,audit log同步频率,Audit log synchronous frequency,TRUE,TRUE @@ -558,8 +558,8 @@ kylin.engine.snapshot.specified-spark-conf-enabled,boolean,默认关闭,开启 kylin.source.hive.support-special-symbol-in-hive-column,boolean,默认关闭,开启后支持hive列包含特殊字符(#@-+等等),不开启只支持数值字符-,"Turn off by default. After opening, the HIVE column contains special characters (#@-+, etc.).",TRUE,TRUE kylin.streaming.job-meta-retained-time,String,默认2h,实时任务hdfs元数据的保留时间,超过则会被清理,"By default 2H, the retention time of real -time task HDFS metadata will be cleaned up if it exceeds",TRUE,TRUE kylin.streaming.meta-scheme,String,"可选""jdbc"",表示实时任务从jdbc读取还是从Hdfs读取元数据","Optional ""JDBC"", indicating that real -time tasks are read from JDBC or from HDFS read metadata",TRUE,TRUE -kylin.engine.cluster-manager-health-check-max-times,Int,"KC 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the KC environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE -kylin.engine.cluster-manager-heal-check-interval-second,Int,"KC 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the KC environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is t [...] +kylin.engine.cluster-manager-health-check-max-times,Int,"N/A 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the N/A environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE +kylin.engine.cluster-manager-heal-check-interval-second,Int,"N/A 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the N/A environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is [...] kylin.env.log-rotate-check-cron,String,日志滚动的 cron 表达式,cron for log rotate,FALSE,TRUE kylin.env.log-rotate-enabled,boolean,是否开启日志滚动,whether to enable log rotate,FALSE,TRUE kylin.model.measure-name-check-enabled,boolean,是否校验度量名称,whether to validate measure's name,FALSE,TRUE diff --git a/src/datasource-service/src/main/java/org/apache/kylin/rest/service/SparkSourceService.java b/src/datasource-service/src/main/java/org/apache/kylin/rest/service/SparkSourceService.java index fbf3a1387e..4718713c27 100644 --- a/src/datasource-service/src/main/java/org/apache/kylin/rest/service/SparkSourceService.java +++ b/src/datasource-service/src/main/java/org/apache/kylin/rest/service/SparkSourceService.java @@ -296,7 +296,7 @@ public class SparkSourceService extends BasicService { fileSystem.copyFromLocalFile(new Path(parquetFile.getAbsolutePath()), new Path(hdfsPath)); } } - // KC-6666, check and delete location + // N/A-6666, check and delete location String tbLocation = String.format(Locale.ROOT, "%s/%s", ss.catalog().getDatabase(db).locationUri(), tableName); FileSystem fs = FileSystem.get(ss.sparkContext().hadoopConfiguration()); diff --git a/src/datasource-service/src/test/java/org/apache/kylin/rest/service/SparkSourceServiceTest.java b/src/datasource-service/src/test/java/org/apache/kylin/rest/service/SparkSourceServiceTest.java index bc306dedf9..152ca5eaa7 100644 --- a/src/datasource-service/src/test/java/org/apache/kylin/rest/service/SparkSourceServiceTest.java +++ b/src/datasource-service/src/test/java/org/apache/kylin/rest/service/SparkSourceServiceTest.java @@ -293,7 +293,7 @@ public class SparkSourceServiceTest extends NLocalFileMetadataTestCase { @Test public void testLoadSamples() throws IOException, InterruptedException { Assert.assertEquals(8, sparkSourceService.loadSamples(ss, SaveMode.Overwrite).size()); - // KC-6666, table not exists but table location exists + // N/A-6666, table not exists but table location exists // re-create spark context and re-load samples { ss.stop(); diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.disable index dff3f0a166..5707988e19 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.disable @@ -1,5 +1,4 @@ ---disable reason: https://github.com/Kyligence/KAP/issues/14425 select --add_months(CAL_DT,2), count(distinct date_part('YEAR',CAL_DT)), count(distinct date_part('MONTH',CAL_DT)), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.expected.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.expected.disable index 9776c3cf09..35d1c898bf 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.expected.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_DateUDF/query01.sql.expected.disable @@ -1,5 +1,4 @@ ---disable reason: https://github.com/Kyligence/KAP/issues/14425 select --add_months(CAL_DT,2), count(distinct date_format(CAL_DT,'y')), count(distinct date_format(CAL_DT,'M')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.disable index 30f2fecaa4..f197f012ac 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(date_format(CAL_DT,'YEAR')), count(date_format(CAL_DT,'y')), count(date_format(CAL_DT,'Y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.expected.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.expected.disable index eb1a024356..3144492bf9 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.expected.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query02.sql.expected.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(date_format(CAL_DT,'y')), count(date_format(CAL_DT,'y')), count(date_format(CAL_DT,'Y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.disable index 10ae5dd480..db4279d6b6 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 --test count(date_format(timestamp,part) select count(date_format(TEST_TIME_ENC,'YEAR')), count(date_format(TEST_TIME_ENC,'Y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.expected.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.expected.disable index 1181c64d33..cdaba4d125 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.expected.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query03.sql.expected.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(date_format(TEST_TIME_ENC,'y')), count(date_format(TEST_TIME_ENC,'Y')), count(date_format(TEST_TIME_ENC,'y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.disable index 881cdb6900..56766582a0 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.disable @@ -1,5 +1,3 @@ - ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(distinct date_format(CAL_DT,'YEAR')), count(distinct date_format(CAL_DT,'y')), count(distinct date_format(CAL_DT,'Y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.expected.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.expected.disable index bef3dc1410..7463f0f760 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.expected.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query06.sql.expected.disable @@ -1,5 +1,4 @@ ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(distinct date_format(CAL_DT,'y')), count(distinct date_format(CAL_DT,'y')), count(distinct date_format(CAL_DT,'Y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.disable index 3d90fce549..fd049e2a55 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.disable @@ -1,6 +1,4 @@ - ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(distinct date_format(TEST_TIME_ENC,'YEAR')), count(distinct date_format(TEST_TIME_ENC,'Y')), count(distinct date_format(TEST_TIME_ENC,'y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.expected.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.expected.disable index 9ba825b3e7..63c980e21e 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.expected.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_formatUDF/query07.sql.expected.disable @@ -1,6 +1,4 @@ - ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select count(distinct date_format(TEST_TIME_ENC,'y')), count(distinct date_format(TEST_TIME_ENC,'Y')), count(distinct date_format(TEST_TIME_ENC,'y')), diff --git a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_ifnull_timestamp/query00.sql.disable b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_ifnull_timestamp/query00.sql.disable index 91fa555464..ce2c4c139e 100644 --- a/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_ifnull_timestamp/query00.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_computedcolumn/sql_computedcolumn_ifnull_timestamp/query00.sql.disable @@ -1,6 +1,4 @@ ---https://github.com/Kyligence/KAP/issues/13977 ---disable reason: https://github.com/Kyligence/KAP/issues/14074 select count(ifnull(time2,CURRENT_TIMESTAMP)) from TEST_MEASURE diff --git a/src/kylin-it/src/test/resources/query/sql_function/query06.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query06.sql.expected index 513aea1c55..2947b2c5fe 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query06.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query06.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 select initcap(lstg_format_name) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query11.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query11.sql.expected index 0036db12ac..811c3b56c2 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query11.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query11.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 select position('A',lstg_format_name) a from test_kylin_fact diff --git a/src/kylin-it/src/test/resources/query/sql_function/query12.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query12.sql.expected index a06dbc53ac..4b6d74f3f9 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query12.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query12.sql.expected @@ -1,3 +1,2 @@ --- https://github.com/Kyligence/KAP/issues/13613 SELECT INITCAP('apache') FROM "TEST_KYLIN_FACT" \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query13.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query13.sql.expected index 7adc4ccd2b..9bc5180381 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query13.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query13.sql.expected @@ -1,3 +1,2 @@ --- https://github.com/Kyligence/KAP/issues/13613 SELECT INITCAP('') FROM "TEST_KYLIN_FACT" \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query19.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query19.sql.expected index 246df2e5db..a0749e6536 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query19.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query19.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 select position('A',lstg_format_name) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query20.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query20.sql.expected index 12cf96579f..ac2cfefb34 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query20.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query20.sql.expected @@ -1,3 +1,2 @@ --- https://github.com/Kyligence/KAP/issues/13613 select INITCAP(SUBSTR(lstg_format_name,2)) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query21.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query21.sql.expected index f7f1f8b240..82dc6f63b7 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query21.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query21.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 select substr(initcap(lstg_format_name),2) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query22.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query22.sql.expected index 68aafcf9e5..73700080e2 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query22.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query22.sql.expected @@ -1,3 +1,2 @@ --- https://github.com/Kyligence/KAP/issues/13613 select LENGTH(INITCAP(SUBSTR(lstg_format_name,2))) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query23.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query23.sql.expected index 6f9eea162d..59caa61d75 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query23.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query23.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 select length(substr(initcap(lstg_format_name),2)) a from test_kylin_fact \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_function/query25.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query25.sql.expected index 2a6e528ea3..cd0bbf397b 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query25.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query25.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 SELECT ORDER_ID,CASE substr(initcap(LSTG_FORMAT_NAME),1,1) WHEN 'A' THEN 'LSTG_FORMAT_NAME begin with A' diff --git a/src/kylin-it/src/test/resources/query/sql_function/query26.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/query26.sql.expected index 17aad6e3cd..be66674be2 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/query26.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/query26.sql.expected @@ -1,4 +1,3 @@ --- https://github.com/Kyligence/KAP/issues/13613 SELECT ORDER_ID,CASE length(substr(initcap(LSTG_FORMAT_NAME),1,1)) WHEN '1' THEN 'LSTG_FORMAT_NAME length is 1' diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_DateUDF/query01.sql.disable b/src/kylin-it/src/test/resources/query/sql_function/sql_function_DateUDF/query01.sql.disable index d94e15fdc4..2fd28e6906 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_DateUDF/query01.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_DateUDF/query01.sql.disable @@ -1,4 +1,3 @@ ---https://github.com/Kyligence/KAP/issues/13614 select CAL_DT,hour(CAL_DT) from TEST_KYLIN_FACT diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query02.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query02.sql.expected index 53df04a8d6..791218c337 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query02.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query02.sql.expected @@ -1,4 +1,3 @@ ---https://github.com/Kyligence/KAP/issues/13612 select date_format(CAL_DT,'y'), date_format(CAL_DT,'y'), diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query03.sql.expected b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query03.sql.expected index cc6faa9e18..334303be0a 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query03.sql.expected +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query03.sql.expected @@ -1,4 +1,3 @@ ---https://github.com/Kyligence/KAP/issues/13612 --test date_format(timestamp,part) select date_format(TEST_TIME_ENC,'y'), diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.disable b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.disable index 1a78ffc240..ad25bf7948 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select date_format(CAL_DT,'YEAR'), date_format(CAL_DT,'y'), date_format(CAL_DT,'Y'), diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.excepted.disable b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.excepted.disable index ee27aab99f..791218c337 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.excepted.disable +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query04.sql.excepted.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select date_format(CAL_DT,'y'), date_format(CAL_DT,'y'), date_format(CAL_DT,'Y'), diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.disable b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.disable index 59030524be..3e05016d11 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.disable +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 --test date_format(timestamp,part) select date_format(TEST_TIME_ENC,'YEAR'), date_format(TEST_TIME_ENC,'Y'), diff --git a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.excepted.disable b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.excepted.disable index aab4808a1a..de98f5d9ba 100644 --- a/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.excepted.disable +++ b/src/kylin-it/src/test/resources/query/sql_function/sql_function_formatUDF/query05.sql.excepted.disable @@ -1,6 +1,4 @@ ---https://github.com/kyligence/kap/issues/14155# ---disable reason: https://github.com/Kyligence/KAP/issues/14426 select date_format(TEST_TIME_ENC,'y'), date_format(TEST_TIME_ENC,'Y'), date_format(TEST_TIME_ENC,'y'), diff --git a/src/kylin-it/src/test/resources/query/sql_percentile/query02.sql.disabled b/src/kylin-it/src/test/resources/query/sql_percentile/query02.sql.disabled index 734779fb6f..bb88361c3a 100644 --- a/src/kylin-it/src/test/resources/query/sql_percentile/query02.sql.disabled +++ b/src/kylin-it/src/test/resources/query/sql_percentile/query02.sql.disabled @@ -16,7 +16,6 @@ -- limitations under the License. -- -- percentile's result is unstable, therefore round is added --- Todo (unstable test) https://github.com/Kyligence/KAP/issues/10761 select seller_id, round(percentile_approx(price, 0.5),0) from test_kylin_fact where seller_id is not null group by seller_id \ No newline at end of file diff --git a/src/kylin-it/src/test/resources/query/sql_powerbi/query01.sql b/src/kylin-it/src/test/resources/query/sql_powerbi/query01.sql index 6b155c25b2..cbae73e06b 100644 --- a/src/kylin-it/src/test/resources/query/sql_powerbi/query01.sql +++ b/src/kylin-it/src/test/resources/query/sql_powerbi/query01.sql @@ -19,7 +19,7 @@ -- ISSUE #5527 --- failed at io.kyligence.kap.newten.auto.NAutoBuildAndQueryTest.testPowerBiQuery() +-- failed at NAutoBuildAndQueryTest.testPowerBiQuery() SELECT "NAME" diff --git a/src/kylin-it/src/test/resources/query/sql_subquery/query18.sql b/src/kylin-it/src/test/resources/query/sql_subquery/query18.sql index 1c39bb55c3..a0a4637012 100644 --- a/src/kylin-it/src/test/resources/query/sql_subquery/query18.sql +++ b/src/kylin-it/src/test/resources/query/sql_subquery/query18.sql @@ -13,7 +13,6 @@ -- See the License for the specific language governing permissions and -- limitations under the License. --- related issue https://github.com/Kyligence/KAP/issues/4286#issuecomment-377104695 select test_kylin_fact.lstg_format_name, sum(test_kylin_fact.price) as GMV diff --git a/src/kylin-it/src/test/resources/query/sql_subquery/query19.sql b/src/kylin-it/src/test/resources/query/sql_subquery/query19.sql index 2e01cfe3fb..6204b6d2e8 100644 --- a/src/kylin-it/src/test/resources/query/sql_subquery/query19.sql +++ b/src/kylin-it/src/test/resources/query/sql_subquery/query19.sql @@ -17,7 +17,6 @@ -- --- related https://github.com/Kyligence/KAP/issues/7614 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT diff --git a/src/kylin-it/src/test/resources/query/sql_subquery/query25.sql b/src/kylin-it/src/test/resources/query/sql_subquery/query25.sql index 4241e04b1d..d3fa33e82c 100644 --- a/src/kylin-it/src/test/resources/query/sql_subquery/query25.sql +++ b/src/kylin-it/src/test/resources/query/sql_subquery/query25.sql @@ -17,7 +17,6 @@ -- --- related https://github.com/Kyligence/KAP/issues/7614 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV diff --git a/src/kylin-it/src/test/resources/query/sql_tableau/query67.sql b/src/kylin-it/src/test/resources/query/sql_tableau/query67.sql index c75a56b935..001609c423 100644 --- a/src/kylin-it/src/test/resources/query/sql_tableau/query67.sql +++ b/src/kylin-it/src/test/resources/query/sql_tableau/query67.sql @@ -23,5 +23,4 @@ FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT" group by (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END) ORDER BY 1 ASC -- below group by causes error because of CC replacement -- since (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END) is replaced by CC col --- see https://github.com/Kyligence/KAP/issues/14072 -- GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" ORDER BY 1 ASC diff --git a/src/kylin-it/src/test/resources/query/sql_udf/query01.sql.todo b/src/kylin-it/src/test/resources/query/sql_udf/query01.sql.todo index d6a5541b9d..b6dd3ea39c 100644 --- a/src/kylin-it/src/test/resources/query/sql_udf/query01.sql.todo +++ b/src/kylin-it/src/test/resources/query/sql_udf/query01.sql.todo @@ -15,7 +15,6 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- --- ISSUE: https://github.com/Kyligence/KAP/issues/10038 SELECT round(SUM({fn POWER({fn CONVERT(2, SQL_DOUBLE)}, item_count)}),-290) diff --git a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/NTableController.java b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/NTableController.java index ff35be5737..92ddf793a6 100644 --- a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/NTableController.java +++ b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/NTableController.java @@ -241,7 +241,7 @@ public class NTableController extends NBasicController { } @ApiOperation(value = "loadAWSTablesCompatibleCrossAccount", tags = { - "KC" }, notes = "Update Body: data_source_type, need_sampling, sampling_rows, data_source_properties") + "N/A" }, notes = "Update Body: data_source_type, need_sampling, sampling_rows, data_source_properties") @PostMapping(value = "/compatibility/aws") @ResponseBody public EnvelopeResponse<LoadTableResponse> loadAWSTablesCompatibleCrossAccount( @@ -270,7 +270,7 @@ public class NTableController extends NBasicController { return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, loadTableResponse, ""); } - @ApiOperation(value = "updateLoadedAWSTableExtProp", tags = { "KC" }, notes = "Update Body: data_source_properties") + @ApiOperation(value = "updateLoadedAWSTableExtProp", tags = { "N/A" }, notes = "Update Body: data_source_properties") @PutMapping(value = "/ext/prop/aws") @ResponseBody public EnvelopeResponse<UpdateAWSTableExtDescResponse> updateLoadedAWSTableExtProp( diff --git a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenTableController.java b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenTableController.java index 11e4d159b3..0fea65c66a 100644 --- a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenTableController.java +++ b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenTableController.java @@ -154,7 +154,7 @@ public class OpenTableController extends NBasicController { return tableController.loadTables(tableLoadRequest); } - @ApiOperation(value = "loadAWSTablesCompatibleCrossAccount", tags = {"KC"}) + @ApiOperation(value = "loadAWSTablesCompatibleCrossAccount", tags = {"N/A"}) @PostMapping(value = "/compatibility/aws") @ResponseBody public EnvelopeResponse<LoadTableResponse> loadAWSTablesCompatibleCrossAccount(@RequestBody AWSTableLoadRequest tableLoadRequest) @@ -223,7 +223,7 @@ public class OpenTableController extends NBasicController { return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, response, ""); } - @ApiOperation(value = "reloadAWSTablesCompatibleCrossAccount", tags = {"KC"}) + @ApiOperation(value = "reloadAWSTablesCompatibleCrossAccount", tags = {"N/A"}) @PostMapping(value = "/reload/compatibility/aws") @ResponseBody public EnvelopeResponse<OpenReloadTableResponse> reloadAWSTablesCompatibleCrossAccount(@RequestBody OpenReloadTableRequest request) { @@ -279,7 +279,7 @@ public class OpenTableController extends NBasicController { return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, dbTblName, ""); } - @ApiOperation(value = "updateLoadedAWSTableExtProp", tags = {"KC" }) + @ApiOperation(value = "updateLoadedAWSTableExtProp", tags = {"N/A" }) @PutMapping(value = "/ext/prop/aws") @ResponseBody public EnvelopeResponse<UpdateAWSTableExtDescResponse> updateLoadedAWSTableExtProp(@RequestBody UpdateAWSTableExtDescRequest request) { diff --git a/src/modeling-service/src/main/resources/bisync/tds/tableau.template.xml b/src/modeling-service/src/main/resources/bisync/tds/tableau.template.xml index b80874faf8..a72b454dfc 100644 --- a/src/modeling-service/src/main/resources/bisync/tds/tableau.template.xml +++ b/src/modeling-service/src/main/resources/bisync/tds/tableau.template.xml @@ -20,7 +20,7 @@ <connection class='federated'> <named-connections> <named-connection caption='' name='genericodbc.11du78x0szfyb51b703es1ocv315'> - <connection class='genericodbc' dbname='' odbc-connect-string-extras='' odbc-dbms-name='MySQL' odbc-driver='KyligenceODBCDriver' odbc-dsn='' odbc-suppress-connection-pooling='' odbc-use-connection-pooling='' port='7070' schema='DEFAULT' server='' username='ADMIN'> + <connection class='genericodbc' dbname='' odbc-connect-string-extras='' odbc-dbms-name='MySQL' odbc-driver='ODBCDriver' odbc-dsn='' odbc-suppress-connection-pooling='' odbc-use-connection-pooling='' port='7070' schema='DEFAULT' server='' username='ADMIN'> </connection> </named-connection> </named-connections> diff --git a/src/query-booter/src/main/resources/config/config_library.csv b/src/query-booter/src/main/resources/config/config_library.csv index 631c673653..5337564cc0 100644 --- a/src/query-booter/src/main/resources/config/config_library.csv +++ b/src/query-booter/src/main/resources/config/config_library.csv @@ -80,7 +80,7 @@ kylin.engine.global-dict-check-enabled,boolean,是否开启全局字典检查,Wh kylin.engine.index-column-flattable-enabled,boolean,是否开启平表中只包含索引列,Whether to open the flat watch contains only index columns,TRUE,TRUE kylin.engine.inferior-flattable-enabled,boolean,是否开启亚平表功能,Whether to enable inferior flat table,TRUE,TRUE kylin.engine.inferior-flattable-storage-level,String,亚平表数据的缓存级别,Storage level for inferior flat table,TRUE,TRUE -kylin.engine.log.local-working-directory,String,KC 环境中,日志的工作路径,"In the KC environment, the working path of the log",TRUE,TRUE +kylin.engine.log.local-working-directory,String,N/A 环境中,日志的工作路径,"In the N/A environment, the working path of the log",TRUE,TRUE kylin.engine.lookup-table-default-count-value,Long,维度表的默认行数,Default number of the dimension table,TRUE,TRUE kylin.engine.max-allocation-proportion,Double,yarn集群队列中的内存最大使用比例,Maximum use ratio in the Yarn cluster queue,TRUE,TRUE kylin.engine.max-retry-time,Int,spark构建作业的重试次数,SPARK to construct homework renewal times,TRUE,TRUE @@ -110,7 +110,7 @@ kylin.engine.spark.sampling-class-name,String,spark抽样作业实现类,SPARK s kylin.engine.spark.snapshot-build-class-name,String,构建 snapshot job 的类名,Build the name of Snapshot Job,TRUE,TRUE kylin.engine.spark.task-core-factor,Int,多少 spark 任务使用一个 core,How many spark tasks use a core,TRUE,TRUE kylin.engine.spark.task-impact-instance-enabled,boolean,spark 构建作业是否根据任务数量来计算core数量,Whether spark builds a job based on the number of tasks calculates the number of cores,TRUE,TRUE -kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,KC 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO. Kyligence.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE +kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,N/A 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE kylin.engine.streaming-base-ckeckpoint-location,String,实时OLAP构建作业的check point目录,Real -time OLAP CHCK POINT directory that builds homework,TRUE,TRUE kylin.engine.streaming-duration,Long,实时OLAP构建定时触发,单位毫秒,"Real -time OLAP builds regular triggers, the unit milliseconds",TRUE,TRUE kylin.engine.streaming-metrics-enabled,boolean,实时OLAP构建监控是否开启,Real -time OLAP Construction Monitoring Whether it is turned on,TRUE,TRUE @@ -233,8 +233,8 @@ kylin.kerberos.principal,String,kerberos prncipal配置,Kerberos PRNCIPAL config kylin.kerberos.project-level-enabled,boolean,项目级kerberous配置开关,Project -level Kerberous configuration switch,TRUE,TRUE kylin.kerberos.ticket-refresh-interval-minutes,Long,zk Kerberos ticket更新周期,ZK KERBEROS TICKET update cycle,TRUE,TRUE kylin.kerberos.zookeeper-server-principal,String,zk Kerberos principal,zk Kerberos principal,TRUE,TRUE -kylin.lightning.cluster-id,Long,KC 环境中,集群 id,"In the KC environment, cluster ID",TRUE,TRUE -kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the KC environment, the path of zookeeper",TRUE,TRUE +kylin.lightning.cluster-id,Long,N/A 环境中,集群 id,"In the N/A environment, cluster ID",TRUE,TRUE +kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the N/A environment, the path of zookeeper",TRUE,TRUE kylin.metadata.audit-log.batch-size,Int,读取audit log批次大小,Read the Audit Log batch size,TRUE,TRUE kylin.metadata.audit-log.batch-timeout,String,审计日志执行 sql 的超时时间,The audit log executes the timeout of SQL,TRUE,TRUE kylin.metadata.audit-log.catchup-interval,String,audit log同步频率,Audit log synchronous frequency,TRUE,TRUE @@ -558,8 +558,8 @@ kylin.engine.snapshot.specified-spark-conf-enabled,boolean,默认关闭,开启 kylin.source.hive.support-special-symbol-in-hive-column,boolean,默认关闭,开启后支持hive列包含特殊字符(#@-+等等),不开启只支持数值字符-,"Turn off by default. After opening, the HIVE column contains special characters (#@-+, etc.).",TRUE,TRUE kylin.streaming.job-meta-retained-time,String,默认2h,实时任务hdfs元数据的保留时间,超过则会被清理,"By default 2H, the retention time of real -time task HDFS metadata will be cleaned up if it exceeds",TRUE,TRUE kylin.streaming.meta-scheme,String,"可选""jdbc"",表示实时任务从jdbc读取还是从Hdfs读取元数据","Optional ""JDBC"", indicating that real -time tasks are read from JDBC or from HDFS read metadata",TRUE,TRUE -kylin.engine.cluster-manager-health-check-max-times,Int,"KC 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the KC environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE -kylin.engine.cluster-manager-heal-check-interval-second,Int,"KC 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the KC environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is t [...] +kylin.engine.cluster-manager-health-check-max-times,Int,"N/A 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the N/A environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE +kylin.engine.cluster-manager-heal-check-interval-second,Int,"N/A 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the N/A environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is [...] kylin.env.log-rotate-check-cron,String,日志滚动的 cron 表达式,cron for log rotate,FALSE,TRUE kylin.env.log-rotate-enabled,boolean,是否开启日志滚动,whether to enable log rotate,FALSE,TRUE kylin.model.measure-name-check-enabled,boolean,是否校验度量名称,whether to validate measure's name,FALSE,TRUE diff --git a/src/query-server/src/main/java/org/apache/kylin/rest/controller/v2/NQueryMetaController.java b/src/query-server/src/main/java/org/apache/kylin/rest/controller/v2/NQueryMetaController.java index d93c93f8c5..2cbff5994c 100644 --- a/src/query-server/src/main/java/org/apache/kylin/rest/controller/v2/NQueryMetaController.java +++ b/src/query-server/src/main/java/org/apache/kylin/rest/controller/v2/NQueryMetaController.java @@ -35,10 +35,8 @@ import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.ApiOperation; /** - * Backward capable API for KyligenceODBC: /kylin/api/tables_and_columns - * - * Ref(KE 3.x): org.apache.kylin.rest.controller.QueryController.getMetadata(MetaRequest) - * + * Backward capable API for : /kylin/api/tables_and_columns + ** * TODO ODBC should support Newten API: /kylin/api/query/tables_and_columns * * @author yifanzhang diff --git a/src/second-storage/clickhouse-it/src/test/resources/tdvt/inputs/untest.sql b/src/second-storage/clickhouse-it/src/test/resources/tdvt/inputs/untest.sql index 88a1d2c17c..2841c5b1b4 100644 --- a/src/second-storage/clickhouse-it/src/test/resources/tdvt/inputs/untest.sql +++ b/src/second-storage/clickhouse-it/src/test/resources/tdvt/inputs/untest.sql @@ -1,4 +1,4 @@ -- This is a query file that has been blacklisted. --- It includes a query that should crash Kyligence. +-- It includes a query that should crash . -- If the test case is run, the whole suite would fail. -some random not working query that should crash Kyligence. \ No newline at end of file +some random not working query that should crash Kylin. \ No newline at end of file diff --git a/src/server/src/main/resources/config/config_library.csv b/src/server/src/main/resources/config/config_library.csv index 631c673653..1de0dfe3fd 100644 --- a/src/server/src/main/resources/config/config_library.csv +++ b/src/server/src/main/resources/config/config_library.csv @@ -80,7 +80,7 @@ kylin.engine.global-dict-check-enabled,boolean,是否开启全局字典检查,Wh kylin.engine.index-column-flattable-enabled,boolean,是否开启平表中只包含索引列,Whether to open the flat watch contains only index columns,TRUE,TRUE kylin.engine.inferior-flattable-enabled,boolean,是否开启亚平表功能,Whether to enable inferior flat table,TRUE,TRUE kylin.engine.inferior-flattable-storage-level,String,亚平表数据的缓存级别,Storage level for inferior flat table,TRUE,TRUE -kylin.engine.log.local-working-directory,String,KC 环境中,日志的工作路径,"In the KC environment, the working path of the log",TRUE,TRUE +kylin.engine.log.local-working-directory,String,N/A 环境中,日志的工作路径,"In the N/A environment, the working path of the log",TRUE,TRUE kylin.engine.lookup-table-default-count-value,Long,维度表的默认行数,Default number of the dimension table,TRUE,TRUE kylin.engine.max-allocation-proportion,Double,yarn集群队列中的内存最大使用比例,Maximum use ratio in the Yarn cluster queue,TRUE,TRUE kylin.engine.max-retry-time,Int,spark构建作业的重试次数,SPARK to construct homework renewal times,TRUE,TRUE @@ -110,7 +110,7 @@ kylin.engine.spark.sampling-class-name,String,spark抽样作业实现类,SPARK s kylin.engine.spark.snapshot-build-class-name,String,构建 snapshot job 的类名,Build the name of Snapshot Job,TRUE,TRUE kylin.engine.spark.task-core-factor,Int,多少 spark 任务使用一个 core,How many spark tasks use a core,TRUE,TRUE kylin.engine.spark.task-impact-instance-enabled,boolean,spark 构建作业是否根据任务数量来计算core数量,Whether spark builds a job based on the number of tasks calculates the number of cores,TRUE,TRUE -kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,KC 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `IO. Kyligence.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE +kylin.engine.steps.skip,String,值为`org.apache.kylin.engine.spark.job.NResourceDetectStep` 时代表关闭资源探测,N/A 如果配置此值将无法自动伸缩构建节点,所以建议永远不要配置,"The value is `.kap.engine.Spark.job.nRsourceDeteCTStep` Anti -resource detection. If you configure this value, it will not be automatically expanded to build nodes, so it is recommended not to configure the configuration.",TRUE,TRUE kylin.engine.streaming-base-ckeckpoint-location,String,实时OLAP构建作业的check point目录,Real -time OLAP CHCK POINT directory that builds homework,TRUE,TRUE kylin.engine.streaming-duration,Long,实时OLAP构建定时触发,单位毫秒,"Real -time OLAP builds regular triggers, the unit milliseconds",TRUE,TRUE kylin.engine.streaming-metrics-enabled,boolean,实时OLAP构建监控是否开启,Real -time OLAP Construction Monitoring Whether it is turned on,TRUE,TRUE @@ -233,8 +233,8 @@ kylin.kerberos.principal,String,kerberos prncipal配置,Kerberos PRNCIPAL config kylin.kerberos.project-level-enabled,boolean,项目级kerberous配置开关,Project -level Kerberous configuration switch,TRUE,TRUE kylin.kerberos.ticket-refresh-interval-minutes,Long,zk Kerberos ticket更新周期,ZK KERBEROS TICKET update cycle,TRUE,TRUE kylin.kerberos.zookeeper-server-principal,String,zk Kerberos principal,zk Kerberos principal,TRUE,TRUE -kylin.lightning.cluster-id,Long,KC 环境中,集群 id,"In the KC environment, cluster ID",TRUE,TRUE -kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the KC environment, the path of zookeeper",TRUE,TRUE +kylin.lightning.cluster-id,Long,N/A 环境中,集群 id,"In the N/A environment, cluster ID",TRUE,TRUE +kylin.lightning.server.zookeeper-node,String,KC环境中,zookeeper 的路径,"In the N/A environment, the path of zookeeper",TRUE,TRUE kylin.metadata.audit-log.batch-size,Int,读取audit log批次大小,Read the Audit Log batch size,TRUE,TRUE kylin.metadata.audit-log.batch-timeout,String,审计日志执行 sql 的超时时间,The audit log executes the timeout of SQL,TRUE,TRUE kylin.metadata.audit-log.catchup-interval,String,audit log同步频率,Audit log synchronous frequency,TRUE,TRUE @@ -558,8 +558,8 @@ kylin.engine.snapshot.specified-spark-conf-enabled,boolean,默认关闭,开启 kylin.source.hive.support-special-symbol-in-hive-column,boolean,默认关闭,开启后支持hive列包含特殊字符(#@-+等等),不开启只支持数值字符-,"Turn off by default. After opening, the HIVE column contains special characters (#@-+, etc.).",TRUE,TRUE kylin.streaming.job-meta-retained-time,String,默认2h,实时任务hdfs元数据的保留时间,超过则会被清理,"By default 2H, the retention time of real -time task HDFS metadata will be cleaned up if it exceeds",TRUE,TRUE kylin.streaming.meta-scheme,String,"可选""jdbc"",表示实时任务从jdbc读取还是从Hdfs读取元数据","Optional ""JDBC"", indicating that real -time tasks are read from JDBC or from HDFS read metadata",TRUE,TRUE -kylin.engine.cluster-manager-health-check-max-times,Int,"KC 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the KC environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE -kylin.engine.cluster-manager-heal-check-interval-second,Int,"KC 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the KC environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is t [...] +kylin.engine.cluster-manager-health-check-max-times,Int,"N/A 环境中, 轮询 spark master 的次数, 默认值: 10 , 10 表示10次轮询都无法连接spark master, 即达到 120s * 10 后停止任务, -1 表示不行进行检测, 一般情况下填写非零正整数用于调整轮询次数","In the N/A environment, the number of times of inquiry spark master. Under normal circumstances, fill in the non -zero -conditioned integer to adjust the number of rim inquiries """,TRUE,TRUE +kylin.engine.cluster-manager-heal-check-interval-second,Int,"N/A 环境中, 构建任务 spark driver 轮询连接 spark master 的时间间隔, 默认值 120 : 120S轮训一次, 需与 kylin.engine.cluster-manager-health-check-max-times 搭配使用, 只允许填写非零正整数, 若数值过小, 会对 spark master 造成压力","In the N/A environment, the time interval between the SPARK DRIVER rotation of the Spark Driver rotate the Spark Master. The default value is 120: 120s. It needs to be used with Kylin.engine.Cluster-HEALTH-Check-Max-Times. Positive integer, if the value is [...] kylin.env.log-rotate-check-cron,String,日志滚动的 cron 表达式,cron for log rotate,FALSE,TRUE kylin.env.log-rotate-enabled,boolean,是否开启日志滚动,whether to enable log rotate,FALSE,TRUE kylin.model.measure-name-check-enabled,boolean,是否校验度量名称,whether to validate measure's name,FALSE,TRUE diff --git a/src/spark-project/engine-spark/src/test/scala/org/apache/kylin/engine/spark/job/TestUdfManager.scala b/src/spark-project/engine-spark/src/test/scala/org/apache/kylin/engine/spark/job/TestUdfManager.scala index 31b712d220..94426103fd 100644 --- a/src/spark-project/engine-spark/src/test/scala/org/apache/kylin/engine/spark/job/TestUdfManager.scala +++ b/src/spark-project/engine-spark/src/test/scala/org/apache/kylin/engine/spark/job/TestUdfManager.scala @@ -35,7 +35,7 @@ class TestUdfManager extends SparderBaseFunSuite with SharedSparkSession with Be } // ignore for dev, if you want to run this case, modify udfCache maximum to Long.MaxValue - // and if (funcName == "TOP_N") to if (funcName.startsWith("TOP_N")) in io.kyligence.kap.engine.spark.job.UdfManager + // and if (funcName == "TOP_N") to if (funcName.startsWith("TOP_N")) in spark.job.UdfManager ignore("test register udf in multi-thread") { import functions.udf val testFunc = udf(() => "test") diff --git a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/RuntimeHelper.scala b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/RuntimeHelper.scala index 61ca3307b2..2109b0ecdb 100644 --- a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/RuntimeHelper.scala +++ b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/RuntimeHelper.scala @@ -141,7 +141,6 @@ object RuntimeHelper extends Logging { } else if (deriveMap.contains(index)) { deriveMap.apply(index) } else if (DataType.DATETIME_FAMILY.contains(column.getType.getName)) { - // https://github.com/Kyligence/KAP/issues/14561 literalTs.as(s"${factTableName}_${columnName}") } else if (DataType.STRING_FAMILY.contains(column.getType.getName)) { literalString.as(s"${factTableName}_${columnName}")