Skip to content

Commit 708cd75

Browse files
fangyuefyfangyuefy
committed
Quicksql version upgraded to 0.7.1
1 parent 767a4e8 commit 708cd75

File tree

20 files changed

+46
-40
lines changed

20 files changed

+46
-40
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help us improve
44
---
55

66
## Versions
7-
eg: 0.7.0
7+
eg: 0.7.1
88

99
## Describe the bug
1010
A clear and concise description of what the bug is.

‎assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>qsql</artifactId>
77
<groupId>com.qihoo.qsql</groupId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎assembly/src/main/assembly/assembly-linux.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<outputDirectory>/${qsql.release}/lib/flink</outputDirectory>
3636
<fileMode>0755</fileMode>
3737
<includes>
38-
<include>**/qsql-core-0.7.0-fat.jar</include>
38+
<include>**/qsql-core-0.7.1-fat.jar</include>
3939
</includes>
4040
</fileSet>
4141
<fileSet>

‎bin/commons.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
unset QSQL_JARS
33
unset PROJECT_VERSION
44

5-
PROJECT_VERSION="0.7.0"
5+
PROJECT_VERSION="0.7.1"
66

77
if [ -z "${QSQL_HOME}" ]
88
then

‎client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>qsql</artifactId>
77
<groupId>com.qihoo.qsql</groupId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/pom.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ limitations under the License.
2222
<parent>
2323
<groupId>com.qihoo.qsql</groupId>
2424
<artifactId>qsql</artifactId>
25-
<version>0.7.0</version>
25+
<version>0.7.1</version>
2626
</parent>
2727

2828
<artifactId>qsql-core</artifactId>
2929
<packaging>jar</packaging>
30-
<version>0.7.0</version>
30+
<version>0.7.1</version>
3131
<name>qsql-core</name>
3232

3333
<properties>
3434
<top.dir>${project.basedir}/..</top.dir>
35-
<qsql.release>qsql-0.7.0</qsql.release>
35+
<qsql.release>qsql-0.7.1</qsql.release>
3636
<output.directory>/${qsql.release}/lib/flink</output.directory>
3737
</properties>
3838

@@ -56,6 +56,10 @@ limitations under the License.
5656
<artifactId>asm</artifactId>
5757
<groupId>asm</groupId>
5858
</exclusion>
59+
<exclusion>
60+
<artifactId>protobuf-java</artifactId>
61+
<groupId>com.google.protobuf</groupId>
62+
</exclusion>
5963
</exclusions>
6064
</dependency>
6165
<!-- qsql-->

