incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1004893 - in /incubator/hama/trunk: ./ src/examples/org/apache/hama/examples/ src/examples/org/apache/hama/examples/mapreduce/ src/java/org/apache/hama/ src/java/org/apache/hama/matrix/ src/java/org/apache/hama/util/ src/test/org/apache/ha...
Date Wed, 06 Oct 2010 04:19:33 GMT
Author: edwardyoon
Date: Wed Oct  6 04:19:32 2010
New Revision: 1004893

URL: http://svn.apache.org/viewvc?rev=1004893&view=rev
Log:
Removing M/R and HBase based implementations

Removed:
    incubator/hama/trunk/src/examples/org/apache/hama/examples/AbstractExample.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/CosineSimilarityMatrix.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/JacobiEigen.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixNorm.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/RandomMatrix.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/mapreduce/
    incubator/hama/trunk/src/java/org/apache/hama/HamaAdmin.java
    incubator/hama/trunk/src/java/org/apache/hama/HamaAdminImpl.java
    incubator/hama/trunk/src/java/org/apache/hama/matrix/
    incubator/hama/trunk/src/java/org/apache/hama/util/BytesUtil.java
    incubator/hama/trunk/src/test/org/apache/hama/Benchmarks.java
    incubator/hama/trunk/src/test/org/apache/hama/TestHamaAdmin.java
    incubator/hama/trunk/src/test/org/apache/hama/TestHbaseClient.java
    incubator/hama/trunk/src/test/org/apache/hama/Utils.java
    incubator/hama/trunk/src/test/org/apache/hama/examples/
    incubator/hama/trunk/src/test/org/apache/hama/matrix/
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java
    incubator/hama/trunk/src/java/org/apache/hama/Constants.java
    incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1004893&r1=1004892&r2=1004893&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed Oct  6 04:19:32 2010
@@ -46,6 +46,7 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
     
+    HAMA-256: Removing M/R and HBase based implementations (edwardyoon)
     HAMA-293: Add starter classes for ZooKeeper, BSPMaster
                 and GroomServer (Filipe Manana via edwardyoon)
     HAMA-286: Task progress should be monitored (eddieyoon)

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java?rev=1004893&r1=1004892&r2=1004893&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java Wed Oct
 6 04:19:32 2010
@@ -28,14 +28,6 @@ public class ExampleDriver {
     try {
       pgd.addClass("pi", PiEstimator.class, "Pi Estimator");
       
-      /*
-      pgd.addClass("sprint", SerializePrinting.class, "Serialize Printing");
-      pgd.addClass("rand", RandomMatrix.class, "Generate matrix with random elements.");
-      pgd.addClass("mult", MatrixMultiplication.class, "Mat-Mat Multiplication.");
-      pgd.addClass("similarity", CosineSimilarityMatrix.class, "Cosine Similarity Matrix.");
-      pgd.addClass("norms", MatrixNorm.class, "Matrix Norms.");
-      */
-      
       pgd.driver(args);
     } catch (Throwable e) {
       e.printStackTrace();

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java?rev=1004893&r1=1004892&r2=1004893&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java Wed Oct  6
04:19:32 2010
@@ -55,7 +55,7 @@ public class PiEstimator {
       byte[] myData = Bytes.toBytes(4.0 * (double) in / (double) iterations);
       BSPMessage estimate = new BSPMessage(tagName, myData);
 
-      bspPeer.send(new InetSocketAddress("slave.udanax.org", 61000), estimate);
+      bspPeer.send(new InetSocketAddress("localhost", 61000), estimate);
       bspPeer.sync();
 
       double pi = 0.0;

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=1004893&r1=1004892&r2=1004893&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/Constants.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/Constants.java Wed Oct  6 04:19:32 2010
@@ -19,9 +19,6 @@
  */
 package org.apache.hama;
 
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.io.Text;
-
 /**
  * Some constants used in the Hama
  */
@@ -41,6 +38,8 @@ public interface Constants {
 
   public static final long ATLEAST_WAIT_TIME = 100;
 
+  public static final String PEER_ID = "bsp.peer.id";
+  
   ///////////////////////////////////////
   // Constants for ZooKeeper
   ///////////////////////////////////////  
@@ -70,75 +69,5 @@ public interface Constants {
   static final String CLUSTER_DISTRIBUTED = "hama.cluster.distributed";
   /** Cluster is fully-distributed */
   static final String CLUSTER_IS_DISTRIBUTED = "true";
-  ///////////////////////////////////////
-  // Constants for Matrix Package
-  ///////////////////////////////////////
-  /**
-   * An empty instance.
-   */
-  public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-  
-  /**
-   * Hbase Structure for matrices 
-   */
-  
-  /** 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");
-  public static final String PEER_ID = "bsp.peer.id";
 }

Modified: incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java?rev=1004893&r1=1004892&r2=1004893&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java Wed Oct  6 04:19:32
2010
@@ -19,8 +19,6 @@
  */
 package org.apache.hama.util;
 
-import org.apache.hama.Constants;
-
 /**
  * The RandomVaraibale Class provides static methods for generating random
  * numbers.
@@ -49,32 +47,6 @@ public class RandomVariable {
     int i = i0 + (int) Math.floor((i1 - i0 + 1) * x);
     return i;
   }
-
-  /**
-   * Generate a random matrix Path(tablename) with a default length.
-   * @return random matrix name
-   */
-  public static String randMatrixPath() {
-    return randString(Constants.RANDOM, 5);
-  }
-  
-  /**
-   * Generate a random matrix Path(tablename) with a given length.
-   * @param length the matrix path's length
-   * @return random matrix name
-   */
-  public static String randMatrixPath(int length) {
-    return randString(Constants.RANDOM, length);
-  }
-  
-  /**
-   * Generate a random aliase name.
-   * 
-   * @return random aliase name
-   */
-  public static String randAliaseName() {
-    return randString(Constants.RANDOMALIASE, 5);
-  }
   
   /**
     * Generate a random string using the specified prefix and a fixed length. 



Mime
View raw message