Merge pull request yahoo#322 from yahoo/qgen-registry

Use version while registering query generator
Avkash · Aug 31, 2018 · f510738 · f510738
2 parents 15b9cc2 + a211b7b
commit f510738
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
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
@@ -177,6 +177,7 @@ trait QueryGenerator[T <: EngineRequirement] {
   def generate(queryContext: QueryContext): Query
   def engine: Engine
   def validateEngineConstraints(requestModel: RequestModel): Boolean = true
+  def version: Version = Version.DEFAULT
 }
 
 trait BaseQueryGenerator[T <: EngineRequirement] extends QueryGenerator[T] {

diff --git a/core/src/main/scala/com/yahoo/maha/core/query/hive/HiveQueryGeneratorV1.scala b/core/src/main/scala/com/yahoo/maha/core/query/hive/HiveQueryGeneratorV1.scala
@@ -16,6 +16,7 @@ import scala.collection.{SortedSet, mutable}
 class HiveQueryGeneratorV1(partitionColumnRenderer:PartitionColumnRenderer, udfStatements: Set[UDFRegistration]) extends HiveQueryGeneratorCommon(partitionColumnRenderer, udfStatements) with Logging {
 
   override val engine: Engine = HiveEngine
+  override val version: Version = Version.v1
   override def generate(queryContext: QueryContext): Query = {
     info(s"Generating Hive query using HiveQueryGeneratorV1: ${queryContext.getClass.getName}")
     queryContext match {

diff --git a/service/src/main/scala/com/yahoo/maha/service/MahaService.scala b/service/src/main/scala/com/yahoo/maha/service/MahaService.scala
@@ -418,7 +418,7 @@ object MahaServiceConfig {
             implicit val queryGeneratorRegistry = new QueryGeneratorRegistry
             generatorMap.filter(g => registryConfig.generators.contains(g._1)).foreach {
               case (name, generator) =>
-                queryGeneratorRegistry.register(generator.engine, generator)
+                queryGeneratorRegistry.register(generator.engine, generator, generator.version)
             }
             val queryExecutorContext = new QueryExecutorContext
             executorMap.filter(e => registryConfig.executors.contains(e._1)).foreach {

diff --git a/service/src/test/scala/com/yahoo/maha/service/factory/MahaServiceTest.scala b/service/src/test/scala/com/yahoo/maha/service/factory/MahaServiceTest.scala
@@ -402,7 +402,8 @@ class MahaServiceTest extends BaseFactoryTest {
                          |            "dimCardinality": 40000,
                          |            "maximumMaxRows": 5000,
                          |            "maximumTopNMaxRows": 400,
-                         |            "maximumMaxRowsAsync": 100000
+                         |            "maximumMaxRowsAsync": 100000,
+                         |            "version": 0
                          |         }
                          |      }
                          |   },