diff --git a/spark/sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala b/spark/sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala index 96c301db9..44b4f5fe6 100644 --- a/spark/sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala +++ b/spark/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/spark/sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala b/spark/sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala index b301b88cd..d16499d98 100644 --- a/spark/sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala +++ b/spark/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)) }