Revert "HADOOP-17430. Restore ability to set Text to empty byte array (#2545)"

This reverts commit 9e85eb9a2e.

Change-Id: Id1ac803b29931b0f643cb37bbe58534726c36f1e
This commit is contained in:
Steve Loughran 2021-01-08 10:49:31 +00:00
parent 98565b6c60
commit a2ae0d7079
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 2 additions and 29 deletions

View File

@ -203,19 +203,10 @@ public void set(String string) {
} }
} }
/** /** Set to a utf8 byte array
* Set to a utf8 byte array. If the length of <code>utf8</code> is
* <em>zero</em>, actually clear {@link #bytes} and any existing
* data is lost.
*/ */
public void set(byte[] utf8) { public void set(byte[] utf8) {
if (utf8.length == 0) { set(utf8, 0, utf8.length);
bytes = EMPTY_BYTES;
length = 0;
textLength = -1;
} else {
set(utf8, 0, utf8.length);
}
} }
/** copy a text. */ /** copy a text. */

View File

@ -449,22 +449,4 @@ public void testUtf8Length() {
2, Text.utf8Length(new String(new char[]{(char)254}))); 2, Text.utf8Length(new String(new char[]{(char)254})));
} }
@Test
public void testSetBytes(){
Text a = new Text(new byte[100]);
assertEquals("testSetBytes100 getLength error !",
100, a.getLength());
assertEquals("testSetBytes100 getBytes.length error !",
100, a.getBytes().length);
assertEquals("testSetBytes100 getTextLength error !",
100, a.getTextLength());
a.set(new byte[0]);
assertEquals("testSetBytes0 getLength error !",
0, a.getLength());
assertEquals("testSetBytes0 getBytes.length error !",
0, a.getBytes().length);
assertEquals("testSetBytes0 getTextLength error !",
0, a.getTextLength());
}
} }