Revert changes to Text class

plugins/examples/custom-suggester/src/main/java/org/elasticsearch/example/customsuggester/CustomSuggester.java

@@ -11,7 +11,7 @@
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.util.CharsRefBuilder;
-import org.elasticsearch.xcontent.Text;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.search.suggest.Suggester;
 

plugins/examples/custom-suggester/src/main/java/org/elasticsearch/example/customsuggester/CustomSuggestion.java

@@ -11,7 +11,7 @@
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.xcontent.Text;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentBuilder;

server/src/main/java/org/elasticsearch/cluster/service/MasterService.java

@@ -36,6 +36,7 @@
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
 import org.elasticsearch.common.util.concurrent.CountDown;
@@ -55,7 +56,6 @@
 import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.threadpool.Scheduler;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.xcontent.Text;
 
 import java.util.ArrayList;
 import java.util.Collections;

server/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java

@@ -13,8 +13,8 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 

server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java

@@ -23,12 +23,12 @@
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.settings.SecureString;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.core.CharArrays;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.EOFException;
 import java.io.FilterInputStream;
@@ -391,23 +391,13 @@ public Text readOptionalText() throws IOException {
         if (length == -1) {
             return null;
         }
-        byte[] bytes = new byte[length];
-        if (length > 0) {
-            readBytes(bytes, 0, length);
-        }
-        var byteBuff = ByteBuffer.wrap(bytes);
-        return new Text(byteBuff);
+        return new Text(readBytesReference(length));
     }
 
     public Text readText() throws IOException {
-        // use Text so we can cache the string if it's ever converted to it
+        // use StringAndBytes so we can cache the string if it's ever converted to it
         int length = readInt();
-        byte[] bytes = new byte[length];
-        if (length > 0) {
-            readBytes(bytes, 0, length);
-        }
-        var byteBuff = ByteBuffer.wrap(bytes);
-        return new Text(byteBuff);
+        return new Text(readBytesReference(length));
     }
 
     @Nullable

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -22,11 +22,11 @@
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.io.stream.Writeable.Writer;
 import org.elasticsearch.common.settings.SecureString;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.ByteUtils;
 import org.elasticsearch.core.CharArrays;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
@@ -419,7 +419,7 @@ public void writeText(Text text) throws IOException {
             writeInt(spare.length());
             write(spare.bytes(), 0, spare.length());
         } else {
-            BytesReference bytes = BytesReference.fromByteBuffer(text.bytes());
+            BytesReference bytes = text.bytes();
             writeInt(bytes.length());
             bytes.writeTo(this);
         }

libs/x-content/src/main/java/org/elasticsearch/xcontent/Text.java → server/src/main/java/org/elasticsearch/common/text/Text.java

@@ -6,17 +6,22 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.xcontent;
+package org.elasticsearch.common.text;
+
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.xcontent.ToXContentFragment;
+import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 /**
- * Both {@link String} and {@link ByteBuffer} representation of the text. Starts with one of those, and if
+ * Both {@link String} and {@link BytesReference} representation of the text. Starts with one of those, and if
  * the other is requests, caches the other one in a local reference so no additional conversion will be needed.
  */
