Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

tillw/hyracks0.3.2 #168

Open
westmann wants to merge 15 commits into
base: master
Choose a base branch
from
Open

tillw/hyracks0.3.2 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d196d65
Add missing dependencies
westmann May 7, 2017
1f03bf7
Fixes for current Hyracks 0.3.2-SNAPSHOT
westmann May 7, 2017
b449382
More fixes for current Hyracks 0.3.2-SNAPSHOT
westmann May 13, 2017
8b6fd08
Enable verbose logging for VXQueryIT
westmann May 15, 2017
061b2f0
Add option to set implicit timezone for tests
May 28, 2017
029f3bc
The implicit timezone for tests is not required.
May 28, 2017
37642be
Preparing the site for the next release.
prestoncarman Jun 4, 2017
4a38f67
[VXQUERY-196][VXQUERY-204][VXQUERY-228] Cleaning up indexing query st…
pavlopoul May 30, 2017
0ed20c5
Add missing dependencies
westmann May 7, 2017
f706f0b
Fixes for current Hyracks 0.3.2-SNAPSHOT
westmann May 7, 2017
bfbe295
More fixes for current Hyracks 0.3.2-SNAPSHOT
westmann May 13, 2017
20bd06f
Enable verbose logging for VXQueryIT
westmann May 15, 2017
41918ae
Add option to set implicit timezone for tests
May 28, 2017
fbd9f69
The implicit timezone for tests is not required.
May 28, 2017
460bf6c
Merge branch 'tillw/hyracks0.3.2' of https://github.com/westmann/vxqu…
westmann Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 68 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,37 @@
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>2.0.9</version>
<version>2.33</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.2</version>
</dependency>

<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>

<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>

<dependency>
Expand All @@ -231,6 +261,12 @@
<version>${hyracks.version}</version>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-util</artifactId>
<version>${hyracks.version}</version>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-common</artifactId>
Expand Down Expand Up @@ -328,12 +364,24 @@
<type>jar</type>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.7.0</version>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>2.7.0</version>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>2.7.0</version>
</dependency>

<dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
Expand Down Expand Up @@ -383,6 +431,12 @@
<version>2.8.4</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.4</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand All @@ -395,6 +449,18 @@
<version>1.4</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.2</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -670,7 +736,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<hyracks.version>0.3.0</hyracks.version>
<hyracks.version>0.3.2-SNAPSHOT</hyracks.version>
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
</properties>

Expand Down
78 changes: 73 additions & 5 deletions src/site/apt/development_contribution.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Contributing Code

