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

Jump to bottom

Add more logging for paginated query requests #445

Merged
merged 1 commit into from
Dec 9, 2023
Merged

Add more logging for paginated query requests #445

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
18 changes: 12 additions & 6 deletions client/src/main/scala/io/delta/sharing/client/DeltaSharingClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class DeltaSharingRestClient(
)
val (version, respondedFormat, lines) = if (queryTablePaginationEnabled) {
logInfo(
s"Making paginated queryTable requests for table " +
s"Making paginated queryTable from version $startingVersion requests for table " +
s"${table.share}.${table.schema}.${table.name} with maxFiles=$maxFilesPerReq"
)
val (version, respondedFormat, lines, _) = getFilesByPage(target, request)
Expand Down Expand Up @@ -483,7 +483,8 @@ class DeltaSharingRestClient(
expectedVersion = version,
expectedRespondedFormat = respondedFormat,
expectedProtocol = protocol,
expectedMetadata = metadata
expectedMetadata = metadata,
pageNumber = numPages
)
allLines.appendAll(res._1)
endStreamAction = res._2
Expand All @@ -497,7 +498,7 @@ class DeltaSharingRestClient(
}

// TODO: remove logging once changes are rolled out
logInfo(s"Took ${System.currentTimeMillis() - start} ms to query $numPages pages" +
logInfo(s"Took ${System.currentTimeMillis() - start} ms to query $numPages pages " +
s"of ${allLines.size} files")
(version, respondedFormat, allLines.toSeq, refreshToken)
}
Expand Down Expand Up @@ -598,7 +599,8 @@ class DeltaSharingRestClient(
expectedVersion = version,
expectedRespondedFormat = respondedFormat,
expectedProtocol = protocol,
expectedMetadata = metadata
expectedMetadata = metadata,
pageNumber = numPages
)
allLines.appendAll(res._1)
endStreamAction = res._2
Expand All @@ -613,7 +615,7 @@ class DeltaSharingRestClient(

// TODO: remove logging once changes are rolled out
logInfo(
s"Took ${System.currentTimeMillis() - start} ms to query $numPages pages" +
s"Took ${System.currentTimeMillis() - start} ms to query $numPages pages " +
s"of ${allLines.size} files"
)
(version, respondedFormat, allLines.toSeq)
Expand All @@ -628,12 +630,16 @@ class DeltaSharingRestClient(
expectedVersion: Long,
expectedRespondedFormat: String,
expectedProtocol: String,
expectedMetadata: String): (Seq[String], Option[EndStreamAction]) = {
expectedMetadata: String,
pageNumber: Int): (Seq[String], Option[EndStreamAction]) = {
val start = System.currentTimeMillis()
val (version, respondedFormat, lines) = if (requestBody.isDefined) {
getNDJson(targetUrl, requestBody.get)
} else {
getNDJson(targetUrl, requireVersion = false)
}
logInfo(s"Took ${System.currentTimeMillis() - start} to fetch ${pageNumber}th page " +
s"of ${lines.size} lines.")

// Validate that version/format/protocol/metadata in the response don't change across pages
if (version != expectedVersion ||
Expand Down
Loading