Merge pull request #404 from ryankwagner/simplifyPipelineCall

Simplify pipeline filter render with function call.
yahoo · Feb 22, 2019 · a0d51cc · a0d51cc
2 parents b2301df + 101cba8
commit a0d51cc
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 59 deletions.
diff --git a/api-example/pom.xml b/api-example/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>maha-parent</artifactId>
         <groupId>com.yahoo.maha</groupId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha api-example</name>

diff --git a/api-jersey/pom.xml b/api-jersey/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha api-jersey</name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha core</name>

diff --git a/core/src/main/scala/com/yahoo/maha/core/query/QueryGenerator.scala b/core/src/main/scala/com/yahoo/maha/core/query/QueryGenerator.scala
@@ -262,6 +262,22 @@ object QueryGeneratorHelper {
     }
   }
 
+  def getFieldMapByColumn(name: String
+                          , column: Column
+                         , fact: Fact
+                         , publicFact: PublicFact
+                         , colFn: Column => String): Map[String, (String, String)] = {
+    val nameOrAlias: String = column.alias.getOrElse(column.name)
+    if(fact.dimColMap.contains(nameOrAlias))
+      Map.empty
+    else if (fact.factColMap.contains(nameOrAlias)) {
+      Map(name -> (nameOrAlias, colFn(column)))
+    } else {
+      throw new IllegalArgumentException(
+        s"Unknown fact column: publicFact=${publicFact.name}, fact=${fact.name} alias=${column.alias}, name=$nameOrAlias")
+    }
+  }
+
   def handleFilterRender(filter: Filter,
                          publicFact: PublicFact,
                          fact: Fact,
@@ -273,54 +289,24 @@ object QueryGeneratorHelper {
     val fieldNames: mutable.ArrayBuffer[String] = new ArrayBuffer[String]()
     val isMultiField: Boolean = filter.isInstanceOf[MultiFieldForcedFilter]
 
-    fieldNames += publicFact.aliasToNameColumnMap(filter.field)
+    fieldNames += filter.field
     if(isMultiField)
-      fieldNames += publicFact.aliasToNameColumnMap(filter.asInstanceOf[MultiFieldForcedFilter].compareTo)
-
-    val baseFieldName = fieldNames.remove(0)
-    if (fact.dimColMap.contains(baseFieldName)) {
-
-      FilterSql.renderFilter(
-        filter,
-        aliasToNameMapFull,
-        Map.empty,
-        fact.columnsByNameMap,
-        engine,
-        literalMapper
-      )
-
-    } else if (fact.factColMap.contains(baseFieldName)) {
-      val column = fact.columnsByNameMap(baseFieldName)
-      val exp = colFn(column)
-
-      if(!isMultiField) {
-        FilterSql.renderFilter(
-          filter,
-          queryContext.factBestCandidate.publicFact.aliasToNameColumnMap,
-          Map(filter.field -> (baseFieldName, exp)),
-          fact.columnsByNameMap,
-          engine,
-          literalMapper
-        )
-      } else {
-        val multiFieldForcedFilter = filter.asInstanceOf[MultiFieldForcedFilter]
-        val compareToFieldName = fieldNames.remove(0)
-        val compareToColumn = fact.columnsByNameMap(compareToFieldName)
-        val secondExp = colFn(compareToColumn)
-        FilterSql.renderFilter(
-          filter,
-          queryContext.factBestCandidate.publicFact.aliasToNameColumnMap,
-          Map(multiFieldForcedFilter.field -> (baseFieldName, exp), multiFieldForcedFilter.compareTo -> (compareToColumn.alias.getOrElse(compareToColumn.name), secondExp)),
-          fact.columnsByNameMap,
-          engine,
-          literalMapper
-        )
-      }
+      fieldNames += filter.asInstanceOf[MultiFieldForcedFilter].compareTo
 
-    } else {
-      throw new IllegalArgumentException(
-        s"Unknown fact column: publicFact=${publicFact.name}, fact=${fact.name} alias=${filter.field}, name=$baseFieldName")
+    var fMap = new mutable.HashMap[String, (String, String)]()
+
+    for (fieldName <- fieldNames) {
+      fMap ++= getFieldMapByColumn(fieldName, fact.columnsByNameMap(publicFact.aliasToNameColumnMap(fieldName)), fact, publicFact, colFn)
     }
+
+    FilterSql.renderFilter(
+      filter,
+      aliasToNameMapFull,
+      fMap.toMap,
+      fact.columnsByNameMap,
+      engine,
+      literalMapper
+    )
   }
 }
 

diff --git a/db/pom.xml b/db/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha db</name>

diff --git a/druid-lookups/pom.xml b/druid-lookups/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maha-parent</artifactId>
         <groupId>com.yahoo.maha</groupId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/druid/pom.xml b/druid/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha druid executor</name>

diff --git a/job-service/pom.xml b/job-service/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha job service</name>

diff --git a/oracle/pom.xml b/oracle/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha oracle executor</name>

diff --git a/par-request-2/pom.xml b/par-request-2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.yahoo.maha</groupId>
     <artifactId>maha-parent</artifactId>
-    <version>5.241-SNAPSHOT</version>
+    <version>5.242-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>maha parent</name>

diff --git a/presto/pom.xml b/presto/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha presto executor</name>

diff --git a/request-log/pom.xml b/request-log/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha request log</name>

diff --git a/service/pom.xml b/service/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha service</name>

diff --git a/worker/pom.xml b/worker/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yahoo.maha</groupId>
         <artifactId>maha-parent</artifactId>
-        <version>5.241-SNAPSHOT</version>
+        <version>5.242-SNAPSHOT</version>
     </parent>
 
     <name>maha worker</name>