Skip to content

Commit f9e875d

Browse files
authored
[common] Upgrade fluss-shaded to org.apache.fluss:1.0-incubating (apache#1494)
1 parent f94f8e2 commit f9e875d

File tree

200 files changed

+730
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+730
-642
lines changed

fluss-client/src/main/java/com/alibaba/fluss/client/write/RecordAccumulator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import com.alibaba.fluss.record.LogRecordBatch;
3636
import com.alibaba.fluss.row.arrow.ArrowWriter;
3737
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
38-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
39-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
4038
import com.alibaba.fluss.utils.CopyOnWriteMap;
4139
import com.alibaba.fluss.utils.MathUtils;
4240
import com.alibaba.fluss.utils.clock.Clock;
4341

42+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
43+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
4444
import org.slf4j.Logger;
4545
import org.slf4j.LoggerFactory;
4646

fluss-client/src/main/resources/META-INF/NOTICE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ This project bundles the following dependencies under the Apache Software Licens
1111
- org.apache.commons:commons-lang3:3.18.0
1212
- org.apache.commons:commons-math3:3.6.1
1313
- org.lz4:lz4-java:1.8.0
14+
- org.apache.fluss:fluss-shaded-arrow:15.0.0-1.0-incubating
15+
- org.apache.fluss:fluss-shaded-guava:32.1.3-jre-1.0-incubating
16+
- org.apache.fluss:fluss-shaded-jackson:2.15.3-1.0-incubating
17+
- org.apache.fluss:fluss-shaded-netty:4.1.104.Final-1.0-incubating
1418

1519
This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
1620
See bundled license files for details.

fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
import com.alibaba.fluss.security.acl.Resource;
5555
import com.alibaba.fluss.security.acl.ResourceFilter;
5656
import com.alibaba.fluss.server.testutils.FlussClusterExtension;
57-
import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Lists;
5857
import com.alibaba.fluss.utils.CloseableIterator;
5958

59+
import org.apache.fluss.shaded.guava32.com.google.common.collect.Lists;
6060
import org.junit.jupiter.api.AfterEach;
6161
import org.junit.jupiter.api.BeforeEach;
6262
import org.junit.jupiter.api.Test;

fluss-client/src/test/java/com/alibaba/fluss/client/write/ArrowLogWriteBatchTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import com.alibaba.fluss.row.GenericRow;
3131
import com.alibaba.fluss.row.arrow.ArrowWriter;
3232
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
33-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
34-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
3533
import com.alibaba.fluss.utils.CloseableIterator;
3634

3735
import org.apache.commons.lang3.RandomStringUtils;
36+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
37+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
3838
import org.junit.jupiter.api.AfterEach;
3939
import org.junit.jupiter.api.BeforeEach;
4040
import org.junit.jupiter.api.Test;

fluss-common/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@
4242
</dependency>
4343

4444
<dependency>
45-
<groupId>com.alibaba.fluss</groupId>
45+
<groupId>org.apache.fluss</groupId>
4646
<artifactId>fluss-shaded-guava</artifactId>
4747
</dependency>
4848

4949
<dependency>
50-
<groupId>com.alibaba.fluss</groupId>
50+
<groupId>org.apache.fluss</groupId>
5151
<artifactId>fluss-shaded-jackson</artifactId>
5252
</dependency>
5353

5454
<!-- Netty dependencies used for LogRecords -->
5555
<dependency>
56-
<groupId>com.alibaba.fluss</groupId>
56+
<groupId>org.apache.fluss</groupId>
5757
<artifactId>fluss-shaded-netty</artifactId>
5858
</dependency>
5959

6060
<dependency>
61-
<groupId>com.alibaba.fluss</groupId>
61+
<groupId>org.apache.fluss</groupId>
6262
<artifactId>fluss-shaded-arrow</artifactId>
6363
</dependency>
6464

fluss-common/src/main/java/com/alibaba/fluss/bucketing/IcebergBucketingFunction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package com.alibaba.fluss.bucketing;
1919

20-
import com.alibaba.fluss.shaded.guava32.com.google.common.hash.HashFunction;
21-
import com.alibaba.fluss.shaded.guava32.com.google.common.hash.Hashing;
20+
import org.apache.fluss.shaded.guava32.com.google.common.hash.HashFunction;
21+
import org.apache.fluss.shaded.guava32.com.google.common.hash.Hashing;
2222

2323
/** An implementation of {@link BucketingFunction} to follow Iceberg's bucketing strategy. */
2424
public class IcebergBucketingFunction implements BucketingFunction {

fluss-common/src/main/java/com/alibaba/fluss/classloading/ComponentClassLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
package com.alibaba.fluss.classloading;
1919

2020
import com.alibaba.fluss.annotation.VisibleForTesting;
21-
import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
2221
import com.alibaba.fluss.utils.function.FunctionWithException;
2322

23+
import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
24+
2425
import java.io.IOException;
2526
import java.io.InputStream;
2627
import java.net.URL;

fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionFactory.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
package com.alibaba.fluss.compression;
1919

2020
import com.alibaba.fluss.annotation.Internal;
21-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
22-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
23-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
21+
22+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
23+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
24+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
2425

2526
/* This file is based on source code of Apache Arrow-java Project (https://github.com/apache/arrow-java), licensed by
2627
* the Apache Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with

fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
import com.alibaba.fluss.config.ConfigOptions;
2121
import com.alibaba.fluss.config.Configuration;
22-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
22+
23+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
2324

2425
/** Compression information for Arrow record batches. */
2526
public class ArrowCompressionInfo {

fluss-common/src/main/java/com/alibaba/fluss/compression/Lz4ArrowCompressionCodec.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717

1818
package com.alibaba.fluss.compression;
1919

20-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
21-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
22-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
23-
import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
2420
import com.alibaba.fluss.utils.IOUtils;
2521

22+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
23+
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
24+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
25+
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
26+
2627
import java.io.ByteArrayInputStream;
2728
import java.io.ByteArrayOutputStream;
2829
import java.io.IOException;

0 commit comments

Comments
 (0)