Modified naming: udf_extractor -> json_extractor

HazyResearch · May 3, 2014 · cb121a1 · cb121a1
1 parent 5a6d651
commit cb121a1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/examples/spouse_example/README.md b/examples/spouse_example/README.md
@@ -7,18 +7,18 @@ This directory contains 3 different implementation of spouse example listed onli
 Performance Comparison
 ----
 
-### udf_extractor (default)
-
 Environment: TODO
 
+### json_extractor (default)
+
+    ext_has_spouse_candidates SUCCESS [19143 ms]
+    ext_has_spouse_features SUCCESS [71408 ms]
 
 ### plpy_extractor
 
-    --------------------------------------------------
     ext_people SUCCESS [3451 ms]
     ext_has_spouse_candidates SUCCESS [4627 ms]
     ext_has_spouse_features SUCCESS [5764 ms]
-    --------------------------------------------------
 
 ### tsv_extractor
 
diff --git a/src/main/scala/org/deepdive/extraction/ExtractorRunner.scala b/src/main/scala/org/deepdive/extraction/ExtractorRunner.scala
@@ -91,7 +91,7 @@ class ExtractorRunner(dataStore: JsonExtractionDataStore) extends Actor
 
       task.extractor.style match {
 
-        case "udf_extractor" =>
+        case "json_extractor" =>
           // Start the children workers
           val workers = startWorkers(task)
 

diff --git a/src/main/scala/org/deepdive/settings/SettingsParser.scala b/src/main/scala/org/deepdive/settings/SettingsParser.scala
@@ -49,9 +49,9 @@ object SettingsParser extends Logging {
     val extractorParallelism = Try(extractionConfig.getInt("parallelism")).getOrElse(1)
     val extractors = extractionConfig.getObject("extractors").keySet().map { extractorName =>
       val extractorConfig = extractionConfig.getConfig(s"extractors.$extractorName")
-      val style = Try(extractorConfig.getString(s"style")).getOrElse("udf_extractor")
+      val style = Try(extractorConfig.getString(s"style")).getOrElse("json_extractor")
       style match {
-        case "udf_extractor" | "plpy_extractor" | "tsv_extractor" =>
+        case "json_extractor" | "plpy_extractor" | "tsv_extractor" =>
           val outputRelation = extractorConfig.getString ("output_relation")
           val inputQuery = InputQueryParser.parse (InputQueryParser.inputQueryExpr,
             extractorConfig.getString (s"input") ).getOrElse {

diff --git a/src/test/scala/unit/extraction/ExtractionManagerSpec.scala b/src/test/scala/unit/extraction/ExtractionManagerSpec.scala
@@ -34,15 +34,15 @@ class ExtractionManagerSpec(_system: ActorSystem) extends TestKit(_system)
 
     it("should execute one task") {
       val manager = TestActorRef[MemoryExtractionManager](Props(classOf[MemoryExtractionManager], 1))
-      val someExtractor = Extractor("e1", "udf_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
+      val someExtractor = Extractor("e1", "json_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
         None, None, "query", None)
       manager ! ExtractionTask(someExtractor)
       expectMsg("Done!")
     }
 
     it("should execute tasks when parallelism=1") {
       val manager = TestActorRef[MemoryExtractionManager](Props(classOf[MemoryExtractionManager], 1))
-      val someExtractor = Extractor("e1", "udf_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
+      val someExtractor = Extractor("e1", "json_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
          None, None, "query", None)
       manager ! ExtractionTask(someExtractor)
       manager ! ExtractionTask(someExtractor.copy(name="e2"))
@@ -54,7 +54,7 @@ class ExtractionManagerSpec(_system: ActorSystem) extends TestKit(_system)
 
     it("should execute tasks when paralleism > 1") {
       val manager = TestActorRef[MemoryExtractionManager](Props(classOf[MemoryExtractionManager], 4))
-      val someExtractor = Extractor("e1", "udf_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
+      val someExtractor = Extractor("e1", "json_extractor", "r1", "query", "udf", 3, 1000, 1000, Set(),
          None, None, "query", None)
       manager ! ExtractionTask(someExtractor)
       manager ! ExtractionTask(someExtractor.copy(name="e2"))

diff --git a/src/test/scala/unit/extraction/ExtractorRunnerSpec.scala b/src/test/scala/unit/extraction/ExtractorRunnerSpec.scala
@@ -44,7 +44,7 @@ class ExtractorRunnerSpec(_system: ActorSystem) extends TestKit(_system) with Im
         assert(numRecords === 1)
       }
 
-      val task = new ExtractionTask(Extractor("testExtractor", "udf_extractor", "relation1", 
+      val task = new ExtractionTask(Extractor("testExtractor", "json_extractor", "relation1", 
         "SELECT * FROM relation1", "/bin/cat", 1, 1000, 1000, Nil.toSet, None, None, "SELECT * FROM relation1", None))
       actor ! ExtractorRunner.SetTask(task)
       watch(actor)

diff --git a/src/test/scala/unit/settings/SettingsParserSpec.scala b/src/test/scala/unit/settings/SettingsParserSpec.scala
@@ -43,7 +43,7 @@ class SettingsParserSpec extends FunSpec with PrivateMethodTester {
       val loadExtractionSettings = PrivateMethod[ExtractionSettings]('loadExtractionSettings)
       val result = SettingsParser invokePrivate loadExtractionSettings(config)
       assert(result == ExtractionSettings(List(
-        Extractor("extractor1", "udf_extractor", "entities", "SELECT * FROM documents", "udf/entities.py", 
+        Extractor("extractor1", "json_extractor", "entities", "SELECT * FROM documents", "udf/entities.py", 
           4, 100, 1000, Set("extractor2"), Option("/bin/cat"), Option("/bin/dog"), "", None)), 5))
     }