-
Notifications
You must be signed in to change notification settings - Fork 28.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-33655][SQL] Improve performance of processing FETCH_PRIOR
### What changes were proposed in this pull request? Currently, when a client requests FETCH_PRIOR to Thriftserver, Thriftserver reiterates from the start position. Because Thriftserver caches a query result with an array when THRIFTSERVER_INCREMENTAL_COLLECT feature is off, FETCH_PRIOR can be implemented without reiterating the result. A trait FeatureIterator is added in order to separate the implementation for iterator and an array. Also, FeatureIterator supports moves cursor with absolute position, which will be useful for the implementation of FETCH_RELATIVE, FETCH_ABSOLUTE. ### Why are the changes needed? For better performance of Thriftserver. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? FetchIteratorSuite Closes #30600 from Dooyoung-Hwang/refactor_with_fetch_iterator. Authored-by: Dooyoung Hwang <dooyoung.hwang@sk.com> Signed-off-by: HyukjinKwon <gurwls223@apache.org>
- Loading branch information
1 parent
48f93af
commit a713a7e
Showing
3 changed files
with
256 additions
and
54 deletions.
There are no files selected for viewing
107 changes: 107 additions & 0 deletions
107
...ve-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/FetchIterator.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.sql.hive.thriftserver | ||
|
||
private[hive] sealed trait FetchIterator[A] extends Iterator[A] { | ||
/** | ||
* Begin a fetch block, forward from the current position. | ||
* Resets the fetch start offset. | ||
*/ | ||
def fetchNext(): Unit | ||
|
||
/** | ||
* Begin a fetch block, moving the iterator back by offset from the start of the previous fetch | ||
* block start. | ||
* Resets the fetch start offset. | ||
* | ||
* @param offset the amount to move a fetch start position toward the prior direction. | ||
*/ | ||
def fetchPrior(offset: Long): Unit = fetchAbsolute(getFetchStart - offset) | ||
|
||
/** | ||
* Begin a fetch block, moving the iterator to the given position. | ||
* Resets the fetch start offset. | ||
* | ||
* @param pos index to move a position of iterator. | ||
*/ | ||
def fetchAbsolute(pos: Long): Unit | ||
|
||
def getFetchStart: Long | ||
|
||
def getPosition: Long | ||
} | ||
|
||
private[hive] class ArrayFetchIterator[A](src: Array[A]) extends FetchIterator[A] { | ||
private var fetchStart: Long = 0 | ||
|
||
private var position: Long = 0 | ||
|
||
override def fetchNext(): Unit = fetchStart = position | ||
|
||
override def fetchAbsolute(pos: Long): Unit = { | ||
position = (pos max 0) min src.length | ||
fetchStart = position | ||
} | ||
|
||
override def getFetchStart: Long = fetchStart | ||
|
||
override def getPosition: Long = position | ||
|
||
override def hasNext: Boolean = position < src.length | ||
|
||
override def next(): A = { | ||
position += 1 | ||
src(position.toInt - 1) | ||
} | ||
} | ||
|
||
private[hive] class IterableFetchIterator[A](iterable: Iterable[A]) extends FetchIterator[A] { | ||
private var iter: Iterator[A] = iterable.iterator | ||
|
||
private var fetchStart: Long = 0 | ||
|
||
private var position: Long = 0 | ||
|
||
override def fetchNext(): Unit = fetchStart = position | ||
|
||
override def fetchAbsolute(pos: Long): Unit = { | ||
val newPos = pos max 0 | ||
if (newPos < position) resetPosition() | ||
while (position < newPos && hasNext) next() | ||
fetchStart = position | ||
} | ||
|
||
override def getFetchStart: Long = fetchStart | ||
|
||
override def getPosition: Long = position | ||
|
||
override def hasNext: Boolean = iter.hasNext | ||
|
||
override def next(): A = { | ||
position += 1 | ||
iter.next() | ||
} | ||
|
||
private def resetPosition(): Unit = { | ||
if (position != 0) { | ||
iter = iterable.iterator | ||
position = 0 | ||
fetchStart = 0 | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
...riftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/FetchIteratorSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.sql.hive.thriftserver | ||
|
||
import org.apache.spark.SparkFunSuite | ||
|
||
class FetchIteratorSuite extends SparkFunSuite { | ||
|
||
private def getRows(fetchIter: FetchIterator[Int], maxRowCount: Int): Seq[Int] = { | ||
for (_ <- 0 until maxRowCount if fetchIter.hasNext) yield fetchIter.next() | ||
} | ||
|
||
test("SPARK-33655: Test fetchNext and fetchPrior") { | ||
val testData = 0 until 10 | ||
|
||
def iteratorTest(fetchIter: FetchIterator[Int]): Unit = { | ||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 0) | ||
assertResult(0 until 2)(getRows(fetchIter, 2)) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 2) | ||
|
||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 2) | ||
assert(fetchIter.getPosition == 2) | ||
assertResult(2 until 3)(getRows(fetchIter, 1)) | ||
assert(fetchIter.getFetchStart == 2) | ||
assert(fetchIter.getPosition == 3) | ||
|
||
fetchIter.fetchPrior(2) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 0) | ||
assertResult(0 until 3)(getRows(fetchIter, 3)) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 3) | ||
|
||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 3) | ||
assert(fetchIter.getPosition == 3) | ||
assertResult(3 until 8)(getRows(fetchIter, 5)) | ||
assert(fetchIter.getFetchStart == 3) | ||
assert(fetchIter.getPosition == 8) | ||
|
||
fetchIter.fetchPrior(2) | ||
assert(fetchIter.getFetchStart == 1) | ||
assert(fetchIter.getPosition == 1) | ||
assertResult(1 until 4)(getRows(fetchIter, 3)) | ||
assert(fetchIter.getFetchStart == 1) | ||
assert(fetchIter.getPosition == 4) | ||
|
||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 4) | ||
assert(fetchIter.getPosition == 4) | ||
assertResult(4 until 10)(getRows(fetchIter, 10)) | ||
assert(fetchIter.getFetchStart == 4) | ||
assert(fetchIter.getPosition == 10) | ||
|
||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 10) | ||
assert(fetchIter.getPosition == 10) | ||
assertResult(Seq.empty[Int])(getRows(fetchIter, 10)) | ||
assert(fetchIter.getFetchStart == 10) | ||
assert(fetchIter.getPosition == 10) | ||
|
||
fetchIter.fetchPrior(20) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 0) | ||
assertResult(0 until 3)(getRows(fetchIter, 3)) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 3) | ||
} | ||
iteratorTest(new ArrayFetchIterator[Int](testData.toArray)) | ||
iteratorTest(new IterableFetchIterator[Int](testData)) | ||
} | ||
|
||
test("SPARK-33655: Test fetchAbsolute") { | ||
val testData = 0 until 10 | ||
|
||
def iteratorTest(fetchIter: FetchIterator[Int]): Unit = { | ||
fetchIter.fetchNext() | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 0) | ||
assertResult(0 until 5)(getRows(fetchIter, 5)) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 5) | ||
|
||
fetchIter.fetchAbsolute(2) | ||
assert(fetchIter.getFetchStart == 2) | ||
assert(fetchIter.getPosition == 2) | ||
assertResult(2 until 5)(getRows(fetchIter, 3)) | ||
assert(fetchIter.getFetchStart == 2) | ||
assert(fetchIter.getPosition == 5) | ||
|
||
fetchIter.fetchAbsolute(7) | ||
assert(fetchIter.getFetchStart == 7) | ||
assert(fetchIter.getPosition == 7) | ||
assertResult(7 until 8)(getRows(fetchIter, 1)) | ||
assert(fetchIter.getFetchStart == 7) | ||
assert(fetchIter.getPosition == 8) | ||
|
||
fetchIter.fetchAbsolute(20) | ||
assert(fetchIter.getFetchStart == 10) | ||
assert(fetchIter.getPosition == 10) | ||
assertResult(Seq.empty[Int])(getRows(fetchIter, 1)) | ||
assert(fetchIter.getFetchStart == 10) | ||
assert(fetchIter.getPosition == 10) | ||
|
||
fetchIter.fetchAbsolute(0) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 0) | ||
assertResult(0 until 3)(getRows(fetchIter, 3)) | ||
assert(fetchIter.getFetchStart == 0) | ||
assert(fetchIter.getPosition == 3) | ||
} | ||
iteratorTest(new ArrayFetchIterator[Int](testData.toArray)) | ||
iteratorTest(new IterableFetchIterator[Int](testData)) | ||
} | ||
} |