The following steps outline how to submit code to the VXQuery community for inclusion.
Please read the Developer {{{http://vxquery.apache.org/developer_get_started.html}Get Started}} Guide
to answer question about getting start as a developer.
to answer questions about getting start as a developer.
VXQuery community supports two methods for contributing code to the project.

[[1]] <<Submit a patch file to an open VXQuery issue.>>
Expand Down Expand Up @@ -55,13 +55,19 @@ Contributing Code
VXQuery uses the following convention when creating a branch: authors_username/topic_or_issue
(examples: prestonc/vxquery_142 or tillw/group_by_clause).
The following branch name helps keep branches separated and keeps it easy to determine the author and topic.
The authors_username is very important when reviewing a developers code on your own machine.

---
git checkout master
git pull
git branch prestonc/vxquery_142
git checkout prestonc/vxquery_142
---

* Make the change.

:-)


* Add new tests. (optional)

If the change is not covered in the XQTS, please create a new test in the VXQuery test suite
Expand All @@ -82,12 +88,19 @@ Contributing Code

Remove an extra debug code and verify the patch only includes code for the change.

* Commit and push code.

Commit changes to the branch and push to github.


* Create a github Pull Request.

Once the work has been tested, a pull request can be created for the change branch.
Please use the Apache VXQuery master as branch to compare the change branch.
The branch should be up-to-date with the lastest Apache VXQuery master branch.
The branch should be up-to-date with the latest Apache VXQuery master branch.

Git rebase is a nice option for keeping your code up-to-date with master without messing up the Pull Request.
(Merge will show changes in master as your changes on your branch.)


* Post your Pull Request.
Expand All @@ -96,16 +109,41 @@ Contributing Code
At least one other member of the community should review the change.
If there is any feedback, address this and repeat the posting process.

* Update your Pull Request.

Update your change to address any comments from reviewers.

* Prepare your change for merge.

Squash your changes into a single commit with a nice commit message.
The commit message's first line should be less than 50 character and any additional comments
are included below a blank line.

---
VXQUERY-142: fn:doc support for source files

The fn:doc function now supports reading files defined in the test suite XML source tag.
---

Git rebase has a option of merging commits into a single commit that works nicely for squashing your changes.
({{{http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html}git ready}} has a nice example.)
Although, this will not work if you happened use merge when updated to the latest master branch.


** Code Reviewer

* Review the Pull Request.

Post inline or global comments for the developer.
Post in-line or global comments for the developer.
Be polite in your suggestions.
Guide the developer to bring the code up to VXQuery's code standards.

* Double check the VXQuery and XQTS tests.

Each Pull Request automatically triggers a {{{https://asterix-jenkins.ics.uci.edu/job/vxquery-pr/}VXQuery Jenkins}}
job that runs all the tests.



** VXQuery Committer (author or sponsor of the change)

Expand All @@ -114,9 +152,39 @@ Contributing Code
they are pushing on to the repository.
Often the committer will also be the reviewer for non-committer changes.

* Add ASF as a git remote (first time committers).

Create a git remote for ASF repository. {{{https://git-wip-us.apache.org/repos/asf/vxquery.git}}}

* Double check the VXQuery and XQTS tests.

A {{{https://asterix-jenkins.ics.uci.edu/job/vxquery-pr/}VXQuery Jenkins}} instance has been set up to
check the last ten Pull Requests.
The Pull Request being reviewed should pass all tests.
Each commit to a Pull Request will trigger a new test run.
Confirm the last test run passes all the tests.

* Double check the change.

Confirm the change has a single commit and includes a nice commit message.

* Merge the change with ASF master.

When merging the change, do not rebase.
When merging the change, do not <<rebase>> (we do not want to change the Apache commit history).
Instead do a single merge commit into Apache VXQuery master.
Since the Pull Request now has a single commit, an alternative would be to cherry pick that commit
from the given branch into master.

---
git checkout master
git merge prestonc/vxquery_142
git log
---

Review the log to confirm the history is correct.


* Push change to ASF remote.

Confirm the log is correct on your local master.
Push master to the ASF remote.
5 changes: 3 additions & 2 deletions src/site/apt/index.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
Apache VXQuery

Apache VXQuery\x99 will be a standards compliant XML Query processor implemented in Java.
The focus is on the evaluation of queries on large amounts of XML data.
Specifically the goal is to evaluate queries on large collections of relatively small XML documents.
The XQuery processor supports the {{{http://www.jsoniq.org/}JSONiq}} extension to XQuery.
The focus is on the evaluation of queries on large amounts of JSON and XML data.
Specifically the goal is to evaluate queries on large collections of relatively small JSON or XML documents.
To achieve this queries will be evaluated on a cluster of shared nothing machines.

There are lots of large collections of relatively small documents like e.g. the {{{http://www.sec.gov/info/edgar/ednews/dissemin.htm}EDGAR dataset}} or the {{{http://wiki.openstreetmap.org/wiki/Download}OpenStreetMap dataset}}.
Expand Down
Binary file modified src/site/resources/images/vxquery_stack.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 19 additions & 4 deletions vxquery-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
Expand Down Expand Up @@ -122,19 +132,24 @@
<artifactId>hyracks-control-common</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-common</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-hdfs-core</artifactId>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-hdfs-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-hdfs-2.x</artifactId>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-hdfs-2.x</artifactId>
</dependency>
</dependencies>

Expand Down
Loading