Added possibility to serve from files instead of DB for increased performance

Author: govertbuijs

scripts/create_flat_files.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+"""
+This script produces flatfiles for the weather-server
+"""
+
+from datetime import datetime, timedelta
+import os
+
+
+START       = datetime(2009,  1,  1)
+END         = datetime(2011, 12, 31)
+LOCATIONS   = ["rotterdam"]
+
+START       = datetime(2008,  8,  1)
+END         = datetime(2010, 10,  3)
+LOCATIONS   = ["minneapolis", "cleveland", "seattle", "san francisco",
+               "palm springs", "phoenix", "memphis", "miami", "denver"]
+
+BASE_URL    = "http://localhost:8080/"\
+              "WeatherServer/faces/index.xhtml"\
+              "?weatherDate=%s&weatherLocation=%s"
+DIR         = "/home/govert/Dropbox/flat_files/%s/%s.%s.xml"
+
+
+def wget_date(date, location):
+    date_string = date.strftime("%Y%m%d00")
+    url = BASE_URL % (date_string, location) 
+    file_name = DIR % (location.replace(" ", "_"), date_string, location)
+
+    print
+    print date, date_string, url, file_name
+    print 'wget "%s" -O %s' % (url, file_name)
+    os.system('wget "%s" -O %s' % (url, file_name))
+
+
+def main():
+    for location in LOCATIONS:
+        date = START
+        while (True):
+            wget_date(date, location)
+
+            date += timedelta(1)
+            if date > END:
+                break
+
+
+if __name__ == "__main__":
+    main()
+

src/main/java/org/powertac/weatherserver/Parser.java

@@ -20,6 +20,9 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -65,6 +68,50 @@ public static String parseRestRequest (Map<?, ?> params)
           weatherLocation.getLocationName(), weatherDate.getMediumString()));
     }
 
+    if (properties.getProperty("useFlatFiles").equals("true")) {
+      String flatFile = parseFile(weatherDate, weatherLocation);
+      if (flatFile != null) {
+        return flatFile;
+      }
+    }
+
+    return queryDB (responseType, weatherDate, weatherLocation);
+	}
+
+  private static String parseFile (WeatherDate weatherDate, Location location)
+  {
+    StringBuilder sb = null;
+    BufferedReader br = null;
+    try {
+      String sCurrentLine;
+      sb = new StringBuilder();
+      br = new BufferedReader(
+          new FileReader(properties.getProperty("flatFileLocation")
+              + weatherDate.getSmallString() + "."
+              + location.getLocationName() + ".xml"));
+
+      while ((sCurrentLine = br.readLine()) != null) {
+        sb.append(sCurrentLine);
+      }
+    } catch (IOException ignored) {
+      sb = null;
+    } finally {
+      try {
+        if (br != null) {
+          br.close();
+        }
+      } catch (IOException ignored) {}
+    }
+
+    if (sb != null) {
+      return sb.toString();
+    }
+    return null;
+  }
+
+  private static String queryDB (String responseType, WeatherDate weatherDate,
+                                 Location weatherLocation)
+  {
     List<Weather> reports = new ArrayList<Weather>();
     List<Forecast> forecasts = new ArrayList<Forecast>();
     List<Energy> energys = new ArrayList<Energy>();
@@ -105,7 +152,7 @@ else if (responseType.equalsIgnoreCase("energy")) {
     }
 
     return createXML(reports, forecasts, energys);
-	}
+  }
 
   private static String createXML (List<Weather> reports,
                                    List<Forecast> forecasts,

src/main/java/org/powertac/weatherserver/listeners/Initializer.java

@@ -0,0 +1,26 @@
+package org.powertac.weatherserver.listeners;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.Set;
+
+
+public class Initializer implements ServletContextListener
+{
+  public void contextDestroyed (ServletContextEvent e)
+  {
+    Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
+    Thread[] threadArray = threadSet.toArray(new Thread[threadSet.size()]);
+    for (Thread t: threadArray) {
+      if (t.getName().contains("Abandoned connection cleanup thread")) {
+        synchronized(t) {
+          t.stop(); //don't complain, it works
+        }
+      }
+    }
+  }
+
+  public void contextInitialized (ServletContextEvent e)
+  {
+  }
+}

src/main/resources/weatherserver.properties.template

@@ -28,4 +28,7 @@ reportTable = reports
 forecastTable = forecasts
 energyTable = energy
 
-showRequestInLog = false
+showRequestInLog = false
+
+useFlatFiles = false
+flatFileLocation = /tmp/

src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="YourProjectName" version="3.0">
+	id="PowerTAC-WeatherServer" version="3.0">
 	<display-name>WeatherServer</display-name>
 
 	<!-- End Spring -->