Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ case class Filter(condition: Expression, child: SparkPlan) extends UnaryNode {
* will be ub - lb.
* @param withReplacement Whether to sample with replacement.
* @param seed the random seed
* @param child the QueryPlan
* @param child the SparkPlan
*/
@DeveloperApi
case class Sample(
Expand Down
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
Expand Up @@ -73,6 +73,30 @@ abstract class LocalNode extends TreeNode[LocalNode] {
}
result
}

def toIterator: Iterator[InternalRow] = new Iterator[InternalRow] {
Copy link
Contributor

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 :)


private var currentRow: InternalRow = null

override def hasNext: Boolean = {
if (currentRow == null) {
if (LocalNode.this.next()) {
currentRow = fetch()
true
} else {
false
}
} else {
true
}
}

override def next(): InternalRow = {
val r = currentRow
currentRow = null
r
}
}
}


Expand All @@ -87,3 +111,12 @@ abstract class UnaryLocalNode extends LocalNode {

override def children: Seq[LocalNode] = Seq(child)
}

abstract class BinaryLocalNode extends LocalNode {

def left: LocalNode

def right: LocalNode

override def children: Seq[LocalNode] = Seq(left, right)
}
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())
Copy link
Contributor

Choose a reason for hiding this comment

The 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 Utils.random.nextLong just like how PartitionwiseSampledRDD does it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PartitionwiseSampledRDD doesn't use the provided seed directly, it calls random.nextLong to create seed for each partition. Here I want to make SampleNode generate the same result like the first partition of PartitionwiseSampledRDD, so I don't use the provided seed directly.

Copy link
Contributor

Choose a reason for hiding this comment

The 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 = _
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you

  1. kill the spaces between the vars, and
  2. move them before the defs?


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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to copy the comment here too:

// Priority keeps the largest elements, so let's reverse the ordering.

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be easier to read if you just expand this:

currentRow = projection match {
  case Some(p) => p(_currentRow)
  case None => _currentRow
}

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
Expand Up @@ -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)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think with your latest code you can revert these changes


/**
* Runs the LocalNode and makes sure the answer matches the expected result.
Expand Down
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] = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

private

Copy link
Contributor

Choose a reason for hiding this comment

The 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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, I usually put the . in the beginning of the line instead of at the end, like

val input = sqlContext.sparkContext
  .parallelize((1 to 10).map(...), 1)
  .toDF("key", "value")

but feel free to leave this as is if you prefer the existing style

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()
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is largely duplicated. Can you put it in a private def testSample(withReplacement: Boolean): Unit?

}
}
Loading