Wildcard queries now parse the * character correctly. Update tests. (#…

…1458)
elastic · Apr 3, 2020 · b838ff8 · b838ff8
1 parent 3b7380d
commit b838ff8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 30 deletions.
diff --git a/.../sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala b/.../sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
@@ -998,11 +998,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_starts_with")
     var filter = df.filter(df("airport").startsWith("O"))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     if (!keepHandledFilters) {
       // term query pick field with multi values
       assertEquals(2, filter.count())
@@ -1019,11 +1014,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_ends_with")
     var filter = df.filter(df("airport").endsWith("O"))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     if (!keepHandledFilters) {
       // term query pick field with multi values
       assertEquals(2, filter.count())
@@ -1048,11 +1038,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_and")
     var filter = df.filter(df("reason").isNotNull.and(df("airport").endsWith("O")))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     assertEquals(1, filter.count())
     assertEquals("jan", filter.select("tag").take(1)(0)(0))
   }

diff --git a/.../sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala b/.../sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
@@ -1055,11 +1055,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_starts_with")
     var filter = df.filter(df("airport").startsWith("O"))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     if (!keepHandledFilters) {
       // term query pick field with multi values
       assertEquals(2, filter.count())
@@ -1076,11 +1071,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_ends_with")
     var filter = df.filter(df("airport").endsWith("O"))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     if (!keepHandledFilters) {
       // term query pick field with multi values
       assertEquals(2, filter.count())
@@ -1105,11 +1095,6 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
     val df = esDataSource("pd_and")
     var filter = df.filter(df("reason").isNotNull.and(df("airport").endsWith("O")))
 
-    if (strictPushDown) {
-      assertEquals(0, filter.count())
-      return
-    }
-
     assertEquals(1, filter.count())
     assertEquals("jan", filter.select("tag").take(1)(0)(0))
   }