| commit | a9b0c5b750b41ae75a14b4f8a0ca71d80aa52535 | [log] [tgz] |
|---|---|---|
| author | vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> | Tue Feb 26 09:02:22 2013 +0000 |
| committer | vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> | Tue Feb 26 09:02:22 2013 +0000 |
| tree | 334fa6ee78dd7840d22616677e254478a37f1734 | |
| parent | f6e0a80befeec6968e99f7bca0909144b38797fc [diff] |
Merged fullstack_asterix_stabilization -r 2813:2933 git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_ioc@2995 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestCase.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestCase.java index 7a5bba6..5a556fa 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestCase.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestCase.java
@@ -38,7 +38,7 @@ public class RunJobTestCase extends TestCase { private static final String NC1 = "nc1"; - private static final String HYRACKS_APP_NAME = "giraph"; + private static final String HYRACKS_APP_NAME = "pregelix"; private static String HDFS_INPUTPATH = "/webmap"; private static String HDFS_OUTPUTPAH = "/result";
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java index ca16c15..4bf83e6 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java
@@ -62,7 +62,7 @@ private static final String DATA_PATH3 = "data/clique/clique.txt"; private static final String HDFS_PATH3 = "/clique/"; - private static final String HYRACKS_APP_NAME = "giraph"; + private static final String HYRACKS_APP_NAME = "pregelix"; private static final String HADOOP_CONF_PATH = ACTUAL_RESULT_DIR + File.separator + "conf.xml"; private MiniDFSCluster dfsCluster;
diff --git a/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml b/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml index 1b9a4d6..71450f1 100644 --- a/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml +++ b/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml
@@ -18,8 +18,8 @@ <value>20</value> </property> <property> - <name>mapred.min.split.size</name> - <value>65536</value> + <name>mapred.max.split.size</name> + <value>128</value> </property> </configuration>