-public final class Text implements XContentString, Comparable<Text>, ToXContentFragment {
+public final class Text implements Comparable<Text>, ToXContentFragment {
 
     public static final Text[] EMPTY_ARRAY = new Text[0];
 
@@ -31,43 +36,31 @@ public static Text[] convertFromStringArray(String[] strings) {
         return texts;
     }
 
-    private ByteBuffer bytes;
+    private BytesReference bytes;
     private String text;
     private int hash;
-    private int stringLength = -1;
-
-    /**
-     * Construct a Text from a UTF-8 encoded ByteBuffer. Since no string length is specified, {@link #stringLength()}
-     * will perform a string conversion to measure the string length.
-     */
-    public Text(ByteBuffer bytes) {
-        this.bytes = bytes;
-    }
 
-    /**
-     * Construct a Text from a UTF-8 encoded ByteBuffer and an explicit string length. Used to avoid string conversion
-     * in {@link #stringLength()}.
-     */
-    public Text(ByteBuffer bytes, int stringLength) {
+    public Text(BytesReference bytes) {
         this.bytes = bytes;
-        this.stringLength = stringLength;
     }
 
     public Text(String text) {
         this.text = text;
     }
 
     /**
-     * Whether a {@link ByteBuffer} view of the data is already materialized.
+     * Whether a {@link BytesReference} view of the data is already materialized.
      */
     public boolean hasBytes() {
         return bytes != null;
     }
 
-    @Override
-    public ByteBuffer bytes() {
+    /**
+     * Returns a {@link BytesReference} view of the data.
+     */
+    public BytesReference bytes() {
         if (bytes == null) {
-            bytes = StandardCharsets.UTF_8.encode(text);
+            bytes = new BytesArray(text.getBytes(StandardCharsets.UTF_8));
         }
         return bytes;
     }
@@ -79,20 +72,11 @@ public boolean hasString() {
         return text != null;
     }
 
-    @Override
+    /**
+     * Returns a {@link String} view of the data.
+     */
     public String string() {
-        if (text == null) {
-            text = StandardCharsets.UTF_8.decode(bytes).toString();
-        }
-        return text;
-    }
-
-    @Override
-    public int stringLength() {
-        if (stringLength < 0) {
-            stringLength = string().length();
-        }
-        return stringLength;
+        return text == null ? bytes.utf8ToString() : text;
     }
 
     @Override
@@ -131,8 +115,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         } else {
             // TODO: TextBytesOptimization we can use a buffer here to convert it? maybe add a
             // request to jackson to support InputStream as well?
-            assert bytes.hasArray();
-            return builder.utf8Value(bytes.array(), bytes.arrayOffset() + bytes.position(), bytes.remaining());
+            BytesRef br = this.bytes().toBytesRef();
+            return builder.utf8Value(br.bytes, br.offset, br.length);
         }
     }
 }

server/src/main/java/org/elasticsearch/search/SearchHit.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.xcontent.ChunkedToXContent;
 import org.elasticsearch.common.xcontent.XContentHelper;
@@ -38,7 +39,6 @@
 import org.elasticsearch.search.lookup.Source;
 import org.elasticsearch.transport.LeakTracker;
 import org.elasticsearch.transport.RemoteClusterAware;
-import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;

server/src/main/java/org/elasticsearch/search/SearchShardTarget.java

@@ -12,10 +12,10 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.transport.RemoteClusterAware;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 import java.util.Objects;

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/DefaultHighlighter.java

@@ -21,6 +21,7 @@
 import org.elasticsearch.common.CheckedSupplier;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.lucene.Lucene;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.IdFieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
@@ -33,7 +34,6 @@
 import org.elasticsearch.lucene.search.uhighlight.Snippet;
 import org.elasticsearch.search.fetch.FetchContext;
 import org.elasticsearch.search.fetch.FetchSubPhase;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 import java.text.BreakIterator;

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java

@@ -23,6 +23,7 @@
 import org.apache.lucene.search.vectorhighlight.SingleFragListBuilder;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.TextSearchInfo;
@@ -32,7 +33,6 @@
 import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext.Field;
 import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext.FieldOptions;
 import org.elasticsearch.search.lookup.Source;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 import java.text.BreakIterator;

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java

@@ -12,7 +12,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.xcontent.Text;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java

@@ -24,12 +24,12 @@
 import org.apache.lucene.search.highlight.TextFragment;
 import org.apache.lucene.util.BytesRefHash;
 import org.elasticsearch.common.lucene.Lucene;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.lucene.search.uhighlight.QueryMaxAnalyzedOffset;
 import org.elasticsearch.search.fetch.FetchContext;
 import org.elasticsearch.search.fetch.FetchSubPhase;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 import java.util.ArrayList;

server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java

@@ -19,12 +19,12 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.sort.SortAndFormats;
 import org.elasticsearch.xcontent.ParseField;
-import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;

server/src/main/java/org/elasticsearch/search/suggest/Suggest.java

@@ -14,13 +14,13 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.rest.action.search.RestSearchAction;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry;
 import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry.Option;
 import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
 import org.elasticsearch.xcontent.ParseField;
-import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 

server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java

@@ -19,10 +19,10 @@
 import org.apache.lucene.search.suggest.document.TopSuggestDocs;
 import org.apache.lucene.search.suggest.document.TopSuggestDocsCollector;
 import org.apache.lucene.util.CharsRefBuilder;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.index.mapper.CompletionFieldMapper;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.search.suggest.Suggester;
-import org.elasticsearch.xcontent.Text;
 
 import java.io.IOException;
 import java.util.Collections;

server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java

@@ -14,12 +14,12 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.Lucene;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.xcontent.ParseField;
-import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;