Skip to content

Commit ea29fb7

Browse files
pan3793pan3793
authored
Build: Make main aware 0.8.0 (#356)
1 parent 3486fd2 commit ea29fb7

14 files changed

+29
-25
lines changed

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Spark ClickHouse Connector
22
===
3-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.housepower/clickhouse-spark-runtime-3.3_2.12/badge.svg)](https://search.maven.org/search?q=clickhouse-spark-runtime)
3+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.clickhouse.spark/clickhouse-spark-runtime-3.5_2.12/badge.svg)](https://search.maven.org/search?q=clickhouse-spark-runtime)
44
[![License](https://img.shields.io/github/license/clickhouse/spark-clickhouse-connector)](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/LICENSE)
55

66
Build on Apache Spark DataSourceV2 API.
@@ -24,12 +24,15 @@ Notes:
2424
2. Since 0.6.0, HTTP becomes the default protocol.
2525
3. Since 0.7.0, gRPC is deprecated and not recommended, it may be removed in the future.
2626
4. Since 0.8.0, gRPC is removed.
27+
5. Since 0.8.0, the project groupId is rename from `com.github.housepower` to `com.clickhouse.spark`, and
28+
the class `xenon.clickhouse.ClickHouseCatalog` is renamed to `com.clickhouse.spark.ClickHouseCatalog`
2729

2830
## Compatible Matrix
2931

3032
| Version | Compatible Spark Versions | ClickHouse JDBC version |
3133
|---------|---------------------------|-------------------------|
3234
| main | Spark 3.3, 3.4, 3.5 | 0.6.3 |
35+
| 0.8.0 | Spark 3.3, 3.4, 3.5 | 0.6.3 |
3336
| 0.7.3 | Spark 3.3, 3.4 | 0.4.6 |
3437
| 0.6.0 | Spark 3.3 | 0.3.2-patch11 |
3538
| 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |

‎docker/.env‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
#
1414

1515
# latest stable version
16-
PROJECT_VERSION=0.7.3
16+
PROJECT_VERSION=0.8.0
1717

1818
CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:23.8
1919
AWS_JAVA_SDK_VERSION=1.12.367
20-
CLICKHOUSE_JDBC_VERSION=0.4.6
20+
CLICKHOUSE_JDBC_VERSION=0.6.3
2121
HADOOP_VERSION=3.3.6
2222
HIVE_VERSION=2.3.9
23-
ICEBERG_VERSION=1.4.3
24-
KYUUBI_VERSION=1.9.0
23+
ICEBERG_VERSION=1.6.0
24+
KYUUBI_VERSION=1.9.2
2525
KYUUBI_HADOOP_VERSION=3.3.6
2626
POSTGRES_VERSION=12
2727
POSTGRES_JDBC_VERSION=42.3.4
2828
SCALA_BINARY_VERSION=2.12
29-
SPARK_VERSION=3.4.2
30-
SPARK_BINARY_VERSION=3.4
29+
SPARK_VERSION=3.5.2
30+
SPARK_BINARY_VERSION=3.5
3131
SPARK_HADOOP_VERSION=3.3.4
3232
ZOOKEEPER_VERSION=3.6.3

‎docker/.env-dev‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
#
1414

1515
# current developing version
16-
PROJECT_VERSION=0.8.0-SNAPSHOT
16+
PROJECT_VERSION=0.9.0-SNAPSHOT
1717

1818
CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:23.8
1919
AWS_JAVA_SDK_VERSION=1.12.367
2020
CLICKHOUSE_JDBC_VERSION=0.6.3
2121
HADOOP_VERSION=3.3.6
2222
HIVE_VERSION=2.3.9
23-
ICEBERG_VERSION=1.4.3
24-
KYUUBI_VERSION=1.9.0
23+
ICEBERG_VERSION=1.6.0
24+
KYUUBI_VERSION=1.9.2
2525
KYUUBI_HADOOP_VERSION=3.3.6
2626
POSTGRES_VERSION=12
2727
POSTGRES_JDBC_VERSION=42.3.4
2828
SCALA_BINARY_VERSION=2.12
29-
SPARK_VERSION=3.4.2
30-
SPARK_BINARY_VERSION=3.4
29+
SPARK_VERSION=3.5.2
30+
SPARK_BINARY_VERSION=3.5
3131
SPARK_HADOOP_VERSION=3.3.4
3232
ZOOKEEPER_VERSION=3.6.3

‎docker/compose-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ services:
153153
- zookeeper
154154

155155
cloudbeaver:
156-
image: dbeaver/cloudbeaver:24.0.2
156+
image: dbeaver/cloudbeaver:24.1
157157
environment:
158158
CB_LOCAL_HOST_ADDR: 0.0.0.0
159159
CB_SERVER_NAME: Kyuubi Playground

‎docker/compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ services:
152152
- zookeeper
153153

154154
cloudbeaver:
155-
image: pan3793/cloudbeaver:20240223
155+
image: dbeaver/cloudbeaver:24.1
156156
environment:
157157
CB_LOCAL_HOST_ADDR: 0.0.0.0
158158
CB_SERVER_NAME: Kyuubi Playground

‎docker/image/scc-metastore.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV HIVE_HOME=/opt/hive
2424
ENV HIVE_CONF_DIR=/etc/hive/conf
2525

2626
RUN set -x && \
27-
wget -q ${APACHE_MIRROR}/hive/hive-${HIVE_VERSION}/apache-hive-${HIVE_VERSION}-bin.tar.gz && \
27+
wget -q https://archive.apache.org/dist/hive/hive-${HIVE_VERSION}/apache-hive-${HIVE_VERSION}-bin.tar.gz && \
2828
tar -xzf apache-hive-${HIVE_VERSION}-bin.tar.gz -C /opt && \
2929
ln -s /opt/apache-hive-${HIVE_VERSION}-bin ${HIVE_HOME} && \
3030
rm apache-hive-${HIVE_VERSION}-bin.tar.gz

‎docker/image/scc-spark.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ RUN set -x && \
5959
CLICKHOUSE_JDBC_JAR_NAME=clickhouse-jdbc && \
6060
wget -q ${MAVEN_MIRROR}/com/clickhouse/${CLICKHOUSE_JDBC_JAR_NAME}/${CLICKHOUSE_JDBC_VERSION}/${CLICKHOUSE_JDBC_JAR_NAME}-${CLICKHOUSE_JDBC_VERSION}-all.jar -P ${SPARK_HOME}/jars && \
6161
SCC_JAR_NAME=clickhouse-spark-runtime-${SPARK_BINARY_VERSION}_${SCALA_BINARY_VERSION} && \
62-
if [ "$(echo ${PROJECT_VERSION} | grep SNAPSHOT)" = "" ]; then wget -q ${MAVEN_MIRROR}/com/github/housepower/${SCC_JAR_NAME}/${PROJECT_VERSION}/${SCC_JAR_NAME}-${PROJECT_VERSION}.jar -P ${SPARK_HOME}/jars; fi
62+
if [ "$(echo ${PROJECT_VERSION} | grep SNAPSHOT)" = "" ]; then wget -q ${MAVEN_MIRROR}/com/clickhouse/spark/${SCC_JAR_NAME}/${PROJECT_VERSION}/${SCC_JAR_NAME}-${PROJECT_VERSION}.jar -P ${SPARK_HOME}/jars; fi

‎docs/developers/04_public_release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ workflow, it is scheduled to be deployed at midnight every day.
3737
3. Create new tag, e.g. `v0.3.0`, it will trigger the [Publish Release](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/.github/workflows/publish-release.yml)
3838
workflow;
3939
4. Verify, close, and release in [Sonatype Repository](https://oss.sonatype.org/#stagingRepositories)
40-
5. Announce in [GitHub Release](https://github.com/housepower/spark-clickhouse-connector/releases)
40+
5. Announce in [GitHub Release](https://github.com/ClickHouse/spark-clickhouse-connector/releases)
4141
6. Update version in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0` to `0.3.1-SNAPSHOT`;
4242
7. Update version on main branch in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.4.0-SNAPSHOT`;
4343
8. [Publish Docker image](https://github.com/ClickHouse/spark-clickhouse-connector/tree/main/docker) after jars

‎docs/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ For old versions, please refer the compatible matrix.
4646
| Version | Compatible Spark Versions | ClickHouse JDBC version |
4747
|---------|---------------------------|-------------------------|
4848
| main | Spark 3.3, 3.4, 3.5 | 0.6.3 |
49+
| 0.8.0 | Spark 3.3, 3.4, 3.5 | 0.6.3 |
4950
| 0.7.3 | Spark 3.3, 3.4 | 0.4.6 |
5051
| 0.6.0 | Spark 3.3 | 0.3.2-patch11 |
5152
| 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |

‎docs/quick_start/01_get_the_library.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ The name pattern of binary jar is
2222
```
2323
clickhouse-spark-runtime-${spark_binary_version}_${scala_binary_version}-${version}.jar
2424
```
25-
you can find all available released jars under [Maven Central Repository](https://repo1.maven.org/maven2/com/github/housepower)
26-
and all daily build SNAPSHOT jars under [Sonatype OSS Snapshots Repository](https://oss.sonatype.org/content/repositories/snapshots/com/github/housepower/).
25+
you can find all available released jars under [Maven Central Repository](https://repo1.maven.org/maven2/com/clickhouse/spark)
26+
and all daily build SNAPSHOT jars under [Sonatype OSS Snapshots Repository](https://oss.sonatype.org/content/repositories/snapshots/com/clickhouse/spark/).
2727

2828
## Import as Dependency
2929

3030
### Gradle
3131

3232
```
3333
dependencies {
34-
implementation("com.github.housepower:clickhouse-spark-runtime-{{ spark_binary_version }}_{{ scala_binary_version }}:{{ stable_version }}")
34+
implementation("com.clickhouse.spark:clickhouse-spark-runtime-{{ spark_binary_version }}_{{ scala_binary_version }}:{{ stable_version }}")
3535
implementation("com.clickhouse:clickhouse-jdbc:{{ clickhouse_jdbc_version }}:all") { transitive = false }
3636
}
3737
```
@@ -48,7 +48,7 @@ repositries {
4848

4949
```
5050
<dependency>
51-
<groupId>com.github.housepower</groupId>
51+
<groupId>com.clickhouse.spark</groupId>
5252
<artifactId>clickhouse-spark-runtime-{{ spark_binary_version }}_{{ scala_binary_version }}</artifactId>
5353
<version>{{ stable_version }}</version>
5454
</dependency>

0 commit comments

Comments
 (0)