[comptage] "Optimisations"

This commit is contained in:
Pierre-Elliott Bécue 2014-06-21 19:31:49 +02:00
parent 6ca9a058e1
commit aa63141c63
2 changed files with 12 additions and 16 deletions

View file

@ -56,8 +56,6 @@ FROM (
machines.mac_addr = upload.mac_src
WHERE
ip_src=%(pg_value)s
AND NOT
ip_src <<= inet%(ipv6_local)s
AND NOT
ip_dst <<= inet%(ipv6_local)s
AND NOT
@ -69,7 +67,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,
@ -97,8 +95,6 @@ FROM (
ip_dst=%(pg_value)s
AND NOT
ip_src <<= inet%(ipv6_local)s
AND NOT
ip_dst <<= inet%(ipv6_local)s
AND NOT
ip_src <<= inet%(plage_ens)s
AND NOT
@ -108,7 +104,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,
@ -152,7 +148,7 @@ FROM (
ON
machines.mac_addr = upload.mac_src
WHERE
machines.mac_addr=%(pg_value)s
mac_src=macaddr%(pg_value)s
AND NOT
ip_src <<= inet%(ipv6_local)s
AND NOT
@ -166,7 +162,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,
@ -191,7 +187,7 @@ FROM (
ON
machines.mac_addr = upload.mac_dst
WHERE
machines.mac_addr=%(pg_value)s
mac_dst=macaddr%(pg_value)s
AND NOT
ip_src <<= inet%(ipv6_local)s
AND NOT
@ -205,7 +201,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,
@ -265,7 +261,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,
@ -306,7 +302,7 @@ FROM (
AND
stamp_inserted >= %(begin)s
AND
stamp_updated <= %(end)s
stamp_inserted <= %(end)s
GROUP BY
mac,
ip_crans,