renamed common to hash

This commit is contained in:
Rob Austin
2014-10-29 12:11:24 +00:00
parent ebecafe54a
commit 2f73cf1f39
54 changed files with 105 additions and 107 deletions
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import net.openhft.chronicle.map.ChronicleMap;
import net.openhft.chronicle.set.ChronicleSet;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import net.openhft.chronicle.map.*;
import net.openhft.chronicle.set.ChronicleSet;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import java.io.Serializable;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import org.slf4j.Logger;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
import net.openhft.chronicle.map.ChronicleMap;
import net.openhft.chronicle.set.ChronicleSet;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.exceptions;
package net.openhft.chronicle.hash.exceptions;
import java.io.IOException;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.exceptions;
package net.openhft.chronicle.hash.exceptions;
/**
* @author Rob Austin.
@@ -23,4 +23,4 @@
* the same level because {@code net.openhft.chronicle} package is occupied by <a
* href="https://github.com/OpenHFT/Chronicle-Queue">Chronicle Queue</a> project.
*/
package net.openhft.chronicle.common;
package net.openhft.chronicle.hash;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
public interface AgileBytesMarshaller<E> extends BytesReader<E>, BytesInterop<E>, SizeMarshaller {
}
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.model.Byteable;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.serialization.BytesMarshaller;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,11 +16,11 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.StatefulCopyable;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.threadlocal.Provider;
import net.openhft.chronicle.hash.threadlocal.StatefulCopyable;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.DirectBytes;
import net.openhft.lang.io.DirectStore;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,9 +16,9 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import java.io.ObjectStreamException;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.NativeBytes;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,9 +16,9 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import java.io.Serializable;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization;
package net.openhft.chronicle.hash.serialization;
import net.openhft.lang.io.Bytes;
@@ -16,11 +16,11 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.BytesInterop;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.BytesInterop;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
public enum ByteArrayMarshaller implements BytesInterop<byte[]>, BytesReader<byte[]> {
@@ -16,10 +16,10 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.MultiStoreBytes;
import net.openhft.lang.io.NativeBytes;
@@ -16,11 +16,11 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.BytesInterop;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.BytesInterop;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
public enum CharArrayMarshaller implements BytesInterop<char[]>, BytesReader<char[]> {
@@ -16,13 +16,13 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.lang.io.AbstractBytes;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.pool.CharSequenceInterner;
import net.openhft.chronicle.common.threadlocal.StatefulCopyable;
import net.openhft.chronicle.hash.threadlocal.StatefulCopyable;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -16,9 +16,9 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.BytesWriter;
import net.openhft.chronicle.hash.serialization.BytesWriter;
import net.openhft.lang.io.AbstractBytes;
import net.openhft.lang.io.Bytes;
@@ -16,10 +16,10 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
import static java.lang.Double.doubleToLongBits;
@@ -16,10 +16,10 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
public enum IntegerMarshaller implements AgileBytesMarshaller<Integer> {
@@ -16,10 +16,10 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.common.serialization.Hasher;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.io.Bytes;
public enum LongMarshaller implements AgileBytesMarshaller<Long> {
@@ -16,9 +16,9 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.serialization.impl;
package net.openhft.chronicle.hash.serialization.impl;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.lang.io.Bytes;
public enum VoidMarshaller implements AgileBytesMarshaller<Void> {
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.threadlocal;
package net.openhft.chronicle.hash.threadlocal;
public abstract class Provider<T> {
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.threadlocal;
package net.openhft.chronicle.hash.threadlocal;
public interface StatefulCopyable<S extends StatefulCopyable<S>> {
Object stateIdentity();
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.common.threadlocal;
package net.openhft.chronicle.hash.threadlocal;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -18,12 +18,12 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.*;
import net.openhft.chronicle.common.serialization.MetaBytesInterop;
import net.openhft.chronicle.common.serialization.MetaBytesWriter;
import net.openhft.chronicle.common.serialization.MetaProvider;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.*;
import net.openhft.chronicle.hash.serialization.MetaBytesInterop;
import net.openhft.chronicle.hash.serialization.MetaBytesWriter;
import net.openhft.chronicle.hash.serialization.MetaProvider;
import net.openhft.chronicle.hash.threadlocal.Provider;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.set.ChronicleSetBuilder;
import net.openhft.lang.Maths;
import net.openhft.lang.io.ByteBufferBytes;
@@ -18,8 +18,8 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.ChronicleHash;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.hash.ChronicleHash;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.serialization.BytesMarshaller;
import net.openhft.lang.model.Byteable;
@@ -16,8 +16,8 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.ChronicleHashBuilder;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.ChronicleHashBuilder;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.serialization.BytesMarshallable;
import net.openhft.lang.io.serialization.BytesMarshaller;
@@ -18,8 +18,8 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.common.serialization.MetaBytesWriter;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.chronicle.hash.serialization.MetaBytesWriter;
import net.openhft.lang.io.ByteBufferBytes;
import java.nio.ByteBuffer;
@@ -16,8 +16,8 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.serialization.BytesWriter;
import net.openhft.chronicle.common.serialization.MetaBytesWriter;
import net.openhft.chronicle.hash.serialization.BytesWriter;
import net.openhft.chronicle.hash.serialization.MetaBytesWriter;
import net.openhft.lang.io.Bytes;
import java.io.Serializable;
@@ -19,13 +19,12 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.TimeProvider;
import net.openhft.chronicle.common.serialization.BytesReader;
import net.openhft.chronicle.common.serialization.MetaBytesInterop;
import net.openhft.chronicle.common.serialization.MetaBytesWriter;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.TimeProvider;
import net.openhft.chronicle.hash.serialization.BytesReader;
import net.openhft.chronicle.hash.serialization.MetaBytesInterop;
import net.openhft.chronicle.hash.serialization.MetaBytesWriter;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.lang.Maths;
import net.openhft.lang.MemoryUnit;
import net.openhft.lang.collection.ATSDirectBitSet;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.MultiStoreBytes;
@@ -41,7 +40,7 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicReferenceArray;
import static net.openhft.chronicle.common.serialization.Hasher.hash;
import static net.openhft.chronicle.hash.serialization.Hasher.hash;
import static net.openhft.lang.MemoryUnit.BITS;
import static net.openhft.lang.MemoryUnit.BYTES;
import static net.openhft.lang.MemoryUnit.CACHE_LINES;
@@ -18,10 +18,10 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.common.serialization.*;
import net.openhft.chronicle.common.serialization.impl.*;
import net.openhft.chronicle.hash.threadlocal.Provider;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.serialization.*;
import net.openhft.chronicle.hash.serialization.impl.*;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.serialization.BytesMarshallable;
import net.openhft.lang.io.serialization.BytesMarshaller;
@@ -38,7 +38,7 @@ import java.io.Serializable;
import java.lang.reflect.Modifier;
import static net.openhft.chronicle.map.Objects.hash;
import static net.openhft.chronicle.common.serialization.SizeMarshallers.stopBit;
import static net.openhft.chronicle.hash.serialization.SizeMarshallers.stopBit;
final class SerializationBuilder<E> implements Cloneable {
@@ -18,9 +18,9 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.common.serialization.*;
import net.openhft.chronicle.hash.threadlocal.Provider;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.serialization.*;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.model.Byteable;
import net.openhft.lang.model.constraints.NotNull;
@@ -19,9 +19,9 @@
package net.openhft.chronicle.map;
import com.sun.jdi.connect.spi.ClosedConnectionException;
import net.openhft.chronicle.common.StatelessBuilder;
import net.openhft.chronicle.common.exceptions.IORuntimeException;
import net.openhft.chronicle.common.exceptions.TimeoutRuntimeException;
import net.openhft.chronicle.hash.StatelessBuilder;
import net.openhft.chronicle.hash.exceptions.IORuntimeException;
import net.openhft.chronicle.hash.exceptions.TimeoutRuntimeException;
import net.openhft.lang.io.ByteBufferBytes;
import net.openhft.lang.io.Bytes;
import org.jetbrains.annotations.NotNull;
@@ -18,10 +18,10 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.common.ChronicleHashErrorListener;
import net.openhft.chronicle.common.serialization.*;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.hash.ChronicleHashErrorListener;
import net.openhft.chronicle.hash.serialization.*;
import net.openhft.chronicle.hash.threadlocal.Provider;
import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies;
import net.openhft.lang.collection.DirectBitSet;
import net.openhft.lang.collection.SingleThreadedDirectBitSet;
import net.openhft.lang.io.*;
@@ -18,7 +18,7 @@
package net.openhft.chronicle.set;
import net.openhft.chronicle.common.ChronicleHash;
import net.openhft.chronicle.hash.ChronicleHash;
import java.util.Set;
@@ -18,16 +18,15 @@
package net.openhft.chronicle.set;
import net.openhft.chronicle.common.ChronicleHashBuilder;
import net.openhft.chronicle.common.ChronicleHashErrorListener;
import net.openhft.chronicle.common.StatelessBuilder;
import net.openhft.chronicle.common.TimeProvider;
import net.openhft.chronicle.hash.ChronicleHashBuilder;
import net.openhft.chronicle.hash.ChronicleHashErrorListener;
import net.openhft.chronicle.hash.StatelessBuilder;
import net.openhft.chronicle.hash.TimeProvider;
import net.openhft.chronicle.map.*;
import net.openhft.lang.io.serialization.BytesMarshaller;
import net.openhft.lang.io.serialization.BytesMarshallerFactory;
import net.openhft.lang.io.serialization.ObjectFactory;
import net.openhft.lang.io.serialization.ObjectSerializer;
import net.openhft.lang.io.serialization.impl.NullObjectFactory;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -18,7 +18,7 @@
package net.openhft.chronicle.set;
import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller;
import net.openhft.lang.io.Bytes;
import static net.openhft.chronicle.set.DummyValue.DUMMY_VALUE;