incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r833996 - in /incubator/hama/trunk: CHANGES.txt build.xml conf/hama-env.sh src/java/org/apache/hama/Constants.java
Date Mon, 09 Nov 2009 08:46:27 GMT
Author: edwardyoon
Date: Mon Nov  9 08:46:21 2009
New Revision: 833996

URL: http://svn.apache.org/viewvc?rev=833996&view=rev
Log:
Add simple admin tool for manage the temporary tables.

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/build.xml
    incubator/hama/trunk/conf/hama-env.sh
    incubator/hama/trunk/src/java/org/apache/hama/Constants.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=833996&r1=833995&r2=833996&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Mon Nov  9 08:46:21 2009
@@ -42,6 +42,7 @@
 
   IMPROVEMENTS
 
+    HAMA-223: Add simple admin tool for manage the temporary tables (edwardyoon)
     HAMA-202: Replacement for deprecated API of Map/Reduce (edwardyoon)
     HAMA-206: Replacement of JacobiEigenValueMap/Reduce (edwardyoon)
     HAMA-217: Replacement of Block Multiplication Map/Reduce (edwardyoon)

Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=833996&r1=833995&r2=833996&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Mon Nov  9 08:46:21 2009
@@ -264,7 +264,7 @@
             <fileset dir="${build.classes}" />
             <fileset dir="${src.test}" includes="**/*.properties" />
             <manifest>
-              <attribute name="Main-Class" value="org/apache/hama/Benchmarks" />
+              <attribute name="Main-Class" value="org/apache/hama/Utils" />
             </manifest>
         </jar>
     </target>

Modified: incubator/hama/trunk/conf/hama-env.sh
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/conf/hama-env.sh?rev=833996&r1=833995&r2=833996&view=diff
==============================================================================
--- incubator/hama/trunk/conf/hama-env.sh (original)
+++ incubator/hama/trunk/conf/hama-env.sh Mon Nov  9 08:46:21 2009
@@ -22,19 +22,19 @@
 # Set environment variables here.
 
 # The java implementation to use.  Required.
-# export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+export JAVA_HOME=/usr/java/jdk1.6.0_10
 
 # hadoop conf dir. to find the mapreduce cluster.
-# export HADOOP_CONF_DIR=
+export HADOOP_CONF_DIR=/usr/local/src/hadoop-0.20.1/conf
 
 # hbase conf dir. to find the hbase cluster.
-# export HBASE_CONF_DIR= 
+export HBASE_CONF_DIR=/usr/local/src/hbase-0.20.0/conf
 
 # Extra Java CLASSPATH elements.  Optional.
-# export HAMA_CLASSPATH=$HADOOP_CONF_DIR:$HBASE_CONF_DIR
+export HAMA_CLASSPATH=$HADOOP_CONF_DIR:$HBASE_CONF_DIR
 
 # The maximum amount of heap to use, in MB. Default is 1000.
-# export HBASE_HEAPSIZE=1000
+export HBASE_HEAPSIZE=1000
 
 # Where log files are stored.  $HAMA_HOME/logs by default.
 # export HAMA_LOG_DIR=${HAMA_HOME}/logs

