- * The resulting reader will start reading at the given - * offset. The total number of char values that can be - * read from this reader will be either length or - * buf.length-offset, whichever is smaller. - * - * @param buf Input buffer (not copied) - * @param offset Offset of the first char to read - * @param length Number of chars to read - * @throws IllegalArgumentException If offset is negative or greater than - * buf.length, or if length is negative, or if - * the sum of these two values is negative. - */ - public FastCharArrayReader(char buf[], int offset, int length) { - if ((offset < 0) || (offset > buf.length) || (length < 0) || - ((offset + length) < 0)) { - throw new IllegalArgumentException(); - } - this.buf = buf; - this.pos = offset; - this.count = Math.min(offset + length, buf.length); - this.markedPos = offset; - } - - /** - * Checks to make sure that the stream has not been closed - */ - private void ensureOpen() throws IOException { - if (buf == null) - throw new IOException("Stream closed"); - } - - /** - * Reads a single character. - * - * @throws IOException If an I/O error occurs - */ - @Override - public int read() throws IOException { - ensureOpen(); - if (pos >= count) - return -1; - else - return buf[pos++]; - } - - /** - * Reads characters into a portion of an array. - * - * @param b Destination buffer - * @param off Offset at which to start storing characters - * @param len Maximum number of characters to read - * @return The actual number of characters read, or -1 if - * the end of the stream has been reached - * @throws IOException If an I/O error occurs - */ - @Override - public int read(char b[], int off, int len) throws IOException { - ensureOpen(); - if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } else if (len == 0) { - return 0; - } - - if (pos >= count) { - return -1; - } - if (pos + len > count) { - len = count - pos; - } - if (len <= 0) { - return 0; - } - System.arraycopy(buf, pos, b, off, len); - pos += len; - return len; - } - - /** - * Skips characters. Returns the number of characters that were skipped. - *
- * The n parameter may be negative, even though the
- * skip method of the {@link Reader} superclass throws
- * an exception in this case. If n is negative, then
- * this method does nothing and returns 0.
- *
- * @param n The number of characters to skip
- * @return The number of characters actually skipped
- * @throws IOException If the stream is closed, or an I/O error occurs
- */
- @Override
- public long skip(long n) throws IOException {
- ensureOpen();
- if (pos + n > count) {
- n = count - pos;
- }
- if (n < 0) {
- return 0;
- }
- pos += n;
- return n;
- }
-
- /**
- * Tells whether this stream is ready to be read. Character-array readers
- * are always ready to be read.
- *
- * @throws IOException If an I/O error occurs
- */
- @Override
- public boolean ready() throws IOException {
- ensureOpen();
- return (count - pos) > 0;
- }
-
- /**
- * Tells whether this stream supports the mark() operation, which it does.
- */
- @Override
- public boolean markSupported() {
- return true;
- }
-
- /**
- * Marks the present position in the stream. Subsequent calls to reset()
- * will reposition the stream to this point.
- *
- * @param readAheadLimit Limit on the number of characters that may be
- * read while still preserving the mark. Because
- * the stream's input comes from a character array,
- * there is no actual limit; hence this argument is
- * ignored.
- * @throws IOException If an I/O error occurs
- */
- @Override
- public void mark(int readAheadLimit) throws IOException {
- ensureOpen();
- markedPos = pos;
- }
-
- /**
- * Resets the stream to the most recent mark, or to the beginning if it has
- * never been marked.
- *
- * @throws IOException If an I/O error occurs
- */
- @Override
- public void reset() throws IOException {
- ensureOpen();
- pos = markedPos;
- }
-
- /**
- * Closes the stream and releases any system resources associated with
- * it. Once the stream has been closed, further read(), ready(),
- * mark(), reset(), or skip() invocations will throw an IOException.
- * Closing a previously closed stream has no effect.
- */
- @Override
- public void close() {
- buf = null;
- }
-}
diff --git a/server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java b/server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java
deleted file mode 100644
index 87313eae7f938..0000000000000
--- a/server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.io;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Arrays;
-
-/**
- * A similar class to {@link java.io.CharArrayWriter} allowing to get the underlying char[] buffer.
- */
-public class FastCharArrayWriter extends Writer {
-
- /**
- * The buffer where data is stored.
- */
- protected char buf[];
-
- /**
- * The number of chars in the buffer.
- */
- protected int count;
-
- /**
- * Creates a new CharArrayWriter.
- */
- public FastCharArrayWriter() {
- this(32);
- }
-
- /**
- * Creates a new CharArrayWriter with the specified initial size.
- *
- * @param initialSize an int specifying the initial buffer size.
- * @throws IllegalArgumentException if initialSize is negative
- */
- public FastCharArrayWriter(int initialSize) {
- if (initialSize < 0) {
- throw new IllegalArgumentException("Negative initial size: "
- + initialSize);
- }
- buf = new char[initialSize];
- }
-
- /**
- * Writes a character to the buffer.
- */
- @Override
- public void write(int c) {
- int newcount = count + 1;
- if (newcount > buf.length) {
- buf = Arrays.copyOf(buf, Math.max(buf.length << 1, newcount));
- }
- buf[count] = (char) c;
- count = newcount;
- }
-
- /**
- * Writes characters to the buffer.
- *
- * @param c the data to be written
- * @param off the start offset in the data
- * @param len the number of chars that are written
- */
- @Override
- public void write(char c[], int off, int len) {
- if ((off < 0) || (off > c.length) || (len < 0) ||
- ((off + len) > c.length) || ((off + len) < 0)) {
- throw new IndexOutOfBoundsException();
- } else if (len == 0) {
- return;
- }
- int newcount = count + len;
- if (newcount > buf.length) {
- buf = Arrays.copyOf(buf, Math.max(buf.length << 1, newcount));
- }
- System.arraycopy(c, off, buf, count, len);
- count = newcount;
- }
-
- /**
- * Write a portion of a string to the buffer.
- *
- * @param str String to be written from
- * @param off Offset from which to start reading characters
- * @param len Number of characters to be written
- */
- @Override
- public void write(String str, int off, int len) {
- int newcount = count + len;
- if (newcount > buf.length) {
- buf = Arrays.copyOf(buf, Math.max(buf.length << 1, newcount));
- }
- str.getChars(off, off + len, buf, count);
- count = newcount;
- }
-
- /**
- * Writes the contents of the buffer to another character stream.
- *
- * @param out the output stream to write to
- * @throws java.io.IOException If an I/O error occurs.
- */
- public void writeTo(Writer out) throws IOException {
- out.write(buf, 0, count);
- }
-
- /**
- * Appends the specified character sequence to this writer.
- *
- * An invocation of this method of the form out.append(csq) - * behaves in exactly the same way as the invocation - *
- * out.write(csq.toString())- * - *
Depending on the specification of toString for the - * character sequence csq, the entire sequence may not be - * appended. For instance, invoking the toString method of a - * character buffer will return a subsequence whose content depends upon - * the buffer's position and limit. - * - * @param csq The character sequence to append. If csq is - * null, then the four characters "null" are - * appended to this writer. - * @return This writer - * @since 1.5 - */ - @Override - public FastCharArrayWriter append(CharSequence csq) { - String s = (csq == null ? "null" : csq.toString()); - write(s, 0, s.length()); - return this; - } - - /** - * Appends a subsequence of the specified character sequence to this writer. - *
- * An invocation of this method of the form out.append(csq, start, - * end) when csq is not null, behaves in - * exactly the same way as the invocation - *
- * out.write(csq.subSequence(start, end).toString())- * - * @param csq The character sequence from which a subsequence will be - * appended. If csq is null, then characters - * will be appended as if csq contained the four - * characters "null". - * @param start The index of the first character in the subsequence - * @param end The index of the character following the last character in the - * subsequence - * @return This writer - * @throws IndexOutOfBoundsException If start or end are negative, start - * is greater than end, or end is greater than - * csq.length() - * @since 1.5 - */ - @Override - public FastCharArrayWriter append(CharSequence csq, int start, int end) { - String s = (csq == null ? "null" : csq).subSequence(start, end).toString(); - write(s, 0, s.length()); - return this; - } - - /** - * Appends the specified character to this writer. - *
- * An invocation of this method of the form out.append(c) - * behaves in exactly the same way as the invocation - *
- * out.write(c)- * - * @param c The 16-bit character to append - * @return This writer - * @since 1.5 - */ - @Override - public FastCharArrayWriter append(char c) { - write(c); - return this; - } - - /** - * Resets the buffer so that you can use it again without - * throwing away the already allocated buffer. - */ - public void reset() { - count = 0; - } - - /** - * Returns a copy of the input data. - * - * @return an array of chars copied from the input data. - */ - public char toCharArray()[] { - return Arrays.copyOf(buf, count); - } - - /** - * Returns the underlying char array. Note, use {@link #size()} in order to know the size of - * of the actual content within the array. - */ - public char[] unsafeCharArray() { - return buf; - } - - /** - * Returns the current size of the buffer. - * - * @return an int representing the current size of the buffer. - */ - public int size() { - return count; - } - - /** - * Converts input data to a string. - * - * @return the string. - */ - @Override - public String toString() { - return new String(buf, 0, count); - } - - /** - * Converts the input data to a string with trimmed whitespaces. - */ - public String toStringTrim() { - int st = 0; - int len = count; - char[] val = buf; /* avoid getfield opcode */ - - while ((st < len) && (val[st] <= ' ')) { - st++; - len--; - } - while ((st < len) && (val[len - 1] <= ' ')) { - len--; - } - return new String(buf, st, len); - } - - /** - * Flush the stream. - */ - @Override - public void flush() { - } - - /** - * Close the stream. This method does not release the buffer, since its - * contents might still be required. Note: Invoking this method in this class - * will have no effect. - */ - @Override - public void close() { - } - -} diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java index b874c3aeca311..4d6fceba869ff 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -36,8 +36,8 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.common.io.FastCharArrayReader; +import java.io.CharArrayReader; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -314,7 +314,7 @@ public static int analyze(Analyzer analyzer, BytesRef toAnalyze, String field, T spare.copyUTF8Bytes(toAnalyze); CharsRef charsRef = spare.get(); try (TokenStream ts = analyzer.tokenStream( - field, new FastCharArrayReader(charsRef.chars, charsRef.offset, charsRef.length))) { + field, new CharArrayReader(charsRef.chars, charsRef.offset, charsRef.length))) { return analyze(ts, consumer); } } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java index e6e1767386061..eb9694c6039b7 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java @@ -27,10 +27,10 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.common.io.FastCharArrayReader; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.Candidate; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.CandidateSet; +import java.io.CharArrayReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -139,7 +139,7 @@ public Result getCorrections(Analyzer analyzer, BytesRef query, CandidateGenerat public TokenStream tokenStream(Analyzer analyzer, BytesRef query, CharsRefBuilder spare, String field) throws IOException { spare.copyUTF8Bytes(query); - return analyzer.tokenStream(field, new FastCharArrayReader(spare.chars(), 0, spare.length())); + return analyzer.tokenStream(field, new CharArrayReader(spare.chars(), 0, spare.length())); } public static class Result {