Skip to content

[Refactor] Update iceberg version to 0.14.1 #12306

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
southernriver wants to merge 1 commit into from
Closed

[Refactor] Update iceberg version to 0.14.1 #12306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions fe/fe-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<starrocks.home>${basedir}/../../</starrocks.home>
<fe_ut_parallel>${env.FE_UT_PARALLEL}</fe_ut_parallel>
<jacoco.version>0.8.5</jacoco.version>
<iceberg.version>0.12.1</iceberg.version>
<iceberg.version>0.14.1</iceberg.version>
Copy link
Contributor

@stephen-shelby stephen-shelby Oct 26, 2022

Choose a reason for hiding this comment

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

It's better to move it to parent pom properties.

<python>python</python>
</properties>

Expand Down Expand Up @@ -236,9 +236,37 @@ under the License.
<scope>test</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-core -->
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-mr</artifactId>
<artifactId>iceberg-core</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-hive-metastore -->
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-hive-metastore</artifactId>
<version>${iceberg.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-bundled-guava -->
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-bundled-guava</artifactId>
<version>${iceberg.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-common -->
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-common</artifactId>
<version>${iceberg.version}</version>
</dependency>

Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/external/iceberg/hive/CachedClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,9 @@ private synchronized void init() {
public <R> R run(Action<R, IMetaStoreClient, TException> action) throws TException, InterruptedException {
return clientPool().run(action);
}

@Override
public <R> R run(Action<R, IMetaStoreClient, TException> action, boolean retry) throws TException, InterruptedException {
return clientPool().run(action, retry);
}
}
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/com/starrocks/external/iceberg/hive/HiveClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class HiveClientPool extends ClientPoolImpl<IMetaStoreClient, TException>
private final HiveConf hiveConf;

public HiveClientPool(int poolSize, Configuration conf) {
super(poolSize, TTransportException.class);
super(poolSize, TTransportException.class, true);
this.hiveConf = new HiveConf(conf, HiveClientPool.class);
this.hiveConf.addResource(conf);
}
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/test/java/com/starrocks/external/iceberg/IcebergCustomCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static class IcebergCustomTestingCatalog extends BaseMetastoreCatalog imp
private ClientPool<IMetaStoreClient, TException> clients;

@VisibleForTesting
private IcebergCustomTestingCatalog() {
public IcebergCustomTestingCatalog() {
}

@Override
Expand Down