[hive] branch master updated: HIVE-25679: Use serdeContants#COLLECTION_DELIM in MultiDelimSerDe (#2768) (Franck Thang reviewed by Zoltan Haindrich)

[kgyrtkirk]

This is an automated email from the ASF dual-hosted git repository.

kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 15263be  HIVE-25679: Use serdeContants#COLLECTION_DELIM in 
MultiDelimSerDe (#2768) (Franck Thang reviewed by Zoltan Haindrich)
15263be is described below

commit 15263be5abe2050fe1f2cabf30ff77852728bcac
Author: Franck <franck.th...@epita.fr>
AuthorDate: Mon Nov 22 12:57:18 2021 +0100

    HIVE-25679: Use serdeContants#COLLECTION_DELIM in MultiDelimSerDe (#2768) 
(Franck Thang reviewed by Zoltan Haindrich)
---
 serde/src/java/org/apache/hadoop/hive/serde2/MultiDelimitSerDe.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/serde/src/java/org/apache/hadoop/hive/serde2/MultiDelimitSerDe.java 
b/serde/src/java/org/apache/hadoop/hive/serde2/MultiDelimitSerDe.java
index 42734af..0ec33f4 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/MultiDelimitSerDe.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/MultiDelimitSerDe.java
@@ -65,8 +65,6 @@ import org.apache.hadoop.io.Writable;
 public class MultiDelimitSerDe extends AbstractEncodingAwareSerDe {
 
   private static final byte[] DEFAULT_SEPARATORS = {(byte) 1, (byte) 2, (byte) 
3};
-  // Due to HIVE-6404, define our own constant
-  private static final String COLLECTION_DELIM = "collection.delim";
 
   // actual delimiter(fieldDelimited) is replaced by REPLACEMENT_DELIM in row.
   public static final String REPLACEMENT_DELIM_SEQUENCE = "\1";
@@ -107,8 +105,7 @@ public class MultiDelimitSerDe extends 
AbstractEncodingAwareSerDe {
     }
 
     // get the collection separator and map key separator
-    // TODO: use serdeConstants.COLLECTION_DELIM when the typo is fixed
-    collSep = LazyUtils.getByte(properties.getProperty(COLLECTION_DELIM),
+    collSep = 
LazyUtils.getByte(properties.getProperty(serdeConstants.COLLECTION_DELIM),
         DEFAULT_SEPARATORS[1]);
     keySep = 
LazyUtils.getByte(properties.getProperty(serdeConstants.MAPKEY_DELIM),
         DEFAULT_SEPARATORS[2]);