Skip to content

Conversation

marmbrus
Copy link
Contributor

No description provided.

liancheng and others added 5 commits November 10, 2014 16:57
PR apache#3175 is for master branch only and can't be backported to branch 1.1 directly because Hive 0.13.1 support.

Author: Cheng Lian <[email protected]>

Closes apache#3176 from liancheng/fix-op-state-for-1.1 and squashes the following commits:

8791d87 [Cheng Lian] This is a follow up of apache#3175 for branch 1.1
This PR backports apache#2843 to branch-1.1. The key difference is that this one doesn't support Hive 0.13.1 and thus always returns `0.12.0` when `spark.sql.hive.version` is queried.

6 other commits on which apache#2843 depends were also backported, they are:

- apache#2887 for `SessionState` lifecycle control
- apache#2675, apache#2823 & apache#3060 for major test suite refactoring and bug fixes
- apache#2164, for Parquet test suites updates
- apache#2493, for reading `spark.sql.*` configurations

Author: Cheng Lian <[email protected]>
Author: Cheng Lian <[email protected]>
Author: Michael Armbrust <[email protected]>

Closes apache#3113 from liancheng/get-info-for-1.1 and squashes the following commits:

d354161 [Cheng Lian] Provides Spark and Hive version in HiveThriftServer2 for branch-1.1
0c2a244 [Michael Armbrust] [SPARK-3646][SQL] Copy SQL configuration from SparkConf when a SQLContext is created.
3202a36 [Michael Armbrust] [SQL] Decrease partitions when testing
7f395b7 [Cheng Lian] [SQL] Fixes race condition in CliSuite
0dd28ec [Cheng Lian] [SQL] Fixes the race condition that may cause test failure
5928b39 [Cheng Lian] [SPARK-3809][SQL] Fixes test suites in hive-thriftserver
faeca62 [Cheng Lian] [SPARK-4037][SQL] Removes the SessionState instance created in HiveThriftServer2
The queries like SELECT a.key FROM (SELECT key FROM src) \`a\` does not work as backticks in subquery aliases are not handled properly. This PR fixes that.

Author : ravipesala ravindra.pesalahuawei.com

Author: ravipesala <[email protected]>

Closes apache#2737 from ravipesala/SPARK-3834 and squashes the following commits:

0e0ab98 [ravipesala] Fixing issue in backtick handling for subquery aliases

Conflicts:
	sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
case ```ShortType```, we should add short value to hive row. Int value may lead to some problems.

Author: scwf <[email protected]>

Closes apache#2551 from scwf/fix-addColumnValue and squashes the following commits:

08bcc59 [scwf] ColumnValue.shortValue for short type
The below query gives error
sql("SELECT k FROM (SELECT \`key\` AS \`k\` FROM src) a")
It gives error because the aliases are not cleaned so it could not be resolved in further processing.

Author: ravipesala <[email protected]>

Closes apache#2594 from ravipesala/SPARK-3708 and squashes the following commits:

d55db54 [ravipesala] Fixed SPARK-3708 (Backticks aren't handled correctly is aliases)

Conflicts:
	sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
@SparkQA
Copy link

SparkQA commented Nov 11, 2014

QA tests have started for PR 3199 at commit 4c9f3e6.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Nov 11, 2014

QA tests have finished for PR 3199 at commit 4c9f3e6.

  • This patch fails unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/23182/
Test FAILed.

@SparkQA
Copy link

SparkQA commented Nov 11, 2014

QA tests have started for PR 3199 at commit 019a0dd.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Nov 11, 2014

QA tests have finished for PR 3199 at commit 019a0dd.

  • This patch passes unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/23188/
Test PASSed.

@andrewor14
Copy link
Contributor

Hey @marmbrus is this good to merge?

@marmbrus
Copy link
Contributor Author

Merged!

asfgit pushed a commit that referenced this pull request Nov 11, 2014
Author: Michael Armbrust <[email protected]>
Author: ravipesala <[email protected]>
Author: scwf <[email protected]>

Closes #3199 from marmbrus/backport1.1 and squashes the following commits:

019a0dd [Michael Armbrust] Drop incorrectly ported test cases
4c9f3e6 [ravipesala] [SPARK-3708][SQL] Backticks aren't handled correctly is aliases
064750d [scwf] [SPARK-3704][SQL] Fix ColumnValue type for Short values in thrift server
f4e17cd [ravipesala] [SPARK-3834][SQL] Backticks not correctly handled in subquery aliases
@andrewor14
Copy link
Contributor

Awesome. Would you mind closing this now that this is merged?

@marmbrus
Copy link
Contributor Author

Hmmm, I wonder why github is not doing that. The commit has the magic phrase.

@marmbrus marmbrus closed this Nov 11, 2014
@marmbrus marmbrus deleted the backport1.1 branch November 19, 2014 02:45
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.

7 participants