diff --git standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java index 13071f6266..40a5eb42ea 100644 --- standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -1843,7 +1843,7 @@ private MTable convertToMTable(Table tbl) throws InvalidObjectException, private List convertToFieldSchemas(List mkeys) { List keys = null; if (mkeys != null) { - keys = new ArrayList<>(mkeys.size()); + keys = new ArrayList<>(); for (MFieldSchema part : mkeys) { keys.add(new FieldSchema(part.getName(), part.getType(), part .getComment())); @@ -1855,7 +1855,7 @@ private MTable convertToMTable(Table tbl) throws InvalidObjectException, private List convertToMOrders(List keys) { List mkeys = null; if (keys != null) { - mkeys = new ArrayList<>(keys.size()); + mkeys = new ArrayList<>(); for (Order part : keys) { mkeys.add(new MOrder(normalizeIdentifier(part.getCol()), part.getOrder())); } @@ -1866,7 +1866,7 @@ private MTable convertToMTable(Table tbl) throws InvalidObjectException, private List convertToOrders(List mkeys) { List keys = null; if (mkeys != null) { - keys = new ArrayList<>(mkeys.size()); + keys = new ArrayList<>(); for (MOrder part : mkeys) { keys.add(new Order(part.getCol(), part.getOrder())); } @@ -1953,7 +1953,7 @@ private StorageDescriptor convertToStorageDescriptor(MStorageDescriptor msd) private List> convertToSkewedValues(List mLists) { List> lists = null; if (mLists != null) { - lists = new ArrayList<>(mLists.size()); + lists = new ArrayList<>(); for (MStringList element : mLists) { lists.add(new ArrayList<>(element.getInternalList())); } @@ -1978,7 +1978,7 @@ private StorageDescriptor convertToStorageDescriptor(MStorageDescriptor msd) private Map, String> covertToSkewedMap(Map mMap) { Map, String> map = null; if (mMap != null) { - map = new HashMap<>(mMap.size()); + map = new HashMap<>(); Set keys = mMap.keySet(); for (MStringList key : keys) { map.put(new ArrayList<>(key.getInternalList()), mMap.get(key)); @@ -1993,7 +1993,7 @@ private StorageDescriptor convertToStorageDescriptor(MStorageDescriptor msd) private Map covertToMapMStringList(Map, String> mMap) { Map map = null; if (mMap != null) { - map = new HashMap<>(mMap.size()); + map = new HashMap<>(); Set> keys = mMap.keySet(); for (List key : keys) { map.put(new MStringList(key), mMap.get(key)); diff --git standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java index 64a542997b..18672ea146 100644 --- standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java +++ standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java @@ -2497,6 +2497,7 @@ private ConnectionLockIdPair enqueueLockWithRetry(LockRequest rqst) throws NoSuc List rows = new ArrayList<>(); List> paramsList = new ArrayList<>(); long intLockId = 0; + long lastHB = (isValidTxn(txnid) ? 0 : getDbTime(dbConn)); for (LockComponent lc : rqst.getComponent()) { if(lc.isSetOperationType() && lc.getOperationType() == DataOperationType.UNSET && (MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST) || MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEZ_TEST))) { @@ -2526,13 +2527,12 @@ private ConnectionLockIdPair enqueueLockWithRetry(LockRequest rqst) throws NoSuc lockChar = LOCK_SEMI_SHARED; break; } - long now = getDbTime(dbConn); rows.add(extLockId + ", " + intLockId + "," + txnid + ", ?, " + ((tblName == null) ? "null" : "?") + ", " + ((partName == null) ? "null" : "?") + ", " + quoteChar(LOCK_WAITING) + ", " + quoteChar(lockChar) + ", " + //for locks associated with a txn, we always heartbeat txn and timeout based on that - (isValidTxn(txnid) ? 0 : now) + ", " + + lastHB + ", " + ((rqst.getUser() == null) ? "null" : "?") + ", " + ((rqst.getHostname() == null) ? "null" : "?") + ", " + ((rqst.getAgentInfo() == null) ? "null" : "?"));// + ")";