Skip to content
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

#339. Use more effective record count when JDBC source is used #460

Merged
merged 3 commits into from
Aug 13, 2024
Merged

#339. Use more effective record count when JDBC source is used #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e79080
#339. Use more effective record count when JDBC source is used with a…
VladimirRybalko Aug 9, 2024
068a35f
Merge branch 'main' into 339-optimized-record-count-for-query
VladimirRybalko Aug 13, 2024
e68ebfb
Don't use spark to get count query.
VladimirRybalko Aug 13, 2024
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
15 changes: 13 additions & 2 deletions pramen/core/src/main/scala/za/co/absa/pramen/core/reader/TableReaderJdbc.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory
import za.co.absa.pramen.api.Query
import za.co.absa.pramen.core.config.Keys
import za.co.absa.pramen.core.reader.model.TableReaderJdbcConfig
import za.co.absa.pramen.core.utils.{ConfigUtils, JdbcSparkUtils, TimeUtils}
import za.co.absa.pramen.core.utils.{ConfigUtils, JdbcNativeUtils, JdbcSparkUtils, TimeUtils}

import java.time.format.DateTimeFormatter
import java.time.{Instant, LocalDate}
Expand Down Expand Up @@ -109,7 +109,18 @@ class TableReaderJdbc(jdbcReaderConfig: TableReaderJdbcConfig,

private[core] def getCountForSql(sql: String, infoDateBegin: LocalDate, infoDateEnd: LocalDate): Long = {
val filteredSql = TableReaderJdbcNative.getFilteredSql(sql, infoDateBegin, infoDateEnd)
getWithRetry[Long](filteredSql, isDataQuery = false, jdbcRetries, None)(df => df.count())
val countSql = s"SELECT COUNT(*) FROM ($filteredSql)"
var count = 0L

JdbcNativeUtils.withResultSet(jdbcUrlSelector, countSql, jdbcRetries) { rs =>
if (!rs.next())
throw new IllegalStateException(s"No rows returned by the count query: $countSql")
else {
count = rs.getLong(1)
}
}

count
}

private[core] def getDataForTable(tableName: String, infoDateBegin: LocalDate, infoDateEnd: LocalDate, columns: Seq[String]): DataFrame = {
Expand Down
2 changes: 1 addition & 1 deletion pramen/core/src/test/scala/za/co/absa/pramen/core/tests/reader/TableReaderJdbcSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ class TableReaderJdbcSuite extends AnyWordSpec with BeforeAndAfterAll with Spark
assert(df.schema.fields.length == 7)
}

"return selected columnd for a table snapshot-like query" in {
"return selected column for a table snapshot-like query" in {
val testConfig = conf
val reader = TableReaderJdbc(testConfig.getConfig("reader"), "reader")

Expand Down
Loading