This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin5 by this push:
new 256414c3a0 revert KYLIN-5407 CH query total_scan_count issue
256414c3a0 is described below
commit 256414c3a002c9d6e459188f47047a23481bb304
Author: Qian Xia <[email protected]>
AuthorDate: Thu Feb 9 17:08:00 2023 +0800
revert KYLIN-5407 CH query total_scan_count issue
---
.../src/components/query/query_history_table.vue | 23 +++-----------
kystudio/src/components/query/query_result.vue | 36 +++-------------------
kystudio/src/store/model.js | 3 --
kystudio/src/store/system.js | 3 --
kystudio/src/store/types.js | 1 -
5 files changed, 8 insertions(+), 58 deletions(-)
diff --git a/kystudio/src/components/query/query_history_table.vue
b/kystudio/src/components/query/query_history_table.vue
index b2b47df506..f09db8b504 100644
--- a/kystudio/src/components/query/query_history_table.vue
+++ b/kystudio/src/components/query/query_history_table.vue
@@ -136,11 +136,11 @@
<span
class="label">{{$t('kylinLang.query.snapshot')}}:</span>
<span
class="text">{{getSnapshots(props.row.realizations)}}</span>
</p>
- <p class="list"
v-if="!isHaveStorageQuery(props.row.realizations) ||
(isHaveStorageQuery(props.row.realizations) && storageQueryMetricCollect)">
+ <p class="list">
<span
class="label">{{$t('kylinLang.query.total_scan_count')}}:</span>
<span class="text">{{props.row.total_scan_count |
filterNumbers}}</span>
</p>
- <p class="list"
v-if="!isHaveStorageQuery(props.row.realizations) ||
(isHaveStorageQuery(props.row.realizations) && storageQueryMetricCollect)">
+ <p class="list">
<span
class="label">{{$t('kylinLang.query.total_scan_bytes')}}:</span>
<span class="text">{{props.row.total_scan_bytes |
filterNumbers}}</span>
</p>
@@ -326,8 +326,7 @@ import Diagnostic from 'components/admin/Diagnostic/index'
'currentSelectedProject',
'briefMenuGet',
'queryHistoryFilter',
- 'isNonAdminGenQueryDiagPackage',
- 'storageQueryMetricCollect' // 系统逃生通道：是否可以获取统计分层存储扫描行数、扫描字节数
+ 'isNonAdminGenQueryDiagPackage'
])
},
components: {
@@ -377,8 +376,7 @@ import Diagnostic from 'components/admin/Diagnostic/index'
downloadQueryDiagnosticPackage: 'Download Query Diagnostic Package',
queryError: 'Query error.',
viewDetails: 'View Details',
- errorTitle: 'Error Details',
- fetchError: 'Can\'t get the result as the record is missing'
+ errorTitle: 'Error Details'
}
},
filters: {
@@ -462,19 +460,6 @@ export default class QueryHistoryTable extends Vue {
return [{text: this.$t('allModels'), value: 'modelName', icon:
'el-icon-ksd-cube'}]
}
- isHaveStorageQuery (realizations) {
- let isStorageQuery = false
- if (realizations && realizations.length) {
- for (let r of realizations) {
- if (r.secondStorage) {
- isStorageQuery = true
- break
- }
- }
- }
- return isStorageQuery
- }
-
// 排除击中 snapshot 的查询对象
getRealizations (row) {
return row.filter(item => item.indexType !== 'Table Snapshot' &&
item.layoutId !== 0 && item.layoutId !== -1)
diff --git a/kystudio/src/components/query/query_result.vue
b/kystudio/src/components/query/query_result.vue
index d6c4739976..9b8438a003 100644
--- a/kystudio/src/components/query/query_result.vue
+++ b/kystudio/src/components/query/query_result.vue
@@ -83,15 +83,9 @@
</span>
<span class="text" v-else>{{Math.round(extraoption.duration /
1000 * 100) / 100 || 0.00}}s</span>
</p>
- <p class="resultText"
v-if="!extraoption.pushDown&&(isHaveStorageQuery&&storageQueryMetricCollect ||
!isHaveStorageQuery)">
+ <p class="resultText" v-if="!extraoption.pushDown">
<span class="label">{{$t('kylinLang.query.total_scan_count')}}:
</span>
- <span class="text"
v-if="!isHaveStorageQuery">{{extraoption.totalScanRows | filterNumbers}}</span>
- <span class="text" v-else>
- <span v-if="isLoadingScanRows"><i
class="el-ksd-icon-refresh_16"></i><span
class="refresh-loading">{{$t('loading')}}</span></span>
- <span v-else-if="extraoption.totalScanRows === 0"
@click="fetchTotalScanRows"><i class="el-ksd-icon-refresh_16"></i><span
class="refresh-label">{{$t('refreshManual')}}</span></span>
- <span v-else-if="extraoption.totalScanRows === -1"><span
class="refresh-error">{{$t('fetchError')}}</span></span>
- <span v-else>{{extraoption.totalScanRows |
filterNumbers}}</span>
- </span>
+ <span class="text">{{extraoption.totalScanRows |
filterNumbers}}</span>
</p>
<p class="resultText" v-if="!extraoption.pushDown">
<span class="label">{{$t('kylinLang.query.result_row_count')}}:
</span>
@@ -215,8 +209,7 @@ import echarts from 'echarts'
...mapActions({
query: 'QUERY_BUILD_TABLES',
postToExportCSV: 'EXPORT_CSV',
- loadAllIndex: 'LOAD_ALL_INDEX',
- loadSecondStorageScanRows: 'LOAD_SECOND_STORAGE_SCAN_ROWS'
+ loadAllIndex: 'LOAD_ALL_INDEX'
}),
...mapActions('DetailDialogModal', {
callGlobalDetailDialog: 'CALL_MODAL'
@@ -226,8 +219,7 @@ import echarts from 'echarts'
...mapGetters([
'currentSelectedProject',
'insightActions',
- 'datasourceActions',
- 'storageQueryMetricCollect' // 系统逃生通道：是否可以获取统计分层存储扫描行数
+ 'datasourceActions'
])
},
components: {
@@ -335,8 +327,6 @@ export default class queryResult extends Vue {
model = {
uuid: ''
}
- isHaveStorageQuery = false
- isLoadingScanRows = false
// 增加可视化按钮
get insightBtnGroups () {
return [
@@ -503,15 +493,11 @@ export default class queryResult extends Vue {
}
}
get realizations () {
- this.isHaveStorageQuery = false
if (this.extraoption.realizations && this.extraoption.realizations.length)
{
let realizations = []
for (let i of this.extraoption.realizations) {
if (i.layoutId !== -1 && i.layoutId !== null && i.layoutId !== 0) {
realizations.push(i)
- if (i.secondStorage) {
- this.isHaveStorageQuery = true
- }
}
}
return realizations
@@ -549,20 +535,6 @@ export default class queryResult extends Vue {
return this.$store.state.project.multi_partition_enabled ?
this.$t('noModelRangeTips2') : this.$t('noModelRangeTips')
}
- async fetchTotalScanRows () {
- try {
- this.isLoadingScanRows = true
- const { queryId } = this.extraoption
- const res = await this.loadSecondStorageScanRows({ project:
this.currentSelectedProject, query_id: queryId })
- const data = await handleSuccessAsync(res)
- this.extraoption.totalScanRows = data.total_scan_count
- this.isLoadingScanRows = false
- } catch (e) {
- this.isLoadingScanRows = false
- handleError(e)
- }
- }
-
// 展示 layout 详情
async openLayoutDetails (item) {
const {modelId, layoutId} = item
diff --git a/kystudio/src/store/model.js b/kystudio/src/store/model.js
index b2df301cd0..cbcf4e1615 100644
--- a/kystudio/src/store/model.js
+++ b/kystudio/src/store/model.js
@@ -407,9 +407,6 @@ export default {
},
[types.CHECK_INTERNAL_MEASURE] (_, params) {
return api.model.checkInternalMeasure(params)
- },
- [types.LOAD_SECOND_STORAGE_SCAN_ROWS] (_, params) {
- return api.model.loadSecondStorageScanRows(params)
}
},
getters: {
diff --git a/kystudio/src/store/system.js b/kystudio/src/store/system.js
index 1d80cd71c7..b662f17c36 100644
--- a/kystudio/src/store/system.js
+++ b/kystudio/src/store/system.js
@@ -239,9 +239,6 @@ export default {
},
isStreamingEnabled: (state) => {
return state.streamingEnabled === 'true'
- },
- storageQueryMetricCollect: (state) => {
- return state.storageQuery === 'true'
}
}
}
diff --git a/kystudio/src/store/types.js b/kystudio/src/store/types.js
index 20d7567f71..c829a94feb 100644
--- a/kystudio/src/store/types.js
+++ b/kystudio/src/store/types.js
@@ -285,7 +285,6 @@ export const GET_JOB_SIMPLE_LOG = 'GET_JOB_SIMPLE_LOG'
export const VALIDATE_DATE_FORMAT = 'VALIDATE_DATE_FORMAT'
export const CHECK_INTERNAL_MEASURE = 'CHECK_INTERNAL_MEASURE'
export const UPDATE_FILTER_MODEL_NAME_CLOUD = 'UPDATE_FILTER_MODEL_NAME_CLOUD'
-export const LOAD_SECOND_STORAGE_SCAN_ROWS = 'LOAD_SECOND_STORAGE_SCAN_ROWS'
// table index
export const GET_TABLE_INDEX = 'GET_TABLE_INDEX'
export const EDIT_TABLE_INDEX = 'EDIT_TABLE_INDEX'
