Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 45472 invoked from network); 13 Apr 2009 20:02:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Apr 2009 20:02:44 -0000 Received: (qmail 69678 invoked by uid 500); 13 Apr 2009 20:02:44 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 69667 invoked by uid 500); 13 Apr 2009 20:02:44 -0000 Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@hadoop.apache.org Delivered-To: mailing list chukwa-commits@hadoop.apache.org Received: (qmail 69657 invoked by uid 99); 13 Apr 2009 20:02:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2009 20:02:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 13 Apr 2009 20:02:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AB77E238893B; Mon, 13 Apr 2009 20:02:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764592 - /hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java Date: Mon, 13 Apr 2009 20:02:21 -0000 To: chukwa-commits@hadoop.apache.org From: eyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090413200221.AB77E238893B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eyang Date: Mon Apr 13 20:02:21 2009 New Revision: 764592 URL: http://svn.apache.org/viewvc?rev=764592&view=rev Log: CHUKWA-122. Updated logic for finding time partition for Macro. (Eric Yang) Modified: hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java Modified: hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java?rev=764592&r1=764591&r2=764592&view=diff ============================================================================== --- hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java (original) +++ hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/Macro.java Mon Apr 13 20:02:21 2009 @@ -79,15 +79,18 @@ String meta=""; String[] table = null; if(forCharting) { - dbc.findTableNameForCharts(macro.substring(macro.indexOf("(")+1,macro.indexOf(")")), start, end); + table = dbc.findTableNameForCharts(macro.substring(macro.indexOf("(")+1,macro.indexOf(")")), start, end); } else { - dbc.findTableName(macro.substring(macro.indexOf("(")+1,macro.indexOf(")")), start, end); + table = dbc.findTableName(macro.substring(macro.indexOf("(")+1,macro.indexOf(")")), start, end); } try { String cluster = System.getProperty("CLUSTER"); if(cluster==null) { cluster="unknown"; } + if(db==null) { + db = new DatabaseWriter(cluster); + } DatabaseMetaData dbMetaData = db.getConnection().getMetaData(); ResultSet rs = dbMetaData.getColumns ( null,null,table[0], null); boolean first=true; @@ -124,6 +127,7 @@ first=false; } } + db.close(); if(first) { throw new SQLException("Table is undefined."); }