crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[analyse2] La requête est optimisée pour des inner join

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-06-29 18:21:17 +02:00
parent 7b31b3e0e7
commit e68d3eb8dc
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
surveillance/analyse2.py
View file

@ -59,7 +59,7 @@ FROM (
port_dst as port_ext port_dst as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_src machines_sans_doublon.mac_addr = upload.mac_src
@ -98,7 +98,7 @@ FROM (
port_src as port_ext port_src as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_dst machines_sans_doublon.mac_addr = upload.mac_dst
@ -165,7 +165,7 @@ FROM (
port_dst as port_ext port_dst as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_src machines_sans_doublon.mac_addr = upload.mac_src
@ -206,7 +206,7 @@ FROM (
port_src as port_ext port_src as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_dst machines_sans_doublon.mac_addr = upload.mac_dst
@ -275,7 +275,7 @@ FROM (
port_dst as port_ext port_dst as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_src machines_sans_doublon.mac_addr = upload.mac_src
@ -318,7 +318,7 @@ FROM (
port_src as port_ext port_src as port_ext
FROM FROM
upload upload
LEFT JOIN INNER JOIN
machines_sans_doublon machines_sans_doublon
ON ON
machines_sans_doublon.mac_addr = upload.mac_dst machines_sans_doublon.mac_addr = upload.mac_dst
@ -427,14 +427,14 @@ GROUP BY
convert = lambda ip:ip convert = lambda ip:ip
if not args.fichier or args.couleur: if not args.fichier or args.couleur:
styles = (None, None, None, None, None, down_color, up_color) styles = (None, None, None, None, down_color, up_color)
else: else:
styles = None styles = None
entete = [u"Mac", u"Ip_crans", u"Ip_ext", u"Port_crans", u"Port_ext", unicode("Download (Mio)"), unicode("Upload (Mio)")] entete = [u"Ip_crans", u"Ip_ext", u"Port_crans", u"Port_ext", unicode("Download (Mio)"), unicode("Upload (Mio)")]
longueur = [17, '*', '*', 10, 8, 14, 14] longueur = [30, '*', 10, 8, 14, 14]
format = ('s', 's', 's', 's', 's', 'o', 'o') format = ('s', 's', 's', 's', 'o', 'o')
data = [[unicode(ligne['mac']), unicode(convert(ligne['ip_crans'])), unicode(convert(ligne['ip_ext'])), unicode(ligne['port_crans']), unicode(ligne['port_ext']), unicode(ligne["tot_download"]), unicode(ligne["tot_upload"])] for ligne in stats] data = [[unicode(convert(ligne['ip_crans'])), unicode(convert(ligne['ip_ext'])), unicode(ligne['port_crans']), unicode(ligne['port_ext']), unicode(ligne["tot_download"]), unicode(ligne["tot_upload"])] for ligne in stats]
final_data = affichage.tableau(data, titre=entete, largeur=longueur, styles=styles, format=format, width=120) final_data = affichage.tableau(data, titre=entete, largeur=longueur, styles=styles, format=format, width=125)
output += u"Upload total : %s Mio, download total : %s Mio\n" % (sum([int(ligne["tot_upload"]) for ligne in stats])/1024/1024, sum([int(ligne["tot_download"]) for ligne in stats])/1024/1024) output += u"Upload total : %s Mio, download total : %s Mio\n" % (sum([int(ligne["tot_upload"]) for ligne in stats])/1024/1024, sum([int(ligne["tot_download"]) for ligne in stats])/1024/1024)
output += final_data output += final_data