-
Notifications
You must be signed in to change notification settings - Fork 28.1k
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
[SPARK-10613] [SPARK-10624] [SQL] Reduce LocalNode tests dependency on SQLContext #8764
Closed
Closed
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7740f5c
Rewrite FilterNodeSuite to use LocalRelations
10fc109
Intersect, Project, and Limit
a93a260
TakeOrderedAndProject + Sample
0030ba0
Merge branch 'master' of github.com:apache/spark into sql-local-tests…
473e3eb
HashJoinNodeSuite
8364d23
NestedLoopJoinNodeSuite
36fb038
ExpandNode
060e5e6
Delete all obsolete code in LocalNodeTest
372ab5f
Fix TakeOrderedAndProjectNode
3bd5ac7
Merge branch 'master' of github.com:apache/spark into sql-local-tests…
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
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
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
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
68 changes: 68 additions & 0 deletions
68
sql/core/src/test/scala/org/apache/spark/sql/execution/local/DummyNode.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,68 @@ | ||
/* | ||
* 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.execution.local | ||
|
||
import org.apache.spark.sql.SQLConf | ||
import org.apache.spark.sql.catalyst.InternalRow | ||
import org.apache.spark.sql.catalyst.expressions.Attribute | ||
import org.apache.spark.sql.catalyst.plans.logical.LocalRelation | ||
|
||
/** | ||
* A dummy [[LocalNode]] that just returns rows from a [[LocalRelation]]. | ||
*/ | ||
private[local] case class DummyNode( | ||
output: Seq[Attribute], | ||
relation: LocalRelation, | ||
conf: SQLConf) | ||
extends LocalNode(conf) { | ||
|
||
import DummyNode._ | ||
|
||
private var index: Int = CLOSED | ||
private val input: Seq[InternalRow] = relation.data | ||
|
||
def this(output: Seq[Attribute], data: Seq[Product], conf: SQLConf = new SQLConf) { | ||
this(output, LocalRelation.fromProduct(output, data), conf) | ||
} | ||
|
||
def isOpen: Boolean = index != CLOSED | ||
|
||
override def children: Seq[LocalNode] = Seq.empty | ||
|
||
override def open(): Unit = { | ||
index = -1 | ||
} | ||
|
||
override def next(): Boolean = { | ||
index += 1 | ||
index < input.size | ||
} | ||
|
||
override def fetch(): InternalRow = { | ||
assert(index >= 0 && index < input.size) | ||
input(index) | ||
} | ||
|
||
override def close(): Unit = { | ||
index = CLOSED | ||
} | ||
} | ||
|
||
private object DummyNode { | ||
val CLOSED: Int = Int.MinValue | ||
} |
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
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
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
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
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.
@zsxwing I had to remove this to make testing deterministic. Looking at this further I still don't see the point of introducing another layer of randomness here. What change in behavior does this entail?
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.
I was using
DataFrame.sample
to test SampleNode and it mocked the behavior ofDataFrame.sample(withReplacement = true)
. Since you don't use DataFrame to test it now, I agree that we can remove this tricky logic.