You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2013/09/03 16:42:15 UTC
git commit: MRQL-10: Add dist module to generate release tarball
Updated Branches:
refs/heads/master f5e66d20c -> 2fda775d3
MRQL-10: Add dist module to generate release tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/2fda775d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/2fda775d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/2fda775d
Branch: refs/heads/master
Commit: 2fda775d36c6cd7f7dafbd42a2494054c65ffc0e
Parents: f5e66d2
Author: fegaras <fe...@cse.uta.edu>
Authored: Tue Sep 3 09:41:08 2013 -0500
Committer: fegaras <fe...@cse.uta.edu>
Committed: Tue Sep 3 09:41:08 2013 -0500
----------------------------------------------------------------------
BSP/pom.xml | 27 ++---
Gen/pom.xml | 12 +--
Makefile | 2 +-
MapReduce/pom.xml | 27 ++---
NOTICE | 12 ---
Spark/pom.xml | 27 ++---
bin/mrql | 4 +-
dist/pom.xml | 69 ++++++++++++
pom.xml | 125 +++++++++++++++++++++-
src/main/assembly/bin.xml | 57 ++++++++++
src/main/assembly/src.xml | 67 ++++++++++++
src/main/java/BSP/BSPPlan.java | 2 +-
src/main/java/BSP/Evaluator.gen | 4 +-
src/main/java/MapReduce/Evaluator.gen | 4 +-
src/main/java/core/AlgebraicOptimization.gen | 2 +-
src/main/java/core/Normalization.gen | 4 +-
src/main/java/core/Test.java | 1 +
src/main/java/spark/Evaluator.gen | 2 +-
src/site/xdoc/index.xml | 6 +-
19 files changed, 377 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/BSP/pom.xml
----------------------------------------------------------------------
diff --git a/BSP/pom.xml b/BSP/pom.xml
index a7942aa..39343df 100644
--- a/BSP/pom.xml
+++ b/BSP/pom.xml
@@ -47,20 +47,23 @@
</dependencies>
<build>
- <sourceDirectory>../src/main/java</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>5</source>
- <target>5</target>
- <includes>
- <include>**/core/**/*java</include>
- <include>**/BSP/**/*java</include>
- </includes>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals><goal>add-source</goal></goals>
+ <configuration>
+ <sources>
+ <source>../src/main/java/core</source>
+ <source>../src/main/java/BSP</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/Gen/pom.xml
----------------------------------------------------------------------
diff --git a/Gen/pom.xml b/Gen/pom.xml
index 8bb7bb4..261a7af 100644
--- a/Gen/pom.xml
+++ b/Gen/pom.xml
@@ -34,19 +34,9 @@
</parent>
<build>
- <sourceDirectory>../src/main/java</sourceDirectory>
+ <sourceDirectory>../src/main/java/gen</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>5</source>
- <target>5</target>
- <includes><include>**/gen/**/*java</include></includes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 5f499be..531eac8 100644
--- a/Makefile
+++ b/Makefile
@@ -109,4 +109,4 @@ clean_tests:
@/bin/rm -rf tests/results/*/*
clean:
- @/bin/rm -rf *~ */*~ */*/*~ classes mrql-tmp tmp null tests/error_log.txt
+ @/bin/rm -rf *~ */*~ */*/*~ classes mrql-tmp tmp null tests/error_log.txt */dependency-reduced-pom.xml
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/MapReduce/pom.xml
----------------------------------------------------------------------
diff --git a/MapReduce/pom.xml b/MapReduce/pom.xml
index 6f6d55a..bf7c7a9 100644
--- a/MapReduce/pom.xml
+++ b/MapReduce/pom.xml
@@ -48,20 +48,23 @@
</dependencies>
<build>
- <sourceDirectory>../src/main/java</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>5</source>
- <target>5</target>
- <includes>
- <include>**/core/**/*java</include>
- <include>**/MapReduce/**/*java</include>
- </includes>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals><goal>add-source</goal></goals>
+ <configuration>
+ <sources>
+ <source>../src/main/java/core</source>
+ <source>../src/main/java/MapReduce</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a13e262..2317859 100644
--- a/NOTICE
+++ b/NOTICE
@@ -87,15 +87,3 @@ same license, as is the CUP runtime code linked with the generated
parser. Java is a trademark of Sun Microsystems, Inc. References to
the Java programming language in relation to JLex are not meant to
imply that Sun endorses this product.
-
-----------------------------------------------------------------------------
-
-Gen: A Java Package for Constructing and Manipulating Abstract Syntax Trees
-
-Copyright (c) 2013 by Leonidas Fegaras, the University of Texas at
-Arlington. All rights reserved.
-
-This material is provided as is, with absolutely no warranty expressed
-or implied. Any use is at your own risk. Permission is hereby granted
-to use or copy this program for any purpose, provided the above
-notices are retained on all copies.
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/Spark/pom.xml
----------------------------------------------------------------------
diff --git a/Spark/pom.xml b/Spark/pom.xml
index 0f2df11..edc4baa 100644
--- a/Spark/pom.xml
+++ b/Spark/pom.xml
@@ -47,20 +47,23 @@
</dependencies>
<build>
- <sourceDirectory>../src/main/java</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>5</source>
- <target>5</target>
- <includes>
- <include>**/core/**/*java</include>
- <include>**/spark/**/*java</include>
- </includes>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals><goal>add-source</goal></goals>
+ <configuration>
+ <sources>
+ <source>../src/main/java/core</source>
+ <source>../src/main/java/spark</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/bin/mrql
----------------------------------------------------------------------
diff --git a/bin/mrql b/bin/mrql
index 7dd80f7..b6dfc15 100755
--- a/bin/mrql
+++ b/bin/mrql
@@ -32,5 +32,7 @@ export JAVA_HOME MAPRED_JOB_TRACKER FS_DEFAULT_NAME
if [ "$1" == "-local" ] || [ "$1" == "-dist" ]; then
$HADOOP_HOME/bin/hadoop jar $MRQL_HOME/lib/mrql-mr-*.jar org.apache.mrql.Main $*
else
- mvn -q -f $MRQL_HOME/pom.xml -pl MapReduce exec:java -Dexec.mainClass="org.apache.mrql.Main" -Dexec.args="$*"
+ #mvn -q -f $MRQL_HOME/pom.xml -pl MapReduce exec:java -Dexec.mainClass="org.apache.mrql.Main" -Dexec.args="$*"
+ CLASSPATH=$(readlink -f $MRQL_HOME/lib/mrql-mr-*.jar):$HADOOP_JARS
+ $JAVA_HOME/bin/java -classpath $CLASSPATH org.apache.mrql.Main $*
fi
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
new file mode 100644
index 0000000..a9c5656
--- /dev/null
+++ b/dist/pom.xml
@@ -0,0 +1,69 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mrql-dist</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.mrql</groupId>
+ <artifactId>MRQL</artifactId>
+ <version>0.9.0-incubating</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>bin-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>mrql-${project.version}-bin</finalName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>mrql-${project.version}-src</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 757d232..80f45f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,15 @@
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ </parent>
<properties>
<hadoop.version>1.0.3</hadoop.version>
@@ -45,6 +54,7 @@
<module>MapReduce</module>
<module>BSP</module>
<module>Spark</module>
+ <module>dist</module>
</modules>
<dependencies>
@@ -73,18 +83,121 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>.git/**</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.classpath/**</exclude>
+ <exclude>.project/**</exclude>
+ <exclude>tests/**</exclude>
+ <exclude>queries/**</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/docs/apidocs/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>**/*~</include>
+ <include>lib/**</include>
+ <include>tests/results/**</include>
+ <include>tests/error_log.txt</include>
+ <include>mrql-tmp</include>
+ <include>tmp</include>
+ <include>**/dependency-reduced-pom.xml</include>
+ <include>**/docs/**</include>
+ <include>**/.project</include>
+ <include>**/.classpath</include>
+ <include>**/.settings/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <outputDirectory>docs/apidocs</outputDirectory>
+ <show>package</show>
+ <quiet>true</quiet>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ </extensions>
</build>
+ <distributionManagement>
+ <repository>
+ <id>apache.website</id>
+ <url>scpexe://people.apache.org/www/mrql.apache.org</url>
+<!--
+ <url>file://target</url>
+-->
+ </repository>
+ </distributionManagement>
+
<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/MRQL</url>
@@ -92,6 +205,12 @@
<mailingLists>
<mailingList>
+ <name>User List</name>
+ <subscribe>user-subscribe@mrql.incubator.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@mrql.incubator.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-mrql-user/</archive>
+ </mailingList>
+ <mailingList>
<name>Development</name>
<post>dev@mrql.incubator.apache.org</post>
<subscribe>dev-subscribe@mrql.incubator.apache.org</subscribe>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
new file mode 100644
index 0000000..aba99d9
--- /dev/null
+++ b/src/main/assembly/bin.xml
@@ -0,0 +1,57 @@
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>conf/mrql-env.sh</include>
+ </includes>
+ <excludes>
+ <exclude>**/*~</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../lib</directory>
+ <excludes>
+ <exclude>gen*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../tests</directory>
+ <includes>
+ <include>queries/**</include>
+ <include>data/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../bin</directory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
new file mode 100644
index 0000000..f7edb3c
--- /dev/null
+++ b/src/main/assembly/src.xml
@@ -0,0 +1,67 @@
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>Makefile</include>
+ <include>**/*.xml</include>
+ <include>**/apidocs/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/*~</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>../queries</directory>
+ </fileSet>
+ <fileSet>
+ <directory>../tests</directory>
+ <includes>
+ <include>queries/**</include>
+ <include>data/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../bin</directory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../conf</directory>
+ </fileSet>
+ <fileSet>
+ <directory>../lib</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/BSP/BSPPlan.java
----------------------------------------------------------------------
diff --git a/src/main/java/BSP/BSPPlan.java b/src/main/java/BSP/BSPPlan.java
index 7252628..4ccd95d 100644
--- a/src/main/java/BSP/BSPPlan.java
+++ b/src/main/java/BSP/BSPPlan.java
@@ -450,7 +450,7 @@ final public class BSPPlan extends Plan {
}
/** Evaluate a BSP operation that aggregates the results
- * @param source_nums output tags
+ * @param source_num output tag
* @param superstep the superstep function
* @param init_state initial state
* @param acc_fnc accumulator function
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/BSP/Evaluator.gen
----------------------------------------------------------------------
diff --git a/src/main/java/BSP/Evaluator.gen b/src/main/java/BSP/Evaluator.gen
index f3e594d..5331ab0 100644
--- a/src/main/java/BSP/Evaluator.gen
+++ b/src/main/java/BSP/Evaluator.gen
@@ -68,7 +68,7 @@ final public class Evaluator extends Interpreter {
}
/** Evaluate MRQL physical operators using BSP
- * @param e the physical plan
+ * @param plan the physical plan
* @param env contains bindings fro variables to values (MRData)
* @return a DataSet (stored in HDFS)
*/
@@ -104,7 +104,7 @@ final public class Evaluator extends Interpreter {
* @param zero the zero element of type T
* @param plan the plan that constructs the dataset that contains the bag of values {T}
* @param env contains bindings fro variables to values (MRData)
- * @returns the aggregation result of type T
+ * @return the aggregation result of type T
*/
final static MRData aggregate ( Tree acc_fnc,
Tree zero,
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/MapReduce/Evaluator.gen
----------------------------------------------------------------------
diff --git a/src/main/java/MapReduce/Evaluator.gen b/src/main/java/MapReduce/Evaluator.gen
index cb2d50f..52f2757 100644
--- a/src/main/java/MapReduce/Evaluator.gen
+++ b/src/main/java/MapReduce/Evaluator.gen
@@ -73,7 +73,7 @@ final public class Evaluator extends Interpreter {
* @param zero the zero element of type T
* @param plan the plan that constructs the dataset that contains the bag of values {T}
* @param env contains bindings fro variables to values (MRData)
- * @returns the aggregation result of type T
+ * @return the aggregation result of type T
*/
final static MRData aggregate ( Tree acc_fnc,
Tree zero,
@@ -105,7 +105,6 @@ final public class Evaluator extends Interpreter {
/** Evaluate an MRQL physical plan using Hadoop and print tracing info
* @param e the physical plan
* @param env contains bindings fro variables to values (MRData)
- * @param tne name of the counter used in loops
* @return a DataSet (stored in HDFS)
*/
final static DataSet eval ( final Tree e,
@@ -130,7 +129,6 @@ final public class Evaluator extends Interpreter {
/** Evaluate MRQL physical operators using Hadoop
* @param e the physical plan
* @param env contains bindings fro variables to values (MRData)
- * @param tne name of the counter used in loops
* @return a DataSet (stored in HDFS)
*/
final static DataSet evalD ( final Tree e,
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/core/AlgebraicOptimization.gen
----------------------------------------------------------------------
diff --git a/src/main/java/core/AlgebraicOptimization.gen b/src/main/java/core/AlgebraicOptimization.gen
index 0b1a100..101e1d7 100644
--- a/src/main/java/core/AlgebraicOptimization.gen
+++ b/src/main/java/core/AlgebraicOptimization.gen
@@ -36,7 +36,7 @@ public class AlgebraicOptimization extends Simplification {
/**
* algebraic optimization (algebra to algebra)
* @param e the algebraic form to be optimized
- * @returns the optimized form
+ * @return the optimized form
*/
public static Tree translate ( Tree e ) {
match e {
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/core/Normalization.gen
----------------------------------------------------------------------
diff --git a/src/main/java/core/Normalization.gen b/src/main/java/core/Normalization.gen
index e98ec06..1f8b05c 100644
--- a/src/main/java/core/Normalization.gen
+++ b/src/main/java/core/Normalization.gen
@@ -313,7 +313,7 @@ public class Normalization extends Translator {
}
/** normalize algebraic expressions to more efficient forms using heuristic rules */
- static Tree normalize ( Tree e ) {
+ public static Tree normalize ( Tree e ) {
match e {
case select(`u,from(),where(true)):
return normalize(#<bag(`u)>);
@@ -397,7 +397,7 @@ public class Normalization extends Translator {
}
/** normalize algebraic expressions to more efficient forms using heuristic rules */
- static Tree normalize_all ( Tree e ) {
+ public static Tree normalize_all ( Tree e ) {
Tree ne = normalize(e);
if (e.equals(ne))
return e;
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/core/Test.java
----------------------------------------------------------------------
diff --git a/src/main/java/core/Test.java b/src/main/java/core/Test.java
index f49f018..6de5eb0 100644
--- a/src/main/java/core/Test.java
+++ b/src/main/java/core/Test.java
@@ -106,6 +106,7 @@ final public class Test {
throw new Error("Must provide a query directory, a result directory, and an error log file");
File query_dir = new File(Main.query_file);
result_directory = Config.extra_args.get(0);
+ (new File(result_directory)).mkdirs();
System.setErr(new PrintStream(Config.extra_args.get(1)));
test_out = System.out;
for ( File f: query_dir.listFiles() )
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/main/java/spark/Evaluator.gen
----------------------------------------------------------------------
diff --git a/src/main/java/spark/Evaluator.gen b/src/main/java/spark/Evaluator.gen
index 7b370e3..be7287a 100644
--- a/src/main/java/spark/Evaluator.gen
+++ b/src/main/java/spark/Evaluator.gen
@@ -144,7 +144,7 @@ final public class Evaluator extends Interpreter implements Serializable {
* @param zero the zero element of type T
* @param plan the plan that constructs the dataset that contains the bag of values {T}
* @param env contains bindings fro variables to values (MRData)
- * @returns the aggregation result of type T
+ * @return the aggregation result of type T
*/
final static MRData aggregate ( Tree acc_fnc,
Tree zero,
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2fda775d/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 8cf483e..7d25008 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -19,13 +19,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties></properties>
- <title>a Query processing and optimization system</title>
+ <title>A Query Processing and Optimization System</title>
<body>
<section name="Apache MRQL"></section>
- <p>MRQL is a query processing and optimization system for large-scale, distributed data analysis, built on top of Apache Hadoop and Hama.
+ <p>MRQL is a query processing and optimization system for large-scale, distributed data analysis, built on top of Apache Hadoop, Hama, and Spark.
<br/><br/>
- MRQL (pronounced miracle) is a query processing and optimization system for large-scale, distributed data analysis. MRQL (the MapReduce Query Language) is an SQL-like query language for large-scale data analysis on a cluster of computers. The MRQL query processing system can evaluate MRQL queries in two modes: in MapReduce mode on top of Apache Hadoop or in Bulk Synchronous Parallel (BSP) mode on top of Apache Hama. The MRQL query language is powerful enough to express most common data analysis tasks over many forms of raw in-situ data, such as XML and JSON documents, binary files, and CSV documents. MRQL is more powerful than other current high-level MapReduce languages, such as Hive and PigLatin, since it can operate on more complex data and supports more powerful query constructs, thus eliminating the need for using explicit MapReduce code. With MRQL, users will be able to express complex data analysis tasks, such as PageRank, k-means clustering, matrix factorization, etc, us
ing SQL-like queries exclusively, while the MRQL query processing system will be able to compile these queries to efficient Java code.</p>
+ MRQL (pronounced miracle) is a query processing and optimization system for large-scale, distributed data analysis. MRQL (the MapReduce Query Language) is an SQL-like query language for large-scale data analysis on a cluster of computers. The MRQL query processing system can evaluate MRQL queries in three modes: in Map-Reduce mode using Apache Hadoop, in BSP mode (Bulk Synchronous Parallel mode) using Apache Hama, and in Spark mode using Apache Spark. The MRQL query language is powerful enough to express most common data analysis tasks over many forms of raw in-situ data, such as XML and JSON documents, binary files, and CSV documents. MRQL is more powerful than other current high-level MapReduce languages, such as Hive and PigLatin, since it can operate on more complex data and supports more powerful query constructs, thus eliminating the need for using explicit MapReduce code. With MRQL, users are able to express complex data analysis tasks, such as PageRank, k-means clusterin
g, matrix factorization, etc, using SQL-like queries exclusively, while the MRQL query processing system is able to compile these queries to efficient Java code.</p>
<section name="News"></section>
<p>
<ul>