Skip to content

Commit

Permalink
fix jly8866#94
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhyo
hhyo committed Nov 27, 2018
1 parent 582e9fb commit d3c23b0
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 70 deletions.
118 changes: 56 additions & 62 deletions sql/query.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import simplejson as json
from django.core.urlresolvers import reverse

from django.db.models import Q, Min, F, Sum
from django.db.models import Q, Min, F, Sum, Max
from django.db import connection
from django.conf import settings
from django.db.models.functions import Concat
Expand Down Expand Up @@ -721,8 +721,12 @@ def query(request):
query_log.save()

# 返回查询结果
return HttpResponse(json.dumps(finalResult, cls=ExtendJSONEncoder, bigint_as_string=True),
content_type='application/json')
try:
return HttpResponse(json.dumps(finalResult, cls=ExtendJSONEncoder, bigint_as_string=True),
content_type='application/json')
except Exception:
return HttpResponse(json.dumps(finalResult, default=str, bigint_as_string=True, encoding='latin1'),
content_type='application/json')


# 获取sql查询记录
Expand Down Expand Up @@ -840,15 +844,11 @@ def slowquery_review(request):
slowsql_obj = SlowQuery.objects.filter(
slowqueryhistory__hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
slowqueryhistory__db_max=DBName,
slowqueryhistory__ts_min__range=(StartTime, EndTime),
last_seen__range=(StartTime, EndTime)
).annotate(CreateTime=F('last_seen'),
SQLId=F('checksum'),
DBName=F('slowqueryhistory__db_max'), # 数据库
SQLText=F('fingerprint'), # SQL语句
).values(
'CreateTime', 'SQLId', 'DBName', 'SQLText'
).annotate(
slowqueryhistory__ts_min__range=(StartTime, EndTime)
).annotate(SQLText=F('fingerprint'), SQLId=F('checksum')).values('SQLText', 'SQLId').annotate(
CreateTime=Max('slowqueryhistory__ts_max'),
DBName=Max('slowqueryhistory__db_max'), # 数据库
QueryTimeAvg=Sum('slowqueryhistory__query_time_sum') / Sum('slowqueryhistory__ts_cnt'), # 平均执行时长
MySQLTotalExecutionCounts=Sum('slowqueryhistory__ts_cnt'), # 执行总次数
MySQLTotalExecutionTimes=Sum('slowqueryhistory__query_time_sum'), # 执行总时长
ParseTotalRowCounts=Sum('slowqueryhistory__rows_examined_sum'), # 扫描总行数
Expand All @@ -858,15 +858,11 @@ def slowquery_review(request):
slowsql_obj_count = SlowQuery.objects.filter(
slowqueryhistory__hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
slowqueryhistory__db_max=DBName,
slowqueryhistory__ts_min__range=(StartTime, EndTime),
last_seen__range=(StartTime, EndTime)
).annotate(CreateTime=F('last_seen'),
SQLId=F('checksum'),
DBName=F('slowqueryhistory__db_max'), # 数据库
SQLText=F('fingerprint'), # SQL语句
).values(
'CreateTime', 'SQLId', 'DBName', 'SQLText'
).annotate(
slowqueryhistory__ts_min__range=(StartTime, EndTime)
).annotate(SQLText=F('fingerprint'), SQLId=F('checksum')).values('SQLText', 'SQLId').annotate(
CreateTime=Max('slowqueryhistory__ts_max'),
DBName=Max('slowqueryhistory__db_max'), # 数据库
QueryTimeAvg=Sum('slowqueryhistory__query_time_sum') / Sum('slowqueryhistory__ts_cnt'), # 平均执行时长
MySQLTotalExecutionCounts=Sum('slowqueryhistory__ts_cnt'), # 执行总次数
MySQLTotalExecutionTimes=Sum('slowqueryhistory__query_time_sum'), # 执行总时长
ParseTotalRowCounts=Sum('slowqueryhistory__rows_examined_sum'), # 扫描总行数
Expand All @@ -877,14 +873,10 @@ def slowquery_review(request):
slowsql_obj = SlowQuery.objects.filter(
slowqueryhistory__hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
slowqueryhistory__ts_min__range=(StartTime, EndTime),
last_seen__range=(StartTime, EndTime)
).annotate(CreateTime=F('last_seen'),
SQLId=F('checksum'),
DBName=F('slowqueryhistory__db_max'), # 数据库
SQLText=F('fingerprint'), # SQL语句
).values(
'CreateTime', 'SQLId', 'DBName', 'SQLText'
).annotate(
).annotate(SQLText=F('fingerprint'), SQLId=F('checksum')).values('SQLText', 'SQLId').annotate(
CreateTime=Max('slowqueryhistory__ts_max'),
DBName=Max('slowqueryhistory__db_max'), # 数据库
QueryTimeAvg=Sum('slowqueryhistory__query_time_sum') / Sum('slowqueryhistory__ts_cnt'), # 平均执行时长
MySQLTotalExecutionCounts=Sum('slowqueryhistory__ts_cnt'), # 执行总次数
MySQLTotalExecutionTimes=Sum('slowqueryhistory__query_time_sum'), # 执行总时长
ParseTotalRowCounts=Sum('slowqueryhistory__rows_examined_sum'), # 扫描总行数
Expand All @@ -894,14 +886,10 @@ def slowquery_review(request):
slowsql_obj_count = SlowQuery.objects.filter(
slowqueryhistory__hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
slowqueryhistory__ts_min__range=(StartTime, EndTime),
last_seen__range=(StartTime, EndTime)
).annotate(CreateTime=F('last_seen'),
SQLId=F('checksum'),
DBName=F('slowqueryhistory__db_max'), # 数据库
SQLText=F('fingerprint'), # SQL语句
).values(
'CreateTime', 'SQLId', 'DBName', 'SQLText'
).annotate(
).annotate(SQLText=F('fingerprint'), SQLId=F('checksum')).values('SQLText', 'SQLId').annotate(
CreateTime=Max('slowqueryhistory__ts_max'),
DBName=Max('slowqueryhistory__db_max'), # 数据库
QueryTimeAvg=Sum('slowqueryhistory__query_time_sum') / Sum('slowqueryhistory__ts_cnt'), # 平均执行时长
MySQLTotalExecutionCounts=Sum('slowqueryhistory__ts_cnt'), # 执行总次数
MySQLTotalExecutionTimes=Sum('slowqueryhistory__query_time_sum'), # 执行总时长
ParseTotalRowCounts=Sum('slowqueryhistory__rows_examined_sum'), # 扫描总行数
Expand Down Expand Up @@ -947,17 +935,19 @@ def slowquery_review_history(request):
hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
checksum=SQLId,
ts_min__range=(StartTime, EndTime)
).annotate(ExecutionStartTime=F('ts_min'), # 执行开始时间
).annotate(ExecutionStartTime=F('ts_min'), # 本次统计(每5分钟一次)该类型sql语句出现的最小时间
DBName=F('db_max'), # 数据库名
HostAddress=Concat(V('\''), 'user_max', V('\''), V('@'), V('\''), 'client_max', V('\'')), # 用户名
SQLText=F('sample'), # SQL语句
QueryTimes=F('query_time_sum'), # 执行时长(秒)
LockTimes=F('lock_time_sum'), # 锁定时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 解析行数
ReturnRowCounts=F('rows_sent_sum') # 返回行数
TotalExecutionCounts=F('ts_cnt'), # 本次统计该sql语句出现的次数
QueryTimePct95=F('query_time_pct_95'), # 本次统计该sql语句95%耗时
QueryTimes=F('query_time_sum'), # 本次统计该sql语句花费的总时间(秒)
LockTimes=F('lock_time_sum'), # 本次统计该sql语句锁定总时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 本次统计该sql语句解析总行数
ReturnRowCounts=F('rows_sent_sum') # 本次统计该sql语句返回总行数
).values(
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'QueryTimes', 'LockTimes', 'ParseRowCounts',
'ReturnRowCounts'
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'TotalExecutionCounts', 'QueryTimePct95',
'QueryTimes', 'LockTimes', 'ParseRowCounts', 'ReturnRowCounts'
)[offset:limit]

slowsql_obj_count = SlowQueryHistory.objects.filter(
Expand All @@ -972,18 +962,20 @@ def slowquery_review_history(request):
hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
db_max=DBName,
ts_min__range=(StartTime, EndTime)
).annotate(ExecutionStartTime=F('ts_min'), # 执行开始时间
).annotate(ExecutionStartTime=F('ts_min'), # 本次统计(每5分钟一次)该类型sql语句出现的最小时间
DBName=F('db_max'), # 数据库名
HostAddress=Concat(V('\''), 'user_max', V('\''), V('@'), V('\''), 'client_max', V('\'')), # 用户名
HostAddress=Concat(V('\''), 'user_max', V('\''), V('@'), V('\''), 'client_max', V('\'')),
# 用户名
SQLText=F('sample'), # SQL语句
QueryTimes=F('query_time_sum'), # 执行时长(秒)
LockTimes=F('lock_time_sum'), # 锁定时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 解析行数
ReturnRowCounts=F('rows_sent_sum') # 返回行数
TotalExecutionCounts=F('ts_cnt'), # 本次统计该sql语句出现的次数
QueryTimePct95=F('query_time_pct_95'), # 本次统计该sql语句出现的次数
QueryTimes=F('query_time_sum'), # 本次统计该sql语句花费的总时间(秒)
LockTimes=F('lock_time_sum'), # 本次统计该sql语句锁定总时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 本次统计该sql语句解析总行数
ReturnRowCounts=F('rows_sent_sum') # 本次统计该sql语句返回总行数
).values(
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'QueryTimes', 'LockTimes',
'ParseRowCounts',
'ReturnRowCounts'
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'TotalExecutionCounts', 'QueryTimePct95',
'QueryTimes', 'LockTimes', 'ParseRowCounts', 'ReturnRowCounts'
)[offset:limit] # 执行总次数倒序排列

slowsql_obj_count = SlowQueryHistory.objects.filter(
Expand All @@ -996,18 +988,20 @@ def slowquery_review_history(request):
slowsql_record_obj = SlowQueryHistory.objects.filter(
hostname_max=(cluster_info.master_host + ':' + str(cluster_info.master_port)),
ts_min__range=(StartTime, EndTime)
).annotate(ExecutionStartTime=F('ts_min'), # 执行开始时间
).annotate(ExecutionStartTime=F('ts_min'), # 本次统计(每5分钟一次)该类型sql语句出现的最小时间
DBName=F('db_max'), # 数据库名
HostAddress=F('user_max'), # 用户名
HostAddress=Concat(V('\''), 'user_max', V('\''), V('@'), V('\''), 'client_max', V('\'')),
# 用户名
SQLText=F('sample'), # SQL语句
QueryTimes=F('query_time_sum'), # 执行时长(秒)
LockTimes=F('lock_time_sum'), # 锁定时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 解析行数
ReturnRowCounts=F('rows_sent_sum') # 返回行数
TotalExecutionCounts=F('ts_cnt'), # 本次统计该sql语句出现的次数
QueryTimePct95=F('query_time_pct_95'), # 本次统计该sql语句95%耗时
QueryTimes=F('query_time_sum'), # 本次统计该sql语句花费的总时间(秒)
LockTimes=F('lock_time_sum'), # 本次统计该sql语句锁定总时长(秒)
ParseRowCounts=F('rows_examined_sum'), # 本次统计该sql语句解析总行数
ReturnRowCounts=F('rows_sent_sum') # 本次统计该sql语句返回总行数
).values(
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'QueryTimes', 'LockTimes',
'ParseRowCounts',
'ReturnRowCounts'
'ExecutionStartTime', 'DBName', 'HostAddress', 'SQLText', 'TotalExecutionCounts', 'QueryTimePct95',
'QueryTimes', 'LockTimes', 'ParseRowCounts', 'ReturnRowCounts'
)[offset:limit] # 执行总次数倒序排列

slowsql_obj_count = SlowQueryHistory.objects.filter(
Expand Down
28 changes: 20 additions & 8 deletions sql/static/slowquery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@
}
},
formatter: function (value, row, index) {
if (value.length > 80) {
var sql = value.substr(0, 808) + '...';
if (value.length > 100) {
var sql = value.substr(0, 100) + '...';
return sql;
}
else {
Expand All @@ -345,6 +345,9 @@
field: 'ReturnTotalRowCounts'
}],
locale: 'zh-CN',
onLoadError: function () {
alert("数据加载失败！请检查接口返回信息和错误日志！");
},
responseHandler: function (res) {
//在ajax获取到数据，渲染表格之前，修改数据源
return res;
Expand Down Expand Up @@ -435,30 +438,39 @@
title: 'SQL语句',
field: 'SQLText',
formatter: function (value, row, index) {
if (value.length > 80) {
var sql = value.substr(0, 80) + '...';
if (value.length > 100) {
var sql = value.substr(0, 100) + '...';
return sql;
}
else {
return value
}
}
}, {
title: '执行时长(秒)',
title: '执行总次数',
field: 'TotalExecutionCounts'
}, {
title: '执行时长(95%)',
field: 'QueryTimePct95'
}, {
title: '执行总时长(秒)',
field: 'QueryTimes'
}, {
title: '锁定时长(秒)',
title: '锁定总时长(秒)',
field: 'LockTimes'
}, {
title: '解析行数',
title: '解析总行数',
field: 'ParseRowCounts'
}, {
title: '返回行数',
title: '返回总行数',
field: 'ReturnRowCounts'
}],
singleSelect: true,
toolbar: "#sqladvisor-toolbar", //指明自定义的toolbar
locale: 'zh-CN',
onLoadError: function () {
alert("数据加载失败！请检查接口返回信息和错误日志！");
},
responseHandler: function (res) {
//在ajax获取到数据，渲染表格之前，修改数据源
return res;
Expand Down

0 comments on commit d3c23b0

Please sign in to comment.