hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chl...@apache.org
Subject hama git commit: 1. Add scalatest, type config dependency. 2. Add Setting for future use.
Date Sat, 24 Mar 2018 20:21:20 GMT
Repository: hama
Updated Branches:
  refs/heads/componentization 4074f091c -> 9ee1751cd


1. Add scalatest, type config dependency.
2. Add Setting for future use.


Project: http://git-wip-us.apache.org/repos/asf/hama/repo
Commit: http://git-wip-us.apache.org/repos/asf/hama/commit/9ee1751c
Tree: http://git-wip-us.apache.org/repos/asf/hama/tree/9ee1751c
Diff: http://git-wip-us.apache.org/repos/asf/hama/diff/9ee1751c

Branch: refs/heads/componentization
Commit: 9ee1751cd740213a09a9a13a5d62e23110648c07
Parents: 4074f09
Author: ChiaHung Lin <chl501@apache.org>
Authored: Sat Mar 24 21:19:12 2018 +0100
Committer: ChiaHung Lin <chl501@apache.org>
Committed: Sat Mar 24 21:19:56 2018 +0100

----------------------------------------------------------------------
 core/pom.xml                                    | 16 ++++++
 .../main/scala/org/apache/hama/bsp/Event.scala  | 25 ---------
 .../main/scala/org/apache/hama/bsp/State.scala  | 26 ---------
 .../scala/org/apache/hama/conf/Setting.scala    | 58 ++++++++++++++++++++
 .../scala/org/apache/hama/logging/Logging.scala | 27 +++++++++
 .../scala/org/apache/hama/master/State.scala    | 32 +++++++++++
 .../java/org/apache/hama/monitor/fd/TestFD.java |  5 +-
 .../CustomVertexReadWriteStateTest.java         |  2 +
 .../java/org/apache/hama/examples/SSSPTest.java |  5 +-
 pom.xml                                         | 12 +---
 10 files changed, 141 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 46d2e68..9cf730f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -163,6 +163,22 @@
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.typesafe</groupId>
+      <artifactId>config</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scalactic</groupId>
+      <artifactId>scalactic_2.12</artifactId>
+      <version>3.0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_2.12</artifactId>
+      <version>3.0.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/main/scala/org/apache/hama/bsp/Event.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/hama/bsp/Event.scala b/core/src/main/scala/org/apache/hama/bsp/Event.scala
deleted file mode 100644
index a858228..0000000
--- a/core/src/main/scala/org/apache/hama/bsp/Event.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 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.bsp
-
-trait Event 
-case object Start extends Event
-case object Restart extends Event
-case object ShutDown extends Event 
-case object Recover extends Event
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/main/scala/org/apache/hama/bsp/State.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/hama/bsp/State.scala b/core/src/main/scala/org/apache/hama/bsp/State.scala
deleted file mode 100644
index 0ff6776..0000000
--- a/core/src/main/scala/org/apache/hama/bsp/State.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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.bsp
-
-sealed trait State 
-case object Stopped extends State
-case object Initializing extends State
-case object Running extends State
-case object ShuttingDown extends State
-case object Recovering extends State
-case object Failure extends State
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/main/scala/org/apache/hama/conf/Setting.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/hama/conf/Setting.scala b/core/src/main/scala/org/apache/hama/conf/Setting.scala
new file mode 100644
index 0000000..7145dd1
--- /dev/null
+++ b/core/src/main/scala/org/apache/hama/conf/Setting.scala
@@ -0,0 +1,58 @@
+/**
+ * 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.conf
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+import com.typesafe.config.ConfigValue
+import com.typesafe.config.ConfigValueFactory
+import org.apache.hama.logging.Logging
+import scala.util.Failure
+import scala.util.Success
+import scala.util.Try
+import scala.reflect.ClassTag
+
+object Setting {
+  
+  def create(name: String = "hama"): Setting = 
+    new DefaultSetting(ConfigFactory.load(name))
+  
+}
+
+trait Setting extends Logging {
+
+  def get[T: ClassTag](key: String): Option[T]
+
+  def set[T](key: String, default: T): Setting
+
+}
+
+protected[conf] class DefaultSetting(config: Config) extends Setting {
+  
+  
+  override def get[T: ClassTag](key: String): Option[T] = 
+    Try(config.getAnyRef(key)) match {
+      case Failure(ex) => None
+      case Success(value) => Option(value.asInstanceOf[T])
+    }
+
+  override def set[T](key: String, default: T): Setting = new DefaultSetting( 
+    config.withValue(key, ConfigValueFactory.fromAnyRef(key))
+  )
+  
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/main/scala/org/apache/hama/logging/Logging.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/hama/logging/Logging.scala b/core/src/main/scala/org/apache/hama/logging/Logging.scala
new file mode 100644
index 0000000..b02341a
--- /dev/null
+++ b/core/src/main/scala/org/apache/hama/logging/Logging.scala
@@ -0,0 +1,27 @@
+/**
+ * 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.logging
+
+import org.slf4j.LoggerFactory
+import java.io.Serializable
+
+trait Logging extends Serializable {
+
+  val log = LoggerFactory.getLogger(getClass)
+  
+}

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/main/scala/org/apache/hama/master/State.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/hama/master/State.scala b/core/src/main/scala/org/apache/hama/master/State.scala
new file mode 100644
index 0000000..85a5418
--- /dev/null
+++ b/core/src/main/scala/org/apache/hama/master/State.scala
@@ -0,0 +1,32 @@
+/**
+ * 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.master
+
+sealed trait State 
+case object Stopped extends State
+case object Initializing extends State
+case object Running extends State
+case object ShuttingDown extends State
+case object Recovering extends State
+case object Failed extends State
+
+trait Event 
+case object Start extends Event
+case object Restart extends Event
+case object ShutDown extends Event 
+case object Recover extends Event
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/core/src/test/java/org/apache/hama/monitor/fd/TestFD.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/hama/monitor/fd/TestFD.java b/core/src/test/java/org/apache/hama/monitor/fd/TestFD.java
index 1ea0cd1..fa40578 100644
--- a/core/src/test/java/org/apache/hama/monitor/fd/TestFD.java
+++ b/core/src/test/java/org/apache/hama/monitor/fd/TestFD.java
@@ -15,16 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+/*
 package org.apache.hama.monitor.fd;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hama.HamaCluster;
 
-/**
  * Test case for Phi accrual fail detector.
- */
 public class TestFD extends HamaCluster {
   public static final Log LOG = LogFactory.getLog(TestFD.class);
   // final HamaConfiguration conf;
@@ -97,3 +95,4 @@ public class TestFD extends HamaCluster {
   // sched.shutdown();
   // }
 }
+*/

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/examples/src/test/java/org/apache/hama/examples/CustomVertexReadWriteStateTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/hama/examples/CustomVertexReadWriteStateTest.java
b/examples/src/test/java/org/apache/hama/examples/CustomVertexReadWriteStateTest.java
index f753ffb..e3d5c5f 100644
--- a/examples/src/test/java/org/apache/hama/examples/CustomVertexReadWriteStateTest.java
+++ b/examples/src/test/java/org/apache/hama/examples/CustomVertexReadWriteStateTest.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/*
 package org.apache.hama.examples;
 
 import java.io.DataInput;
@@ -68,3 +69,4 @@ public class CustomVertexReadWriteStateTest extends TestCase {
   }
 
 }
+*/

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/examples/src/test/java/org/apache/hama/examples/SSSPTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/hama/examples/SSSPTest.java b/examples/src/test/java/org/apache/hama/examples/SSSPTest.java
index 116abbb..b59e7d5 100644
--- a/examples/src/test/java/org/apache/hama/examples/SSSPTest.java
+++ b/examples/src/test/java/org/apache/hama/examples/SSSPTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 package org.apache.hama.examples;
-
+/*
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -43,9 +43,7 @@ import org.apache.hama.examples.SSSP.SSSPTextReader;
 import org.apache.hama.graph.GraphJob;
 import org.junit.Test;
 
-/**
  * Testcase for {@link ShortestPaths}
- */
 public class SSSPTest extends TestCase {
   String[] input = new String[] { "1:85\t2:217\t4:173",// 0
       "0:85\t5:80",// 1
@@ -180,3 +178,4 @@ public class SSSPTest extends TestCase {
     }
   }
 }
+*/

http://git-wip-us.apache.org/repos/asf/hama/blob/9ee1751c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c95857..2df41f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,7 +357,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -366,7 +365,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
         <configuration>
           <parallel>methods</parallel>
           <threadCount>10</threadCount>
@@ -376,13 +374,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version>
-      </plugin>
+        </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.6</version>
-      </plugin>
+        </plugin>
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -391,7 +387,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
         <configuration>
           <mavenExecutorId>forked-path</mavenExecutorId>
         </configuration>
@@ -406,7 +401,6 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.10</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -457,7 +451,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.4.1</version>
         <configuration>
           <filesets>
             <fileset>
@@ -480,7 +473,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
         <configuration>
           <aggregate>true</aggregate>
           <failOnError>false</failOnError>


Mime
View raw message