From 0967afd5d6d364f2a9a47b5164cc5ae4c20786aa Mon Sep 17 00:00:00 2001
From: Owen O'Malley <omalley@apache.org>
Date: Wed, 21 Mar 2018 15:08:52 -0700
Subject: [PATCH 1/2] HIVE-19013. Fix various storage-api build issues.

---
 .../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(-)
 create mode 100644 storage-api/src/test/resources/log4j2.xml

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 3a513b777e68..a849264b8edd 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 ValidCompactorWriteIdList(String tableName, long[] abortedWriteIdList, Bi
     this(tableName, abortedWriteIdList, abortedBits, highWatermark, Long.MAX_VALUE);
   }
   /**
-   * @param tableName table which is under compaction. Full name of format <db_name>.<table_name>
+   * @param tableName table which is under compaction. Full name of format &lt;db_name&gt;.&lt;table_name&gt;
    * @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,
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 b01bbcb537d2..b3d64021e60b 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 @@ enum RangeResponse {NONE, SOME, ALL};
    * 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 @@ enum RangeResponse {NONE, SOME, ALL};
   /**
    * 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 @@ enum RangeResponse {NONE, SOME, ALL};
 
   /**
    * Get the table for which the ValidWriteIdList is formed
-   * @return table name (<db_name>.<table_name>) associated with ValidWriteIdList.
+   * @return table name (&lt;db_name&gt;.&lt;table_name&gt;) associated with ValidWriteIdList.
    */
   String getTableName();
 
@@ -112,7 +114,8 @@ enum RangeResponse {NONE, SOME, ALL};
   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();
 }
diff --git a/storage-api/src/test/resources/log4j2.xml b/storage-api/src/test/resources/log4j2.xml
new file mode 100644
index 000000000000..de321259dab9
--- /dev/null
+++ b/storage-api/src/test/resources/log4j2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
+<Configuration status="WARN">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Root level="error">
+      <AppenderRef ref="Console"/>
+    </Root>
+  </Loggers>
+</Configuration>

From d69b4779124514226e20057c5c815006d8e23bab Mon Sep 17 00:00:00 2001
From: Owen O'Malley <omalley@apache.org>
Date: Wed, 21 Mar 2018 16:15:18 -0700
Subject: [PATCH 2/2] HIVE-19013. Address review comment

---
 storage-api/src/test/resources/log4j2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage-api/src/test/resources/log4j2.xml b/storage-api/src/test/resources/log4j2.xml
index de321259dab9..7ed205fadf5c 100644
--- a/storage-api/src/test/resources/log4j2.xml
+++ b/storage-api/src/test/resources/log4j2.xml
@@ -17,7 +17,7 @@
 -->
 <Configuration status="WARN">
   <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
+    <Console name="Console" target="SYSTEM_ERR">
       <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
     </Console>
   </Appenders>