Modified: incubator/hama/trunk/src/java/org/apache/hama/Constants.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/Constants.java?rev=833996&r1=833995&r2=833996&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/Constants.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/Constants.java Mon Nov  9 08:46:21 2009
@@ -1,112 +1,112 @@
-/**
- * Copyright 2007 The Apache Software Foundation
- *
- * 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.
- */
-package org.apache.hama;
-
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.io.Text;
-
-/**
- * Some constants used in the Hama
- */
-public class Constants {
-
-  /** Meta-columnFamily to store the matrix-info */
-  public final static String METADATA = "metadata";
-
-  /** Column index & attributes */
-  public final static String CINDEX = "cIndex";
-
-  /** The attribute column family */
-  public static byte[] ATTRIBUTE = Bytes.toBytes("attribute");
-
-  /** The type of the matrix */
-  public final static String METADATA_TYPE = "type";
-  
-  /** The reference of the matrix */
-  /** (1) when we create a Matrix object, we set up a connection to hbase table,
-   *      the reference of the table will be incremented.
-   *  (2) when we close a Matrix object, we disconnect the hbase table, 
-   *      the reference of the table will be decremented.
-   *      i)  if the reference of the table is not zero:
-   *          we should not delete the table, because some other matrix object
-   *          connect to the table.
-   *      ii) if the reference of the table is zero:
-   *          we need to know if the matrix table is aliased.
-   *          1) if the matrix table is aliased, we should not delete the table.
-   *          2) if the matrix table is not aliased, we need to delete the table.
-   */
-  public final static String METADATA_REFERENCE = "reference";
-  
-  /** The aliase names column family */
-  public final static String ALIASEFAMILY = "aliase";
-  
-  /** Default columnFamily name */
-  public static byte[] COLUMNFAMILY = Bytes.toBytes("column");
-  
-  /** Temporary random matrices name prefix */
-  public final static String RANDOM = "rand";
-
-  /** Admin table name */
-  public final static String ADMINTABLE = "admin.table";
-
-  /** Matrix path columnFamily */
-  public static final String PATHCOLUMN = "path";
-
-  /** Temporary Aliase name prefix in Hama Shell */
-  public static final String RANDOMALIASE = "_";
-  
-  /** default matrix's path length (tablename length) */
-  public static final int DEFAULT_PATH_LENGTH = 5;
-  
-  /** default matrix's max path length (tablename length) */
-  public static final int DEFAULT_MAXPATHLEN = 10000;
-  
-  /** default try times to generate a suitable tablename */
-  public static final int DEFAULT_TRY_TIMES = 10000000;
-  
-  /** block data column */
-  public static final String BLOCK = "block";
-  
-  public static final Text ROWCOUNT= new Text("row");
-
-  /**
-   * EigenValue Constants
-   */
-  /** a matrix copy of the original copy collected in "eicol" family * */
-  public static final String EICOL = "eicol";
-
-  /** a column family collect all values and statuses used during computation * */
-  public static final String EI = "eival";
-  public static final String EIVAL = "value";
-  public static final String EICHANGED = "changed";
-
-  /** a column identify the index of the max absolute value each row * */
-  public static final String EIIND = "ind";
-
-  /** a matrix collect all the eigen vectors * */
-  public static final String EIVEC = "eivec";
-  public static final String MATRIX = "hama.jacobieigenvalue.matrix";
-
-  /** parameters for pivot * */
-  public static final String PIVOTROW = "hama.jacobi.pivot.row";
-  public static final String PIVOTCOL = "hama.jacobi.pivot.col";
-  public static final String PIVOTSIN = "hama.jacobi.pivot.sin";
-  public static final String PIVOTCOS = "hama.jacobi.pivot.cos";
-}
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * 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.
+ */
+package org.apache.hama;
+
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.io.Text;
+
+/**
+ * Some constants used in the Hama
+ */
+public class Constants {
+
+  /** Meta-columnFamily to store the matrix-info */
+  public final static String METADATA = "metadata";
+
+  /** Column index & attributes */
+  public final static String CINDEX = "cIndex";
+
+  /** The attribute column family */
+  public static byte[] ATTRIBUTE = Bytes.toBytes("attribute");
+
+  /** The type of the matrix */
+  public final static String METADATA_TYPE = "type";
+  
+  /** The reference of the matrix */
+  /** (1) when we create a Matrix object, we set up a connection to hbase table,
+   *      the reference of the table will be incremented.
+   *  (2) when we close a Matrix object, we disconnect the hbase table, 
+   *      the reference of the table will be decremented.
+   *      i)  if the reference of the table is not zero:
+   *          we should not delete the table, because some other matrix object
+   *          connect to the table.
+   *      ii) if the reference of the table is zero:
+   *          we need to know if the matrix table is aliased.
+   *          1) if the matrix table is aliased, we should not delete the table.
+   *          2) if the matrix table is not aliased, we need to delete the table.
+   */
+  public final static String METADATA_REFERENCE = "reference";
+  
+  /** The aliase names column family */
+  public final static String ALIASEFAMILY = "aliase";
+  
+  /** Default columnFamily name */
+  public static byte[] COLUMNFAMILY = Bytes.toBytes("column");
+  
+  /** Temporary random matrices name prefix */
+  public final static String RANDOM = "rand";
+
+  /** Admin table name */
+  public final static String ADMINTABLE = "hama.admin.table";
+
+  /** Matrix path columnFamily */
+  public static final String PATHCOLUMN = "path";
+
+  /** Temporary Aliase name prefix in Hama Shell */
+  public static final String RANDOMALIASE = "_";
+  
+  /** default matrix's path length (tablename length) */
+  public static final int DEFAULT_PATH_LENGTH = 5;
+  
+  /** default matrix's max path length (tablename length) */
+  public static final int DEFAULT_MAXPATHLEN = 10000;
+  
+  /** default try times to generate a suitable tablename */
+  public static final int DEFAULT_TRY_TIMES = 10000000;
+  
+  /** block data column */
+  public static final String BLOCK = "block";
+  
+  public static final Text ROWCOUNT= new Text("row");
+
+  /**
+   * EigenValue Constants
+   */
+  /** a matrix copy of the original copy collected in "eicol" family * */
+  public static final String EICOL = "eicol";
+
+  /** a column family collect all values and statuses used during computation * */
+  public static final String EI = "eival";
+  public static final String EIVAL = "value";
+  public static final String EICHANGED = "changed";
+
+  /** a column identify the index of the max absolute value each row * */
+  public static final String EIIND = "ind";
+
+  /** a matrix collect all the eigen vectors * */
+  public static final String EIVEC = "eivec";
+  public static final String MATRIX = "hama.jacobieigenvalue.matrix";
+
+  /** parameters for pivot * */
+  public static final String PIVOTROW = "hama.jacobi.pivot.row";
+  public static final String PIVOTCOL = "hama.jacobi.pivot.col";
+  public static final String PIVOTSIN = "hama.jacobi.pivot.sin";
+  public static final String PIVOTCOS = "hama.jacobi.pivot.cos";
+}



Mime
View raw message