SVN Commit by andreas: r4840 - in trunk/pgadmin3: . src/slony

Author: andreas
Date: 2005-12-12 11:36:44 +0000 (Mon, 12 Dec 2005)
New Revision: 4840

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/slony/slNode.cpp
Log:
fix slony node statistics

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-12-11 23:08:20 UTC (rev 4839)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-12-12 11:36:44 UTC (rev 4840)
@@ -18,6 +18,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-12-12 AP  1.4.2  fix slony node statistics
     <li>2005-12-11 AP         support 8.1 language templates
     <li>2005-12-11 AP  1.4.2  Fix: Unsubscribe set on receiver
     <li>2005-12-11 AP  1.4.2  Another wxComboBox(2.6.2) related fix

Modified: trunk/pgadmin3/src/slony/slNode.cpp
===================================================================
--- trunk/pgadmin3/src/slony/slNode.cpp    2005-12-11 23:08:20 UTC (rev 4839)
+++ trunk/pgadmin3/src/slony/slNode.cpp    2005-12-12 11:36:44 UTC (rev 4840)
@@ -171,7 +171,7 @@
                 wxT("       st_last_event_ts - st_last_received_ts AS eventlag,")
                 wxT("       ev_seqno, ev_type || ' ' || COALESCE(ev_data1, '') AS hanging\n")
                 wxT("  FROM ") + GetCluster()->GetSchemaPrefix() + wxT("sl_status\n")
-                wxT("  LEFT JOIN ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event ON ev_seqno=\n")
+                wxT("  LEFT JOIN ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event ON ev_origin=st_origin AND
ev_seqno=\n")
                 wxT("         (SELECT MIN(ev_seqno) FROM ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event WHERE
ev_seqno> st_last_received)\n") 
                 wxT(" WHERE st_origin = ") + NumToStr(GetCluster()->GetLocalNodeID()) + wxT("\n")
                 wxT("   AND st_received = ") + NumToStr(GetSlId()));
@@ -331,7 +331,7 @@
         wxT("       CASE WHEN st_lag_num_events > 0 THEN st_last_event_ts - st_last_received_ts END AS eventlag,")
         wxT("       ev_seqno, ev_type || ' ' || COALESCE(ev_data1, '') AS hanging\n")
         wxT("  FROM ") + GetCluster()->GetSchemaPrefix() + wxT("sl_status\n")
-        wxT("  LEFT JOIN ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event ON ev_seqno=\n")
+        wxT("  LEFT JOIN ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event ON ev_origin=st_origin AND ev_seqno=\n")
         wxT("         (SELECT MIN(ev_seqno) FROM ") + GetCluster()->GetSchemaPrefix() + wxT("sl_event WHERE ev_seqno >
st_last_received)\n")
         wxT(" WHERE st_origin = ") + NumToStr(GetCluster()->GetLocalNodeID()));