You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by ry...@apache.org on 2021/04/15 11:08:50 UTC
[iceberg] branch master updated: Bump Nessie to 0.5.1 & only run
Nessie tests, when code/dependencies have changed (#2450)
This is an automated email from the ASF dual-hosted git repository.
rymurr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 7c3b143 Bump Nessie to 0.5.1 & only run Nessie tests, when code/dependencies have changed (#2450)
7c3b143 is described below
commit 7c3b14384d4900e9bf2db94b8ba5c2c75256c35c
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Thu Apr 15 13:08:33 2021 +0200
Bump Nessie to 0.5.1 & only run Nessie tests, when code/dependencies have changed (#2450)
---
build.gradle | 19 ++++++++-----------
.../java/org/apache/iceberg/nessie/NessieCatalog.java | 8 +++++---
.../apache/iceberg/nessie/NessieTableOperations.java | 8 +++++---
versions.props | 4 ++--
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/build.gradle b/build.gradle
index e2a95d4..f1746cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ buildscript {
plugins {
id 'nebula.dependency-recommender' version '9.0.2'
- id 'org.projectnessie' version '0.4.0'
+ id 'org.projectnessie' version '0.5.1'
}
try {
@@ -1122,21 +1122,18 @@ project(':iceberg-nessie') {
compile project(':iceberg-core')
compile project(path: ':iceberg-bundled-guava', configuration: 'shadow')
compile "org.projectnessie:nessie-client"
- quarkusAppRunnerConfig "org.projectnessie:nessie-quarkus:0.4.0"
+
+ // dependency version "recommendation" via nebula.dependency-recommender don't work here "immediately",
+ // so pull the Quarkus + Nessie versions from the root-project
+ def quarkusVersion = rootProject.dependencyRecommendations.getRecommendedVersion("io.quarkus", "quarkus-bom")
+ def nessieVersion = rootProject.dependencyRecommendations.getRecommendedVersion("org.projectnessie", "nessie-quarkus")
+ nessieQuarkusRuntime(enforcedPlatform("io.quarkus:quarkus-bom:${quarkusVersion}"))
+ nessieQuarkusServer "org.projectnessie:nessie-quarkus:${nessieVersion}"
compileOnly "org.apache.hadoop:hadoop-common"
testCompile project(path: ':iceberg-api', configuration: 'testArtifacts')
}
- quarkusAppRunnerProperties {
- props = ["quarkus.http.test-port": 0]
- }
- tasks.getByName("quarkus-start")
- // This is not doing anything with Docker or building a native image, just a quirk of Quarkus since 1.10.
- .doFirst { System.setProperty("quarkus.native.builder-image", "quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11") }
- .dependsOn("compileTestJava")
- tasks.test.dependsOn("quarkus-start").finalizedBy("quarkus-stop")
-
}
@Memoized
diff --git a/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java b/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
index 1358f98..a248cd1 100644
--- a/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
+++ b/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
@@ -19,6 +19,7 @@
package org.apache.iceberg.nessie;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -50,6 +51,7 @@ import org.projectnessie.client.NessieConfigConstants;
import org.projectnessie.error.BaseNessieClientServerException;
import org.projectnessie.error.NessieConflictException;
import org.projectnessie.error.NessieNotFoundException;
+import org.projectnessie.model.CommitMeta;
import org.projectnessie.model.Contents;
import org.projectnessie.model.IcebergTable;
import org.projectnessie.model.ImmutableDelete;
@@ -179,6 +181,7 @@ public class NessieCatalog extends BaseMetastoreCatalog implements AutoCloseable
Operations contents = ImmutableOperations.builder()
.addOperations(ImmutablePut.builder().key(NessieUtil.toKey(to)).contents(existingFromTable).build(),
ImmutableDelete.builder().key(NessieUtil.toKey(from)).build())
+ .commitMeta(CommitMeta.fromMessage("iceberg rename table"))
.build();
try {
@@ -187,8 +190,7 @@ public class NessieCatalog extends BaseMetastoreCatalog implements AutoCloseable
.stopRetryOn(NessieNotFoundException.class)
.throwFailureWhenFinished()
.run(c -> {
- client.getTreeApi().commitMultipleOperations(reference.getAsBranch().getName(), reference.getHash(),
- "iceberg rename table", c);
+ client.getTreeApi().commitMultipleOperations(reference.getAsBranch().getName(), reference.getHash(), c);
refresh();
}, BaseNessieClientServerException.class);
@@ -325,7 +327,7 @@ public class NessieCatalog extends BaseMetastoreCatalog implements AutoCloseable
private Stream<TableIdentifier> tableStream(Namespace namespace) {
try {
return client.getTreeApi()
- .getEntries(reference.getHash())
+ .getEntries(reference.getHash(), null, null, Collections.emptyList())
.getEntries()
.stream()
.filter(NessieUtil.namespacePredicate(namespace))
diff --git a/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java b/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java
index 724d6d9..01b006c 100644
--- a/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java
+++ b/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java
@@ -29,6 +29,7 @@ import org.apache.iceberg.io.FileIO;
import org.projectnessie.client.NessieClient;
import org.projectnessie.error.NessieConflictException;
import org.projectnessie.error.NessieNotFoundException;
+import org.projectnessie.model.CommitMeta;
import org.projectnessie.model.Contents;
import org.projectnessie.model.ContentsKey;
import org.projectnessie.model.IcebergTable;
@@ -94,9 +95,10 @@ public class NessieTableOperations extends BaseMetastoreTableOperations {
boolean threw = true;
try {
IcebergTable newTable = ImmutableIcebergTable.builder().metadataLocation(newMetadataLocation).build();
- Operations op = ImmutableOperations.builder().addOperations(Operation.Put.of(key, newTable)).build();
- client.getTreeApi().commitMultipleOperations(reference.getAsBranch().getName(), reference.getHash(),
- String.format("iceberg commit%s", applicationId()), op);
+ Operations op = ImmutableOperations.builder().addOperations(Operation.Put.of(key, newTable))
+ .commitMeta(CommitMeta.fromMessage(String.format("iceberg commit%s", applicationId())))
+ .build();
+ client.getTreeApi().commitMultipleOperations(reference.getAsBranch().getName(), reference.getHash(), op);
threw = false;
} catch (NessieConflictException ex) {
diff --git a/versions.props b/versions.props
index 0b31078..ceee38a 100644
--- a/versions.props
+++ b/versions.props
@@ -19,9 +19,9 @@ org.apache.arrow:arrow-memory-netty = 2.0.0
com.github.stephenc.findbugs:findbugs-annotations = 1.3.9-1
software.amazon.awssdk:* = 2.15.7
org.scala-lang:scala-library = 2.12.10
-org.projectnessie:* = 0.4.0
+org.projectnessie:* = 0.5.1
javax.ws.rs:javax.ws.rs-api = 2.1.1
-io.quarkus:* = 1.12.1.Final
+io.quarkus:* = 1.13.1.Final
# test deps
junit:junit = 4.12