Skip to content

[7.13] Fix failing strict wildcard pushdown tests (#1683) #1692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2021
Merged

[7.13] Fix failing strict wildcard pushdown tests (#1683) #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .../sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,31 +998,39 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
val df = esDataSource("pd_starts_with")
var filter = df.filter(df("airport").startsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
}
}

@Test
def testDataSourcePushDown10EndsWith() {
val df = esDataSource("pd_ends_with")
var filter = df.filter(df("airport").endsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
}
}

@Test
Expand All @@ -1036,7 +1044,7 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
@Test
def testDataSourcePushDown12And() {
val df = esDataSource("pd_and")
var filter = df.filter(df("reason").isNotNull.and(df("airport").endsWith("O")))
var filter = df.filter(df("reason").isNotNull.and(df("tag").equalTo("jan")))

assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
Expand Down
22 changes: 15 additions & 7 deletions .../sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,31 +1055,39 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
val df = esDataSource("pd_starts_with")
var filter = df.filter(df("airport").startsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
}
}

@Test
def testDataSourcePushDown10EndsWith() {
val df = esDataSource("pd_ends_with")
var filter = df.filter(df("airport").endsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
}
}

@Test
Expand All @@ -1093,7 +1101,7 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
@Test
def testDataSourcePushDown12And() {
val df = esDataSource("pd_and")
var filter = df.filter(df("reason").isNotNull.and(df("airport").endsWith("O")))
var filter = df.filter(df("reason").isNotNull.and(df("tag").equalTo("jan")))

assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
Expand Down
22 changes: 15 additions & 7 deletions .../sql-30/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,31 +1055,39 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
val df = esDataSource("pd_starts_with")
var filter = df.filter(df("airport").startsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("feb", filter.select("tag").take(1)(0)(0))
}
}

@Test
def testDataSourcePushDown10EndsWith() {
val df = esDataSource("pd_ends_with")
var filter = df.filter(df("airport").endsWith("O"))

if (!keepHandledFilters) {
if (!keepHandledFilters && !strictPushDown) {
// term query pick field with multi values
assertEquals(2, filter.count())
return
}

filter.show
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
if (strictPushDown) {
assertEquals(0, filter.count()) // Strict means specific terms matching, and the terms are lowercased
} else {
assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
}
}

@Test
Expand All @@ -1093,7 +1101,7 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
@Test
def testDataSourcePushDown12And() {
val df = esDataSource("pd_and")
var filter = df.filter(df("reason").isNotNull.and(df("airport").endsWith("O")))
var filter = df.filter(df("reason").isNotNull.and(df("tag").equalTo("jan")))

assertEquals(1, filter.count())
assertEquals("jan", filter.select("tag").take(1)(0)(0))
Expand Down