Skip to content

Merged Apache branch-1.6 #153

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

Merged
markhamstra merged 8 commits into from
Feb 23, 2016
Merged

Merged Apache branch-1.6 #153

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
699644c
[SPARK-12546][SQL] Change default number of open parquet files
marmbrus Feb 22, 2016
85e6a22
[SPARK-13298][CORE][UI] Escape "label" to avoid DAG being broken by s…
zsxwing Feb 23, 2016
f7898f9
[SPARK-11624][SPARK-11972][SQL] fix commands that need hive to exec
adrian-wang Feb 23, 2016
40d11d0
Update branch-1.6 for 1.6.1 release
marmbrus Feb 23, 2016
152252f
Preparing Spark release v1.6.1-rc1
pwendell Feb 23, 2016
2902798
Preparing development version 1.6.1-SNAPSHOT
pwendell Feb 23, 2016
54f83d3
Merge branch 'branch-1.6' of github.com:apache/spark into csd-1.6
markhamstra Feb 23, 2016
52016a7
fixed version number
markhamstra Feb 23, 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
Next Next commit
[SPARK-12546][SQL] Change default number of open parquet files 
A common problem that users encounter with Spark 1.6.0 is that writing to a partitioned parquet table OOMs.  The root cause is that parquet allocates a significant amount of memory that is not accounted for by our own mechanisms.  As a workaround, we can ensure that only a single file is open per task unless the user explicitly asks for more.

Author: Michael Armbrust <[email protected]>

Closes apache#11308 from marmbrus/parquetWriteOOM.

(cherry picked from commit 173aa94)
Signed-off-by: Michael Armbrust <[email protected]>
  • Loading branch information
@marmbrus
marmbrus committed Feb 22, 2016
commit 699644c692472e5b78baa56a1a6c44d8d174e70e
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ private[spark] object SQLConf {

val PARTITION_MAX_FILES =
intConf("spark.sql.sources.maxConcurrentWrites",
defaultValue = Some(5),
defaultValue = Some(1),
doc = "The maximum number of concurrent files to open before falling back on sorting when " +
"writing out files using dynamic partitioning.")

Expand Down