-
Notifications
You must be signed in to change notification settings - Fork 982
[KYUUBI #360] Correct handle getNextRowSet with FETCH_PRIOR FETCH_FIRST #370
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
2307f1f
[KYUUBI #360] move ThriftUtils to kyuubi-common
pan3793 455af6b
[KYUUBI #360] correct getNextRowSet with FETCH_PRIOR FETCH_FIRST
pan3793 179404d
[KYUUBI #360] nit
pan3793 16178d6
[KYUUBI #360] ut
pan3793 eda3e59
[KYUUBI #360] fix import
pan3793 3d1b2a6
[KYUUBI #360] fix ut
pan3793 0fae3db
fix import
pan3793 e79b8cb
[KYUUBI #360] comments
pan3793 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
110 changes: 110 additions & 0 deletions
110
...kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/FetchIterator.scala
This file contains hidden or 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,110 @@ | ||
| /* | ||
| * 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.kyuubi.engine.spark | ||
|
|
||
| /** | ||
| * Borrowed from Apache Spark, see SPARK-33655 | ||
| */ | ||
| private[engine] 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[engine] 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[engine] 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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's honor Spark libraries and add some comment about it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated