Update SerDe Name and License and minor PR fixes

Author: bangtim

Diff for: core/trino-spi/src/main/java/io/trino/spi/block/BlockUtil.java

@@ -229,7 +229,7 @@ static int countAndMarkSelectedPositionsFromOffsets(boolean[] positions, int[] o
     }
 
     /**
-     * Returns <tt>true</tt> if the two specified arrays contain the same object in every position.
+     * Returns <var>true</var> if the two specified arrays contain the same object in every position.
      * Unlike the {@link Arrays#equals(Object[], Object[])} method, this method compares using reference equals.
      */
     static boolean arraySame(Object[] array1, Object[] array2)

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/BooleanConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class BooleanConverter
         extends IConverter<Boolean>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/ByteConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class ByteConverter
         extends IConverter<Byte>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Converter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -30,6 +28,8 @@
  * @author anthonyc
  *
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class Converter
 {
     private Converter() {}

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/DateConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -19,6 +17,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class DateConverter
         extends IConverter<Date>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Discovery.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -36,6 +34,8 @@
  * @author anthonycorbacho
  * @since 0.0.2
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class Discovery
 {
     private Grok grok;
@@ -61,6 +61,7 @@ private Map<String, Grok> sort(Map<String, Grok> groks)
         List<Grok> groky = new ArrayList<Grok>(groks.values());
         Map<String, Grok> mGrok = new LinkedHashMap<String, Grok>();
         Collections.sort(groky, new Comparator<Grok>() {
+            @Override
             public int compare(Grok g1, Grok g2)
             {
                 return (this.complexity(g1.getNamedRegex()) < this.complexity(g2.getNamedRegex())) ? 1

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/DoubleConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class DoubleConverter
         extends IConverter<Double>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/FloatConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class FloatConverter
         extends IConverter<Float>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Garbage.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -28,6 +26,8 @@
  * @author anthonycorbacho
  * @since 0.0.2
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class Garbage
 {
     private List<String> toRemove;

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Grok.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -24,6 +22,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -51,6 +50,8 @@
  * @since 0.0.1
  * @author anthonycorbacho
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class Grok
         implements Serializable
 {
@@ -244,7 +245,7 @@ public static Grok create(String grokPatternPath, String grokDatatypePath, Strin
     static Reader getFileFromResouces(String filePath)
             throws GrokException
     {
-        Reader reader = new InputStreamReader(Grok.class.getClassLoader().getResourceAsStream(filePath));
+        Reader reader = new InputStreamReader(Grok.class.getClassLoader().getResourceAsStream(filePath), Charset.defaultCharset());
         if (reader == null) {
             throw new GrokException("File <" + filePath + "> not found.");
         }
@@ -481,7 +482,7 @@ public void addDateFormatFromReader(Reader r)
 
     // match log with regex and capture results
     /**
-     * Match the given <tt>log</tt> with the named regex.
+     * Match the given <var>log</var> with the named regex.
      * And return the json representation of the matched element
      *
      * @param log : log to match
@@ -496,7 +497,7 @@ public String capture(String log)
     }
 
     /**
-     * Match the given list of <tt>log</tt> with the named regex
+     * Match the given list of <var>log</var> with the named regex
      * and return the list of json representation of the matched elements.
      *
      * @param logs : list of log
@@ -521,7 +522,7 @@ public List<String> captures(List<String> logs)
     }
 
     /**
-     * Match the given <tt>text</tt> with the named regex
+     * Match the given <var>text</var> with the named regex
      * {@code Grok} will extract data from the string and get an extence of {@link Match}.
      *
      * @param text : Single line of log
@@ -593,7 +594,7 @@ public void compile(String pattern, boolean namedOnly)
             // Match %{Foo=regex} -> add new regex definition
             if (m.find()) {
                 continueIteration = true;
-                Map<String, String> group = GrokUtils.namedGroups(m, m.group()); // AMZN - probably don't need this tag since it's going into OSS Trino
+                Map<String, String> group = GrokUtils.namedGroups(m, m.group());
                 if (group.get("definition") != null) {
                     try {
                         addPattern(group.get("pattern"), group.get("definition"));
@@ -692,9 +693,9 @@ public String getSaved_pattern()
         return savedPattern;
     }
 
-    public void setSaved_pattern(String savedpattern)
+    public void setSaved_pattern(String savedPattern)
     {
-        this.savedPattern = savedpattern;
+        this.savedPattern = savedPattern;
     }
 
     public boolean getStrictMode()

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/GrokDeserializer.java

@@ -35,7 +35,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.hive.formats.HiveFormatUtils.parseHiveDate;
@@ -62,8 +61,6 @@ public class GrokDeserializer
         implements LineDeserializer
 {
     private final List<Column> columns;
-    private final String inputFormat;
-    private final Optional<String> inputGrokCustomPatterns;
     private Grok grokPattern;
     private final List<Type> types;
 
@@ -74,9 +71,6 @@ public GrokDeserializer(List<Column> columns, String inputFormat, String inputGr
                 .map(Column::type)
                 .collect(toImmutableList());
 
-        this.inputFormat = inputFormat;
-        this.inputGrokCustomPatterns = Optional.ofNullable(inputGrokCustomPatterns);
-
         //assert that columns size and types size are the same
         if (columns.size() != types.size()) {
             throw new RuntimeException("Number of columns does not match the number of types for each column");

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/GrokDeserializerFactory.java

@@ -31,7 +31,7 @@ public class GrokDeserializerFactory
     @Override
     public Set<String> getHiveSerDeClassNames()
     {
-        return ImmutableSet.of("com.amazonaws.glue.serde.GrokSerDe"); //what should this value be (there isn't a hive grok serde)
+        return ImmutableSet.of("com.amazonaws.serde.GrokSerDe");
     }
 
     @Override

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/GrokUtils.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -28,6 +26,8 @@
  * @author anthonycorbacho
  * @since 0.0.6
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class GrokUtils
 {
     private GrokUtils() {}

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/IConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 abstract class IConverter<T>
 {
     public T convert(String value, String informat)

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/IntegerConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class IntegerConverter
         extends IConverter<Integer>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/KeyValue.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class KeyValue
 {
     private String key;

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/LongConverter.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -15,6 +13,8 @@
  */
 package io.trino.hive.formats.line.grok;
 
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 class LongConverter
         extends IConverter<Long>
 {

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Match.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -31,6 +29,8 @@
  * @author anthonycorbacho
  * @since 0.0.1
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 public class Match
 {
     private static final Gson PRETTY_GSON =
@@ -149,7 +149,7 @@ public String getSubject()
     }
 
     /**
-     * Match to the <tt>subject</tt> the <tt>regex</tt> and save the matched element into a map.
+     * Match to the <var>subject</var> the <var>regex</var> and save the matched element into a map.
      *
      */
     public void captures()

Diff for: lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/grok/Pile.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 Anthony Corbacho, and contributors.
- *
  * Licensed 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
@@ -28,6 +26,8 @@
  * @author anthonycorbacho
  * @since 0.0.1
  */
+// Note: this code is forked from oi.thekraken.grok.api
+// Copyright 2014 Anthony Corbacho, and contributors.
 @Deprecated
 public class Pile
 {
@@ -117,7 +117,7 @@ public void compile(String pattern)
         Map<String, String> map = new TreeMap<String, String>();
 
         for (Map.Entry<String, String> entry : patterns.entrySet()) {
-            if (!map.containsValue((entry.getValue()))) {
+            if (!map.containsValue(entry.getValue())) {
                 grok.addPattern(entry.getKey(), entry.getValue());
             }
         }