Skip to content

[Spark-14138][SQL] Fix generated SpecificColumnarIterator code can exceed JVM size limit for cached DataFrames #11984

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.

Sign up for GitHub

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
kiszk wants to merge 13 commits into from
Closed

[Spark-14138][SQL] Fix generated SpecificColumnarIterator code can exceed JVM size limit for cached DataFrames #11984

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab67d33
make code size of hasNext() smaller by preparing get*Acceessor() methods
kiszk Mar 27, 2016
fea2a52
add test case
kiszk Mar 27, 2016
e56406e
fix scalastyle errors
kiszk Mar 27, 2016
60f6719
fix scalastyle error
kiszk Mar 27, 2016
226bad5
use String as a key instead of DataType object
kiszk Mar 27, 2016
f3307a7
fix boundary condition
kiszk Mar 27, 2016
9346793
add a case that does not generate a new method, but the number of col…
kiszk Mar 27, 2016
beb9840
reduce threadhold of # of calls in a method to allow HotSpot to compi…
kiszk Mar 30, 2016
16cf602
adressed Davies's comments
kiszk Mar 31, 2016
a310bfc
fix scala style errors
kiszk Mar 31, 2016
c1acf82
nit: fix number in a comment
kiszk Mar 31, 2016
60cebd5
addessed Davies's comments
kiszk Mar 31, 2016
3a05ddf
fix scala style errors
kiszk Mar 31, 2016
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
Prev Previous commit
Next Next commit
use String as a key instead of DataType object
  • Loading branch information
@kiszk
kiszk committed Mar 27, 2016
commit 226bad5ee0c0253cad958fa812fd5b274b8c6be0
11 changes: 6 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/GenerateColumnAccessor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ object GenerateColumnAccessor extends CodeGenerator[Seq[DataType], ColumnarItera
val ctx = newCodeGenContext()
val numFields = columnTypes.size
val accessorClasses = new mutable.HashMap[String, String]
val accessorStructClasses = new mutable.HashMap[(String, DataType), (String, String)]
val accessorStructClasses = new mutable.HashMap[(String, String), (String, String)]
val (initializeAccessors, extractors) = columnTypes.zipWithIndex.map { case (dt, index) =>
val accessorName = ctx.freshName("accessor")
val accessorCls = dt match {
Expand Down Expand Up @@ -102,8 +102,9 @@ object GenerateColumnAccessor extends CodeGenerator[Seq[DataType], ColumnarItera
case NullType | StringType | BinaryType =>
s"$accessorName = get${accessorClasses.getOrElseUpdate(accessorCls, shortCls)}($index);"
case other =>
val shortDTCls = dt.getClass.getName.substring(dt.getClass.getName.lastIndexOf(".") + 1)
accessorStructClasses.getOrElseUpdate((accessorCls, dt), (shortCls, shortDTCls))
val dtCls = dt.getClass.getName
val shortDTCls = dt.getClass.getName.substring(dtCls.lastIndexOf(".") + 1)
accessorStructClasses.getOrElseUpdate((accessorCls, dtCls), (shortCls, shortDTCls))
s"$accessorName = get${shortCls}_${shortDTCls}($index);"
}
}
Expand Down Expand Up @@ -131,12 +132,12 @@ object GenerateColumnAccessor extends CodeGenerator[Seq[DataType], ColumnarItera
"""
}
val accessorStructCode = accessorStructClasses.map {
case ((accessorCls, dt), (shortAccCls, shortDTCls)) =>
case ((accessorCls, dtCls), (shortAccCls, shortDTCls)) =>
s"""
private $accessorCls get${shortAccCls}_${shortDTCls}(int idx) {
byte[] buffer = batch.buffers()[columnIndexes[idx]];
return new $accessorCls(ByteBuffer.wrap(buffer).order(nativeOrder),
(${dt.getClass.getName}) columnTypes[idx]);
(${dtCls}) columnTypes[idx]);
}
"""
}
Expand Down