Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 04858D1C2 for ; Sun, 9 Dec 2012 09:41:05 +0000 (UTC) Received: (qmail 39521 invoked by uid 500); 9 Dec 2012 09:41:04 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 39431 invoked by uid 500); 9 Dec 2012 09:41:03 -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 39395 invoked by uid 99); 9 Dec 2012 09:41:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 09:41:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 09:41:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0703E23889BF; Sun, 9 Dec 2012 09:40:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418863 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java test/queries/clientpositive/repair.q test/queries/clientpositive/repair_hadoop23.q Date: Sun, 09 Dec 2012 09:40:39 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121209094040.0703E23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Sun Dec 9 09:40:38 2012 New Revision: 1418863 URL: http://svn.apache.org/viewvc?rev=1418863&view=rev Log: HIVE-3231 : msck repair should find partitions already containing data files (Keegan Mosley via Ashutosh Chauhan) Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java hive/trunk/ql/src/test/queries/clientpositive/repair.q hive/trunk/ql/src/test/queries/clientpositive/repair_hadoop23.q Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java?rev=1418863&r1=1418862&r2=1418863&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java Sun Dec 9 09:40:38 2012 @@ -363,16 +363,18 @@ public class HiveMetaStoreChecker { throws IOException { FileStatus[] statuses = fs.listStatus(basePath); - - if (statuses.length == 0) { - allDirs.add(basePath); - } + boolean directoryFound=false; for (FileStatus status : statuses) { if (status.isDir()) { + directoryFound = true; getAllLeafDirs(status.getPath(), allDirs, fs); } } + + if(!directoryFound){ + allDirs.add(basePath); + } } } Modified: hive/trunk/ql/src/test/queries/clientpositive/repair.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/repair.q?rev=1418863&r1=1418862&r2=1418863&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/repair.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/repair.q Sun Dec 9 09:40:38 2012 @@ -19,6 +19,7 @@ MSCK TABLE repairtable; dfs -mkdir -p ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; dfs -mkdir -p ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; +dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile; MSCK TABLE repairtable; Modified: hive/trunk/ql/src/test/queries/clientpositive/repair_hadoop23.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/repair_hadoop23.q?rev=1418863&r1=1418862&r2=1418863&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/repair_hadoop23.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/repair_hadoop23.q Sun Dec 9 09:40:38 2012 @@ -18,6 +18,7 @@ MSCK TABLE repairtable; dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; +dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile; MSCK TABLE repairtable;