-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-9992][SPARK-9994][SPARK-9998][SQL]Implement the local TopK, sample and intersect operators #8573
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-9992][SPARK-9994][SPARK-9998][SQL]Implement the local TopK, sample and intersect operators #8573
Changes from 3 commits
d252265
d1acc2a
4ccca2a
4090902
a3270b0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * 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 scala.collection.mutable | ||
|
|
||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
|
|
||
| case class IntersectNode(left: LocalNode, right: LocalNode) extends BinaryLocalNode { | ||
|
|
||
| override def output: Seq[Attribute] = left.output | ||
|
|
||
| private[this] var leftRows: mutable.HashSet[InternalRow] = _ | ||
|
|
||
| private[this] var currentRow: InternalRow = _ | ||
|
|
||
| override def open(): Unit = { | ||
| left.open() | ||
| leftRows = mutable.HashSet[InternalRow]() | ||
| while (left.next()) { | ||
| leftRows += left.fetch().copy() | ||
| } | ||
| left.close() | ||
| right.open() | ||
| } | ||
|
|
||
| override def next(): Boolean = { | ||
| currentRow = null | ||
| while (currentRow == null && right.next()) { | ||
| currentRow = right.fetch() | ||
| if (!leftRows.contains(currentRow)) { | ||
| currentRow = null | ||
| } | ||
| } | ||
| currentRow != null | ||
| } | ||
|
|
||
| override def fetch(): InternalRow = currentRow | ||
|
|
||
| override def close(): Unit = { | ||
| left.close() | ||
| right.close() | ||
| } | ||
|
|
||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * 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 java.util.Random | ||
|
|
||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
| import org.apache.spark.util.random.{BernoulliCellSampler, PoissonSampler} | ||
|
|
||
| /** | ||
| * Sample the dataset. | ||
| * | ||
| * @param lowerBound Lower-bound of the sampling probability (usually 0.0) | ||
| * @param upperBound Upper-bound of the sampling probability. The expected fraction sampled | ||
| * will be ub - lb. | ||
| * @param withReplacement Whether to sample with replacement. | ||
| * @param seed the random seed | ||
| * @param child the LocalNode | ||
| */ | ||
| case class SampleNode( | ||
| lowerBound: Double, | ||
| upperBound: Double, | ||
| withReplacement: Boolean, | ||
| seed: Long, | ||
| child: LocalNode) extends UnaryLocalNode { | ||
|
|
||
| override def output: Seq[Attribute] = child.output | ||
|
|
||
| private[this] var iterator: Iterator[InternalRow] = _ | ||
|
|
||
| private[this] var currentRow: InternalRow = _ | ||
|
|
||
| override def open(): Unit = { | ||
| child.open() | ||
| val (sampler, _seed) = if (withReplacement) { | ||
| val random = new Random(seed) | ||
| // Disable gap sampling since the gap sampling method buffers two rows internally, | ||
| // requiring us to copy the row, which is more expensive than the random number generator. | ||
| (new PoissonSampler[InternalRow](upperBound - lowerBound, useGapSamplingIfPossible = false), | ||
| // Use the seed for partition 0 like PartitionwiseSampledRDD to generate the same result | ||
| // of DataFrame | ||
| random.nextLong()) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hm, why not just use the provided seed? It will allow us to test this more deterministically. We can just have the seed in the constructor default to
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. PartitionwiseSampledRDD doesn't use the provided seed directly, it calls
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see, it uses the seed to generate a random seed |
||
| } else { | ||
| (new BernoulliCellSampler[InternalRow](lowerBound, upperBound), seed) | ||
| } | ||
| sampler.setSeed(_seed) | ||
| iterator = sampler.sample(child.toIterator) | ||
| } | ||
|
|
||
| override def next(): Boolean = { | ||
| if (iterator.hasNext) { | ||
| currentRow = iterator.next() | ||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| override def fetch(): InternalRow = currentRow | ||
|
|
||
| override def close(): Unit = child.close() | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * 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.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.util.BoundedPriorityQueue | ||
|
|
||
| case class TakeOrderedAndProjectNode( | ||
| limit: Int, | ||
| sortOrder: Seq[SortOrder], | ||
| projectList: Option[Seq[NamedExpression]], | ||
| child: LocalNode) extends UnaryLocalNode { | ||
|
|
||
| override def output: Seq[Attribute] = { | ||
| val projectOutput = projectList.map(_.map(_.toAttribute)) | ||
| projectOutput.getOrElse(child.output) | ||
| } | ||
|
|
||
| private[this] var projection: Option[Projection] = _ | ||
|
|
||
| private[this] var ord: InterpretedOrdering = _ | ||
|
|
||
| private[this] var iterator: Iterator[InternalRow] = _ | ||
|
|
||
| private[this] var currentRow: InternalRow = _ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you
|
||
|
|
||
| override def open(): Unit = { | ||
| child.open() | ||
| projection = projectList.map(new InterpretedProjection(_, child.output)) | ||
| ord = new InterpretedOrdering(sortOrder, child.output) | ||
| val queue = new BoundedPriorityQueue[InternalRow](limit)(ord.reverse) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. need to copy the comment here too: |
||
| while (child.next()) { | ||
| queue += child.fetch() | ||
| } | ||
| // Close it eagerly since we don't need it. | ||
| child.close() | ||
| iterator = queue.iterator | ||
| } | ||
|
|
||
| override def next(): Boolean = { | ||
| if (iterator.hasNext) { | ||
| val _currentRow = iterator.next() | ||
| currentRow = projection.map(p => p(_currentRow)).getOrElse(_currentRow) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. might be easier to read if you just expand this: |
||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| override def fetch(): InternalRow = currentRow | ||
|
|
||
| override def close(): Unit = child.close() | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| class IntersectNodeSuite extends LocalNodeTest { | ||
|
|
||
| test("basic") { | ||
| val input1 = (1 to 10).map(i => (i, i.toString)).toDF("key", "value") | ||
| val input2 = (1 to 10).filter(_ % 2 == 0).map(i => (i, i.toString)).toDF("key", "value") | ||
|
|
||
| checkAnswer2( | ||
| input1, | ||
| input2, | ||
| (node1, node2) => IntersectNode(node1, node2), | ||
| input1.intersect(input2).collect() | ||
| ) | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,13 +17,29 @@ | |
|
|
||
| package org.apache.spark.sql.execution.local | ||
|
|
||
| import scala.reflect.runtime.universe.TypeTag | ||
| import scala.util.control.NonFatal | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.sql.{DataFrame, Row} | ||
| import org.apache.spark.sql.test.SQLTestUtils | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.{DataFrame, DataFrameHolder, Row} | ||
| import org.apache.spark.sql.test.{SharedSQLContext, SQLTestUtils} | ||
|
|
||
| class LocalNodeTest extends SparkFunSuite { | ||
| class LocalNodeTest extends SparkFunSuite with SharedSQLContext { | ||
|
|
||
| /** | ||
| * Creates a DataFrame from an RDD of Product (e.g. case classes, tuples). | ||
| */ | ||
| implicit def rddToDataFrameHolder[A <: Product : TypeTag](rdd: RDD[A]): DataFrameHolder = { | ||
| DataFrameHolder(_sqlContext.createDataFrame(rdd)) | ||
| } | ||
|
|
||
| /** | ||
| * Creates a DataFrame from a local Seq of Product. | ||
| */ | ||
| implicit def localSeqToDataFrameHolder[A <: Product : TypeTag](data: Seq[A]): DataFrameHolder = { | ||
| sqlContext.implicits.localSeqToDataFrameHolder(data) | ||
| } | ||
|
||
|
|
||
| /** | ||
| * Runs the LocalNode and makes sure the answer matches the expected result. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * 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.Column | ||
| import org.apache.spark.sql.catalyst.expressions.{Ascending, Expression, SortOrder} | ||
|
|
||
| class SampleNodeSuite extends LocalNodeTest { | ||
|
|
||
| def columnToSortOrder(sortExprs: Column*): Seq[SortOrder] = { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. private
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. actually, this is not used is it? |
||
| val sortOrder: Seq[SortOrder] = sortExprs.map { col => | ||
| col.expr match { | ||
| case expr: SortOrder => | ||
| expr | ||
| case expr: Expression => | ||
| SortOrder(expr, Ascending) | ||
| } | ||
| } | ||
| sortOrder | ||
| } | ||
|
|
||
| test("withReplacement: true") { | ||
| val seed = 0L | ||
| val input = sqlContext.sparkContext. | ||
| parallelize((1 to 10).map(i => (i, i.toString)), 1). // Should be only 1 partition | ||
| toDF("key", "value") | ||
|
||
| checkAnswer( | ||
| input, | ||
| node => SampleNode(0.0, 0.3, true, seed, node), | ||
| input.sample(true, 0.3, seed).collect() | ||
| ) | ||
| } | ||
|
|
||
| test("withReplacement: false") { | ||
| val seed = 0L | ||
| val input = sqlContext.sparkContext. | ||
| parallelize((1 to 10).map(i => (i, i.toString)), 1). // Should be only 1 partition | ||
| toDF("key", "value") | ||
| checkAnswer( | ||
| input, | ||
| node => SampleNode(0.0, 0.3, false, seed, node), | ||
| input.sample(false, 0.3, seed).collect() | ||
| ) | ||
|
||
| } | ||
| } | ||
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.
oh, looks like you already implemented this here :)