-
Notifications
You must be signed in to change notification settings - Fork 200
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
base: master
Are you sure you want to change the base?
Spark 2.3 Merge #984
Conversation
build.gradle
Outdated
sparkVersion = '2.1.1' | ||
snappySparkVersion = '2.1.1.1' | ||
sparkVersion = '2.3.0' | ||
snappySparkVersion = '2.3.0' |
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.
Generally the ordinal version we use (snappySparkVersion) is one ahead of Spark version; like 2.3.0.1
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.
Ah right, thanks
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
Conflicts: core/src/main/scala/org/apache/spark/sql/SnappyDDLParser.scala
Conflicts: core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/JDBCSourceAsColumnarStore.scala
Can one of the admins verify this patch? |
0190cc4
to
4e1c31b
Compare
8b43301
to
2b254d9
Compare
2c254f0
to
0f2888f
Compare
a466d26
to
ea127bd
Compare
99ec79c
to
c7b84fa
Compare
Changes proposed in this pull request
Spark 2.3 Merge
Patch testing
precheckin, hydra, perf etc
ReleaseNotes.txt changes
None
Other PRs