Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
108 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Applies some simple optimizations | ||
*/ | ||
package com.foursquare.slashem | ||
|
||
import com.foursquare.slashem.Ast._ | ||
|
||
object Optimizer { | ||
|
||
def optimizeFilters(filters: List[AbstractClause]): List[AbstractClause] = { | ||
filters.filter(f => { | ||
f match { | ||
//Remove all empty search clauses | ||
case Clause("*",Splat(),true) => false | ||
case Clause("_all",Splat(),true) => false | ||
case _ => true | ||
} | ||
}) | ||
} | ||
def optimizeQuery(clause: AbstractClause): AbstractClause = { | ||
clause | ||
} | ||
def optimizeBoosts(boostQueries: List[AbstractClause]): List[AbstractClause] = { | ||
boostQueries | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
package com.foursquare.slashem | ||
import com.foursquare.slashem._ | ||
|
||
import com.twitter.util.Duration | ||
|
||
import org.bson.types.ObjectId | ||
import org.junit.Test | ||
import org.junit._ | ||
|
||
import org.scalacheck._ | ||
import org.scalacheck.Gen._ | ||
import org.scalacheck.Arbitrary.arbitrary | ||
|
||
import org.specs.SpecsMatchers | ||
import org.specs.matcher.ScalaCheckMatchers | ||
|
||
import org.elasticsearch.node.NodeBuilder._ | ||
import org.elasticsearch.node.Node | ||
import org.elasticsearch.client.Requests; | ||
import org.elasticsearch.common.xcontent.XContentFactory._; | ||
|
||
import java.util.concurrent.TimeUnit | ||
import java.util.UUID | ||
|
||
import scalaj.collection.Imports._ | ||
|
||
import com.twitter.util.{Duration, ExecutorServiceFuturePool, Future, FuturePool, FutureTask, Throw, TimeoutException} | ||
import java.util.concurrent.{Executors, ExecutorService} | ||
|
||
class OptimizeTest extends SpecsMatchers with ScalaCheckMatchers { | ||
|
||
//We test this because the optimizer screwed this up once | ||
@Test | ||
def testTermFiltersOptimize { | ||
val q = ESimplePanda where (_.hugenums contains 1L) filter(_.termsfield in List("termhit", "randomterm")) | ||
val res1 = q fetch() | ||
val res2 = q optimize() fetch() | ||
Assert.assertEquals(res1.response.results.length, res2.response.results.length) | ||
} | ||
|
||
@Test | ||
def testTermFiltersMetallFilter { | ||
val q = ESimpleGeoPanda where (_.name contains "ordertest") filter(_.metall any) | ||
val q2 = ESimpleGeoPanda where (_.name contains "ordertest") | ||
val res1 = q fetch() | ||
val res2 = q optimize() fetch() | ||
val res3 = q2 fetch() | ||
Assert.assertEquals(res1.response.results.length, res2.response.results.length) | ||
Assert.assertEquals(res1.response.results.length, res3.response.results.length) | ||
Assert.assertEquals(q.optimize(),q2) | ||
} | ||
|
||
@Test | ||
def testProduceCorrectListfieldFilterAny { | ||
val q = SVenueTest where (_.metall any) filter (_.metall any) | ||
val optimizedQ = q.optimize() | ||
val qp = q.meta.queryParams(optimizedQ).toList | ||
Assert.assertEquals(qp.sortWith(_._1 > _._1), | ||
List("q" -> "*:*", | ||
"start" -> "0", | ||
"rows" -> "10").sortWith(_._1 > _._1)) | ||
} | ||
|
||
@Before | ||
def esSetup { | ||
ElasticQueryTest.hoboPrepIndex() | ||
} | ||
|
||
@After | ||
def esDone { | ||
ElasticQueryTest.hoboDone() | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters