Return-Path: Delivered-To: apmail-incubator-hama-commits-archive@locus.apache.org Received: (qmail 46633 invoked from network); 9 Oct 2008 08:51:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Oct 2008 08:51:55 -0000 Received: (qmail 93701 invoked by uid 500); 9 Oct 2008 08:51:54 -0000 Delivered-To: apmail-incubator-hama-commits-archive@incubator.apache.org Received: (qmail 93687 invoked by uid 500); 9 Oct 2008 08:51:54 -0000 Mailing-List: contact hama-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hama-dev@ Delivered-To: mailing list hama-commits@incubator.apache.org Received: (qmail 93676 invoked by uid 99); 9 Oct 2008 08:51:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2008 01:51:54 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE 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; Thu, 09 Oct 2008 08:50:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7BC1B238898E; Thu, 9 Oct 2008 01:50:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r703105 - in /incubator/hama/trunk/src/java/org/apache/hama: AbstractMatrix.java HamaAdmin.java Date: Thu, 09 Oct 2008 08:50:56 -0000 To: hama-commits@incubator.apache.org From: edwardyoon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081009085056.7BC1B238898E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: edwardyoon Date: Thu Oct 9 01:50:55 2008 New Revision: 703105 URL: http://svn.apache.org/viewvc?rev=703105&view=rev Log: (empty) Modified: incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java Modified: incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java?rev=703105&r1=703104&r2=703105&view=diff ============================================================================== --- incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java (original) +++ incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java Thu Oct 9 01:50:55 2008 @@ -153,10 +153,15 @@ } public void close() throws IOException { - admin.deleteTable(matrixName); + if(admin.isTableEnabled(matrixName)) { + admin.disableTable(matrixName); + admin.deleteTable(matrixName); + } else { + LOG.info("Table doesn't abled"); + } } - public boolean save(String path) throws IOException { - return hAdmin.put(this.matrixName, path); + public boolean save(String name) throws IOException { + return hAdmin.put(this.matrixName, name); } } Modified: incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java?rev=703105&r1=703104&r2=703105&view=diff ============================================================================== --- incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java (original) +++ incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java Thu Oct 9 01:50:55 2008 @@ -61,10 +61,10 @@ } } - public boolean put(String matrixName, String path) { + public boolean put(String matrixName, String name) { boolean result = false; - BatchUpdate update = new BatchUpdate(path); + BatchUpdate update = new BatchUpdate(name); update.put(Constants.PATHCOLUMN, Bytes.toBytes(matrixName)); try { table.commit(update); @@ -76,9 +76,13 @@ return result; } - public String get(String path) { + /** + * @param name + * @return real table name + */ + public String get(String name) { try { - byte[] result = table.get(path, Constants.PATHCOLUMN).getValue(); + byte[] result = table.get(name, Constants.PATHCOLUMN).getValue(); return Bytes.toString(result); } catch (IOException e) { e.printStackTrace();