wangyum commented on a change in pull request #30600:
URL: https://github.com/apache/spark/pull/30600#discussion_r537046807
##########
File path:
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala
##########
@@ -148,43 +142,10 @@ private[hive] class SparkExecuteStatementOperation(
setHasResultSet(true)
val resultRowSet: RowSet = RowSetFactory.create(getResultSetSchema,
getProtocolVersion, false)
- // Reset iter when FETCH_FIRST or FETCH_PRIOR
- if ((order.equals(FetchOrientation.FETCH_FIRST) ||
- order.equals(FetchOrientation.FETCH_PRIOR)) && previousFetchEndOffset
!= 0) {
- // Reset the iterator to the beginning of the query.
- iter = if
(sqlContext.getConf(SQLConf.THRIFTSERVER_INCREMENTAL_COLLECT.key).toBoolean) {
- resultList = None
- result.toLocalIterator.asScala
- } else {
- if (resultList.isEmpty) {
- resultList = Some(result.collect())
- }
- resultList.get.iterator
- }
- }
-
- var resultOffset = {
- if (order.equals(FetchOrientation.FETCH_FIRST)) {
- logInfo(s"FETCH_FIRST request with $statementId. Resetting to
resultOffset=0")
- 0
- } else if (order.equals(FetchOrientation.FETCH_PRIOR)) {
- // TODO: FETCH_PRIOR should be handled more efficiently than rewinding
to beginning and
- // reiterating.
- val targetOffset = math.max(previousFetchStartOffset - maxRowsL, 0)
- logInfo(s"FETCH_PRIOR request with $statementId. Resetting to
resultOffset=$targetOffset")
- var off = 0
- while (off < targetOffset && iter.hasNext) {
- iter.next()
- off += 1
- }
- off
- } else { // FETCH_NEXT
- previousFetchEndOffset
- }
- }
-
- resultRowSet.setStartOffset(resultOffset)
- previousFetchStartOffset = resultOffset
+ if (order.equals(FetchOrientation.FETCH_FIRST)) iter.fetchAbsolute(0)
+ else if (order.equals(FetchOrientation.FETCH_PRIOR))
iter.fetchPrior(maxRowsL)
+ else iter.fetchNext()
Review comment:
Add curly braces?
https://github.com/databricks/scala-style-guide/blob/master/README.md#curly
cc @maropu
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
