Changeset 191

Timestamp:

02/23/06 16:34:38

Author:

douglm

Message:

More statistics changes

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java (modified) (3 diffs)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/TimezoneCache.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalTimezonesImpl.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (2 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/DbStatistics.java (modified) (3 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwRWStats.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwStats.java (modified) (5 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalTimezones.java (modified) (6 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java (modified) (2 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/TimezonesImpl.java (modified) (1 diff)
• trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml (modified) (1 diff)
• trunk/calendar3/webadmin/war/docs/system/showSysStats.jsp (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java (modified) (2 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/StatisticsAction.java (modified) (3 diffs)

trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java

@@ -106 +106 @@
-  private TimeViewDailyInfo[] tvdis;
-  
-
+//
-
-  /** Constructor:
@@ -270 +270 @@
-  public Collection getDaysEvents(MyCalendarVO date) throws Throwable {
-    Vector v = new Vector();
+    CalTimezones tzcache = cal.getTimezones();
-//    Dur oneDay = new Dur(1, 0, 0, 0);
-    long millis = System.currentTimeMillis();
-    
-
+//
-    BwDateTime startDt = CalFacadeUtil.getDateTime(date.getDateDigits(),
-                                                   tzcache);
-
-
-
+
-    BwDateTime endDt = startDt.getNextDay(tzcache);
-    String start = startDt.getDate();
@@ -291 +290 @@
-      events = cal.getEvents(null, null,
-                             CalFacadeUtil.getDateTime(firstDay.getDateDigits(),
-//                                                     cal.getTimezones()),
-                                                       tzcache),
-                             CalFacadeUtil.getDateTime(lastDay.getTomorrow().getDateDigits(),
-//                                                     cal.getTimezones()),
-                                                       tzcache),
-                             CalFacadeDefs.retrieveRecurExpanded);

trunk/calendar3/appcommon/src/org/bedework/appcommon/TimezoneCache.java

@@ -137 +137 @@
-    HashMap cache;
-    
-
+id
-      cache = defaultCache;
-
+id
-      cache = defaultCache;
-    } else {

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalTimezonesImpl.java

@@ -175 +175 @@
-  public void clearPublicTimezones() throws CalFacadeException {
-    cal.clearPublicTimezones();
+    super.clearPublicTimezones();
-  }
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -338 +338 @@
-
-  public BwStats getStats() throws CalFacadeException {
+    if (stats == null) {
+      return null;
+    }
+    
+    BwRWStats rwstats = (BwRWStats)stats;
+    
+    if (timezones != null) {
+      rwstats.setDateCacheHits(timezones.getDateCacheHits());
+      rwstats.setDateCacheMisses(timezones.getDateCacheMisses());
+      rwstats.setDatesCached(timezones.getDatesCached());
+    }
+    
-    return stats;
-  }
-
-Stats
+DbStatsEnabled
-    if (!enable && (dbStats == null)) {
-      return;
@@ -352 +364 @@
-    dbStats.setStatisticsEnabled(enable);
-  }
+
+  public boolean getDbStatsEnabled() throws CalFacadeException {
+    if (dbStats == null) {
+      return false;
+    }
+    
+    return dbStats.isStatisticsEnabled();
+  }
-  
-
+Db
-    DbStatistics.dumpStats(dbStats);
+  }
+  
+  public Collection getDbStats() throws CalFacadeException {
+    return DbStatistics.getStats(dbStats);
-  }
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/DbStatistics.java

@@ -54 +54 @@
-package org.bedework.calcore.hibernate;
-
+import java.util.Collection;
+import java.util.Vector;
+
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwCategory;
@@ -59 +62 @@
-import org.bedework.calfacade.BwLocation;
-import org.bedework.calfacade.BwSponsor;
+import org.bedework.calfacade.BwStats;
-import org.bedework.calfacade.BwUser;
+import org.bedework.calfacade.BwStats.StatsEntry;
-
-import org.apache.log4j.Logger;
@@ -73 +78 @@
- */
-public class DbStatistics {
-  private static final int lcolw = 50;
-  
-  public static void dumpStats(Statistics dbStats) {
+    if (dbStats == null) {
+      return;
+    }
+
+    Logger log = Logger.getLogger(DbStatistics.class);
+
+    log.debug(BwStats.toString(getStats(dbStats)));
+  }
+
+  public static Collection getStats(Statistics dbStats) {
-    /* XXX this ought to be property driven to some extent. The cache stats in
-     * particular.
-     */
+    Vector v = new Vector();
+
-    if (dbStats == null) {
-
+ v
-    }
-    
-    Logger log = Logger.getLogger(DbStatistics.class);
-    
-    log.debug(lpad("Number of connection requests: " , lcolw) + 
-              dbStats.getConnectCount());
-    log.debug(lpad("Session flushes: " , lcolw) + 
-              dbStats.getFlushCount());
-    log.debug(lpad("Transactions: " , lcolw) +
-              dbStats.getTransactionCount());
-    log.debug(lpad("Successful transactions: " , lcolw) + 
-              dbStats.getSuccessfulTransactionCount());
-    log.debug(lpad("Sessions opened: " , lcolw) +
-              dbStats.getSessionOpenCount());
-    log.debug(lpad("Sessions closed: " , lcolw) +
-              dbStats.getSessionCloseCount());
-    log.debug(lpad("Queries executed: " , lcolw) + 
-              dbStats.getQueryExecutionCount());
-    log.debug(lpad("Slowest query time: " , lcolw) + 
-              dbStats.getQueryExecutionMaxTime());
-    
-    log.debug(" "); 
-    log.debug(lpad("Collection statistics" , lcolw)); 
-    log.debug(" "); 
-    
-    log.debug(lpad("Collections fetched: " , lcolw) +
-              dbStats.getCollectionFetchCount());
-    log.debug(lpad("Collections loaded: " , lcolw) +
-              dbStats.getCollectionLoadCount());
-    log.debug(lpad("Collections rebuilt: " , lcolw) +
-              dbStats.getCollectionRecreateCount());
-    log.debug(lpad("Collections batch deleted: " , lcolw) +
-              dbStats.getCollectionRemoveCount());
-    log.debug(lpad("Collections batch updated: " , lcolw) +
-              dbStats.getCollectionUpdateCount());
-    
-    log.debug(" "); 
-    log.debug(lpad("Object statistics" , lcolw)); 
-    log.debug(" "); 
-    
-    log.debug(lpad("Objects fetched: " , lcolw) +
-              dbStats.getEntityFetchCount());
-    log.debug(lpad("Objects loaded: " , lcolw) +
-              dbStats.getEntityLoadCount());
-    log.debug(lpad("Objects inserted: " , lcolw) +
-              dbStats.getEntityInsertCount());
-    log.debug(lpad("Objects deleted: " , lcolw) +
-              dbStats.getEntityDeleteCount());
-    log.debug(lpad("Objects updated: " , lcolw) +
-              dbStats.getEntityUpdateCount());
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    double chit = dbStats.getQueryCacheHitCount();
-    double cmiss = dbStats.getQueryCacheMissCount();
-    
-    log.debug(lpad("Cache hit count: " , lcolw) + chit);
-    log.debug(lpad("Cache miss count: " , lcolw) + cmiss);
-    log.debug(lpad("Cache hit ratio: " , lcolw) + chit / (chit + cmiss));
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
+
+
+
-    String name = cl.getName();
-
-
-
-
-
+
+
+
-    EntityStatistics eStats = dbStats.getEntityStatistics(name);
-
-log.debug(lpad("Fetched: " , lcolw) + eStats.getFetchCount(
-log.debug(lpad("Loaded: " , lcolw) + eStats.getLoadCount(
-log.debug(lpad("Inserted: " , lcolw) + eStats.getInsertCount(
-log.debug(lpad("Deleted: " , lcolw) + eStats.getDeleteCount(
-log.debug(lpad("Updated: " , lcolw) + eStats.getUpdateCount(
+c.add(new StatsEntry("Fetched", eStats.getFetchCount()
+c.add(new StatsEntry("Loaded", eStats.getLoadCount()
+c.add(new StatsEntry("Inserted", eStats.getInsertCount()
+c.add(new StatsEntry("Deleted", eStats.getDeleteCount()
+c.add(new StatsEntry("Updated", eStats.getUpdateCount()
-  }
-
-Statistics dbStats, Class cl, 
-, Logger log
+
+Collection c, Statistics dbStats, Class cl,
+
-    String name = cl.getName() + "." + cname;
-
-
-
-
-
+
+
+
-    CollectionStatistics cStats = dbStats.getCollectionStatistics(name);
-
-log.debug(lpad("Fetched: " , lcolw) + cStats.getFetchCount(
-log.debug(lpad("Loaded: " , lcolw) + cStats.getLoadCount(
-log.debug(lpad("Recreated: " , lcolw) + cStats.getRecreateCount(
-log.debug(lpad("Removed: " , lcolw) + cStats.getRemoveCount(
-log.debug(lpad("Updated: " , lcolw) + cStats.getUpdateCount(
+c.add(new StatsEntry("Fetched", cStats.getFetchCount()
+c.add(new StatsEntry("Loaded", cStats.getLoadCount()
+c.add(new StatsEntry("Recreated", cStats.getRecreateCount()
+c.add(new StatsEntry("Removed", cStats.getRemoveCount()
+c.add(new StatsEntry("Updated", cStats.getUpdateCount()
-  }
-
-
-
-
-
-
-
+
+
+
+
+
-    SecondLevelCacheStatistics slStats = dbStats.getSecondLevelCacheStatistics(name);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwRWStats.java

@@ -80 +80 @@
-    tzStores++;
-  }
+
+  /**
+   * @param  val  double event fetch millis.
+   */
+  public void incEventFetchTime(double val) {
+    eventFetchTime += val;
+  }
+
+  /**
+   * @param val   long event fetches.
+   */
+  public void incEventFetches(long val) {
+    eventFetches += val;
+  }
+
+  /**
+   * @param val   number of utc values cached
+   */
+  public void setDatesCached(long val) {
+    datesCached = val;
+  }
+
+  /**
+   * @param val    date cache hits
+   */
+  public void setDateCacheHits(long val) {
+    dateCacheHits = val;
+  }
+
+  /**
+   * @param val   data cache misses.
+   */
+  public void setDateCacheMisses(long val) {
+    dateCacheMisses = val;
+  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwStats.java

@@ -56 +56 @@
-
-import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
-
-/** Some statistics for the Bedework calendar. These are not necessarily
@@ -64 +67 @@
- */
-public class BwStats implements Serializable {
+  /** Class to hold a statistics. We build a collection of these.
+   * We use Strings for values as these are going to be dumped as xml.
+   */
+  public static class StatsEntry {
+    public final static int statKindHeader = 0;
+    public final static int statKindStat = 1;
+
+    private int statKind;
+
+    private String statLabel;
+
+    public final static int statTypeString = 0;
+    public final static int statTypeInt = 1;
+    public final static int statTypeLong = 2;
+    public final static int statTypeDouble = 3;
+    private int statType;
+
+    private String statVal;
+
+    public StatsEntry(String label, int val) {
+      statKind = statKindStat;
+      statLabel = label;
+      statType = statTypeInt;
+      statVal = String.valueOf(val);
+    }
+
+    public StatsEntry(String label, long val) {
+      statKind = statKindStat;
+      statLabel = label;
+      statType = statTypeLong;
+      statVal = String.valueOf(val);
+    }
+
+    public StatsEntry(String label, double val) {
+      statKind = statKindStat;
+      statLabel = label;
+      statType = statTypeDouble;
+      statVal = String.valueOf(val);
+    }
+
+    public StatsEntry(String label, String val) {
+      statKind = statKindStat;
+      statLabel = label;
+      statType = statTypeString;
+      statVal = val;
+    }
+
+    public StatsEntry(String header) {
+      statKind = statKindHeader;
+      statLabel = header;
+    }
+
+    public int getStatKind() {
+      return statKind;
+    }
+
+    public String getStatLabel() {
+      return statLabel;
+    }
+
+    public int getStatType() {
+      return statType;
+    }
+
+    public String getStatVal() {
+      return statVal;
+    }
+  }
+
-  protected int tzFetches;
-
@@ -69 +141 @@
-
-  protected int tzStores;
-
+
-  protected double eventFetchTime;
-
+
-  protected long eventFetches;
+
+  /* Timezone cache stats */
+  protected long datesCached;
+  protected long dateCacheHits;
+  protected long dateCacheMisses;
-
-  /**
@@ -109 +186 @@
-  }
-
+  /**
+   * @return Number of utc values cached
+   */
+  public long getDatesCached() {
+    return datesCached;
+  }
+
+  /**
+   * @return date cache hits
+   */
+  public long getDateCacheHits() {
+    return dateCacheHits;
+  }
+
+  /**
+   * @return data cache misses.
+   */
+  public long getDateCacheMisses() {
+    return dateCacheMisses;
+  }
+
+  public Collection getStats() {
+    Vector v = new Vector();
+
+    v.add(new StatsEntry("Bedework statistics."));
+    v.add(new StatsEntry("tzFetches", getTzFetches()));
+    v.add(new StatsEntry("systemTzFetches", getSystemTzFetches()));
+    v.add(new StatsEntry("tzStores", getTzStores()));
+
+    v.add(new StatsEntry("event fetch time", getEventFetchTime()));
+    v.add(new StatsEntry("event fetches", getEventFetches()));
+
+    v.add(new StatsEntry("UTC dates cached", getDatesCached()));
+    v.add(new StatsEntry("UTC date cache hits", getDateCacheHits()));
+    v.add(new StatsEntry("UTC date cache misses", getDateCacheMisses()));
+
+    return v;
+  }
+
+  /** Turn the Collection of StatsEntry into a String for dumps.
+   */
+  public static String toString(Collection c) {
+    StringBuffer sb = new StringBuffer();
+
+    Iterator it = c.iterator();
+
+    while (it.hasNext()) {
+      StatsEntry se = (StatsEntry)it.next();
+      int k = se.getStatKind();
+
+      if (k == StatsEntry.statKindHeader) {
+        header(sb, se.getStatLabel());
+      } else {
+        format(sb, se.getStatLabel(), se.getStatVal());
+      }
+    }
+
+    return sb.toString();
+  }
+
-  public String toString() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  private static final int maxvalpad = 10;
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -137 +269 @@
-  }
-
-
-
+
+
+
+
+
+
+
+
-    sb.append(": ");
-String.valueOf(val)
+val
-    sb.append("\n");
-  }
-
-  private void format(StringBuffer sb, String name, int val) {
-    pad(sb, name, maxnamepad);
-    sb.append(": ");
-    pad(sb, String.valueOf(val), maxvalpad);
-    sb.append("\n");
-  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java

@@ -169 +169 @@
-  }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalTimezones.java

@@ -140 +140 @@
-  /* Map of user TimezoneInfo */
-  protected HashMap timezones = new HashMap();
+  
+  /* Cache date only UTC values - we do a lot of those but the number of
+   * different dates should be limited.
+   * 
+   * We have one cache per timezone
+   */
+  private HashMap dateCaches = new HashMap();
+
+  private HashMap defaultDateCache = new HashMap();
+  
+  private long datesCached;
+  private long dateCacheHits;
+  private long dateCacheMisses;
-
-  protected CalTimezones(boolean debug) {
@@ -230 +243 @@
-  public abstract VTimeZone findTimeZone(final String id, BwUser owner) throws CalFacadeException;
-  
-
+. Implementing classes should call this.
-   *
-   * <p>Will remove all public timezones in preparation for a replacement
@@ -237 +250 @@
-   * @throws CalFacadeException
-   */
-
+
+
+
+
-  
-  /** Refresh the public timezone table - presumably after a call to clearPublicTimezones.
@@ -291 +307 @@
-      return time;
-    }
+
+    String dateKey = null;
+    HashMap cache = null;
-    
-    if (CalFacadeUtil.isISODate(time)) {
+      /* See if we have it cached */
+      
+      if (tzid == null) {
+        cache = defaultDateCache;
+      } else if (tzid.equals(getDefaultTimeZoneId())) {
+        cache = defaultDateCache;
+      } else {
+        cache = (HashMap)dateCaches.get(tzid);
+        if (cache == null) {
+          cache = new HashMap();
+          dateCaches.put(tzid, cache);
+        }
+      }
+      
+      String utc = (String)cache.get(time);
+      
+      if (utc != null) {
+        dateCacheHits++;
+        return utc;
+      }
+
+      /* Not in the cache - calculate it */
+      
+      dateCacheMisses++;
+      dateKey = time;
-      time += "T000000";
-    } else if (!CalFacadeUtil.isISODateTime(time)) {
@@ -364 +408 @@
-      digit2(sb, cal.get(Calendar.SECOND));
-      sb.append('Z');
-
+
+
+
+
+
+
+
+
+
-    } catch (Throwable t) {
-      t.printStackTrace();
@@ -371 +423 @@
-  }
-  
+  /**
+   * @return Number of utc values cached
+   */
+  public long getDatesCached() {
+    return datesCached;
+  }
+  
+  /**
+   * @return date cache hits
+   */
+  public long getDateCacheHits() {
+    return dateCacheHits;
+  }
+  
+  /**
+   * @return data cache misses.
+   */
+  public long getDateCacheMisses() {
+    return dateCacheMisses;
+  }
+    
-  /* ====================================================================
-   *                   protected methods

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java

@@ -126 +126 @@
-   * @throws CalFacadeException if not admin
-   */
-
+
+
+
+
+
+
+
+
-
-  /** Dump db statistics 
@@ -132 +139 @@
-   * @throws CalFacadeException if not admin
-   */
-
+
+
+
+
+
+
+
+
-
-  /** Get the system pars

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -325 +325 @@
-
-  public BwStats getStats() throws CalFacadeException {
-//
-//
-//
+
+
+
-
-    return getCal().getStats();
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    trace(getStats().toString());
-
+
+
+
+
+
+
+
+
+
-  }
-

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -119 +119 @@
-   * @throws CalFacadeException if not admin
-   */
-
+
+
+
+
+
+
+
+
-
-  /** Dump db statistics 
@@ -125 +132 @@
-   * @throws CalFacadeException if not admin
-   */
-
+
+
+
+
+
+
+
+
-
-  /** Get the system pars

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/TimezonesImpl.java

@@ -190 +190 @@
-  }
-
-  public void clearPublicTimezones() throws CalFacadeException {
-  }
-
-  public void refreshTimezones() throws CalFacadeException {
-    synchronized (this) {

trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml

@@ -947 +947 @@
-      <forward name="continue"  path="/admingroup/showChooseGroup.rdo" redirect="true" />
-    </action>
+
+    <!-- ===============================================================
+                     Stats Actions
+         =============================================================== -->
+
+    <action    path="/stats/show"
+               type="org.bedework.webadmin.PERenderAction"
+               name="peForm"
+               scope="session"
+               validate="false">
+      <forward name="success" path="/docs/system/showSysStats.jsp" />
+    </action>
+
+    <action    path="/stats/update"
+               type="org.bedework.webcommon.misc.StatisticsAction"
+               name="peForm"
+               scope="session"
+               validate="false">
+      <forward name="continue"  path="/stats/show.rdo" redirect="true" />
+      <forward name="success"  path="/stats/show.rdo" redirect="true" />
+    </action>
-  </action-mappings>
-

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java

@@ -108 +108 @@
-  private BwSystem syspars;
-
+  private Collection sysStats;
+  
-  private transient MailerIntf mailer;
-
@@ -395 +397 @@
-    return syspars;
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  /** This will default to the current user. Superusers will be able to
-   * specify a creator.

trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/StatisticsAction.java

@@ -55 +55 @@
-package org.bedework.webcommon.misc;
-
+import java.util.Collection;
+
+import org.bedework.calfacade.BwStats;
-import org.bedework.calsvci.CalSvcI;
-import org.bedework.webcommon.BwAbstractAction;
@@ -70 +73 @@
- *      <li>"disable"           Disable stats</li>
- *      <li>"dump"              Dump stats</li>
+ *      <li>"fetch"             fetch stats</li>
- * </ul>
- *
@@ -90 +94 @@
-
-    if (getReqPar(request, "enable") != null) {
-Stats
+DbStatsEnabled
-    } else if (getReqPar(request, "disable") != null) {
-Stats
+DbStatsEnabled
-    } else if (getReqPar(request, "dump") != null) {
-
+
+
+
+
+
+
+
+
+
+
+
-    } 
-