You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2015/10/19 11:46:53 UTC
[30/30] incubator-asterixdb git commit: Merge branch 'release-0.8.7'
Merge branch 'release-0.8.7'
Change-Id: Iadb5074d0e0d7fb2a2d4103aa405e9fc91f443c5
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/40b09697
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/40b09697
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/40b09697
Branch: refs/heads/master
Commit: 40b09697862ab21195c30fecc6bf3f3987b9a529
Parents: 4bb94a8 4e6a923
Author: Ian Maxon <im...@apache.org>
Authored: Fri Oct 16 18:18:50 2015 -0700
Committer: Ian Maxon <ia...@maxons.email>
Committed: Fri Oct 16 18:21:57 2015 -0700
----------------------------------------------------------------------
LICENSE.txt | 6 ++++
README.md | 18 ++++++++++
asterix-algebra/pom.xml | 15 ++++----
asterix-algebra/src/main/javacc/AQLPlus.jj | 19 ++++++++++
asterix-app/pom.xml | 25 ++++++-------
.../src/main/resources/feed/dashboard.html | 19 ++++++++++
asterix-app/src/main/resources/feed/home.html | 1 -
.../resources/sdk/static/AdmAql101/demo.html | 18 ++++++++++
.../resources/sdk/static/AdmAql101/js/demo.js | 18 ++++++++++
.../src/main/resources/webui/querytemplate.html | 6 ++--
.../main/resources/webui/static/css/style.css | 19 ++++++++++
.../src/test/resources/fuzzyjoin/amerix/line.py | 16 +++++++++
.../.tinysocial-suite.5.adm.swp | Bin 12288 -> 0 bytes
asterix-aql/pom.xml | 13 +++----
asterix-aql/src/main/javacc/AQL.html | 18 ++++++++++
asterix-aql/src/main/javacc/AQL.jj | 19 ++++++++++
asterix-common/pom.xml | 4 +--
.../src/main/resources/schema/asterix-conf.xsd | 20 +++++++++++
.../src/main/resources/schema/cluster.xsd | 20 +++++++++++
.../src/main/resources/schema/jaxb-bindings.xjb | 19 ++++++++++
.../src/main/resources/schema/yarn_cluster.xsd | 20 +++++++++++
asterix-doc/pom.xml | 6 ++--
asterix-doc/src/site/markdown/api.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/allens.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/datamodel.md | 19 ++++++++++
.../src/site/markdown/aql/externaldata.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/filters.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/functions.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/js-sdk.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/manual.md | 19 ++++++++++
.../src/site/markdown/aql/primer-sql-like.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/primer.md | 19 ++++++++++
asterix-doc/src/site/markdown/aql/similarity.md | 18 ++++++++++
asterix-doc/src/site/markdown/csv.md | 19 ++++++++++
asterix-doc/src/site/markdown/feeds/tutorial.md | 19 ++++++++++
asterix-doc/src/site/markdown/index.md | 19 ++++++++++
asterix-doc/src/site/markdown/install.md | 19 ++++++++++
asterix-doc/src/site/markdown/overview.md | 19 ++++++++++
asterix-doc/src/site/markdown/udf.md | 19 ++++++++++
asterix-doc/src/site/markdown/yarn.md | 19 ++++++++++
asterix-events/pom.xml | 6 ++--
.../src/main/resources/events/execute.sh | 16 +++++++++
.../main/resources/events/file/create_file.sh | 16 +++++++++
.../src/main/resources/events/prepare.sh | 16 +++++++++
.../src/main/resources/schema/event.xsd | 20 +++++++++++
.../main/resources/schema/installer-conf.xsd | 20 +++++++++++
.../src/main/resources/schema/jaxb-bindings.xjb | 19 ++++++++++
.../src/main/resources/schema/pattern.xsd | 20 +++++++++++
asterix-examples/pom.xml | 2 +-
.../src/main/resources/admaql101-demo/README.md | 19 ++++++++++
.../main/resources/admaql101-demo/admaql101.py | 17 +++++++++
.../src/main/resources/admaql101-demo/demo.tpl | 19 +++++++++-
.../resources/admaql101-demo/run_101_demo.py | 17 +++++++++
.../resources/admaql101-demo/static/js/demo.js | 18 ++++++++++
.../src/main/resources/tweetbook-demo/README.md | 19 ++++++++++
.../tweetbook-demo/run_tweetbook_demo.py | 17 +++++++++
.../tweetbook-demo/static/js/tweetbook.js | 18 ++++++++++
.../main/resources/tweetbook-demo/tweetbook.tpl | 18 ++++++++++
.../tweetbook-demo/tweetbook_bootstrap.py | 17 +++++++++
asterix-external-data/pom.xml | 10 +++---
.../main/assembly/binary-assembly-libjar.xml | 18 ++++++++++
.../main/assembly/binary-assembly-libzip.xml | 18 ++++++++++
.../src/main/resources/schema/library.xsd | 20 +++++++++++
.../src/test/resources/library_descriptor.xml | 18 ++++++++++
asterix-fuzzyjoin/data/verify.sh | 19 +++++++++-
asterix-fuzzyjoin/data/verify.stage1.sh | 17 +++++++++
asterix-fuzzyjoin/data/verify.stage2.sh | 17 +++++++++
asterix-fuzzyjoin/data/verify.stage3.sh | 17 +++++++++
asterix-fuzzyjoin/pom.xml | 28 ++++++++-------
asterix-installer/pom.xml | 12 +++----
.../src/main/resources/schema/jaxb-bindings.xjb | 19 ++++++++++
.../src/main/resources/zookeeper/stop_zk | 17 +++++++++
.../src/main/resources/zookeeper/zk.init | 17 +++++++++
.../src/test/resources/clusterts/Vagrantfile | 17 +++++++++
.../src/test/resources/clusterts/cluster.xml | 18 ++++++++++
.../integrationts/library/testsuite.xml | 18 ++++++++++
.../dml_recovery/configure_and_validate.sh | 19 +++++++++-
.../scripts/dml_recovery/create_and_start.sh | 17 +++++++++
.../scripts/dml_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../scripts/dml_recovery/shutdown.sh | 17 +++++++++
.../scripts/dml_recovery/stop_and_delete.sh | 17 +++++++++
.../scripts/dml_recovery/stop_and_start.sh | 17 +++++++++
.../primary_index_only/create_and_start.sh | 17 +++++++++
.../primary_index_only/kill_cc_and_nc.sh | 17 +++++++++
.../primary_index_only/stop_and_delete.sh | 17 +++++++++
.../primary_index_only/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../primary_plus_ngram_index/kill_cc_and_nc.sh | 17 +++++++++
.../primary_plus_ngram_index/stop_and_delete.sh | 17 +++++++++
.../primary_plus_ngram_index/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../primary_plus_rtree_index/kill_cc_and_nc.sh | 17 +++++++++
.../primary_plus_rtree_index/stop_and_delete.sh | 17 +++++++++
.../primary_plus_rtree_index/stop_and_start.sh | 17 +++++++++
.../temp_primary_index_only/create_and_start.sh | 17 +++++++++
.../temp_primary_index_only/kill_cc_and_nc.sh | 17 +++++++++
.../temp_primary_index_only/stop_and_delete.sh | 17 +++++++++
.../temp_primary_index_only/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../dataset_recovery/create_and_start.sh | 17 +++++++++
.../dataset_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../dataset_recovery/stop_and_delete.sh | 17 +++++++++
.../dataset_recovery/stop_and_start.sh | 17 +++++++++
.../datatype_recovery/create_and_start.sh | 17 +++++++++
.../datatype_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../datatype_recovery/stop_and_delete.sh | 17 +++++++++
.../datatype_recovery/stop_and_start.sh | 17 +++++++++
.../dataverse_recovery/create_and_start.sh | 17 +++++++++
.../dataverse_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../dataverse_recovery/stop_and_delete.sh | 17 +++++++++
.../dataverse_recovery/stop_and_start.sh | 17 +++++++++
.../delete_after_recovery/create_and_start.sh | 17 +++++++++
.../delete_after_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../delete_after_recovery/stop_and_delete.sh | 17 +++++++++
.../delete_after_recovery/stop_and_start.sh | 17 +++++++++
.../function_recovery/create_and_start.sh | 17 +++++++++
.../function_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../function_recovery/stop_and_delete.sh | 17 +++++++++
.../function_recovery/stop_and_start.sh | 17 +++++++++
.../insert_after_recovery/create_and_start.sh | 17 +++++++++
.../insert_after_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../insert_after_recovery/stop_and_delete.sh | 17 +++++++++
.../insert_after_recovery/stop_and_start.sh | 17 +++++++++
.../load_after_recovery/create_and_start.sh | 17 +++++++++
.../load_after_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../load_after_recovery/stop_and_delete.sh | 17 +++++++++
.../load_after_recovery/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../secondary_index_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../secondary_index_recovery/stop_and_delete.sh | 17 +++++++++
.../secondary_index_recovery/stop_and_start.sh | 17 +++++++++
.../temp_dataset_recovery/create_and_start.sh | 17 +++++++++
.../temp_dataset_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../temp_dataset_recovery/stop_and_delete.sh | 17 +++++++++
.../temp_dataset_recovery/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../temp_load_after_recovery/kill_cc_and_nc.sh | 17 +++++++++
.../temp_load_after_recovery/stop_and_delete.sh | 17 +++++++++
.../temp_load_after_recovery/stop_and_start.sh | 17 +++++++++
.../create_and_start.sh | 17 +++++++++
.../kill_cc_and_nc.sh | 17 +++++++++
.../stop_and_delete.sh | 17 +++++++++
.../stop_and_start.sh | 17 +++++++++
.../setup_teardown/configure_and_validate.sh | 19 +++++++++-
.../scripts/setup_teardown/kill_cc_and_nc.sh | 17 +++++++++
.../scripts/setup_teardown/shutdown.sh | 17 +++++++++
.../scripts/setup_teardown/stop_and_delete.sh | 17 +++++++++
.../Asterix_ADM_Parser.md | 19 ++++++++++
.../lexer-generator-maven-plugin/README.md | 19 ++++++++++
.../lexer-generator-maven-plugin/pom.xml | 2 +-
.../src/main/resources/default.config | 17 +++++++++
asterix-maven-plugins/pom.xml | 2 +-
.../pom.xml | 2 +-
asterix-metadata/pom.xml | 10 +++---
asterix-om/pom.xml | 6 ++--
asterix-runtime/pom.xml | 10 +++---
asterix-runtime/src/main/resources/adm.grammar | 17 +++++++++
asterix-server/pom.xml | 4 +--
asterix-test-framework/pom.xml | 2 +-
.../src/main/resources/Catalog.xsd | 19 ++++++++++
asterix-tools/pom.xml | 14 ++++----
.../resources/adgts/dgscripts/events/event.adg | 18 ++++++++++
.../resources/adgts/dgscripts/users/user.adg | 19 ++++++++++
asterix-transactions/pom.xml | 6 ++--
asterix-yarn/pom.xml | 16 ++++-----
.../src/main/resources/configs/local.xml | 18 ++++++++++
.../configs/my_awesome_cluster_desc.xml | 18 ++++++++++
asterix-yarn/src/main/resources/scripts/asterix | 17 +++++++++
.../src/test/resources/library/testsuite.xml | 18 ++++++++++
pom.xml | 10 +++---
src/main/assembly/source.xml | 35 ++++++++++++-------
210 files changed, 3339 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-algebra/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-app/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-app/src/main/resources/webui/querytemplate.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-aql/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-events/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-examples/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-external-data/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-fuzzyjoin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-installer/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-metadata/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-om/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-runtime/pom.xml
----------------------------------------------------------------------
diff --cc asterix-runtime/pom.xml
index 0dade16,4fb1b8b..d53ab4b
--- a/asterix-runtime/pom.xml
+++ b/asterix-runtime/pom.xml
@@@ -38,9 -38,19 +38,9 @@@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <fork>true</fork>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>lexer-generator-maven-plugin</artifactId>
- <version>0.8.7-SNAPSHOT</version>
+ <version>0.8.8-SNAPSHOT</version>
<configuration>
<grammarFile>src/main/resources/adm.grammar</grammarFile>
<outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-test-framework/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-test-framework/src/main/resources/Catalog.xsd
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-tools/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/asterix-transactions/pom.xml
----------------------------------------------------------------------
diff --cc asterix-transactions/pom.xml
index 8f9244c,3afeac3..b8673bb
--- a/asterix-transactions/pom.xml
+++ b/asterix-transactions/pom.xml
@@@ -37,9 -37,19 +37,9 @@@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <fork>true</fork>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>record-manager-generator-maven-plugin</artifactId>
- <version>0.8.7-SNAPSHOT</version>
+ <version>0.8.8-SNAPSHOT</version>
<configuration>
<debug>false</debug>
<inputFiles>
@@@ -99,18 -109,13 +99,18 @@@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>0.8.8-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-common</artifactId>
- <version>0.8.7-SNAPSHOT</version>
++ <version>0.8.8-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>18.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/40b09697/pom.xml
----------------------------------------------------------------------