‎core/src/main/java/com/qihoo/qsql/launcher/ExecutionDispatcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private static void welcome() {
237237
+ " / __ \\__ __(_)____/ /__/ ___// __ \\ / / \n"
238238
+ " / / / / / / / / ___/ //_/\\__ \\/ / / / / / \n"
239239
+ " / /_/ / /_/ / / /__/ ,< ___/ / /_/ / / /___\n"
240-
+ "Welcome to \\___\\_\\__,_/_/\\___/_/|_|/____/\\___\\_\\/_____/ version 0.7.0.";
240+
+ "Welcome to \\___\\_\\__,_/_/\\___/_/|_|/____/\\___\\_\\/_____/ version 0.7.1.";
241241
String slogan = " \\ Process data placed anywhere with the most flexible SQL /";
242242
System.out.println(welcome);
243243
System.out.println(slogan);

‎core/src/test/java/com/qihoo/qsql/launcher/ExecutionDispatcherTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void setUp() {
3434
args.add("--jar");
3535
args.add("test.jar");
3636
args.add("--jar_name");
37-
args.add("./target/qsql-core-0.7.0.jar");
37+
args.add("./target/qsql-core-0.7.1.jar");
3838
}
3939

4040
@Test

‎docker/0.7.0/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ RUN wget https://github.com/Qihoo360/Quicksql/releases/download/v0.7.0/quicksql
1414
tar -xzvf quicksql-0.7.0.tar.gz -C /usr/local
1515

1616
# Download Spark package
17-
RUN wget https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz && \
18-
tar -xzvf spark-2.2.0-bin-hadoop2.7.tgz -C /usr/local
17+
RUN wget https://archive.apache.org/dist/spark/spark-2.3.0/spark-2.3.0-bin-hadoop2.7.tgz && \
18+
tar -xzvf spark-2.3.0-bin-hadoop2.7.tgz -C /usr/local
1919

2020
# Setting environments
2121
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk
2222
ENV QSQL_HOME /usr/local/qsql-0.7.0
23-
ENV SPARK_HOME /usr/local/spark-2.2.0-bin-hadoop2.7
23+
ENV SPARK_HOME /usr/local/spark-2.3.0-bin-hadoop2.7
2424
ENV PATH $JAVA_HOME/bin:$SPARK_HOME/bin:$SPARK_HOME/sbin:$QSQL_HOME/bin:$PATH
2525
RUN export PATH QSQL_HOME SPARK_HOME
2626

‎docker/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample --runner spark`
1616

17-
## Start version 0.7.0
17+
## Start version 0.7.1
1818

19-
- `docker run -it --name quicksql francisdu/quicksql:0.7.0 /bin/bash`
19+
- `docker run -it --name quicksql francisdu/quicksql:0.7.1 /bin/bash`
2020

2121
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample --runner spark`
2222

‎docker/latest/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ RUN cd ~/Quicksql && tar -xzvf target/$(awk -v RS='\r\n' '/<qsql.release>[^<]+<\
1616
ln -s /usr/local/$(awk -v RS='\r\n' '/<qsql.release>[^<]+<\/qsql.release>/{gsub(/<qsql.release>|<\/qsql.release>/,"",$1);printf $1;exit;}' ~/Quicksql/pom.xml) /usr/local/qsql
1717

1818
# Download Spark package
19-
RUN cd ~ && wget https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz && \
20-
tar -xzvf spark-2.2.0-bin-hadoop2.7.tgz -C /usr/local && \
21-
ln -s /usr/local/spark-2.2.0-bin-hadoop2.7 /usr/local/spark
19+
RUN cd ~ && wget https://archive.apache.org/dist/spark/spark-2.3.0/spark-2.3.0-bin-hadoop2.7.tgz && \
20+
tar -xzvf spark-2.3.0-bin-hadoop2.7.tgz -C /usr/local && \
21+
ln -s /usr/local/spark-2.3.0-bin-hadoop2.7 /usr/local/spark
2222

2323
# TODO : Add other services such as ES,Flink,etc...
2424

‎docs/deployment/docker.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample`
1818

19-
## Start version 0.7.0
19+
## Start version 0.7.1
2020

21-
- `docker run -it --name quicksql francisdu/quicksql:0.7.0 /bin/bash`
21+
- `docker run -it --name quicksql francisdu/quicksql:0.7.1 /bin/bash`
2222

2323
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample`
2424

‎docs/reference/getting-started.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
· Java >= 1.8
1212

13-
· Spark > 2.2 (必选，未来作为可选)
13+
· Spark >= 2.3 (必选，未来作为可选)
1414

1515
· Flink >= 1.9 (可选)
1616

@@ -19,7 +19,7 @@
1919

2020
``````shell
2121
$ tar -zxvf ./quicksql-release-bin.tar.gz
22-
$ cd quicksql-realease-0.7.0
22+
$ cd quicksql-realease-0.7.1
2323
$ vim ./conf/quicksql-env.sh #Set Your Basic Environment.
2424
``````
2525

@@ -283,7 +283,7 @@ $ ./bin/quicksql-server.sh start -p 5888 -r spark -m yarn-client
283283

284284
**应用接入**
285285

286-
项目手动加入Quicksql driver包 qsql-client-0.7.0.jar，下载地址：<https://github.com/Qihoo360/Quicksql/releases>；
286+
项目手动加入Quicksql driver包 qsql-client-0.7.1.jar，下载地址：<https://github.com/Qihoo360/Quicksql/releases>；
287287

288288
Java代码示例：
289289

‎docs/zh/deployment/docker.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample --runner spark`
1818

19-
## 体验 0.7.0 版本
19+
## 体验 0.7.1 版本
2020

21-
- `docker run -it --name quicksql francisdu/quicksql:0.7.0 /bin/bash`
21+
- `docker run -it --name quicksql francisdu/quicksql:0.7.1 /bin/bash`
2222

2323
- Run example: `quicksql-example.sh --class com.qihoo.qsql.CsvJoinWithEsExample --runner spark`
2424

‎docs/zh/reference/getting-started.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
· Java >= 1.8
1212

13-
· Spark > 2.2 (必选，未来作为可选)
13+
· Spark >= 2.3 (必选，未来作为可选)
1414

1515
· Flink >= 1.9 (可选)
1616

@@ -19,7 +19,7 @@
1919

2020
``````shell
2121
$ tar -zxvf ./quicksql-release-bin.tar.gz
22-
$ cd quicksql-realease-0.7.0
22+
$ cd quicksql-realease-0.7.1
2323
$ vim ./conf/quicksql-env.sh #Set Your Basic Environment.
2424
``````
2525

@@ -283,7 +283,7 @@ $ ./bin/quicksql-server.sh start -P 5888 -R spark -M yarn-client
283283

284284
**应用接入**
285285

286-
项目手动加入Quicksql driver包 qsql-client-0.7.0.jar，下载地址：<https://github.com/Qihoo360/Quicksql/releases>；
286+
项目手动加入Quicksql driver包 qsql-client-0.7.1.jar，下载地址：<https://github.com/Qihoo360/Quicksql/releases>；
287287

288288
Java代码示例：
289289

‎example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>qsql</artifactId>
77
<groupId>com.qihoo.qsql</groupId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>

‎meta/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>qsql</artifactId>
66
<groupId>com.qihoo.qsql</groupId>
7-
<version>0.7.0</version>
7+
<version>0.7.1</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>

‎parser/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
<parent>
2323
<groupId>com.qihoo.qsql</groupId>
2424
<artifactId>qsql</artifactId>
25-
<version>0.7.0</version>
25+
<version>0.7.1</version>
2626
</parent>
2727

2828
<artifactId>qsql-calcite-parser</artifactId>

‎pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.qihoo.qsql</groupId>
99
<artifactId>qsql</artifactId>
1010
<packaging>pom</packaging>
11-
<version>0.7.0</version>
11+
<version>0.7.1</version>
1212
<name>qsql</name>
1313

1414
<modules>
@@ -109,7 +109,7 @@
109109
<servlet.version>3.0.1</servlet.version>
110110
<slf4j.version>1.7.13</slf4j.version>
111111
<log4j2.version>2.11.0</log4j2.version>
112-
<spark.version>2.2.0</spark.version>
112+
<spark.version>2.3.0</spark.version>
113113
<sqlline.version>1.5.0</sqlline.version>
114114
<tpcds.version>1.2</tpcds.version>
115115
<xalan.version>2.7.1</xalan.version>
@@ -143,13 +143,13 @@
143143
<maven-javadoc-plugin.link>https://docs.oracle.com/javase/9/docs/api/
144144
</maven-javadoc-plugin.link>
145145

146-
<calcite.version>1.17.0</calcite.version>
146+
<calcite.version>1.19.0</calcite.version>
147147
<elasticsearch-hadoop.version>7.0.1</elasticsearch-hadoop.version>
148148
<flink.version>1.9.1</flink.version>
149149
<commons-csv.version>1.5</commons-csv.version>
150150
<hppc.version>0.7.1</hppc.version>
151151
<dom4j.version>1.6.1</dom4j.version>
152-
<qsql.release>qsql-0.7.0</qsql.release>
152+
<qsql.release>qsql-0.7.1</qsql.release>
153153
<output.directory>/${qsql.release}/lib/flink</output.directory>
154154
<snakeyaml-version>1.17</snakeyaml-version>
155155
</properties>

‎server/pom.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>qsql</artifactId>
77
<groupId>com.qihoo.qsql</groupId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -36,14 +36,16 @@
3636
<dependency>
3737
<groupId>org.apache.spark</groupId>
3838
<artifactId>spark-sql_${scala.version}</artifactId>
39-
<version>${spark.version}</version>
40-
<scope>provided</scope>
39+
<exclusions>
40+
<exclusion>
41+
<artifactId>protobuf-java</artifactId>
42+
<groupId>com.google.protobuf</groupId>
43+
</exclusion>
44+
</exclusions>
4145
</dependency>
4246
<dependency>
4347
<groupId>org.apache.flink</groupId>
4448
<artifactId>flink-table-api-java-bridge_${scala.version}</artifactId>
45-
<version>${flink.version}</version>
46-
<scope>provided</scope>
4749
</dependency>
4850
<dependency>
4951
<groupId>junit</groupId>

0 commit comments

Comments
 (0)