From cba4aa675ad3d6b7b8c8fb11c14f77ba2e9bf141 Mon Sep 17 00:00:00 2001 From: mzitnik Date: Sun, 30 Jun 2024 11:20:32 +0300 Subject: [PATCH 1/5] change from housepower to clickhouse --- .github/workflows/publish-release.yml | 5 ++--- .github/workflows/publish-snapshot.yml | 3 +-- build.gradle | 2 +- deploy.gradle | 6 +++--- gradle.properties | 8 +++++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 90dacec5..7361ea4d 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -21,7 +21,7 @@ on: jobs: publish-release: - if: ${{ startsWith(github.repository, 'housepower/') }} + if: ${{ startsWith(github.repository, 'clickhouse/') }} runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -51,10 +51,9 @@ jobs: -Prelease -Psigning.gnupg.keyName='Cheng Pan' -Psigning.gnupg.executable=gpg - -PmavenCentralMirror=https://maven-central.storage-download.googleapis.com/maven2/ create-github-release: - if: ${{ startsWith(github.repository, 'housepower/') }} + if: ${{ startsWith(github.repository, 'clickhouse/') }} runs-on: ubuntu-22.04 needs: publish-release steps: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index d7a08c73..314a27b1 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -20,7 +20,7 @@ on: jobs: publish-snapshot: - if: ${{ startsWith(github.repository, 'housepower/') }} + if: ${{ startsWith(github.repository, 'clickhouse/') }} runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -45,4 +45,3 @@ jobs: -Dspark_binary_version=${{ matrix.spark }} -PmavenUser='${{ secrets.NEXUS_USER }}' -PmavenPassword='${{ secrets.NEXUS_PW }}' - -PmavenCentralMirror=https://maven-central.storage-download.googleapis.com/maven2/ diff --git a/build.gradle b/build.gradle index 3847f233..bc6464d5 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ allprojects { version = getProjectVersion() repositories { - maven { url = "$mavenCentralMirror" } + mavenCentral() } } diff --git a/deploy.gradle b/deploy.gradle index a1f96b8a..d24d616b 100644 --- a/deploy.gradle +++ b/deploy.gradle @@ -44,7 +44,7 @@ subprojects { pom { name = "Spark ClickHouse Connector" - url = "https://github.com/housepower/spark-clickhouse-connector" + url = "https://github.com/clickhouse/spark-clickhouse-connector" description = "Spark ClickHouse Connector build on Apache Spark DataSourceV2 API." developers { developer { @@ -61,11 +61,11 @@ subprojects { } } scm { - url = "https://github.com/housepower/spark-clickhouse-connector.git" + url = "https://github.com/clickhouse/spark-clickhouse-connector.git" } issueManagement { system = 'GitHub' - url = 'https://github.com/housepower/spark-clickhouse-connector/issues' + url = 'https://github.com/clickhouse/spark-clickhouse-connector/issues' } } } diff --git a/gradle.properties b/gradle.properties index 8d85ff22..5855c88e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,15 +13,15 @@ # mavenCentralMirror=https://mirrors.cloud.tencent.com/nexus/repository/maven-public/ -mavenSnapshotsRepo=https://oss.sonatype.org/content/repositories/snapshots/ -mavenReleasesRepo=https://oss.sonatype.org/service/local/staging/deploy/maven2/ +mavenSnapshotsRepo=https://s01.oss.sonatype.org/content/repositories/snapshots/ +mavenReleasesRepo=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ systemProp.scala_binary_version=2.12 systemProp.known_scala_binary_versions=2.12,2.13 systemProp.spark_binary_version=3.5 systemProp.known_spark_binary_versions=3.3,3.4,3.5 -group=com.github.housepower +group=com.clickhouse clickhouse_jdbc_version=0.6.0 @@ -62,3 +62,5 @@ kyuubi_version=1.9.0 testcontainers_scala_version=0.41.2 scalatest_version=3.2.16 flexmark_version=0.62.2 + + From 559221102810154791c98198c7ddc32d05217dda Mon Sep 17 00:00:00 2001 From: mzitnik Date: Sun, 30 Jun 2024 14:24:21 +0300 Subject: [PATCH 2/5] change housepower to clickhouse --- .github/workflows/sonar.yml | 2 +- .../src/main/scala/xenon/clickhouse/hash/HashFunc.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 912694f9..4a361ca2 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -20,7 +20,7 @@ on: jobs: sonar-report: - if: ${{ startsWith(github.repository, 'housepower/') }} + if: ${{ startsWith(github.repository, 'clickhouse/') }} runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/clickhouse-core/src/main/scala/xenon/clickhouse/hash/HashFunc.scala b/clickhouse-core/src/main/scala/xenon/clickhouse/hash/HashFunc.scala index b3d215d3..fc227536 100644 --- a/clickhouse-core/src/main/scala/xenon/clickhouse/hash/HashFunc.scala +++ b/clickhouse-core/src/main/scala/xenon/clickhouse/hash/HashFunc.scala @@ -26,7 +26,7 @@ abstract class HashFunc[T: ClassTag] { // Here Array[Byte] means raw byte array, not Clickhouse's Array[UInt8] or Array[Int8]. // Note that Array[UInt8] is handled differently in Clickhouse, so passing it here as Array[Byte] will cause different result. // This is left for performance issue, as sometimes raw bytes is better than constructing the real type - // see https://github.com/housepower/spark-clickhouse-connector/pull/261#discussion_r1271828750 + // see https://github.com/clickhouse/spark-clickhouse-connector/pull/261#discussion_r1271828750 case bytes: Array[Byte] => applyHash(bytes) case string: String => applyHash(string.getBytes(StandardCharsets.UTF_8)) case _ => throw new IllegalArgumentException(s"Unsupported input type: ${input.getClass}") From 31b717b516276dc3b4284e56239187543d30b8f3 Mon Sep 17 00:00:00 2001 From: mzitnik Date: Wed, 3 Jul 2024 11:42:23 +0300 Subject: [PATCH 3/5] Change mavenCentralMirror --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5855c88e..a82dc6c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ # limitations under the License. # -mavenCentralMirror=https://mirrors.cloud.tencent.com/nexus/repository/maven-public/ +mavenCentralMirror=https://repo1.maven.org/maven2/ mavenSnapshotsRepo=https://s01.oss.sonatype.org/content/repositories/snapshots/ mavenReleasesRepo=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ From ab97783359c9065b4da3b5d33f374cf30d496141 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 3 Jul 2024 17:42:03 +0800 Subject: [PATCH 4/5] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bc6464d5..3847f233 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ allprojects { version = getProjectVersion() repositories { - mavenCentral() + maven { url = "$mavenCentralMirror" } } } From a0292ef6e7a805e40f2e1f13f4101691f680b938 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 3 Jul 2024 17:42:09 +0800 Subject: [PATCH 5/5] Update gradle.properties --- gradle.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a82dc6c7..e8166217 100644 --- a/gradle.properties +++ b/gradle.properties @@ -62,5 +62,3 @@ kyuubi_version=1.9.0 testcontainers_scala_version=0.41.2 scalatest_version=3.2.16 flexmark_version=0.62.2 - -