Merged fullstack_staging -r 2426:2786
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_ioc@2788 123451ca-8445-de46-9d55-352943316053
diff --git a/pom.xml b/pom.xml
index 03f22e5..d7621ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,13 +102,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.6.1.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
@@ -230,13 +223,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.4.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
@@ -273,13 +259,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
<version>3.2</version>
@@ -336,6 +315,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<configuration>
@@ -508,6 +488,7 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java b/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
index 6c1ac72..f6aef75 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
+++ b/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
@@ -511,14 +511,13 @@
private void executeHyraxJob(JobSpecification job) throws Exception {
String ipAddress = conf.get("hive.hyracks.host");
int port = Integer.parseInt(conf.get("hive.hyracks.port"));
- String applicationName = conf.get("hive.hyracks.app");
//System.out.println("connect to " + ipAddress + " " + port);
IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port);
//System.out.println("get connected");
long start = System.currentTimeMillis();
- JobId jobId = hcc.startJob(applicationName, job);
+ JobId jobId = hcc.startJob(job);
hcc.waitForCompletion(jobId);
//System.out.println("job finished: " + jobId.toString());
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java b/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
index 05474ca..d90756e 100644
--- a/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
+++ b/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
@@ -87,16 +87,14 @@
ConfUtil.setHiveConf(hconf);
}
- private void setupHyracks() throws Exception {
- // read hive conf
- HiveConf hconf = new HiveConf(SessionState.class);
- hconf.addResource(new Path(PATH_TO_HIVE_CONF));
- SessionState.start(hconf);
- String ipAddress = hconf.get("hive.hyracks.host");
- int clientPort = Integer.parseInt(hconf.get("hive.hyracks.port"));
- int clusterPort = clientPort;
- String applicationName = hconf.get("hive.hyracks.app");
-
+ private void setupHyracks() throws Exception {
+ // read hive conf
+ HiveConf hconf = new HiveConf(SessionState.class);
+ hconf.addResource(new Path(PATH_TO_HIVE_CONF));
+ SessionState.start(hconf);
+ String ipAddress = hconf.get("hive.hyracks.host");
+ int clientPort = Integer.parseInt(hconf.get("hive.hyracks.port"));
+ int clusterPort = clientPort;
// start hyracks cc
CCConfig ccConfig = new CCConfig();
ccConfig.clientNetIpAddress = ipAddress;
@@ -121,12 +119,10 @@
ncs.put(ncConfig.nodeId, nc);
}
- IHyracksClientConnection hcc = new HyracksConnection(
- ccConfig.clientNetIpAddress, clientPort);
- hcc.createApplication(applicationName, null);
- }
+ IHyracksClientConnection hcc = new HyracksConnection(ccConfig.clientNetIpAddress, clientPort);
+ }
- protected void makeDir(String path) throws IOException {
+ protected void makeDir(String path) throws IOException {
dfs.mkdirs(new Path(path));
}
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java b/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
index e9a5736..c03e0a3 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
+++ b/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
@@ -89,15 +89,14 @@
ConfUtil.setHiveConf(hconf);
}
- private void setupHyracks() throws Exception {
- // read hive conf
- HiveConf hconf = new HiveConf(SessionState.class);
- hconf.addResource(new Path(PATH_TO_HIVE_CONF));
- SessionState.start(hconf);
- String ipAddress = hconf.get("hive.hyracks.host");
- int clientPort = Integer.parseInt(hconf.get("hive.hyracks.port"));
- int netPort = clientPort + 1;
- String applicationName = hconf.get("hive.hyracks.app");
+ private void setupHyracks() throws Exception {
+ // read hive conf
+ HiveConf hconf = new HiveConf(SessionState.class);
+ hconf.addResource(new Path(PATH_TO_HIVE_CONF));
+ SessionState.start(hconf);
+ String ipAddress = hconf.get("hive.hyracks.host");
+ int clientPort = Integer.parseInt(hconf.get("hive.hyracks.port"));
+ int netPort = clientPort + 1;
// start hyracks cc
CCConfig ccConfig = new CCConfig();
@@ -124,10 +123,8 @@
ncs.put(ncConfig.nodeId, nc);
}
- IHyracksClientConnection hcc = new HyracksConnection(
- ccConfig.clientNetIpAddress, clientPort);
- hcc.createApplication(applicationName, null);
- }
+ IHyracksClientConnection hcc = new HyracksConnection(ccConfig.clientNetIpAddress, clientPort);
+ }
protected void makeDir(String path) throws IOException {
dfs.mkdirs(new Path(path));