-
Notifications
You must be signed in to change notification settings - Fork 203
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Spark 2.3 Merge #984
Open
ymahajan
wants to merge
34
commits into
master
Choose a base branch
from
spark_2.3_merge
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Spark 2.3 Merge #984
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ashetkar
reviewed
Mar 14, 2018
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
This was referenced Apr 5, 2018
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
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this pull request
Spark 2.3 Merge
Patch testing
precheckin, hydra, perf etc
ReleaseNotes.txt changes
None
Other PRs