Skip to content

Q
Questdb

jobily / Questdb
12 个月 前同步成功

通知 1
Star 0
Fork 0
Q
Questdb

体验新版 GitCode，发现更多精彩内容 >>

提交 31d061b6 编写于 作者: V Vlad Ilyushchenko
浏览文件
操作

package refactoring

上级 59308633
展开全部 隐藏空白更改
内联 并排
Showing with 2524 addition and 2523 deletion
nfsdb-core/pom.xml
浏览文件 @ 31d061b6
......@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<version>2.1.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<groupId>com.nfsdb</groupId>
<artifactId>nfsdb-core</artifactId>
<packaging>jar</packaging>
......
nfsdb-core/src/main/java/com/nfsdb/journal/AbstractResultSetBuilder.java → nfsdb-core/src/main/java/com/nfsdb/AbstractResultSetBuilder.java
浏览文件 @ 31d061b6
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.utils.Interval;
public abstract class AbstractResultSetBuilder<T, X> {
protected final DirectLongList result = new DirectLongList();
......
nfsdb-core/src/main/java/com/nfsdb/journal/BinarySearch.java → nfsdb-core/src/main/java/com/nfsdb/BinarySearch.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
public class BinarySearch {
......
nfsdb-core/src/main/java/com/nfsdb/journal/Journal.java → nfsdb-core/src/main/java/com/nfsdb/Journal.java
浏览文件 @ 31d061b6
......@@ -14,33 +14,33 @@
* limitations under the License.
*/
package com.nfsdb.journal;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.column.FixedColumn;
import com.nfsdb.journal.column.SymbolTable;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.factory.JournalClosingListener;
import com.nfsdb.journal.factory.configuration.Constants;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.journal.iterators.ConcurrentIterator;
import com.nfsdb.journal.iterators.JournalPeekingIterator;
import com.nfsdb.journal.iterators.JournalRowBufferedIterator;
import com.nfsdb.journal.lang.cst.impl.jsrc.JournalSourceImpl;
import com.nfsdb.journal.lang.cst.impl.psrc.JournalPartitionSource;
import com.nfsdb.journal.lang.cst.impl.qry.JournalRecordSource;
import com.nfsdb.journal.lang.cst.impl.rsrc.AllRowSource;
import com.nfsdb.journal.query.api.Query;
import com.nfsdb.journal.query.spi.QueryImpl;
import com.nfsdb.journal.tx.Tx;
import com.nfsdb.journal.tx.TxLog;
import com.nfsdb.journal.utils.Dates;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.journal.utils.Rows;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.column.ColumnType;
import com.nfsdb.column.FixedColumn;
import com.nfsdb.column.SymbolTable;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.factory.JournalClosingListener;
import com.nfsdb.factory.configuration.Constants;
import com.nfsdb.factory.configuration.JournalMetadata;
import com.nfsdb.iterators.ConcurrentIterator;
import com.nfsdb.iterators.JournalPeekingIterator;
import com.nfsdb.iterators.JournalRowBufferedIterator;
import com.nfsdb.lang.cst.impl.jsrc.JournalSourceImpl;
import com.nfsdb.lang.cst.impl.psrc.JournalPartitionSource;
import com.nfsdb.lang.cst.impl.qry.JournalRecordSource;
import com.nfsdb.lang.cst.impl.rsrc.AllRowSource;
import com.nfsdb.query.api.Query;
import com.nfsdb.query.spi.QueryImpl;
import com.nfsdb.tx.Tx;
import com.nfsdb.tx.TxLog;
import com.nfsdb.utils.Dates;
import com.nfsdb.utils.Interval;
import com.nfsdb.utils.Rows;
import com.nfsdb.utils.Unsafe;
import java.io.Closeable;
import java.io.File;
......@@ -302,7 +302,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
* Get the highest global row id of the Journal.
*
* @return the highest global row id of the Journal
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public long getMaxRowID() throws JournalException {
Partition<T> p = getLastPartition();
......@@ -419,7 +419,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
* Read an object by global row id
*
* @param rowID the global row id to read
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public void read(long rowID, T obj) throws JournalException {
getPartition(Rows.toPartitionIndex(rowID), true).read(Rows.toLocalRowID(rowID), obj);
......@@ -430,7 +430,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
*
* @param rowIDs the global row ids to read
* @return some objects
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
@SuppressWarnings("unchecked")
public T[] read(DirectLongList rowIDs) throws JournalException {
......@@ -446,7 +446,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
*
* @param rowID the global row id to read
* @return an object
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public T read(long rowID) throws JournalException {
return getPartition(Rows.toPartitionIndex(rowID), true).read(Rows.toLocalRowID(rowID));
......@@ -597,7 +597,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
columnMetadata = new ColumnMetadata[columnCount];
for (int i = 0; i < columnCount; i++) {
columnMetadata[i] = new ColumnMetadata();
com.nfsdb.journal.factory.configuration.ColumnMetadata meta = metadata.getColumnMetadata(i);
com.nfsdb.factory.configuration.ColumnMetadata meta = metadata.getColumnMetadata(i);
if (meta.type == ColumnType.SYMBOL && meta.sameAs == null) {
int tabIndex = symbolTables.size();
int tabSize = tx.symbolTableSizes.length > tabIndex ? tx.symbolTableSizes[tabIndex] : 0;
......@@ -613,7 +613,7 @@ public class Journal<T> implements Iterable<T>, Closeable {
private void configureSymbolTableSynonyms() {
for (int i = 0; i < getMetadata().getColumnCount(); i++) {
com.nfsdb.journal.factory.configuration.ColumnMetadata meta = metadata.getColumnMetadata(i);
com.nfsdb.factory.configuration.ColumnMetadata meta = metadata.getColumnMetadata(i);
if (meta.type == ColumnType.SYMBOL && meta.sameAs != null) {
SymbolTable tab = getSymbolTable(meta.sameAs);
symbolTableMap.put(meta.name, tab);
......@@ -712,6 +712,6 @@ public class Journal<T> implements Iterable<T>, Closeable {
public static class ColumnMetadata {
public SymbolTable symbolTable;
public com.nfsdb.journal.factory.configuration.ColumnMetadata meta;
public com.nfsdb.factory.configuration.ColumnMetadata meta;
}
}
nfsdb-core/src/main/java/com/nfsdb/journal/JournalBulkReader.java → nfsdb-core/src/main/java/com/nfsdb/JournalBulkReader.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalMetadata;
public class JournalBulkReader<T> extends Journal<T> {
public JournalBulkReader(JournalMetadata<T> metadata, JournalKey<T> key, TimerCache timerCache) throws JournalException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/JournalBulkWriter.java → nfsdb-core/src/main/java/com/nfsdb/JournalBulkWriter.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalMetadata;
public class JournalBulkWriter<T> extends JournalWriter<T> {
public JournalBulkWriter(JournalMetadata<T> metadata, JournalKey<T> key, TimerCache timerCache) throws JournalException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/JournalEntryWriter.java → nfsdb-core/src/main/java/com/nfsdb/JournalEntryWriter.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.exceptions.JournalException;
import java.io.InputStream;
import java.io.OutputStream;
......
nfsdb-core/src/main/java/com/nfsdb/journal/JournalEntryWriterImpl.java → nfsdb-core/src/main/java/com/nfsdb/JournalEntryWriterImpl.java
浏览文件 @ 31d061b6
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.column.*;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Checksum;
import com.nfsdb.column.*;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Checksum;
import java.io.InputStream;
import java.io.OutputStream;
......
nfsdb-core/src/main/java/com/nfsdb/journal/JournalKey.java → nfsdb-core/src/main/java/com/nfsdb/JournalKey.java
浏览文件 @ 31d061b6
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.factory.configuration.Constants;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Files;
import com.nfsdb.factory.configuration.Constants;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Files;
import java.nio.ByteBuffer;
......@@ -84,6 +84,15 @@ public class JournalKey<T> {
this.ordered = ordered;
}
private JournalKey(String clazz, String location, PartitionType partitionType, int recordHint, boolean ordered) {
this.modelClass = null;
this.id = clazz;
this.location = location;
this.partitionType = partitionType;
this.recordHint = recordHint;
this.ordered = ordered;
}
public static JournalKey<Object> fromBuffer(ByteBuffer buffer) {
// id
int clazzLen = buffer.getInt();
......@@ -151,6 +160,8 @@ public class JournalKey<T> {
return result;
}
//////////////////////// REPLICATION CODE //////////////////////
@Override
public String toString() {
return "JournalKey{" +
......@@ -162,8 +173,6 @@ public class JournalKey<T> {
'}';
}
//////////////////////// REPLICATION CODE //////////////////////
public int getBufferSize() {
return 4 + id.getBytes(Files.UTF_8).length + 4 + 2 * (location == null ? 0 : location.length()) + 1 + 1 + 4;
}
......@@ -184,13 +193,4 @@ public class JournalKey<T> {
// ordered
buffer.put((byte) (ordered ? 1 : 0));
}
private JournalKey(String clazz, String location, PartitionType partitionType, int recordHint, boolean ordered) {
this.modelClass = null;
this.id = clazz;
this.location = location;
this.partitionType = partitionType;
this.recordHint = recordHint;
this.ordered = ordered;
}
}
nfsdb-core/src/main/java/com/nfsdb/journal/JournalMode.java → nfsdb-core/src/main/java/com/nfsdb/JournalMode.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
public enum JournalMode {
READ, BULK_READ, APPEND, BULK_APPEND
......
nfsdb-core/src/main/java/com/nfsdb/journal/JournalWriter.java → nfsdb-core/src/main/java/com/nfsdb/JournalWriter.java
浏览文件 @ 31d061b6
......@@ -14,25 +14,25 @@
* limitations under the License.
*/
package com.nfsdb.journal;
import com.nfsdb.journal.column.FixedColumn;
import com.nfsdb.journal.column.HugeBuffer;
import com.nfsdb.journal.column.SymbolTable;
import com.nfsdb.journal.concurrent.PartitionCleaner;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.factory.configuration.Constants;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.journal.iterators.ConcurrentIterator;
import com.nfsdb.journal.iterators.MergingIterator;
import com.nfsdb.journal.iterators.PeekingIterator;
import com.nfsdb.journal.locks.Lock;
import com.nfsdb.journal.locks.LockManager;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.journal.tx.*;
import com.nfsdb.journal.utils.*;
package com.nfsdb;
import com.nfsdb.column.FixedColumn;
import com.nfsdb.column.HugeBuffer;
import com.nfsdb.column.SymbolTable;
import com.nfsdb.concurrent.PartitionCleaner;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.factory.configuration.Constants;
import com.nfsdb.factory.configuration.JournalMetadata;
import com.nfsdb.iterators.ConcurrentIterator;
import com.nfsdb.iterators.MergingIterator;
import com.nfsdb.iterators.PeekingIterator;
import com.nfsdb.locks.Lock;
import com.nfsdb.locks.LockManager;
import com.nfsdb.logging.Logger;
import com.nfsdb.tx.*;
import com.nfsdb.utils.*;
import java.io.File;
import java.io.FileFilter;
......@@ -185,7 +185,7 @@ public class JournalWriter<T> extends Journal<T> {
* have lag partitions.
*
* @return Lag partition instance.
* @throws com.nfsdb.journal.exceptions.JournalException
* @throws com.nfsdb.exceptions.JournalException
*/
public Partition<T> openOrCreateLagPartition() throws JournalException {
Partition<T> result = getIrregularPartition();
......@@ -291,7 +291,7 @@ public class JournalWriter<T> extends Journal<T> {
/**
* Deletes entire Journal.
*
* @throws com.nfsdb.journal.exceptions.JournalException if the Journal is open (must be closed)
* @throws com.nfsdb.exceptions.JournalException if the Journal is open (must be closed)
*/
public void delete() throws JournalException {
if (isOpen()) {
......@@ -304,7 +304,7 @@ public class JournalWriter<T> extends Journal<T> {
* Add objects to the end of the Journal.
*
* @param objects objects to add
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public void append(Iterable<T> objects) throws JournalException {
for (T o : objects) {
......@@ -316,7 +316,7 @@ public class JournalWriter<T> extends Journal<T> {
* Add an object to the end of the Journal.
*
* @param obj the object to add
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public void append(T obj) throws JournalException {
......@@ -380,7 +380,7 @@ public class JournalWriter<T> extends Journal<T> {
* this will always be rejected.
*
* @return max timestamp older then which append is impossible.
* @throws com.nfsdb.journal.exceptions.JournalException if journal cannot calculate timestamp.
* @throws com.nfsdb.exceptions.JournalException if journal cannot calculate timestamp.
*/
public long getAppendTimestampLo() throws JournalException {
if (appendTimestampLo == -1) {
......@@ -416,7 +416,7 @@ public class JournalWriter<T> extends Journal<T> {
}
public Partition<T> createPartition(Interval interval, int partitionIndex) throws JournalException {
Partition<T> result = new Partition<>(this, interval, partitionIndex, Journal.TX_LIMIT_EVAL, null).open();
Partition<T> result = new Partition<>(this, interval, partitionIndex, TX_LIMIT_EVAL, null).open();
partitions.add(result);
return result;
}
......@@ -425,7 +425,7 @@ public class JournalWriter<T> extends Journal<T> {
* Add objects to the end of the Journal.
*
* @param objects objects to add
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
@SafeVarargs
public final void append(T... objects) throws JournalException {
......@@ -438,7 +438,7 @@ public class JournalWriter<T> extends Journal<T> {
* Copy the objects corresponding to the specified ids to the end of the Journal.
*
* @param resultSet the global row ids
* @throws com.nfsdb.journal.exceptions.JournalException if there is an error
* @throws com.nfsdb.exceptions.JournalException if there is an error
*/
public void append(ResultSet<T> resultSet) throws JournalException {
if (isCompatible(resultSet.getJournal())) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/OrderedResultSet.java → nfsdb-core/src/main/java/com/nfsdb/OrderedResultSet.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.utils.Rows;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.utils.Rows;
public class OrderedResultSet<T> extends ResultSet<T> {
public OrderedResultSet(Journal<T> journal, DirectLongList rowIDs) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/OrderedResultSetBuilder.java → nfsdb-core/src/main/java/com/nfsdb/OrderedResultSetBuilder.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.utils.Interval;
public abstract class OrderedResultSetBuilder<T> extends AbstractResultSetBuilder<T, OrderedResultSet<T>> {
......
nfsdb-core/src/main/java/com/nfsdb/journal/Partition.java → nfsdb-core/src/main/java/com/nfsdb/Partition.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,23 +14,23 @@
* limitations under the License.
*/
package com.nfsdb.journal;
import com.nfsdb.journal.column.*;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.factory.configuration.ColumnMetadata;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.journal.index.KVIndex;
import com.nfsdb.journal.iterators.ConcurrentIterator;
import com.nfsdb.journal.iterators.PartitionBufferedIterator;
import com.nfsdb.journal.iterators.PartitionConcurrentIterator;
import com.nfsdb.journal.iterators.PartitionIterator;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.journal.utils.Checksum;
import com.nfsdb.journal.utils.Dates;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb;
import com.nfsdb.column.*;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.factory.configuration.ColumnMetadata;
import com.nfsdb.factory.configuration.JournalMetadata;
import com.nfsdb.index.KVIndex;
import com.nfsdb.iterators.ConcurrentIterator;
import com.nfsdb.iterators.PartitionBufferedIterator;
import com.nfsdb.iterators.PartitionConcurrentIterator;
import com.nfsdb.iterators.PartitionIterator;
import com.nfsdb.logging.Logger;
import com.nfsdb.utils.Checksum;
import com.nfsdb.utils.Dates;
import com.nfsdb.utils.Interval;
import com.nfsdb.utils.Unsafe;
import java.io.Closeable;
import java.io.File;
......@@ -328,7 +328,7 @@ public class Partition<T> implements Iterable<T>, Closeable {
* Rebuild the index of a column using the default keyCountHint and recordCountHint values.
*
* @param columnIndex the column index
* @throws com.nfsdb.journal.exceptions.JournalException if the operation fails
* @throws com.nfsdb.exceptions.JournalException if the operation fails
*/
public void rebuildIndex(int columnIndex) throws JournalException {
JournalMetadata<T> meta = journal.getMetadata();
......@@ -344,7 +344,7 @@ public class Partition<T> implements Iterable<T>, Closeable {
* @param columnIndex the column index
* @param keyCountHint the key count hint override
* @param recordCountHint the record count hint override
* @throws com.nfsdb.journal.exceptions.JournalException if the operation fails
* @throws com.nfsdb.exceptions.JournalException if the operation fails
*/
public void rebuildIndex(int columnIndex, int keyCountHint, int recordCountHint, int txCountHint) throws JournalException {
final long time = LOGGER.isInfoEnabled() ? System.nanoTime() : 0L;
......@@ -446,7 +446,6 @@ public class Partition<T> implements Iterable<T>, Closeable {
}
}
// TODO: rethink visibility
public void updateIndexes(long oldSize, long newSize) {
if (oldSize < newSize) {
try {
......
nfsdb-core/src/main/java/com/nfsdb/journal/PartitionType.java → nfsdb-core/src/main/java/com/nfsdb/PartitionType.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
/**
* Setting partition type on JournalKey to override default settings.
......
nfsdb-core/src/main/java/com/nfsdb/journal/ResultSet.java → nfsdb-core/src/main/java/com/nfsdb/ResultSet.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,17 +14,17 @@
* limitations under the License.
*/
package com.nfsdb.journal;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.column.SymbolTable;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.iterators.ConcurrentIterator;
import com.nfsdb.journal.iterators.ResultSetBufferedIterator;
import com.nfsdb.journal.iterators.ResultSetConcurrentIterator;
import com.nfsdb.journal.iterators.ResultSetIterator;
import com.nfsdb.journal.utils.Rnd;
import com.nfsdb.journal.utils.Rows;
package com.nfsdb;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.column.SymbolTable;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.iterators.ConcurrentIterator;
import com.nfsdb.iterators.ResultSetBufferedIterator;
import com.nfsdb.iterators.ResultSetConcurrentIterator;
import com.nfsdb.iterators.ResultSetIterator;
import com.nfsdb.utils.Rnd;
import com.nfsdb.utils.Rows;
import java.util.Iterator;
......
nfsdb-core/src/main/java/com/nfsdb/journal/SymbolIndexProxy.java → nfsdb-core/src/main/java/com/nfsdb/SymbolIndexProxy.java
浏览文件 @ 31d061b6
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.journal.index.KVIndex;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.journal.utils.Dates;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalMetadata;
import com.nfsdb.index.KVIndex;
import com.nfsdb.logging.Logger;
import com.nfsdb.utils.Dates;
import java.io.Closeable;
......
nfsdb-core/src/main/java/com/nfsdb/journal/TempPartition.java → nfsdb-core/src/main/java/com/nfsdb/TempPartition.java
浏览文件 @ 31d061b6
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.locks.Lock;
import com.nfsdb.journal.locks.LockManager;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.locks.Lock;
import com.nfsdb.locks.LockManager;
import com.nfsdb.utils.Interval;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/UnorderedResultSet.java → nfsdb-core/src/main/java/com/nfsdb/UnorderedResultSet.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.collections.DirectLongList;
/**
* Unordered result set does not guarantee ROWIDs to be in ascending order.
......
nfsdb-core/src/main/java/com/nfsdb/journal/UnorderedResultSetBuilder.java → nfsdb-core/src/main/java/com/nfsdb/UnorderedResultSetBuilder.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal;
package com.nfsdb;
import com.nfsdb.journal.utils.Interval;
import com.nfsdb.utils.Interval;
public abstract class UnorderedResultSetBuilder<T> extends AbstractResultSetBuilder<T, UnorderedResultSet<T>> {
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/AbstractDirectList.java → nfsdb-core/src/main/java/com/nfsdb/collections/AbstractDirectList.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.utils.Unsafe;
import java.io.Closeable;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/AbstractImmutableIterator.java → nfsdb-core/src/main/java/com/nfsdb/collections/AbstractImmutableIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import com.nfsdb.journal.exceptions.JournalImmutableIteratorException;
import com.nfsdb.exceptions.JournalImmutableIteratorException;
import java.util.Iterator;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/DirectIntList.java → nfsdb-core/src/main/java/com/nfsdb/collections/DirectIntList.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.utils.Unsafe;
public class DirectIntList extends AbstractDirectList {
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/DirectLongList.java → nfsdb-core/src/main/java/com/nfsdb/collections/DirectLongList.java
浏览文件 @ 31d061b6
......@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import com.nfsdb.journal.utils.Rnd;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.utils.Rnd;
import com.nfsdb.utils.Unsafe;
public class DirectLongList extends AbstractDirectList {
/**
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/ImmutableIterator.java → nfsdb-core/src/main/java/com/nfsdb/collections/ImmutableIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import java.util.Iterator;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/IntHashSet.java → nfsdb-core/src/main/java/com/nfsdb/collections/IntHashSet.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import java.util.Arrays;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/IntObjHashMap.java → nfsdb-core/src/main/java/com/nfsdb/collections/IntObjHashMap.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/ObjIntHashMap.java → nfsdb-core/src/main/java/com/nfsdb/collections/ObjIntHashMap.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import java.util.Arrays;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/Primes.java → nfsdb-core/src/main/java/com/nfsdb/collections/Primes.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import java.util.Arrays;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/RingQueue.java → nfsdb-core/src/main/java/com/nfsdb/collections/RingQueue.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections;
package com.nfsdb.collections;
import java.lang.reflect.Array;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/mmap/MapMetadata.java → nfsdb-core/src/main/java/com/nfsdb/collections/mmap/MapMetadata.java
浏览文件 @ 31d061b6
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections.mmap;
package com.nfsdb.collections.mmap;
import com.nfsdb.journal.collections.ObjIntHashMap;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.factory.configuration.ColumnMetadata;
import com.nfsdb.journal.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.collections.ObjIntHashMap;
import com.nfsdb.column.ColumnType;
import com.nfsdb.factory.configuration.ColumnMetadata;
import com.nfsdb.lang.cst.impl.qry.RecordMetadata;
import java.util.List;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/mmap/MapRecord.java → nfsdb-core/src/main/java/com/nfsdb/collections/mmap/MapRecord.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections.mmap;
package com.nfsdb.collections.mmap;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.lang.cst.impl.qry.AbstractRecord;
import com.nfsdb.journal.lang.cst.impl.qry.Record;
import com.nfsdb.journal.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.lang.cst.impl.qry.AbstractRecord;
import com.nfsdb.lang.cst.impl.qry.Record;
import com.nfsdb.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.utils.Unsafe;
import java.io.InputStream;
import java.io.OutputStream;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/mmap/MapRecordSource.java → nfsdb-core/src/main/java/com/nfsdb/collections/mmap/MapRecordSource.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections.mmap;
package com.nfsdb.collections.mmap;
import com.nfsdb.journal.collections.AbstractImmutableIterator;
import com.nfsdb.journal.lang.cst.impl.qry.Record;
import com.nfsdb.journal.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.journal.lang.cst.impl.qry.RecordSource;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.collections.AbstractImmutableIterator;
import com.nfsdb.lang.cst.impl.qry.Record;
import com.nfsdb.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.lang.cst.impl.qry.RecordSource;
import com.nfsdb.utils.Unsafe;
public class MapRecordSource extends AbstractImmutableIterator<Record> implements RecordSource<Record> {
private final MapRecord record;
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/mmap/MapValues.java → nfsdb-core/src/main/java/com/nfsdb/collections/mmap/MapValues.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections.mmap;
package com.nfsdb.collections.mmap;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.utils.Unsafe;
public class MapValues {
private final int valueOffsets[];
......
nfsdb-core/src/main/java/com/nfsdb/journal/collections/mmap/MultiMap.java → nfsdb-core/src/main/java/com/nfsdb/collections/mmap/MultiMap.java
浏览文件 @ 31d061b6
......@@ -14,17 +14,17 @@
* limitations under the License.
*/
package com.nfsdb.journal.collections.mmap;
import com.nfsdb.journal.collections.AbstractDirectList;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.collections.Primes;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.factory.configuration.ColumnMetadata;
import com.nfsdb.journal.lang.cst.impl.qry.Record;
import com.nfsdb.journal.lang.cst.impl.qry.RecordSource;
import com.nfsdb.journal.utils.Hash;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb.collections.mmap;
import com.nfsdb.collections.AbstractDirectList;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.collections.Primes;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.factory.configuration.ColumnMetadata;
import com.nfsdb.lang.cst.impl.qry.Record;
import com.nfsdb.lang.cst.impl.qry.RecordSource;
import com.nfsdb.utils.Hash;
import com.nfsdb.utils.Unsafe;
import java.io.Closeable;
import java.util.ArrayList;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/AbstractColumn.java → nfsdb-core/src/main/java/com/nfsdb/column/AbstractColumn.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.exceptions.JournalException;
import java.io.Closeable;
import java.nio.ByteBuffer;
......@@ -25,6 +25,10 @@ public abstract class AbstractColumn implements Closeable {
final MappedFile mappedFile;
long txAppendOffset = -1;
AbstractColumn(MappedFile storage) {
this.mappedFile = storage;
}
public abstract void truncate(long size);
public void preCommit(long appendOffset) {
......@@ -65,8 +69,4 @@ public abstract class AbstractColumn implements Closeable {
public void compact() throws JournalException {
mappedFile.compact();
}
AbstractColumn(MappedFile storage) {
this.mappedFile = storage;
}
}
nfsdb-core/src/main/java/com/nfsdb/journal/column/ByteBufferWrapper.java → nfsdb-core/src/main/java/com/nfsdb/column/ByteBufferWrapper.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.utils.ByteBuffers;
import java.nio.MappedByteBuffer;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/ColumnType.java → nfsdb-core/src/main/java/com/nfsdb/column/ColumnType.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import java.nio.ByteBuffer;
......@@ -33,6 +33,11 @@ public enum ColumnType {
private final Class type;
private final int size;
ColumnType(Class type, int size) {
this.type = type;
this.size = size;
}
public boolean matches(Class type) {
return this.type == type;
}
......@@ -40,9 +45,4 @@ public enum ColumnType {
public int size() {
return size;
}
ColumnType(Class type, int size) {
this.type = type;
this.size = size;
}
}
nfsdb-core/src/main/java/com/nfsdb/journal/column/FixedColumn.java → nfsdb-core/src/main/java/com/nfsdb/column/FixedColumn.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.utils.Unsafe;
public class FixedColumn extends AbstractColumn {
final int width;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/HugeBuffer.java → nfsdb-core/src/main/java/com/nfsdb/column/HugeBuffer.java
浏览文件 @ 31d061b6
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.JournalMode;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.utils.Unsafe;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/MappedFile.java → nfsdb-core/src/main/java/com/nfsdb/column/MappedFile.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.exceptions.JournalException;
import java.io.Closeable;
import java.nio.ByteBuffer;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/MappedFileImpl.java → nfsdb-core/src/main/java/com/nfsdb/column/MappedFileImpl.java
浏览文件 @ 31d061b6
......@@ -14,17 +14,17 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalNoSuchFileException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Files;
import com.nfsdb.journal.utils.Lists;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb.column;
import com.nfsdb.JournalMode;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalNoSuchFileException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.logging.Logger;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Files;
import com.nfsdb.utils.Lists;
import com.nfsdb.utils.Unsafe;
import sun.nio.ch.DirectBuffer;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/SymbolTable.java → nfsdb-core/src/main/java/com/nfsdb/column/SymbolTable.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,19 +14,19 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.collections.AbstractImmutableIterator;
import com.nfsdb.journal.collections.ObjIntHashMap;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalInvalidSymbolValueException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.index.Cursor;
import com.nfsdb.journal.index.KVIndex;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Checksum;
import com.nfsdb.journal.utils.Lists;
package com.nfsdb.column;
import com.nfsdb.JournalMode;
import com.nfsdb.collections.AbstractImmutableIterator;
import com.nfsdb.collections.ObjIntHashMap;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalInvalidSymbolValueException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.index.Cursor;
import com.nfsdb.index.KVIndex;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Checksum;
import com.nfsdb.utils.Lists;
import java.io.Closeable;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/column/VariableColumn.java → nfsdb-core/src/main/java/com/nfsdb/column/VariableColumn.java
浏览文件 @ 31d061b6
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal.column;
package com.nfsdb.column;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Unsafe;
import java.io.IOException;
import java.io.InputStream;
......
nfsdb-core/src/main/java/com/nfsdb/journal/concurrent/NamedDaemonThreadFactory.java → nfsdb-core/src/main/java/com/nfsdb/concurrent/NamedDaemonThreadFactory.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.concurrent;
package com.nfsdb.concurrent;
import org.jetbrains.annotations.NotNull;
......
nfsdb-core/src/main/java/com/nfsdb/journal/concurrent/PartitionCleaner.java → nfsdb-core/src/main/java/com/nfsdb/concurrent/PartitionCleaner.java
浏览文件 @ 31d061b6
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal.concurrent;
package com.nfsdb.concurrent;
import com.lmax.disruptor.BatchEventProcessor;
import com.lmax.disruptor.BlockingWaitStrategy;
import com.lmax.disruptor.RingBuffer;
import com.nfsdb.journal.JournalWriter;
import com.nfsdb.JournalWriter;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
......
nfsdb-core/src/main/java/com/nfsdb/journal/concurrent/PartitionCleanerEvent.java → nfsdb-core/src/main/java/com/nfsdb/concurrent/PartitionCleanerEvent.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.concurrent;
package com.nfsdb.concurrent;
import com.lmax.disruptor.EventFactory;
......
nfsdb-core/src/main/java/com/nfsdb/journal/concurrent/PartitionCleanerEventHandler.java → nfsdb-core/src/main/java/com/nfsdb/concurrent/PartitionCleanerEventHandler.java
浏览文件 @ 31d061b6
......@@ -14,15 +14,15 @@
* limitations under the License.
*/
package com.nfsdb.journal.concurrent;
package com.nfsdb.concurrent;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.LifecycleAware;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.JournalWriter;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.tx.TxLog;
import com.nfsdb.JournalMode;
import com.nfsdb.JournalWriter;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.tx.TxLog;
class PartitionCleanerEventHandler implements EventHandler<PartitionCleanerEvent>, LifecycleAware {
private final JournalWriter writer;
......
nfsdb-core/src/main/java/com/nfsdb/journal/concurrent/TimerCache.java → nfsdb-core/src/main/java/com/nfsdb/concurrent/TimerCache.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.concurrent;
package com.nfsdb.concurrent;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalConfigurationException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalConfigurationException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalConfigurationException extends JournalRuntimeException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalDisconnectedChannelException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalDisconnectedChannelException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalDisconnectedChannelException extends JournalNetworkException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalException extends Exception {
public JournalException() {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalImmutableIteratorException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalImmutableIteratorException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalImmutableIteratorException extends JournalRuntimeException {
public JournalImmutableIteratorException() {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalInvalidSymbolValueException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalInvalidSymbolValueException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalInvalidSymbolValueException extends JournalRuntimeException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalMetadataException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalMetadataException.java
浏览文件 @ 31d061b6
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
import com.nfsdb.journal.factory.configuration.ColumnMetadata;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.factory.configuration.ColumnMetadata;
import com.nfsdb.factory.configuration.JournalMetadata;
import com.nfsdb.logging.Logger;
public class JournalMetadataException extends JournalException {
private static final Logger LOGGER = Logger.getLogger(JournalMetadataException.class);
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalNetworkException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalNetworkException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalNetworkException extends Exception {
public JournalNetworkException(String message) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalNoSuchFileException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalNoSuchFileException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalNoSuchFileException extends JournalException {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalRuntimeException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalRuntimeException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalRuntimeException extends RuntimeException {
public JournalRuntimeException(String message, Object... args) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/exceptions/JournalUnsupportedTypeException.java → nfsdb-core/src/main/java/com/nfsdb/exceptions/JournalUnsupportedTypeException.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.exceptions;
package com.nfsdb.exceptions;
public class JournalUnsupportedTypeException extends JournalRuntimeException {
public JournalUnsupportedTypeException(Enum type) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/export/CharSink.java → nfsdb-core/src/main/java/com/nfsdb/export/CharSink.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.export;
package com.nfsdb.export;
public interface CharSink {
CharSink put(char c);
......
nfsdb-core/src/main/java/com/nfsdb/journal/export/FlexBufferSink.java → nfsdb-core/src/main/java/com/nfsdb/export/FlexBufferSink.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.export;
package com.nfsdb.export;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.utils.ByteBuffers;
import java.io.IOException;
import java.nio.ByteBuffer;
......
nfsdb-core/src/main/java/com/nfsdb/journal/export/RecordSourcePrinter.java → nfsdb-core/src/main/java/com/nfsdb/export/RecordSourcePrinter.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.export;
package com.nfsdb.export;
import com.nfsdb.journal.lang.cst.impl.qry.Record;
import com.nfsdb.journal.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.journal.lang.cst.impl.qry.RecordSource;
import com.nfsdb.journal.utils.Dates;
import com.nfsdb.journal.utils.Numbers;
import com.nfsdb.lang.cst.impl.qry.Record;
import com.nfsdb.lang.cst.impl.qry.RecordMetadata;
import com.nfsdb.lang.cst.impl.qry.RecordSource;
import com.nfsdb.utils.Dates;
import com.nfsdb.utils.Numbers;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@SuppressFBWarnings({"SF_SWITCH_NO_DEFAULT"})
......
nfsdb-core/src/main/java/com/nfsdb/journal/export/StringSink.java → nfsdb-core/src/main/java/com/nfsdb/export/StringSink.java
浏览文件 @ 31d061b6
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.export;
package com.nfsdb.export;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.jetbrains.annotations.NotNull;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/AbstractJournalReaderFactory.java → nfsdb-core/src/main/java/com/nfsdb/factory/AbstractJournalReaderFactory.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.*;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
import com.nfsdb.*;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalConfiguration;
import com.nfsdb.factory.configuration.JournalMetadata;
import java.io.Closeable;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalCachingFactory.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalCachingFactory.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.Journal;
import com.nfsdb.JournalKey;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalConfiguration;
import java.util.ArrayList;
import java.util.HashMap;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalClosingListener.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalClosingListener.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.Journal;
import com.nfsdb.Journal;
public interface JournalClosingListener {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalFactory.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalFactory.java
浏览文件 @ 31d061b6
......@@ -14,18 +14,18 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
import com.nfsdb.journal.JournalBulkWriter;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.JournalWriter;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JMetadataBuilder;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.journal.factory.configuration.JournalConfigurationBuilder;
import com.nfsdb.journal.factory.configuration.JournalMetadata;
package com.nfsdb.factory;
import com.nfsdb.JournalBulkWriter;
import com.nfsdb.JournalKey;
import com.nfsdb.JournalWriter;
import com.nfsdb.PartitionType;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JMetadataBuilder;
import com.nfsdb.factory.configuration.JournalConfiguration;
import com.nfsdb.factory.configuration.JournalConfigurationBuilder;
import com.nfsdb.factory.configuration.JournalMetadata;
import java.io.Closeable;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalPool.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalPool.java
浏览文件 @ 31d061b6
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.concurrent.NamedDaemonThreadFactory;
import com.nfsdb.journal.concurrent.TimerCache;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.concurrent.NamedDaemonThreadFactory;
import com.nfsdb.concurrent.TimerCache;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalConfiguration;
import com.nfsdb.logging.Logger;
import java.io.Closeable;
import java.util.concurrent.ArrayBlockingQueue;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalReaderFactory.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalReaderFactory.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.JournalBulkReader;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.Journal;
import com.nfsdb.JournalBulkReader;
import com.nfsdb.JournalKey;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JournalConfiguration;
import java.io.Closeable;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/JournalWriterFactory.java → nfsdb-core/src/main/java/com/nfsdb/factory/JournalWriterFactory.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory;
package com.nfsdb.factory;
import com.nfsdb.journal.JournalBulkWriter;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.JournalWriter;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.factory.configuration.JMetadataBuilder;
import com.nfsdb.journal.factory.configuration.JournalConfiguration;
import com.nfsdb.JournalBulkWriter;
import com.nfsdb.JournalKey;
import com.nfsdb.JournalWriter;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.factory.configuration.JMetadataBuilder;
import com.nfsdb.factory.configuration.JournalConfiguration;
public interface JournalWriterFactory {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/AbstractGenericMetadataBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/AbstractGenericMetadataBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public abstract class AbstractGenericMetadataBuilder {
protected final ColumnMetadata meta;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/AbstractMetadataBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/AbstractMetadataBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public abstract class AbstractMetadataBuilder<T> {
protected final ColumnMetadata meta;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/BinaryBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/BinaryBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public class BinaryBuilder<T> extends AbstractMetadataBuilder<T> {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/ColumnMetadata.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/ColumnMetadata.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.column.HugeBuffer;
import com.nfsdb.column.ColumnType;
import com.nfsdb.column.HugeBuffer;
public class ColumnMetadata {
public String name;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/Constants.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/Constants.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public class Constants {
public static final String TEMP_DIRECTORY_PREFIX = "temp";
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/GenericBinaryBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/GenericBinaryBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.column.ColumnType;
public class GenericBinaryBuilder extends AbstractGenericMetadataBuilder {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/GenericIntBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/GenericIntBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.column.ColumnType;
public class GenericIntBuilder extends AbstractGenericMetadataBuilder {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/GenericStringBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/GenericStringBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.column.ColumnType;
public class GenericStringBuilder extends AbstractGenericMetadataBuilder {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/GenericSymbolBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/GenericSymbolBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.column.ColumnType;
public class GenericSymbolBuilder extends AbstractGenericMetadataBuilder {
public GenericSymbolBuilder(JournalStructure parent, ColumnMetadata meta) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/IntBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/IntBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public class IntBuilder<T> extends AbstractMetadataBuilder<T> {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JMetadataBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JMetadataBuilder.java
浏览文件 @ 31d061b6
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.PartitionType;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalConfiguration.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalConfiguration.java
浏览文件 @ 31d061b6
......@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.JournalKey;
import com.nfsdb.exceptions.JournalException;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalConfigurationBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalConfigurationBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.exceptions.JournalConfigurationException;
import com.nfsdb.exceptions.JournalConfigurationException;
import java.io.File;
import java.util.ArrayList;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalConfigurationImpl.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalConfigurationImpl.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,17 +14,17 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.column.HugeBuffer;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalMetadataException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Base64;
import com.nfsdb.journal.utils.Checksum;
import com.nfsdb.journal.utils.Files;
package com.nfsdb.factory.configuration;
import com.nfsdb.JournalKey;
import com.nfsdb.JournalMode;
import com.nfsdb.column.HugeBuffer;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalMetadataException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Base64;
import com.nfsdb.utils.Checksum;
import com.nfsdb.utils.Files;
import java.io.File;
import java.util.Map;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalMetadata.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalMetadata.java
浏览文件 @ 31d061b6
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.journal.column.HugeBuffer;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.JournalKey;
import com.nfsdb.PartitionType;
import com.nfsdb.column.HugeBuffer;
import com.nfsdb.exceptions.JournalRuntimeException;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalMetadataBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalMetadataBuilder.java
浏览文件 @ 31d061b6
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.journal.collections.ObjIntHashMap;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.exceptions.JournalConfigurationException;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb.factory.configuration;
import com.nfsdb.PartitionType;
import com.nfsdb.collections.ObjIntHashMap;
import com.nfsdb.column.ColumnType;
import com.nfsdb.exceptions.JournalConfigurationException;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Unsafe;
import java.io.File;
import java.lang.reflect.Constructor;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalMetadataImpl.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalMetadataImpl.java
浏览文件 @ 31d061b6
......@@ -14,16 +14,16 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
import com.nfsdb.journal.JournalKey;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.journal.collections.ObjIntHashMap;
import com.nfsdb.journal.column.HugeBuffer;
import com.nfsdb.journal.exceptions.JournalConfigurationException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Base64;
import com.nfsdb.journal.utils.Checksum;
package com.nfsdb.factory.configuration;
import com.nfsdb.JournalKey;
import com.nfsdb.PartitionType;
import com.nfsdb.collections.ObjIntHashMap;
import com.nfsdb.column.HugeBuffer;
import com.nfsdb.exceptions.JournalConfigurationException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Base64;
import com.nfsdb.utils.Checksum;
import java.io.File;
import java.lang.reflect.Constructor;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/JournalStructure.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/JournalStructure.java
浏览文件 @ 31d061b6
......@@ -14,15 +14,15 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
import com.nfsdb.journal.PartitionType;
import com.nfsdb.journal.collections.ObjIntHashMap;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.exceptions.JournalConfigurationException;
import com.nfsdb.journal.logging.Logger;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Unsafe;
package com.nfsdb.factory.configuration;
import com.nfsdb.PartitionType;
import com.nfsdb.collections.ObjIntHashMap;
import com.nfsdb.column.ColumnType;
import com.nfsdb.exceptions.JournalConfigurationException;
import com.nfsdb.logging.Logger;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Unsafe;
import java.io.File;
import java.lang.reflect.Constructor;
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/StringBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/StringBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
public class StringBuilder<T> extends AbstractMetadataBuilder<T> {
......
nfsdb-core/src/main/java/com/nfsdb/journal/factory/configuration/SymbolBuilder.java → nfsdb-core/src/main/java/com/nfsdb/factory/configuration/SymbolBuilder.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.nfsdb.journal.factory.configuration;
package com.nfsdb.factory.configuration;
import com.nfsdb.journal.column.ColumnType;
import com.nfsdb.journal.exceptions.JournalConfigurationException;
import com.nfsdb.column.ColumnType;
import com.nfsdb.exceptions.JournalConfigurationException;
public class SymbolBuilder<T> extends AbstractMetadataBuilder<T> {
public SymbolBuilder(JournalMetadataBuilder<T> parent, ColumnMetadata meta) {
......
nfsdb-core/src/main/java/com/nfsdb/journal/index/Cursor.java → nfsdb-core/src/main/java/com/nfsdb/index/Cursor.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.index;
package com.nfsdb.index;
public interface Cursor {
......
nfsdb-core/src/main/java/com/nfsdb/journal/index/KVIndex.java → nfsdb-core/src/main/java/com/nfsdb/index/KVIndex.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,16 +14,16 @@
* limitations under the License.
*/
package com.nfsdb.journal.index;
package com.nfsdb.index;
import com.nfsdb.journal.JournalMode;
import com.nfsdb.journal.collections.DirectLongList;
import com.nfsdb.journal.column.MappedFileImpl;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.ByteBuffers;
import com.nfsdb.journal.utils.Files;
import com.nfsdb.journal.utils.Unsafe;
import com.nfsdb.JournalMode;
import com.nfsdb.collections.DirectLongList;
import com.nfsdb.column.MappedFileImpl;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.ByteBuffers;
import com.nfsdb.utils.Files;
import com.nfsdb.utils.Unsafe;
import java.io.Closeable;
import java.io.File;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/AbstractConcurrentIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/AbstractConcurrentIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,26 +14,31 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import com.lmax.disruptor.*;
import com.nfsdb.journal.collections.AbstractImmutableIterator;
import com.nfsdb.journal.concurrent.NamedDaemonThreadFactory;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.collections.AbstractImmutableIterator;
import com.nfsdb.concurrent.NamedDaemonThreadFactory;
import com.nfsdb.exceptions.JournalRuntimeException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public abstract class AbstractConcurrentIterator<T> extends AbstractImmutableIterator<T> implements EventFactory<AbstractConcurrentIterator.Holder<T>>, ConcurrentIterator<T> {
private final ExecutorService service;
RingBuffer<Holder<T>> buffer;
SequenceBarrier barrier;
private final ExecutorService service;
private int bufferSize;
private Sequence sequence;
private long nextSequence;
private long availableSequence;
private boolean started = false;
AbstractConcurrentIterator(int bufferSize) {
this.bufferSize = bufferSize;
this.service = Executors.newCachedThreadPool(new NamedDaemonThreadFactory("jj-iterator", false));
}
@Override
public AbstractConcurrentIterator.Holder<T> newInstance() {
Holder<T> h = new Holder<>();
......@@ -103,9 +108,4 @@ public abstract class AbstractConcurrentIterator<T> extends AbstractImmutableIte
T object;
boolean hasNext;
}
AbstractConcurrentIterator(int bufferSize) {
this.bufferSize = bufferSize;
this.service = Executors.newCachedThreadPool(new NamedDaemonThreadFactory("jj-iterator", false));
}
}
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/ConcurrentIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/ConcurrentIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import java.io.Closeable;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalBufferedIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalBufferedIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.Partition;
import com.nfsdb.journal.collections.AbstractImmutableIterator;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Rows;
import com.nfsdb.Journal;
import com.nfsdb.Partition;
import com.nfsdb.collections.AbstractImmutableIterator;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Rows;
import java.util.List;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalConcurrentIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalConcurrentIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Rows;
import com.nfsdb.Journal;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Rows;
import java.util.List;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.collections.ImmutableIterator;
import com.nfsdb.Journal;
import com.nfsdb.collections.ImmutableIterator;
public interface JournalIterator<T> extends ImmutableIterator<T> {
Journal<T> getJournal();
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalIteratorImpl.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalIteratorImpl.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,13 +14,13 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
import com.nfsdb.journal.Journal;
import com.nfsdb.journal.collections.AbstractImmutableIterator;
import com.nfsdb.journal.exceptions.JournalException;
import com.nfsdb.journal.exceptions.JournalRuntimeException;
import com.nfsdb.journal.utils.Rows;
import com.nfsdb.Journal;
import com.nfsdb.collections.AbstractImmutableIterator;
import com.nfsdb.exceptions.JournalException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.utils.Rows;
import java.util.List;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalIteratorRange.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalIteratorRange.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
public final class JournalIteratorRange {
final int partitionID;
......
nfsdb-core/src/main/java/com/nfsdb/journal/iterators/JournalPeekingIterator.java → nfsdb-core/src/main/java/com/nfsdb/iterators/JournalPeekingIterator.java
浏览文件 @ 31d061b6
/*
* Copyright (c) 2014. Vlad Ilyushchenko
* Copyright (c) 2014-2015. Vlad Ilyushchenko
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.nfsdb.journal.iterators;
package com.nfsdb.iterators;
public interface JournalPeekingIterator<T> extends JournalIterator<T>, PeekingIterator<T> {
}
nfsdb-examples/pom.xml
浏览文件 @ 31d061b6
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或