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 <hussain.towai...@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 <jenk...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hussai...@gmail.com>
Reviewed-by: Dmitry Lychagin <dmitry.lycha...@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);
