Remove readFrom from some classes in index

These methods aren't used. They were just there to implement an interface
and that interface is losing that method.

Relates to #17085
This commit is contained in:
Nik Everett 2016-04-18 21:32:06 -04:00
parent 8126c08400
commit a672ea7ccc
3 changed files with 36 additions and 45 deletions

View File

@ -41,11 +41,19 @@ public class Index implements Writeable<Index> {
this.uuid = uuid.intern(); this.uuid = uuid.intern();
} }
/**
* Read from a stream.
*/
public Index(StreamInput in) throws IOException { public Index(StreamInput in) throws IOException {
this.name = in.readString(); this.name = in.readString();
this.uuid = in.readString(); this.uuid = in.readString();
} }
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
out.writeString(uuid);
}
public String getName() { public String getName() {
return this.name; return this.name;
@ -85,15 +93,4 @@ public class Index implements Writeable<Index> {
result = 31 * result + uuid.hashCode(); result = 31 * result + uuid.hashCode();
return result; return result;
} }
@Override
public Index readFrom(StreamInput in) throws IOException {
return new Index(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
out.writeString(uuid);
}
} }

View File

@ -1077,26 +1077,24 @@ public abstract class Engine implements Closeable {
this.id = Arrays.copyOf(id, id.length); this.id = Arrays.copyOf(id, id.length);
} }
/**
* Read from a stream.
*/
public CommitId(StreamInput in) throws IOException { public CommitId(StreamInput in) throws IOException {
assert in != null; assert in != null;
this.id = in.readByteArray(); this.id = in.readByteArray();
} }
@Override
public String toString() {
return Base64.encodeBytes(id);
}
@Override
public CommitId readFrom(StreamInput in) throws IOException {
return new CommitId(in);
}
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeByteArray(id); out.writeByteArray(id);
} }
@Override
public String toString() {
return Base64.encodeBytes(id);
}
public boolean idsEqual(byte[] id) { public boolean idsEqual(byte[] id) {
return Arrays.equals(id, this.id); return Arrays.equals(id, this.id);
} }

View File

@ -49,16 +49,6 @@ public class StoreFileMetaData implements Writeable {
private final BytesRef hash; private final BytesRef hash;
public StoreFileMetaData(StreamInput in) throws IOException {
name = in.readString();
length = in.readVLong();
checksum = in.readString();
String versionString = in.readString();
assert versionString != null;
writtenBy = Lucene.parseVersionLenient(versionString, FIRST_LUCENE_CHECKSUM_VERSION);
hash = in.readBytesRef();
}
public StoreFileMetaData(String name, long length, String checksum) { public StoreFileMetaData(String name, long length, String checksum) {
this(name, length, checksum, FIRST_LUCENE_CHECKSUM_VERSION); this(name, length, checksum, FIRST_LUCENE_CHECKSUM_VERSION);
} }
@ -79,6 +69,26 @@ public class StoreFileMetaData implements Writeable {
this.hash = hash == null ? new BytesRef() : hash; this.hash = hash == null ? new BytesRef() : hash;
} }
/**
* Read from a stream.
*/
public StoreFileMetaData(StreamInput in) throws IOException {
name = in.readString();
length = in.readVLong();
checksum = in.readString();
// TODO Why not Version.parse?
writtenBy = Lucene.parseVersionLenient(in.readString(), FIRST_LUCENE_CHECKSUM_VERSION);
hash = in.readBytesRef();
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
out.writeVLong(length);
out.writeString(checksum);
out.writeString(writtenBy.toString());
out.writeBytesRef(hash);
}
/** /**
* Returns the name of this file * Returns the name of this file
@ -118,20 +128,6 @@ public class StoreFileMetaData implements Writeable {
return "name [" + name + "], length [" + length + "], checksum [" + checksum + "], writtenBy [" + writtenBy + "]" ; return "name [" + name + "], length [" + length + "], checksum [" + checksum + "], writtenBy [" + writtenBy + "]" ;
} }
@Override
public StoreFileMetaData readFrom(StreamInput in) throws IOException {
return new StoreFileMetaData(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
out.writeVLong(length);
out.writeString(checksum);
out.writeString(writtenBy.toString());
out.writeBytesRef(hash);
}
/** /**
* Returns the Lucene version this file has been written by or <code>null</code> if unknown * Returns the Lucene version this file has been written by or <code>null</code> if unknown
*/ */