This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 69d7209677dac81c1cc37da9dbc976943459352e Author: Hussain Towaileb <[email protected]> AuthorDate: Sat Dec 5 07:26:38 2020 +0300 [NO ISSUE][EXT] Rename dataset's dataverse property to dataset-dataverse Change-Id: I1da77fd4d1ea557aa7fd5f657754057ebfb85255 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/9163 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Reviewed-by: Dmitry Lychagin <[email protected]> --- .../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 | 3 ++- 4 files changed, 6 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 812cb96..326f53d 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 036dbad..a28a2ee 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 @@ -186,7 +186,7 @@ public class ExternalDataUtils { } public static DataverseName getDataverse(Map<String, String> configuration) { - return DataverseName.createFromCanonicalForm(configuration.get(ExternalDataConstants.KEY_DATAVERSE)); + return DataverseName.createFromCanonicalForm(configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE)); } public static String getParserFactory(Map<String, String> configuration) { @@ -311,7 +311,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.getCanonicalForm()); + configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName.getCanonicalForm()); 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 e5fd6f7..2bb4fd5 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 @@ -839,7 +839,8 @@ 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().getCanonicalForm()); + configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, + dataset.getDataverseName().getCanonicalForm()); ITypedAdapterFactory adapterFactory = AdapterFactoryProvider.getAdapterFactory(getApplicationContext().getServiceContext(), adapterName, configuration, itemType, metaType, warningCollector);
