Added map filtering and command-line options.

Author: Dragos Manolescu

build.sbt

@@ -46,7 +46,7 @@ libraryDependencies ++= Seq (
     "com.persist" % "persist-json_2.9.2" % "0.9-RC1",
     "com.codahale" % "jerkson_2.9.1" % "0.5.0",
     "net.liftweb" % "lift-json_2.9.1" % "2.4",
-    "net.minidev" % "json-smart" % "2.0-RC2",
+    "net.minidev" % "json-smart" % "1.1.1",
     "com.rojoma" %% "rojoma-json" % "2.0.0",
     "io.spray" %% "spray-json" % "1.2.3" cross CrossVersion.full,
     "com.yammer.metrics" % "metrics-core" % "2.1.3",

src/main/scala/com/microWorkflow/jsonScalaPerftest/LibraryAdaptor.scala

@@ -16,6 +16,8 @@ abstract class LibraryAdaptor(name: String) extends TimeMeasurements {
 
   def getName = name
 
+  def hasMap: Boolean
+
   def initialize()
 
   def runOnce(json: String, doMap:Boolean): Any

src/main/scala/com/microWorkflow/jsonScalaPerftest/Main.scala

@@ -42,7 +42,7 @@ case class Category(directoryName: String, name: String) {
     sb.toString()
   }
 
-  def measure(adapter: LibraryAdapter, doMap: Boolean) {
+  def measure(adapter: LibraryAdaptor, doMap: Boolean) {
     for (dataset <- datasets) {
       adapter.measure(dataset, doMap)
     }
@@ -59,15 +59,15 @@ object Category {
 
 case class Experiment(measurementsPath: String) {
 
-  val adapters = Array(new liftjson.LiftJsonAdapter("lift")
-    , new jerkson.JerksonAdapter("jerkson")
-    , new jsonsmart.JsonSmartAdapter("JsonSmart")
-    , new spray.SprayAdapter("spray")
-    , new persist.PersistAdapter("persist")
-    , new twitter.TwitterAdapter("twitter")
-    , new socrata.SocrataAdapter("socrata")
-    , new scalalib.ScalaLibAdapter("scalalib")
-    , new jackson.JacksonAdapter("jackson")
+  val adapters = Array(new liftjson.LiftJsonAdaptor("lift")
+    , new jerkson.JerksonAdaptor("jerkson")
+    , new jsonsmart.JsonSmartAdaptor("JsonSmart")
+    , new spray.SprayAdaptor("spray")
+    , new persist.PersistAdaptor("persist")
+    , new twitter.TwitterAdaptor("twitter")
+    , new socrata.SocrataAdaptor("socrata")
+    , new scalalib.ScalaLibAdaptor("scalalib")
+    , new jackson.JacksonAdaptor("jackson")
   )
 
   val loopCounter = Metrics.newCounter(this.getClass, "main loop")
@@ -77,28 +77,26 @@ case class Experiment(measurementsPath: String) {
   def run(iterations: Int, doMap: Boolean) = {
     loopCounter.clear()
     val oldFiles = Category.getFilesMatching(measurementsPath, f => f.isFile)
+    println("Removing %d old files".format(oldFiles.length))
     if (oldFiles != null)
       oldFiles.foreach(f => f.delete())
     CsvReporter.enable(new File(measurementsPath), 100, TimeUnit.MILLISECONDS)
+    val adaptersToTest = if (doMap) adapters.filter(_.hasMap) else adapters
     for (count <- 1 to iterations) {
-      categories.flatMap(c => (adapters map {
+      categories.flatMap(c => (adaptersToTest.map {
         each => c.measure(each, doMap)
       }))
       loopCounter.inc()
     }
   }
 
-  def takeMeasurements(iterations: Int) {
+  def takeMeasurements(iterations: Int, doMap: Boolean) {
     val where = new File(measurementsPath)
     where.mkdirs()
     print("Priming caches...")
-    run(iterations, true)
-    print("Measuring timings w/o mapping...")
-    run(iterations, false)
-    Category.getFilesMatching(measurementsPath, f => f.isFile && f.getName.contains(".csv".toCharArray))
-            .foreach(f => f.renameTo(new File("nomap" + f.getName)))
-    print("Measuring timings w/ mapping...")
-    run(iterations, true)
+    run(iterations, doMap)
+    print("Measuring timings...")
+    run(iterations, doMap)
   }
 
   def printMeanValues() {
@@ -118,8 +116,16 @@ case class Experiment(measurementsPath: String) {
 }
 
 
-object Main extends App {
-  val e = Experiment("/tmp/measurements1")
-  e.takeMeasurements(10)
-  println("Done")
+object Main {
+
+  def main(args: Array[String]) {
+    val where = if (args.length>0) args(0) else "/tmp/measurements"
+    val iterations:Int = if (args.length>1) args(1).toInt else 100
+    val doMap = if (args.length>2) args(2).equalsIgnoreCase("-map") else false
+    println("Runing %d iterations %s object mapping; test results in %s"
+      .format(iterations, if (doMap) "with" else "without", where))
+    val e = Experiment(where)
+    e.takeMeasurements(iterations, doMap)
+    println("Done")
+  }
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/jackson/JacksonAdaptor.scala

@@ -1,8 +1,6 @@
 package com.microWorkflow.jsonScalaPerftest.jackson
 
-import com.persist.JsonOps._
-import com.persist.JsonMapper._
-import com.microWorkflow.jsonScalaPerftest.{LibraryAdaptor, TimeMeasurements}
+import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import org.codehaus.jackson.map.ObjectMapper
 import org.codehaus.jackson.map.DeserializationConfig
 
@@ -14,14 +12,6 @@ import org.codehaus.jackson.map.DeserializationConfig
  * To change this template use File | Settings | File Templates.
  */
 
-/*
-case class Url(indices: Seq[Int], url: String)
-case class Hashtag(indices: Seq[Int], text: String)
-case class UserMention(indices: Seq[Int], name: String)
-case class Entities(hashtags: Seq[Hashtag], urls: Seq[Url], user_mentions: Seq[UserMention])
-case class Tweet(id_str: String, text: String, entities: Entities)
-*/
-
 class Url {
   private var indices:Array[Int] = _
   private var url:String = _
@@ -70,9 +60,9 @@ class Tweet {
   def setEntities(e:Entities) { entities = e}
 }
 
-class JacksonAdaptor(name: String) extends LibraryAdapter(name) {
+class JacksonAdaptor(name: String) extends LibraryAdaptor(name) {
 
-  var m:ObjectMapper = null
+  var m:ObjectMapper = _
 
   override def initialize() { 
     m = new ObjectMapper()
@@ -83,18 +73,11 @@ class JacksonAdaptor(name: String) extends LibraryAdapter(name) {
     if (doMap) {
       val rootNode:Tweet = m.readValue(json, classOf[Tweet])
       rootNode
-      
     } else {
       val rootNode = m.readTree(json)
       rootNode
     }
-    /*
-    Json(json) match {
-      case obj: JsonObject => if (doMap) ToObject[Tweet](obj)
-      case array: JsonArray => //array.extract[List[Tweet]]
-      case _ => List[Tweet]()
-    }
-    */
   }
 
+  override def hasMap = true
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/jerkson/JerksonAdaptor.scala

@@ -1,9 +1,8 @@
 package com.microWorkflow.jsonScalaPerftest.jerkson
 
 import com.codahale.jerkson.JsonSnakeCase
-import org.codehaus.jackson.map.ObjectMapper
 import com.codahale.jerkson.Json._
-import com.microWorkflow.jsonScalaPerftest.{LibraryAdaptor, TimeMeasurements}
+import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import com.codahale.jerkson.AST.JValue
 
 /**
@@ -35,26 +34,20 @@ case class Entities(hashtags: Array[Hashtag], urls: Array[Url], userMentions: Ar
 case class Tweet(idStr: String, text: String, entities: Entities)
 
 
-class JerksonAdaptor(name: String) extends LibraryAdapter(name) {
- var mapper: ObjectMapper = _
+class JerksonAdaptor(name: String) extends LibraryAdaptor(name) {
 
   override def initialize() {
-    //mapper = new ObjectMapper()
+    /* nop */
   }
 
   override def runOnce(json: String, doMap:Boolean) = {
-      try {
-        if (doMap) {
-          parse[Tweet](json)
-        } else {
-          parse[JValue](json)
-        }
-      } catch {
-        case pe: com.codahale.jerkson.ParsingException =>
-          null
-        case iae: java.lang.IllegalArgumentException =>
-          null
-      }
+    if (doMap) {
+      parse[Tweet](json)
+    } else {
+      parse[JValue](json)
+    }
   }
 
+  override def hasMap = true
+
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/jsonsmart/JsonSmartAdaptor.scala

@@ -4,8 +4,8 @@ import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import net.minidev.json.JSONValue.parse
 
 case class User ( utc_offset: Int
-                  , time_zone: String
-                  )
+                , time_zone: String
+                )
 
 case class Url(indices: Array[Int], url: String)
 
@@ -25,9 +25,11 @@ class JsonSmartAdaptor(name: String) extends LibraryAdaptor(name) {
 
   override def runOnce(json: String, doMap:Boolean) = {
     if (doMap)
-      parse(json /* , classOf[Tweet] */)
+      parse(json /* , classOf[Tweet] */)  // TODO: add map (JsonSmart v.2)
     else
       parse(json)
   }
 
+  override def hasMap = false
+
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/liftjson/LiftJsonAdaptor.scala

@@ -1,7 +1,7 @@
 package com.microWorkflow.jsonScalaPerftest.liftjson
 
 import net.liftweb.json._
-import com.microWorkflow.jsonScalaPerftest.{LibraryAdaptor, TimeMeasurements}
+import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 
 /**
  * Created with IntelliJ IDEA.
@@ -11,92 +11,13 @@ import com.microWorkflow.jsonScalaPerftest.{LibraryAdaptor, TimeMeasurements}
  * To change this template use File | Settings | File Templates.
  */
 
-/*
-{
-    "contributors": null,
-    "coordinates": null,
-    "created_at": "Mon Jun 27 21:45:46 +0000 2011",
-    "entities": {
-        "hashtags": [],
-        "urls": [
-            {
-                "display_url": "mercynotes.com",
-                "expanded_url": "http://www.mercynotes.com/",
-                "indices": [
-                    61,
-                    80
-                ],
-                "url": "http://t.co/lKzLFOd"
-            }
-        ],
-        "user_mentions": []
-    },
-    "favorited": false,
-    "geo": null,
-    "id": 85463859615379456,
-    "id_str": "85463859615379456",
-    "in_reply_to_screen_name": null,
-    "in_reply_to_status_id": null,
-    "in_reply_to_status_id_str": null,
-    "in_reply_to_user_id": null,
-    "in_reply_to_user_id_str": null,
-    "place": null,
-    "retweet_count": 0,
-    "retweeted": false,
-    "source": "web",
-    "text": "Been watching Wimbledon? Check out new post Love and Tennis: http://t.co/lKzLFOd",
-    "truncated": false,
-    "user": {
-        "contributors_enabled": false,
-        "created_at": "Mon May 30 16:35:44 +0000 2011",
-        "default_profile": true,
-        "default_profile_image": false,
-        "description": "",
-        "favourites_count": 0,
-        "follow_request_sent": null,
-        "followers_count": 6,
-        "following": null,
-        "friends_count": 12,
-        "geo_enabled": false,
-        "id": 307978890,
-        "id_str": "307978890",
-        "is_translator": false,
-        "lang": "en",
-        "listed_count": 0,
-        "location": "NC",
-        "name": "Julie LaJoe",
-        "notifications": null,
-        "profile_background_color": "C0DEED",
-        "profile_background_image_url": "http://a0.twimg.com/images/themes/theme1/bg.png",
-        "profile_background_image_url_https": "https://si0.twimg.com/images/themes/theme1/bg.png",
-        "profile_background_tile": false,
-        "profile_image_url": "http://a0.twimg.com/profile_images/1375001769/JulieMNnew__2__normal.jpg",
-        "profile_image_url_https": "https://si0.twimg.com/profile_images/1375001769/JulieMNnew__2__normal.jpg",
-        "profile_link_color": "0084B4",
-        "profile_sidebar_border_color": "C0DEED",
-        "profile_sidebar_fill_color": "DDEEF6",
-        "profile_text_color": "333333",
-        "profile_use_background_image": true,
-        "protected": false,
-        "screen_name": "mercynotes",
-        "show_all_inline_media": false,
-        "statuses_count": 13,
-        "time_zone": "Quito",
-        "url": "http://mercynotes.com",
-        "utc_offset": -18000,
-        "verified": false
-    }
-}
-
- */
-
 case class Url(indices: Array[Int], url: String)
 case class Hashtag(indices: Array[Int], text: String)
 case class UserMention(indices: Array[Int], name: String)
 case class Entities(hashtags: Array[Hashtag], urls: Array[Url], userMentions: Array[UserMention])
 case class Tweet(id_str: String, text: String, entities: Entities)
 
-class LiftJsonAdaptor(name: String) extends LibraryAdapter(name) {
+class LiftJsonAdaptor(name: String) extends LibraryAdaptor(name) {
 
   override def initialize() { /* nop */ }
 
@@ -120,4 +41,6 @@ class LiftJsonAdaptor(name: String) extends LibraryAdapter(name) {
       case _ => List[Tweet]()
     }
   }
+
+  override def hasMap = true
 }