Skip to content

[WIP][SPARK-29018][SQL] Implement Spark Thrift Server with it's own code base on PROTOCOL_VERSION_V9 #25721

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

Closed
AngersZhuuuu wants to merge 6 commits into from
Closed

[WIP][SPARK-29018][SQL] Implement Spark Thrift Server with it's own code base on PROTOCOL_VERSION_V9 #25721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c17cbe
save code
AngersZhuuuu Aug 29, 2019
b5e7f69
change SparkThriftServer to it's own API, avoid Hive version problem
AngersZhuuuu Sep 8, 2019
8b9bdd1
hive.setMetaConf(propName, substitution.substitute(ss.getConf, …
AngersZhuuuu Sep 8, 2019
16e8eaf
resolve conflicts
AngersZhuuuu Sep 8, 2019
28813f8
change invalid name
AngersZhuuuu Sep 8, 2019
60415cd
fix little bug
AngersZhuuuu Sep 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
53 changes: 52 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,58 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>${hive.group}</groupId>
<artifactId>hive-service</artifactId>
Copy link
Contributor

@juliuszsompolski juliuszsompolski Oct 21, 2019

Choose a reason for hiding this comment

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

I thought that this is cutting away dependency on Hive?

Also, does it need to be defined in root pom.xml? (genuinely asking: I know little about maven)

Copy link
Contributor

@juliuszsompolski juliuszsompolski Oct 21, 2019

Choose a reason for hiding this comment

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

Ok, I see actually from the description that it is for beeline and Hive JDBC client... Would be nice if that dependency changes could be inside hive-thriftserver, but like I said, I don't know much about maven...

Copy link
Contributor Author

@AngersZhuuuu AngersZhuuuu Oct 21, 2019

Choose a reason for hiding this comment

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

I thought that this is cutting away dependency on Hive?

Also, does it need to be defined in root pom.xml? (genuinely asking: I know little about maven)

We just import this and use it for beeline. Don't need to spend more time dealing with version dependencies

<version>${hive.version}</version>
<scope>${hive.deps.scope}</scope>
<exclusions>
<exclusion>
<groupId>${hive.group}</groupId>
<artifactId>hive-exec</artifactId>
</exclusion>
<exclusion>
<groupId>${hive.group}</groupId>
<artifactId>hive-metastore</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${hive.group}</groupId>
<artifactId>hive-metastore</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...thriftserver/v2.3.5/if/TCLIService.thrift → sql/hive-thriftserver/if/TCLIService.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
// * Service names begin with the letter "T", use a capital letter for each
// new word (with no underscores), and end with the word "Service".

namespace java org.apache.hive.service.rpc.thrift
namespace cpp apache.hive.service.rpc.thrift
namespace java org.apache.spark.service.cli.thrift
namespace cpp apache.spark.service.cli.thrift

// List of protocol versions. A new token should be
// added to the end of this list every time a change is made.
Expand Down
8 changes: 5 additions & 3 deletions sql/hive-thriftserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
<groupId>${hive.group}</groupId>
<artifactId>hive-beeline</artifactId>
</dependency>
<dependency>
<groupId>${hive.group}</groupId>
<artifactId>hive-service</artifactId>
Copy link
Contributor

@juliuszsompolski juliuszsompolski Oct 21, 2019

Choose a reason for hiding this comment

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

Or is it that we now depend on it just so that Hive JDBC client can work?

Copy link
Contributor Author

@AngersZhuuuu AngersZhuuuu Oct 21, 2019

Choose a reason for hiding this comment

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

Or is it that we now depend on it just so that Hive JDBC client can work?

yes, beeline rely on hive-beeline -> hive-jdbc -> hive-service.
So I just import this part for beeline, and this part is follow hive version.
So it is ok to do this.

</dependency>
<!-- Explicit listing hive-contrib and hive-hcatalog-core. Otherwise the maven test fails. -->
<dependency>
<groupId>${hive.group}</groupId>
Expand Down Expand Up @@ -151,9 +155,7 @@
</goals>
<configuration>
<sources>
<source>v${hive.version.short}/src/gen/java</source>
<source>v${hive.version.short}/src/main/java</source>
<source>v${hive.version.short}/src/main/scala</source>
<source>src/gen/java</source>
</sources>
</configuration>
</execution>
Expand Down
14 changes: 2 additions & 12 deletions ...e/service/rpc/thrift/TArrayTypeEntry.java → ...k/service/cli/thrift/TArrayTypeEntry.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions ...ive/service/rpc/thrift/TBinaryColumn.java → ...ark/service/cli/thrift/TBinaryColumn.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions .../hive/service/rpc/thrift/TBoolColumn.java → ...spark/service/cli/thrift/TBoolColumn.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions ...e/hive/service/rpc/thrift/TBoolValue.java → .../spark/service/cli/thrift/TBoolValue.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions .../hive/service/rpc/thrift/TByteColumn.java → ...spark/service/cli/thrift/TByteColumn.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions ...e/hive/service/rpc/thrift/TByteValue.java → .../spark/service/cli/thrift/TByteValue.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 5 additions & 11 deletions .../hive/service/rpc/thrift/TCLIService.java → ...spark/service/cli/thrift/TCLIService.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading