You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "sadikovi (via GitHub)" <gi...@apache.org> on 2023/02/23 01:50:39 UTC
[GitHub] [spark] sadikovi opened a new pull request, #40134: [SPARK-42534] Fix DB2Dialect Limit clause
sadikovi opened a new pull request, #40134:
URL: https://github.com/apache/spark/pull/40134
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
The PR fixes DB2 Limit clause syntax. Although DB2 supports LIMIT keyword, it seems that this support varies across databases and versions and the recommended way is to use `FETCH FIRST x ROWS ONLY`. Doc: https://www.ibm.com/docs/en/db2/11.5?topic=subselect-fetch-clause, usage example: https://www.mullinsconsulting.com/dbu_0502.htm.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Fixes the incorrect Limit clause which could cause errors when using against DB2 versions that don't support LIMIT.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
I added a unit test and an integration test to cover this functionality.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1442797402
PR for 3.4: https://github.com/apache/spark/pull/40155.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1442704002
it has conflicts with 3.4, @sadikovi can you open a backport PR? thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1442450477
@dongjoon-hyun Is there anything else left on this PR to merge?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115217759
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,26 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
+ .select("x", "y")
+ .orderBy("x")
+ .collect()
+
+ val expected = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("query", "SELECT x, y FROM tbl ORDER BY x FETCH FIRST 2 ROWS ONLY")
+ .load()
+ .collect()
+
+ assert(actual.length === 2)
Review Comment:
nit. The next `assert` looks inclusive and enough. Shall we remove this?
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,26 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
+ .select("x", "y")
+ .orderBy("x")
+ .collect()
+
+ val expected = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("query", "SELECT x, y FROM tbl ORDER BY x FETCH FIRST 2 ROWS ONLY")
+ .load()
+ .collect()
+
+ assert(actual.length === 2)
Review Comment:
nit. The next `assert` statement looks inclusive and enough. Shall we remove this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115227618
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,26 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
+ .select("x", "y")
+ .orderBy("x")
+ .collect()
+
+ val expected = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("query", "SELECT x, y FROM tbl ORDER BY x FETCH FIRST 2 ROWS ONLY")
+ .load()
+ .collect()
+
+ assert(actual.length === 2)
Review Comment:
Good point, I will remove.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan closed pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
URL: https://github.com/apache/spark/pull/40134
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115208845
##########
sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala:
##########
@@ -1028,6 +1028,19 @@ class JDBCSuite extends QueryTest with SharedSparkSession {
"SELECT TOP (123) a,b FROM test")
}
+ test("SPARK-42534: DB2Dialect Limit query test") {
+ // JDBC url is a required option but is not used in this test.
+ val options = new JDBCOptions(Map("url" -> "jdbc:db2://host:port", "dbtable" -> "test"))
+ assert(
+ DB2Dialect
+ .getJdbcSQLQueryBuilder(options)
+ .withColumns(Array("a", "b"))
+ .withLimit(123)
+ .build()
+ .trim() ==
+ "SELECT a,b FROM test FETCH FIRST 123 ROWS ONLY")
Review Comment:
Yes, I do. This is because of the string interpolation for the JDBC query that is written like `"$a $b $c...`. So when some of the components are empty, whitespaces are still kept between the components resulting in the long gaps.
```scala
options.prepareQuery +
s"SELECT $myTopExpression $columnList FROM ${options.tableOrQuery} $myTableSampleClause" +
s" $myWhereClause $getGroupByClause $getOrderByClause $myLimitClause $myOffsetClause"
```
https://github.com/apache/spark/blob/4b50a46f1c6ba4ffe2c42f70a512879c28d11dcf/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala#L163.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115227694
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,26 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534") {
Review Comment:
Absolutely 👍.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115208845
##########
sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala:
##########
@@ -1028,6 +1028,19 @@ class JDBCSuite extends QueryTest with SharedSparkSession {
"SELECT TOP (123) a,b FROM test")
}
+ test("SPARK-42534: DB2Dialect Limit query test") {
+ // JDBC url is a required option but is not used in this test.
+ val options = new JDBCOptions(Map("url" -> "jdbc:db2://host:port", "dbtable" -> "test"))
+ assert(
+ DB2Dialect
+ .getJdbcSQLQueryBuilder(options)
+ .withColumns(Array("a", "b"))
+ .withLimit(123)
+ .build()
+ .trim() ==
+ "SELECT a,b FROM test FETCH FIRST 123 ROWS ONLY")
Review Comment:
Yes, I do. This is because of the string interpolation for the JDBC query that is written like `$a $b $c...`. So when some of the components are empty, whitespaces are still kept between the components resulting in the long gaps.
```scala
options.prepareQuery +
s"SELECT $myTopExpression $columnList FROM ${options.tableOrQuery} $myTableSampleClause" +
s" $myWhereClause $getGroupByClause $getOrderByClause $myLimitClause $myOffsetClause"
```
https://github.com/apache/spark/blob/4b50a46f1c6ba4ffe2c42f70a512879c28d11dcf/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala#L163.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115199857
##########
sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala:
##########
@@ -1028,6 +1028,19 @@ class JDBCSuite extends QueryTest with SharedSparkSession {
"SELECT TOP (123) a,b FROM test")
}
+ test("SPARK-42534: DB2Dialect Limit query test") {
+ // JDBC url is a required option but is not used in this test.
+ val options = new JDBCOptions(Map("url" -> "jdbc:db2://host:port", "dbtable" -> "test"))
+ assert(
+ DB2Dialect
+ .getJdbcSQLQueryBuilder(options)
+ .withColumns(Array("a", "b"))
+ .withLimit(123)
+ .build()
+ .trim() ==
+ "SELECT a,b FROM test FETCH FIRST 123 ROWS ONLY")
Review Comment:
very nit: do you know why the generated SQL has more than one spaces before the limit clause?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1441145746
cc @dongjoon-hyun @cloud-fan
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115217088
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,26 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534") {
Review Comment:
Could you add some description, please? :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] huaxingao commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "huaxingao (via GitHub)" <gi...@apache.org>.
huaxingao commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115304895
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,25 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534: DB2 Limit pushdown test") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
Review Comment:
Limit push down is only supported in V2 JDBC. I don't think this `limit(2)` will trigger the newly added `DB2Dialect.getLimitClause`. This test should be done in `v2/DB2IntegrationSuite`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1116260644
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,25 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534: DB2 Limit pushdown test") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
Review Comment:
There are already tests covering limit pushdown.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1442783758
Yes, I will open a separate PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1115217372
##########
sql/core/src/main/scala/org/apache/spark/sql/jdbc/DB2Dialect.scala:
##########
@@ -160,4 +160,8 @@ private object DB2Dialect extends JdbcDialect {
s"DROP SCHEMA ${quoteIdentifier(schema)} RESTRICT"
}
}
+
+ override def getLimitClause(limit: Integer): String = {
+ if (limit > 0 ) s"FETCH FIRST $limit ROWS ONLY" else ""
Review Comment:
nit. Space.
```scala
- if (limit > 0 )
+ if (limit > 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] sadikovi commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "sadikovi (via GitHub)" <gi...@apache.org>.
sadikovi commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1441208481
@dongjoon-hyun I have addressed the comment, could you review again please? Thank you.
Also, do you know whom I can ping on this PR with the regard to DB2 SQL semantics?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40134:
URL: https://github.com/apache/spark/pull/40134#discussion_r1116434189
##########
connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala:
##########
@@ -217,4 +217,25 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
assert(actual.length === 2)
assert(actual.toSet === expectedResult)
}
+
+ test("SPARK-42534: DB2 Limit pushdown test") {
+ val actual = sqlContext.read
+ .format("jdbc")
+ .option("url", jdbcUrl)
+ .option("dbtable", "tbl")
+ .load()
+ .limit(2)
Review Comment:
I think it's OK to leave the test here, in case one day we support limit pushdown in v1 JDBC as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #40134: [SPARK-42534][SQL] Fix DB2Dialect Limit clause
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #40134:
URL: https://github.com/apache/spark/pull/40134#issuecomment-1442703376
thanks, merging to master/3.4 (bug fix)!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org