Skip to content

Remove larray #13545

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
suddendust wants to merge 2 commits into from
Closed

Remove larray #13545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216604c
Remove larray
suddendust Jul 4, 2024
35a8e6a
Remove larray ref from pom.xml
suddendust Jul 4, 2024
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
10 changes: 1 addition & 9 deletions pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkPinotDataBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.apache.pinot.segment.spi.memory.ByteBufferPinotBufferFactory;
import org.apache.pinot.segment.spi.memory.LArrayPinotBufferFactory;
import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
import org.apache.pinot.segment.spi.memory.SmallWithFallbackPinotBufferFactory;
import org.apache.pinot.segment.spi.memory.unsafe.UnsafePinotBufferFactory;
Expand Down Expand Up @@ -61,7 +60,7 @@ public class BenchmarkPinotDataBuffer {

@Param({"1", "32", "1024"})
private int _valueLength;
@Param({"bytebuffer", "larray", "unsafe", "wrapper+unsafe"})
@Param({"bytebuffer", "unsafe", "wrapper+unsafe"})
private String _bufferLibrary;
private byte[] _bytes;
private PinotDataBuffer _buffer;
Expand Down Expand Up @@ -96,16 +95,9 @@ public void setupBufferLibrary() {
case "bytebuffer":
PinotDataBuffer.useFactory(new ByteBufferPinotBufferFactory());
break;
case "larray":
PinotDataBuffer.useFactory(new LArrayPinotBufferFactory());
break;
case "unsafe":
PinotDataBuffer.useFactory(new UnsafePinotBufferFactory());
break;
case "wrapper+larray":
PinotDataBuffer.useFactory(new SmallWithFallbackPinotBufferFactory(
new ByteBufferPinotBufferFactory(), new LArrayPinotBufferFactory()));
break;
case "wrapper+unsafe":
PinotDataBuffer.useFactory(new SmallWithFallbackPinotBufferFactory(
new ByteBufferPinotBufferFactory(), new UnsafePinotBufferFactory()));
Expand Down
4 changes: 0 additions & 4 deletions pinot-segment-local/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-segment-spi</artifactId>
</dependency>
<dependency>
<groupId>org.xerial.larray</groupId>
<artifactId>larray-mmap</artifactId>
</dependency>
<dependency>
<groupId>com.uber</groupId>
<artifactId>h3</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions pinot-segment-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
</dependency>
<dependency>
<groupId>org.xerial.larray</groupId>
<artifactId>larray-mmap</artifactId>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>posix</artifactId>
Expand Down
45 changes: 0 additions & 45 deletions ...gment-spi/src/main/java/org/apache/pinot/segment/spi/memory/LArrayPinotBufferFactory.java
View file
Open in desktop

This file was deleted.

9 changes: 2 additions & 7 deletions pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,8 @@ public static PinotBufferFactory createDefaultFactory(boolean prioritizeByteBuff
String factoryClassName;
factoryClassName = System.getenv("PINOT_BUFFER_LIBRARY");
if (factoryClassName == null) {
if (JavaVersion.VERSION < 16) {
LOGGER.info("Using LArray as buffer on JVM version {}", JavaVersion.VERSION);
factoryClassName = LArrayPinotBufferFactory.class.getCanonicalName();
} else {
LOGGER.info("Using Unsafe as buffer on JVM version {}", JavaVersion.VERSION);
factoryClassName = UnsafePinotBufferFactory.class.getCanonicalName();
}
LOGGER.info("Using Unsafe as buffer on JVM version {}", JavaVersion.VERSION);
factoryClassName = UnsafePinotBufferFactory.class.getCanonicalName();
}
return createFactory(factoryClassName, prioritizeByteBuffer);
}
Expand Down
42 changes: 0 additions & 42 deletions ...ment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotLArrayByteBufferTest.java
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,11 +618,6 @@
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.xerial.larray</groupId>
<artifactId>larray-mmap</artifactId>
<version>0.4.1</version>
</dependency>
<!-- Transitive dependencies with inconsistent version numbers -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
Expand Down