github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

move ackedqueue specific classes into ackedqueue package, fixes #6944

Browse source
This commit is contained in:
Colin Surprenant 2017-04-20 12:32:26 -06:00
parent c29d00c034
commit 02d46525a7
29 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash-core/src/main/java/org/logstash/ackedqueue/FileSettings.java
View file

@ -1,7 +1,7 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.PageIOFactory;
public class FileSettings implements Settings {
private String dirForFiles;

4
logstash-core/src/main/java/org/logstash/ackedqueue/HeadPage.java
View file

@ -1,7 +1,7 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.CheckpointIO;
import org.logstash.common.io.PageIO;
import org.logstash.ackedqueue.io.CheckpointIO;
import org.logstash.ackedqueue.io.PageIO;
import java.io.IOException;
import java.util.BitSet;

4
logstash-core/src/main/java/org/logstash/ackedqueue/MemorySettings.java
View file

@ -1,7 +1,7 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.PageIOFactory;
public class MemorySettings implements Settings {
private CheckpointIOFactory checkpointIOFactory;

2
logstash-core/src/main/java/org/logstash/ackedqueue/Page.java
View file

@ -1,6 +1,6 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.PageIO;
import org.logstash.ackedqueue.io.PageIO;
import java.io.Closeable;
import java.io.IOException;

7
logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
View file

@ -4,9 +4,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.logstash.FileLockFactory;
import org.logstash.LockException;
import org.logstash.common.io.CheckpointIO;
import org.logstash.common.io.PageIO;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.CheckpointIO;
import org.logstash.ackedqueue.io.PageIO;
import org.logstash.ackedqueue.io.PageIOFactory;
import java.io.Closeable;
import java.io.IOException;
@ -17,7 +17,6 @@ import java.nio.file.NoSuchFileException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

4
logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
View file

@ -1,7 +1,7 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.PageIOFactory;
public interface Settings {
Settings setCheckpointIOFactory(CheckpointIOFactory factory);

4
logstash-core/src/main/java/org/logstash/ackedqueue/TailPage.java
View file

@ -1,7 +1,7 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.CheckpointIO;
import org.logstash.common.io.PageIO;
import org.logstash.ackedqueue.io.CheckpointIO;
import org.logstash.ackedqueue.io.PageIO;
import java.io.IOException;
import java.util.BitSet;

8
logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueExtLibrary.java
View file

@ -19,10 +19,10 @@ import org.logstash.ackedqueue.Batch;
import org.logstash.ackedqueue.FileSettings;
import org.logstash.ackedqueue.Queue;
import org.logstash.ackedqueue.Settings;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.FileCheckpointIO;
import org.logstash.common.io.MmapPageIO;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.FileCheckpointIO;
import org.logstash.ackedqueue.io.MmapPageIO;
import org.logstash.ackedqueue.io.PageIOFactory;
import java.io.IOException;

8
logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueMemoryExtLibrary.java
View file

@ -19,10 +19,10 @@ import org.logstash.ackedqueue.Batch;
import org.logstash.ackedqueue.MemorySettings;
import org.logstash.ackedqueue.Queue;
import org.logstash.ackedqueue.Settings;
import org.logstash.common.io.ByteBufferPageIO;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.MemoryCheckpointIO;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.MemoryCheckpointIO;
import org.logstash.ackedqueue.io.PageIOFactory;
import java.io.IOException;

2
logstash-core/src/main/java/org/logstash/common/io/AbstractByteBufferPageIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

2
logstash-core/src/main/java/org/logstash/common/io/ByteBufferPageIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import java.io.IOException;
import java.nio.ByteBuffer;

2
logstash-core/src/main/java/org/logstash/common/io/CheckpointIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.logstash.ackedqueue.Checkpoint;
import java.io.IOException;

2
logstash-core/src/main/java/org/logstash/common/io/CheckpointIOFactory.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIOFactory.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
@FunctionalInterface
public interface CheckpointIOFactory {

6
logstash-core/src/main/java/org/logstash/common/io/FileCheckpointIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java
View file

@ -1,6 +1,10 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.logstash.ackedqueue.Checkpoint;
import org.logstash.common.io.BufferedChecksumStreamInput;
import org.logstash.common.io.BufferedChecksumStreamOutput;
import org.logstash.common.io.ByteArrayStreamOutput;
import org.logstash.common.io.InputStreamStreamInput;
import java.io.IOException;
import java.io.InputStream;

2
logstash-core/src/main/java/org/logstash/common/io/MemoryCheckpointIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.logstash.ackedqueue.Checkpoint;

2
logstash-core/src/main/java/org/logstash/common/io/MmapPageIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import sun.misc.Cleaner;
import sun.nio.ch.DirectBuffer;

2
logstash-core/src/main/java/org/logstash/common/io/PageIO.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.logstash.ackedqueue.SequencedList;

2
logstash-core/src/main/java/org/logstash/common/io/PageIOFactory.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import java.io.IOException;

4
logstash-core/src/main/java/org/logstash/common/io/wip/MemoryPageIOStream.java → logstash-core/src/main/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStream.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io.wip;
package org.logstash.ackedqueue.io.wip;
import org.logstash.ackedqueue.Checkpoint;
import org.logstash.ackedqueue.SequencedList;
@ -6,7 +6,7 @@ import org.logstash.common.io.BufferedChecksumStreamInput;
import org.logstash.common.io.BufferedChecksumStreamOutput;
import org.logstash.common.io.ByteArrayStreamOutput;
import org.logstash.common.io.ByteBufferStreamInput;
import org.logstash.common.io.PageIO;
import org.logstash.ackedqueue.io.PageIO;
import java.io.IOException;
import java.nio.ByteBuffer;

4
logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java
View file

@ -1,8 +1,8 @@
package org.logstash.ackedqueue;
import org.junit.Test;
import org.logstash.common.io.ByteBufferPageIO;
import org.logstash.common.io.PageIO;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import org.logstash.ackedqueue.io.PageIO;
import java.io.IOException;

2
logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java
View file

@ -5,7 +5,7 @@ import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.fail;
import org.junit.rules.TemporaryFolder;
import org.logstash.common.io.ByteBufferPageIO;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import java.io.IOException;
import java.nio.file.NoSuchFileException;

12
logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java
View file

@ -1,11 +1,11 @@
package org.logstash.ackedqueue;
import org.logstash.common.io.ByteBufferPageIO;
import org.logstash.common.io.CheckpointIOFactory;
import org.logstash.common.io.FileCheckpointIO;
import org.logstash.common.io.MemoryCheckpointIO;
import org.logstash.common.io.MmapPageIO;
import org.logstash.common.io.PageIOFactory;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.FileCheckpointIO;
import org.logstash.ackedqueue.io.MemoryCheckpointIO;
import org.logstash.ackedqueue.io.MmapPageIO;
import org.logstash.ackedqueue.io.PageIOFactory;
public class TestSettings {

6
logstash-core/src/test/java/org/logstash/common/io/ByteBufferPageIOTest.java → logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -8,10 +8,10 @@ import org.junit.runners.Parameterized.Parameters;
import org.logstash.ackedqueue.Queueable;
import org.logstash.ackedqueue.SequencedList;
import org.logstash.ackedqueue.StringElement;
import org.logstash.ackedqueue.io.AbstractByteBufferPageIO;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

4
logstash-core/src/test/java/org/logstash/common/io/FileCheckpointIOTest.java → logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java
View file

@ -1,10 +1,12 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.logstash.ackedqueue.Checkpoint;
import org.logstash.ackedqueue.io.CheckpointIO;
import org.logstash.ackedqueue.io.FileCheckpointIO;
import java.net.URL;
import java.nio.file.Files;

3
logstash-core/src/test/java/org/logstash/common/io/FileMmapIOTest.java → logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.junit.Before;
import org.junit.Rule;
@ -6,6 +6,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.logstash.ackedqueue.SequencedList;
import org.logstash.ackedqueue.StringElement;
import org.logstash.ackedqueue.io.MmapPageIO;
import java.util.ArrayList;
import java.util.List;

5
logstash-core/src/test/java/org/logstash/common/io/MemoryCheckpointTest.java → logstash-core/src/test/java/org/logstash/ackedqueue/io/MemoryCheckpointTest.java
View file

@ -1,4 +1,4 @@
package org.logstash.common.io;
package org.logstash.ackedqueue.io;
import org.junit.Before;
import org.junit.Test;
@ -6,6 +6,9 @@ import static org.junit.Assert.fail;
import org.logstash.ackedqueue.Checkpoint;
import org.logstash.ackedqueue.MemorySettings;
import org.logstash.ackedqueue.Settings;
import org.logstash.ackedqueue.io.CheckpointIO;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.MemoryCheckpointIO;
import java.io.IOException;
import java.nio.file.NoSuchFileException;

4
logstash-core/src/test/java/org/logstash/common/io/wip/MemoryPageIOStreamTest.java → logstash-core/src/test/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStreamTest.java
View file

@ -1,10 +1,10 @@
package org.logstash.common.io.wip;
package org.logstash.ackedqueue.io.wip;
import org.junit.Test;
import org.logstash.ackedqueue.Queueable;
import org.logstash.ackedqueue.SequencedList;
import org.logstash.ackedqueue.StringElement;
import org.logstash.common.io.wip.MemoryPageIOStream;
import org.logstash.ackedqueue.io.wip.MemoryPageIOStream;
import java.io.IOException;
import java.nio.ByteBuffer;

7
logstash-core/src/test/java/org/logstash/stress/Concurrent.java
View file

@ -1,7 +1,12 @@
package org.logstash.stress;
import org.logstash.ackedqueue.*;
import org.logstash.common.io.*;
import org.logstash.ackedqueue.io.ByteBufferPageIO;
import org.logstash.ackedqueue.io.CheckpointIOFactory;
import org.logstash.ackedqueue.io.FileCheckpointIO;
import org.logstash.ackedqueue.io.MemoryCheckpointIO;
import org.logstash.ackedqueue.io.MmapPageIO;
import org.logstash.ackedqueue.io.PageIOFactory;
import java.io.IOException;
import java.time.Duration;

0
logstash-core/src/test/resources/org/logstash/common/io/checkpoint.head → logstash-core/src/test/resources/org/logstash/ackedqueue/io/checkpoint.head
View file