Author: edwardyoon
Date: Tue Oct 28 00:07:27 2008
New Revision: 708465
URL: http://svn.apache.org/viewvc?rev=708465&view=rev
Log:
Add an package.html and some comments.
Added:
incubator/hama/trunk/src/java/org/apache/hama/shell/execution/package.html
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/expression/package.html
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/script/package.html
Modified:
incubator/hama/trunk/src/java/org/apache/hama/Constants.java
incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java
incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java
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=708465&r1=708464&r2=708465&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/Constants.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/Constants.java Tue Oct 28
00:07:27 2008
@@ -23,61 +23,40 @@
* Some constants used in the Hama
*/
public class Constants {
-
- /**
- * Meta-columnFamily to store the matrix-info
- */
+
+ /** Meta-columnFamily to store the matrix-info */
public final static String METADATA = "metadata";
-
- /**
- * Column index & attributes
- */
+
+ /** Column index & attributes */
public final static String CINDEX = "cIndex";
-
- /**
- * The attribute column family
- */
+
+ /** The attribute column family */
public final static String ATTRIBUTE = "attribute:";
-
- /**
- * The number of the matrix rows
- */
+
+ /** The number of the matrix rows */
public final static String METADATA_ROWS = "attribute:rows";
-
- /**
- * The number of the matrix columns
- */
+
+ /** The number of the matrix columns */
public final static String METADATA_COLUMNS = "attribute:columns";
-
- /**
- * The type of the matrix
- */
+
+ /** The type of the matrix */
public final static String METADATA_TYPE = "attribute:type";
-
- /**
- * Default columnFamily name
- */
+
+ /** Default columnFamily name */
public final static String COLUMN = "column:";
- /**
- * Temporary random matrices name prefix
- */
+ /** Temporary random matrices name prefix */
public final static String RANDOM = "rand";
-
- /**
- * Admin table name
- */
+
+ /** Admin table name */
public final static String ADMINTABLE = "admin.table";
- /**
- * Matrix path columnFamily
- */
+ /** Matrix path columnFamily */
public static final String PATHCOLUMN = "path:";
-
- /**
- * Temporary Aliase name prefix in Hama Shell
- */
+
+ /** Temporary Aliase name prefix in Hama Shell */
public static final String RANDOMALIASE = "_";
+ /** Matrix type information (e.g. DenseMatrix, SparseMatrix, .., etc) */
public static final String MATRIXTYPE = "type:";
}
Modified: incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java?rev=708465&r1=708464&r2=708465&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java Tue Oct 28
00:07:27 2008
@@ -78,6 +78,9 @@
}
}
+ /**
+ * BlockID Comparator
+ */
public static class Comparator extends WritableComparator {
protected Comparator() {
super(BlockID.class);
Added:
incubator/hama/trunk/src/java/org/apache/hama/shell/execution/package.html
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/execution/package.html?rev=708465&view=auto
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/shell/execution/package.html
(added)
+++ incubator/hama/trunk/src/java/org/apache/hama/shell/execution/package.html
Tue Oct 28 00:07:27 2008
@@ -0,0 +1,23 @@
+<html>
+
+<!--
+ 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.
+-->
+
+<body>
+A simple shell command executor
+</body>
+</html>
Added:
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/expression/package.html
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/parser/expression/package.html?rev=708465&view=auto
==============================================================================
---
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/expression/package.html
(added)
+++
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/expression/package.html
Tue Oct 28 00:07:27 2008
@@ -0,0 +1,23 @@
+<html>
+
+<!--
+ 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.
+-->
+
+<body>
+Arithmetic expression parser package
+</body>
+</html>
Added:
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/script/package.html
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/parser/script/package.html?rev=708465&view=auto
==============================================================================
---
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/script/package.html
(added)
+++
incubator/hama/trunk/src/java/org/apache/hama/shell/parser/script/package.html
Tue Oct 28 00:07:27 2008
@@ -0,0 +1,23 @@
+<html>
+
+<!--
+ 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.
+-->
+
+<body>
+JavaCC scripts package
+</body>
+</html>
Modified: incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java?rev=708465&r1=708464&r2=708465&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java
(original)
+++ incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java Tue Oct
28 00:07:27 2008
@@ -26,6 +26,9 @@
import org.apache.hadoop.mapred.RunningJob;
import org.apache.hama.Matrix;
+/**
+ * A map/reduce job manager
+ */
public class JobManager {
public static void execute(JobConf jobConf, Matrix result) throws
IOException {