Skip to content
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 2.3 Merge #984

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Spark 2.3 Merge #984

wants to merge 34 commits into from

Conversation

ymahajan
Copy link
Contributor

@ymahajan ymahajan commented Mar 12, 2018

Changes proposed in this pull request

Spark 2.3 Merge

Patch testing

precheckin, hydra, perf etc

ReleaseNotes.txt changes

None

Other PRs

build.gradle Outdated
sparkVersion = '2.1.1'
snappySparkVersion = '2.1.1.1'
sparkVersion = '2.3.0'
snappySparkVersion = '2.3.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

Generally the ordinal version we use (snappySparkVersion) is one ahead of Spark version; like 2.3.0.1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah right, thanks

ymahajan and others added 18 commits April 5, 2018 17:24
Conflicts:
	build.gradle
	cluster/src/dunit/scala/io/snappydata/cluster/SnappyTableStatsProviderDUnitTest.scala
	cluster/src/main/scala/io/snappydata/gemxd/SparkSQLPrepareImpl.scala
	core/src/main/scala/org/apache/spark/sql/CachedDataFrame.scala
	core/src/main/scala/org/apache/spark/sql/SnappyParser.scala
	core/src/main/scala/org/apache/spark/sql/SnappySession.scala
	core/src/main/scala/org/apache/spark/sql/SnappyStrategies.scala
	core/src/main/scala/org/apache/spark/sql/catalyst/expressions/ParamLiteral.scala
	core/src/main/scala/org/apache/spark/sql/execution/CachedPlanHelperExec.scala
	core/src/main/scala/org/apache/spark/sql/execution/CodegenSparkFallback.scala
	core/src/main/scala/org/apache/spark/sql/execution/ExistingPlans.scala
	core/src/main/scala/org/apache/spark/sql/execution/aggregate/SnappyHashAggregateExec.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/ColumnInsertExec.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/ColumnTableScan.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/ExternalStoreUtils.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/JDBCAppendableRelation.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnFormatRelation.scala
	core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/JDBCSourceAsColumnarStore.scala
	core/src/main/scala/org/apache/spark/sql/execution/joins/HashJoinExec.scala
	core/src/main/scala/org/apache/spark/sql/execution/row/RowFormatRelation.scala
	core/src/main/scala/org/apache/spark/sql/execution/sources/StoreDataSourceStrategy.scala
	core/src/main/scala/org/apache/spark/sql/execution/ui/SnappySQLListener.scala
	core/src/main/scala/org/apache/spark/sql/hive/SnappyStoreHiveCatalog.scala
	core/src/main/scala/org/apache/spark/sql/internal/ColumnTableBulkOps.scala
	core/src/main/scala/org/apache/spark/sql/internal/SnappySessionState.scala
	core/src/main/scala/org/apache/spark/sql/sources/SnappyStoreStrategy.scala
	core/src/main/scala/org/apache/spark/sql/store/CodeGeneration.scala
Conflicts:
	core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnDelta.scala
	core/src/main/scala/org/apache/spark/sql/execution/sources/StoreDataSourceStrategy.scala
	core/src/main/scala/org/apache/spark/sql/internal/SnappySessionState.scala
	core/src/main/scala/org/apache/spark/sql/store/CodeGeneration.scala
ymahajan and others added 8 commits May 15, 2018 23:50
@PradeepSurale
Copy link
Contributor

Can one of the admins verify this patch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants