Bump jackson.version from 2.9.9 to 2.12.2

accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java

@@ -54,6 +54,7 @@ public class AccumuloSerDe extends AbstractSerDe {
 
   private static final Logger log = LoggerFactory.getLogger(AccumuloSerDe.class);
 
+  @Override
   public void initialize(Configuration conf, Properties properties) throws SerDeException {
     accumuloSerDeParameters = new AccumuloSerDeParameters(conf, properties, getClass().getName());
 
@@ -109,6 +110,7 @@ public LazyAccumuloRow getCachedRow() {
     return cachedRow;
   }
 
+  @Override
   public Class<? extends Writable> getSerializedClass() {
     return Mutation.class;
   }
@@ -135,12 +137,14 @@ public Object deserialize(Writable writable) throws SerDeException {
     return cachedRow;
   }
 
+  @Override
   public ObjectInspector getObjectInspector() throws SerDeException {
     return cachedObjectInspector;
   }
 
+  @Override
   public SerDeStats getSerDeStats() {
-    throw new UnsupportedOperationException("SerdeStats not supported.");
+    return null;
   }
 
   public AccumuloSerDeParameters getParams() {

accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloRangeGenerator.java

@@ -38,7 +38,7 @@
 import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc;
 import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
 import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
-import org.apache.hadoop.hive.ql.udf.UDFToString;
+import org.apache.hadoop.hive.ql.udf.generic.GenericUDFToString;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPAnd;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual;
@@ -388,12 +388,11 @@ public void testCastExpression() throws Exception {
     ExprNodeGenericFuncDesc addition = new ExprNodeGenericFuncDesc(TypeInfoFactory.intTypeInfo, plus, Arrays.asList(fourty, fifty));
 
     // cast(.... as string)
-    UDFToString stringCast = new UDFToString();
-    GenericUDFBridge stringCastBridge = new GenericUDFBridge("cast", false, stringCast.getClass().getName());
+    GenericUDFToString stringCast = new GenericUDFToString();
 
     // cast (40 + 50 as string)
     ExprNodeGenericFuncDesc cast = new ExprNodeGenericFuncDesc(TypeInfoFactory.stringTypeInfo,
-        stringCastBridge, "cast", Collections.<ExprNodeDesc> singletonList(addition));
+        stringCast, "cast", Collections.<ExprNodeDesc> singletonList(addition));
 
     ExprNodeDesc key = new ExprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, "key", null,
         false);

beeline/src/java/org/apache/hive/beeline/BeeLine.java

@@ -65,6 +65,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.ServiceLoader;
@@ -94,6 +95,7 @@
 import org.apache.hive.beeline.hs2connection.HiveSiteHS2ConnectionFileParser;
 import org.apache.hive.beeline.hs2connection.UserHS2ConnectionFileParser;
 import org.apache.hive.common.util.ShutdownHookManager;
+import org.apache.hive.jdbc.HiveConnection;
 import org.apache.hive.jdbc.JdbcUriParseException;
 import org.apache.hive.jdbc.Utils;
 import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
@@ -389,6 +391,12 @@ public class BeeLine implements Closeable {
         .withLongOpt("help")
         .withDescription("Display this message")
         .create('h'));
+
+    // -getUrlsFromBeelineSite
+    options.addOption(OptionBuilder
+        .withLongOpt("getUrlsFromBeelineSite")
+        .withDescription("Print all urls from beeline-site.xml, if it is present in the classpath")
+        .create());
 
     // Substitution option --hivevar
     options.addOption(OptionBuilder
@@ -712,7 +720,7 @@ private void processBeeLineOpt(final String arg) {
 
     private boolean isBeeLineOpt(String arg) {
       return arg.startsWith("--") && !(HIVE_VAR_PREFIX.equals(arg) || (HIVE_CONF_PREFIX.equals(arg))
-          || "--help".equals(arg) || PROP_FILE_PREFIX.equals(arg));
+          || "--help".equals(arg) || PROP_FILE_PREFIX.equals(arg) || "--getUrlsFromBeelineSite".equals(arg));
     }
   }
 
@@ -843,6 +851,12 @@ private boolean connectUsingArgs(BeelineParser beelineParser, CommandLine cl) {
       getOpts().setHelpAsked(true);
       return true;
     }
+
+    if (cl.hasOption("getUrlsFromBeelineSite")) {
+      printBeelineSiteUrls();
+      getOpts().setBeelineSiteUrlsAsked(true);
+      return true;
+    }
 
     Properties hiveVars = cl.getOptionProperties("hivevar");
     for (String key : hiveVars.stringPropertyNames()) {
@@ -919,6 +933,44 @@ private boolean connectUsingArgs(BeelineParser beelineParser, CommandLine cl) {
     return false;
   }
 
+  private void printBeelineSiteUrls() {
+    BeelineSiteParser beelineSiteParser = getUserBeelineSiteParser();
+    if (!beelineSiteParser.configExists()) {
+      output("No beeline-site.xml in the path", true);
+    }
+    if (beelineSiteParser.configExists()) {
+      // Get the named url from user specific config file if present
+      try {
+        Properties userNamedConnectionURLs = beelineSiteParser.getConnectionProperties();
+        userNamedConnectionURLs.remove(BeelineSiteParser.DEFAULT_NAMED_JDBC_URL_PROPERTY_KEY);
+        StringBuilder sb = new StringBuilder("urls: ");
+        for (Entry<Object, Object> entry : userNamedConnectionURLs.entrySet()) {
+          String urlFromBeelineSite = (String) entry.getValue();
+          if (isZkBasedUrl(urlFromBeelineSite)) {
+            List<String> jdbcUrls = HiveConnection.getAllUrlStrings(urlFromBeelineSite);
+            for (String jdbcUrl : jdbcUrls) {
+              sb.append(jdbcUrl + ", ");
+            }
+          } else {
+            sb.append(urlFromBeelineSite + ", ");
+          }
+        }
+        output(sb.toString(), true);
+      } catch (Exception e) {
+        output(e.getMessage(), true);
+        return;
+      }
+    }
+  }
+
+  private boolean isZkBasedUrl(String urlFromBeelineSite) {
+    String zkJdbcUriParam = ("serviceDiscoveryMode=zooKeeper").toLowerCase();
+    if (urlFromBeelineSite.toLowerCase().contains(zkJdbcUriParam)) {
+      return true;
+    }
+    return false;
+  }
+
   private void setHiveConfVar(String key, String val) {
     getOpts().getHiveConfVariables().put(key, val);
     if (HiveConf.ConfVars.HIVE_EXECUTION_ENGINE.varname.equals(key) && "mr".equals(val)) {
@@ -1060,6 +1112,9 @@ public int begin(String[] args, InputStream inputStream) throws IOException {
     if (getOpts().isHelpAsked()) {
       return 0;
     }
+    if (getOpts().isBeelineSiteUrlsAsked()) {
+      return 0;
+    }
     if (getOpts().getScriptFile() != null) {
       return executeFile(getOpts().getScriptFile());
     }

beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java

@@ -114,6 +114,7 @@ class BeeLineOpts implements Completer {
   private Map<String, String> hiveVariables = new HashMap<String, String>();
   private Map<String, String> hiveConfVariables = new HashMap<String, String>();
   private boolean helpAsked;
+  private boolean beelineSiteUrlsAsked;
 
   private String lastConnectedUrl = null;
 
@@ -503,11 +504,12 @@ public void setEscapeCRLF(boolean escapeCRLF) {
   public boolean getEscapeCRLF() {
     if (beeLine.isBeeLine()) {
       return escapeCRLF;
-    } else {
-      boolean flag;
-      HiveConf conf = beeLine.getCommands().getHiveConf(true);
-      flag = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CLI_PRINT_ESCAPE_CRLF);
-      return flag;
+    } else { //hive cli
+      if(conf != null) {
+        return HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CLI_PRINT_ESCAPE_CRLF);
+      } else {
+        return false;
+      }
     }
   }
 
@@ -678,7 +680,16 @@ public void setHelpAsked(boolean helpAsked) {
   public boolean isHelpAsked() {
     return helpAsked;
   }
+
+  public void setBeelineSiteUrlsAsked(boolean beelineSiteUrlsAsked) {
+    this.beelineSiteUrlsAsked = beelineSiteUrlsAsked;
+  }
+
+  public boolean isBeelineSiteUrlsAsked() {
+    return beelineSiteUrlsAsked;
+  }
 
+
   public String getLastConnectedUrl(){
     return lastConnectedUrl;
   }

beeline/src/java/org/apache/hive/beeline/hs2connection/BeelineSiteParser.java

@@ -63,7 +63,7 @@ public BeelineSiteParser() {
       locations
           .add(System.getenv("HIVE_CONF_DIR") + File.separator + DEFAULT_BEELINE_SITE_FILE_NAME);
     }
-    locations.add(ETC_HIVE_CONF_LOCATION + DEFAULT_BEELINE_SITE_FILE_NAME);
+    locations.add(ETC_HIVE_CONF_LOCATION + File.separator + DEFAULT_BEELINE_SITE_FILE_NAME);
   }
 
   @VisibleForTesting

beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java

@@ -56,7 +56,7 @@ public UserHS2ConnectionFileParser() {
       locations.add(
           System.getenv("HIVE_CONF_DIR") + File.separator + DEFAULT_CONNECTION_CONFIG_FILE_NAME);
     }
-    locations.add(ETC_HIVE_CONF_LOCATION + DEFAULT_CONNECTION_CONFIG_FILE_NAME);
+    locations.add(ETC_HIVE_CONF_LOCATION + File.separator + DEFAULT_CONNECTION_CONFIG_FILE_NAME);
   }
 
   @VisibleForTesting

beeline/src/main/resources/BeeLine.properties

@@ -211,6 +211,7 @@ cmd-usage: Usage: java org.apache.hive.cli.beeline.BeeLine \n \
 \  --delimiter=DELIMITER           set the query delimiter; multi-char delimiters are allowed, but quotation\n \
 \                                  marks, slashes, and -- are not allowed; defaults to ;\n \
 \  --convertBinaryArrayToString=[true/false]    display binary column data as string or as byte array \n \
+\  --getUrlsFromBeelineSite        Print all urls from beeline-site.xml, if it is present in the classpath\n \
 \  --help                          display this message\n \
 \n \
 \  Example:\n \

beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java

@@ -24,7 +24,6 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.Ignore;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -253,7 +252,6 @@ public void testUseInvalidDB() {
         "hive (invalidDB)>", os, null, ERRNO_OTHER, false);
   }
 
-  @Ignore("Broken tests -- HIVE-18806")
   @Test
   public void testNoErrorDB() {
     verifyCMD(null, "Error: Method not supported (state=,code=0)", errS, new String[] { "-e", "show tables;" },

beeline/src/test/org/apache/hive/beeline/hs2connection/TestBeelineSiteParser.java

@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF 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.apache.hive.beeline.hs2connection;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestBeelineSiteParser {
+    @Test
+    public void testConfigLocationPathInEtc() throws Exception {
+        BeelineSiteParser testHS2ConfigManager =
+                new BeelineSiteParser();
+        Field locations = testHS2ConfigManager.getClass().getDeclaredField("locations");
+        locations.setAccessible(true);
+        Collection<String> locs = (List<String>)locations.get(testHS2ConfigManager);
+        Assert.assertTrue(locs.contains(
+                BeelineSiteParser.ETC_HIVE_CONF_LOCATION +
+                        File.separator +
+                        BeelineSiteParser.DEFAULT_BEELINE_SITE_FILE_NAME));
+
+    }
+}

beeline/src/test/org/apache/hive/beeline/hs2connection/TestUserHS2ConnectionFileParser.java

@@ -18,7 +18,9 @@
 package org.apache.hive.beeline.hs2connection;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.hive.beeline.hs2connection.BeelineHS2ConnectionFileParseException;
@@ -171,6 +173,20 @@ public void testGetLocationOrder() throws Exception {
         LOCATION_2.equals(testHS2ConfigManager.getFileLocation()));
   }
 
+  @Test
+  public void testConfigLocationPathInEtc() throws Exception {
+    UserHS2ConnectionFileParser testHS2ConfigManager =
+            new UserHS2ConnectionFileParser();
+    Field locations = testHS2ConfigManager.getClass().getDeclaredField("locations");
+    locations.setAccessible(true);
+    Collection<String> locs = (List<String>)locations.get(testHS2ConfigManager);
+    Assert.assertTrue(locs.contains(
+            UserHS2ConnectionFileParser.ETC_HIVE_CONF_LOCATION +
+            File.separator +
+            UserHS2ConnectionFileParser.DEFAULT_CONNECTION_CONFIG_FILE_NAME));
+
+  }
+
   private String getParsedUrlFromConfigFile(String filename)
       throws BeelineHS2ConnectionFileParseException {
     String path = HiveTestUtils.getFileFromClasspath(filename);

common/src/java/org/apache/hadoop/hive/common/ServerUtils.java

@@ -18,7 +18,9 @@
 
 package org.apache.hadoop.hive.common;
 
+import java.io.IOException;
 import java.net.InetAddress;
+import java.net.ServerSocket;
 import java.net.UnknownHostException;
 
 import org.slf4j.Logger;
@@ -77,4 +79,10 @@ public static String hostname() {
     }
   }
 
+  public static int findFreePort() throws IOException {
+    ServerSocket socket= new ServerSocket(0);
+    int port = socket.getLocalPort();
+    socket.close();
+    return port;
+  }
 }

common/src/java/org/apache/hadoop/hive/common/jsonexplain/JsonParserFactory.java

@@ -33,12 +33,10 @@ private JsonParserFactory() {
    * @return the appropriate JsonParser to print a JSONObject into outputStream.
    */
   public static JsonParser getParser(HiveConf conf) {
-    if (HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE).equals("tez")) {
+    String engine = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE);
+    if (engine.equals("mr3") || engine.equals("tez")) {
       return new TezJsonParser();
     }
-    if (HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) {
-      return new SparkJsonParser();
-    }
     return null;
   }
 }

common/src/java/org/apache/hadoop/hive/common/log/InPlaceUpdate.java

@@ -190,14 +190,10 @@ public static boolean canRenderInPlace(HiveConf conf) {
     String engine = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE);
     boolean inPlaceUpdates = false;
 
-    if (engine.equals("tez")) {
+    if (engine.equals("mr3") || engine.equals("tez")) {
       inPlaceUpdates = HiveConf.getBoolVar(conf, HiveConf.ConfVars.TEZ_EXEC_INPLACE_PROGRESS);
     }
 
-    if (engine.equals("spark")) {
-      inPlaceUpdates = HiveConf.getBoolVar(conf, HiveConf.ConfVars.SPARK_EXEC_INPLACE_PROGRESS);
-    }
-
     return inPlaceUpdates && isUnixTerminal();
   }