From e68d3eb8dc557c07e878de33c084d9d43a8ff4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sun, 29 Jun 2014 18:21:17 +0200
Subject: [PATCH] =?UTF-8?q?[analyse2]=20La=20requ=C3=AAte=20est=20optimis?=
 =?UTF-8?q?=C3=A9e=20pour=20des=20inner=20join?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 surveillance/analyse2.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/surveillance/analyse2.py b/surveillance/analyse2.py
index dca04305..0d4a6c1c 100755
--- a/surveillance/analyse2.py
+++ b/surveillance/analyse2.py
@@ -59,7 +59,7 @@ FROM (
             port_dst as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_src
@@ -98,7 +98,7 @@ FROM (
             port_src as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_dst
@@ -165,7 +165,7 @@ FROM (
             port_dst as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_src
@@ -206,7 +206,7 @@ FROM (
             port_src as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_dst
@@ -275,7 +275,7 @@ FROM (
             port_dst as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_src
@@ -318,7 +318,7 @@ FROM (
             port_src as port_ext
         FROM
             upload
-        LEFT JOIN
+        INNER JOIN
             machines_sans_doublon
         ON
             machines_sans_doublon.mac_addr = upload.mac_dst
@@ -427,14 +427,14 @@ GROUP BY
         convert = lambda ip:ip
 
     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:
         styles = None
-    entete = [u"Mac", u"Ip_crans", u"Ip_ext", u"Port_crans", u"Port_ext", unicode("Download (Mio)"), unicode("Upload (Mio)")]
-    longueur = [17, '*', '*', 10, 8, 14, 14]
-    format = ('s', '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]
-    final_data = affichage.tableau(data, titre=entete, largeur=longueur, styles=styles, format=format, width=120)
+    entete = [u"Ip_crans", u"Ip_ext", u"Port_crans", u"Port_ext", unicode("Download (Mio)"), unicode("Upload (Mio)")]
+    longueur = [30, '*', 10, 8, 14, 14]
+    format = ('s', 's', 's', 's', 'o', 'o')
+    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=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 += final_data