From commits-return-32117-archive-asf-public=cust-asf.ponee.io@hive.apache.org Thu Mar 22 23:38:01 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 45F0F180676 for ; Thu, 22 Mar 2018 23:38:01 +0100 (CET) Received: (qmail 79123 invoked by uid 500); 22 Mar 2018 22:38:00 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 79112 invoked by uid 99); 22 Mar 2018 22:38:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Mar 2018 22:38:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 827E8F4E52; Thu, 22 Mar 2018 22:37:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: omalley@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-19013. Fix various storage-api build issues. (Owen O'Malley, reviewed by Prasanth Jayachandran) Date: Thu, 22 Mar 2018 22:37:59 +0000 (UTC) Repository: hive Updated Branches: refs/heads/storage-branch-2.5 a1db68c7c -> 4e018faab HIVE-19013. Fix various storage-api build issues. (Owen O'Malley, reviewed by Prasanth Jayachandran) Signed-off-by: Owen O'Malley Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4e018faa Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4e018faa Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4e018faa Branch: refs/heads/storage-branch-2.5 Commit: 4e018faab5b2dc0a16e6641309b7a3e8cc3b8b8e Parents: a1db68c Author: Owen O'Malley Authored: Wed Mar 21 15:08:52 2018 -0700 Committer: Owen O'Malley Committed: Thu Mar 22 15:37:46 2018 -0700 ---------------------------------------------------------------------- .../hive/common/ValidCompactorWriteIdList.java | 2 +- .../hadoop/hive/common/ValidWriteIdList.java | 7 +++-- storage-api/src/test/resources/log4j2.xml | 29 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4e018faa/storage-api/src/java/org/apache/hadoop/hive/common/ValidCompactorWriteIdList.java ---------------------------------------------------------------------- diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/ValidCompactorWriteIdList.java b/storage-api/src/java/org/apache/hadoop/hive/common/ValidCompactorWriteIdList.java index 3a513b7..a849264 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/ValidCompactorWriteIdList.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/ValidCompactorWriteIdList.java @@ -44,7 +44,7 @@ public class ValidCompactorWriteIdList extends ValidReaderWriteIdList { this(tableName, abortedWriteIdList, abortedBits, highWatermark, Long.MAX_VALUE); } /** - * @param tableName table which is under compaction. Full name of format . + * @param tableName table which is under compaction. Full name of format <db_name>.<table_name> * @param abortedWriteIdList list of all aborted write ids * @param abortedBits bitset marking whether the corresponding write id is aborted * @param highWatermark highest committed write id to be considered for compaction, http://git-wip-us.apache.org/repos/asf/hive/blob/4e018faa/storage-api/src/java/org/apache/hadoop/hive/common/ValidWriteIdList.java ---------------------------------------------------------------------- diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/ValidWriteIdList.java b/storage-api/src/java/org/apache/hadoop/hive/common/ValidWriteIdList.java index b01bbcb..b3d6402 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/ValidWriteIdList.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/ValidWriteIdList.java @@ -50,6 +50,7 @@ public interface ValidWriteIdList { * Returns {@code true} if such base file can be used to materialize the snapshot represented by * this {@code ValidWriteIdList}. * @param writeId highest write ID in a given base_xxxx file + * @return true if the base file can be used */ boolean isValidBase(long writeId); @@ -66,6 +67,7 @@ public interface ValidWriteIdList { /** * Write this ValidWriteIdList into a string. This should produce a string that * can be used by {@link #readFromString(String)} to populate a ValidWriteIdList. + * @return the list as a string */ String writeToString(); @@ -78,7 +80,7 @@ public interface ValidWriteIdList { /** * Get the table for which the ValidWriteIdList is formed - * @return table name (.) associated with ValidWriteIdList. + * @return table name (<db_name>.<table_name>) associated with ValidWriteIdList. */ String getTableName(); @@ -112,7 +114,8 @@ public interface ValidWriteIdList { RangeResponse isWriteIdRangeAborted(long minWriteId, long maxWriteId); /** - * Returns smallest Open write Id in this set, {@code null} if there is none. + * The smallest open write id. + * @return smallest Open write Id in this set, {@code null} if there is none. */ Long getMinOpenWriteId(); } http://git-wip-us.apache.org/repos/asf/hive/blob/4e018faa/storage-api/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/storage-api/src/test/resources/log4j2.xml b/storage-api/src/test/resources/log4j2.xml new file mode 100644 index 0000000..7ed205f --- /dev/null +++ b/storage-api/src/test/resources/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + +