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 2021/07/20 15:26:05 UTC
[asterixdb] branch master updated (03fd6d0 -> 5f9330a)
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from 03fd6d0 [ASTERIXDB-2931][EXT] Reading Parquet files with Temp. and Anon. credentials
new c5da083 [NO ISSUE] Fix rr diagram generation
new 02ea049 [NO ISSUE][EXT] Rename dataset's dataverse property to dataset-dataverse
new 4c55b6d Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
new 0bb11aa [NO ISSUE] Touch 3rdpartylicenses.txt in skip.npm
new 5f9330a Merge branch 'cheshire-cat' into 'master'
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
asterixdb/asterix-dashboard/pom.xml | 22 ++++++++++++++++++++++
asterixdb/asterix-doc/pom.xml | 8 ++++----
asterixdb/pom.xml | 13 +++++++++++++
3 files changed, 39 insertions(+), 4 deletions(-)
[asterixdb] 02/05: [NO ISSUE] Fix rr diagram generation
Posted by im...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c5da08319e1c3b3e4fc7ac471094c9b5d0305f35
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Thu Jul 1 15:02:08 2021 -0700
[NO ISSUE] Fix rr diagram generation
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
Use the proper parameters for antrun plugin 3.0.0
Change-Id: I3f0e749dab55c873a6ec2d5fd101afae9a27413e
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12183
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <im...@uci.edu>
Reviewed-by: Dmitry Lychagin <dm...@couchbase.com>
---
asterixdb/asterix-doc/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml
index c58d983..925beba 100644
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@ -191,10 +191,10 @@
<id>extract-rr</id>
<phase>generate-sources</phase>
<configuration>
- <tasks>
+ <target>
<echo message="Extracting rr" />
<unzip src="${project.build.directory}/rr-1.62-java8.zip" dest="${project.build.directory}" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -204,13 +204,13 @@
<id>extract-diagrams</id>
<phase>process-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo message="Extracting diagrams" />
<unzip src="${project.build.directory}/railroads.zip" dest="${project.build.directory}" />
<copy todir="${project.build.directory}/site/images/diagrams/">
<fileset dir="${project.build.directory}/diagram/"/>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
[asterixdb] 05/05: Merge branch 'cheshire-cat' into 'master'
Posted by im...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 5f9330a10e8ebdd33f0fdcaf55fac431cfbdb154
Merge: 03fd6d0 0bb11aa
Author: Ian Maxon <im...@apache.org>
AuthorDate: Mon Jul 19 17:34:28 2021 -0700
Merge branch 'cheshire-cat' into 'master'
Change-Id: I6da73651773a8f0880a3ae542951241f8672a159
asterixdb/asterix-dashboard/pom.xml | 22 ++++++++++++++++++++++
asterixdb/asterix-doc/pom.xml | 8 ++++----
asterixdb/pom.xml | 13 +++++++++++++
3 files changed, 39 insertions(+), 4 deletions(-)
diff --cc asterixdb/pom.xml
index 98884f8,8b769f4..527eb4a
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -79,10 -79,11 +79,11 @@@
<prepare-env.stage>none</prepare-env.stage>
<shim.stage>none</shim.stage>
<pytestlib.stage>none</pytestlib.stage>
+ <skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.14.1</log4j.version>
[asterixdb] 03/05: Merge branch 'gerrit/mad-hatter' into
'gerrit/cheshire-cat'
Posted by im...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 4c55b6d40a957a207fee8869fec8017a5e90bcb1
Merge: c5da083 02ea049
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Sun Jul 18 20:40:54 2021 +0300
Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
[asterixdb] 04/05: [NO ISSUE] Touch 3rdpartylicenses.txt in skip.npm
Posted by im...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0bb11aa6b26c00bd52a81ffdce58858dd036c964
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Wed Jul 7 14:55:59 2021 -0700
[NO ISSUE] Touch 3rdpartylicenses.txt in skip.npm
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
(Ab)use antrun to make 'skip.npm' work without having to touch
asterixdb/asterix-dashboard/target/dashboard/static/3rdpartylicenses.txt
before the build.
Change-Id: Ic95e592b42139b4750af8bb20297f926b3c973e4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12243
Reviewed-by: Ian Maxon <im...@uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Ian Maxon <im...@uci.edu>
---
asterixdb/asterix-dashboard/pom.xml | 22 ++++++++++++++++++++++
asterixdb/pom.xml | 13 +++++++++++++
2 files changed, 35 insertions(+)
diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml
index df9dfac..2b10a4e 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -182,4 +182,26 @@
<id>skip-dashboard</id>
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>touch-3rdparty</id>
+ <phase>${skip-npm-touch.stage}</phase>
+ <configuration>
+ <target>
+ <touch file="${basedir}/target/dashboard/static/3rdpartylicenses.txt" mkdirs="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index c56c43f..8b769f4 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -79,6 +79,7 @@
<prepare-env.stage>none</prepare-env.stage>
<shim.stage>none</shim.stage>
<pytestlib.stage>none</pytestlib.stage>
+ <skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
<algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
@@ -711,6 +712,18 @@
</properties>
</profile>
<profile>
+ <id>skip-npm</id>
+ <activation>
+ <property>
+ <name>skip.npm</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skip-npm-touch.stage>process-sources</skip-npm-touch.stage>
+ </properties>
+ </profile>
+ <profile>
<id>invalid-tests</id>
<properties>
<invalid.tests />
[asterixdb] 01/05: [NO ISSUE][EXT] Rename dataset's dataverse
property to dataset-dataverse
Posted by im...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 02ea049d7a5e2432959277b09576e6ff5f81a13a
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Tue Jul 13 02:40:56 2021 +0300
[NO ISSUE][EXT] Rename dataset's dataverse property to dataset-dataverse
Change-Id: I997026fbd8118dd4909e0d868cd36e99c8474a6b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12304
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Reviewed-by: Dmitry Lychagin <dm...@couchbase.com>
---
.../test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm | 2 +-
.../java/org/apache/asterix/external/util/ExternalDataConstants.java | 2 +-
.../main/java/org/apache/asterix/external/util/ExternalDataUtils.java | 4 ++--
.../java/org/apache/asterix/metadata/declared/MetadataProvider.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm
index 3ab469e..8ada33c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm
@@ -1 +1 @@
-{ "DataverseName": "feeds", "FeedName": "TweetFeed", "AdapterConfiguration": {{ { "Name": "path", "Value": "asterix_nc1://data/twitter/obamatweets.adm" }, { "Name": "feed", "Value": "TweetFeed" }, { "Name": "adapter-name", "Value": "localfs" }, { "Name": "is-feed", "Value": "true" }, { "Name": "parser", "Value": "adm" }, { "Name": "reader", "Value": "localfs" }, { "Name": "format", "Value": "adm" }, { "Name": "tuple-interval", "Value": "10" }, { "Name": "type-name", "Value": "TweetType" [...]
\ No newline at end of file
+{ "DataverseName": "feeds", "FeedName": "TweetFeed", "AdapterConfiguration": {{ { "Name": "dataset-dataverse", "Value": "feeds" }, { "Name": "path", "Value": "asterix_nc1://data/twitter/obamatweets.adm" }, { "Name": "feed", "Value": "TweetFeed" }, { "Name": "adapter-name", "Value": "localfs" }, { "Name": "is-feed", "Value": "true" }, { "Name": "parser", "Value": "adm" }, { "Name": "reader", "Value": "localfs" }, { "Name": "format", "Value": "adm" }, { "Name": "tuple-interval", "Value": " [...]
\ No newline at end of file
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java
index 0f4117b..265161e 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java
@@ -36,7 +36,7 @@ public class ExternalDataConstants {
// used to specify the stream factory for an adapter that has a stream data source
public static final String KEY_STREAM = "stream";
// used to specify the dataverse of the adapter
- public static final String KEY_DATAVERSE = "dataverse";
+ public static final String KEY_DATASET_DATAVERSE = "dataset-dataverse";
// used to specify the socket addresses when reading data from sockets
public static final String KEY_SOCKETS = "sockets";
// specify whether the socket address points to an NC or an IP
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
index a6b8b47..e0b3562 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
@@ -183,7 +183,7 @@ public class ExternalDataUtils {
}
public static String getDataverse(Map<String, String> configuration) {
- return configuration.get(ExternalDataConstants.KEY_DATAVERSE);
+ return configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE);
}
public static String getParserFactory(Map<String, String> configuration) {
@@ -287,7 +287,7 @@ public class ExternalDataUtils {
if (!configuration.containsKey(ExternalDataConstants.KEY_IS_FEED)) {
configuration.put(ExternalDataConstants.KEY_IS_FEED, ExternalDataConstants.TRUE);
}
- configuration.put(ExternalDataConstants.KEY_DATAVERSE, dataverseName);
+ configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName);
configuration.put(ExternalDataConstants.KEY_FEED_NAME, feedName);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index c5109b7..ee6f4d8 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -785,7 +785,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String>
Map<String, String> configuration, ARecordType itemType, ARecordType metaType,
IWarningCollector warningCollector) throws AlgebricksException {
try {
- configuration.put(ExternalDataConstants.KEY_DATAVERSE, dataset.getDataverseName());
+ configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataset.getDataverseName());
ITypedAdapterFactory adapterFactory =
AdapterFactoryProvider.getAdapterFactory(getApplicationContext().getServiceContext(), adapterName,
configuration, itemType, metaType, warningCollector);