You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/07/18 17:43:45 UTC
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
From Hussain Towaileb <hu...@gmail.com>:
Hussain Towaileb has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
---
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
3 files changed, 0 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/12383/1
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 8d13752..7872cef 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
@@ -208,13 +208,8 @@
}
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
public static DataverseName getDatasetDataverse(Map<String, String> configuration) throws AsterixException {
return DataverseName.createFromCanonicalForm(configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE));
-=======
- public static String getDataverse(Map<String, String> configuration) {
- return configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
}
public static String getParserFactory(Map<String, String> configuration) {
@@ -339,11 +334,7 @@
if (!configuration.containsKey(ExternalDataConstants.KEY_IS_FEED)) {
configuration.put(ExternalDataConstants.KEY_IS_FEED, ExternalDataConstants.TRUE);
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName.getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
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 66b27a6..f18992f 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
@@ -844,12 +844,8 @@
Map<String, String> configuration, ARecordType itemType, ARecordType metaType,
IWarningCollector warningCollector) throws AlgebricksException {
try {
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE,
dataset.getDataverseName().getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataset.getDataverseName());
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
ITypedAdapterFactory adapterFactory =
AdapterFactoryProvider.getAdapterFactory(getApplicationContext().getServiceContext(), adapterName,
configuration, itemType, metaType, warningCollector);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
Gerrit-Change-Number: 12383
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <hu...@gmail.com>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Hussain Towaileb <hu...@gmail.com>:
Hussain Towaileb has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
---
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
3 files changed, 0 insertions(+), 13 deletions(-)
Approvals:
Murtadha Hubail: Looks good to me, approved
Hussain Towaileb: Verified
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 8d13752..7872cef 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
@@ -208,13 +208,8 @@
}
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
public static DataverseName getDatasetDataverse(Map<String, String> configuration) throws AsterixException {
return DataverseName.createFromCanonicalForm(configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE));
-=======
- public static String getDataverse(Map<String, String> configuration) {
- return configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
}
public static String getParserFactory(Map<String, String> configuration) {
@@ -339,11 +334,7 @@
if (!configuration.containsKey(ExternalDataConstants.KEY_IS_FEED)) {
configuration.put(ExternalDataConstants.KEY_IS_FEED, ExternalDataConstants.TRUE);
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName.getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
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 66b27a6..f18992f 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
@@ -844,12 +844,8 @@
Map<String, String> configuration, ARecordType itemType, ARecordType metaType,
IWarningCollector warningCollector) throws AlgebricksException {
try {
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE,
dataset.getDataverseName().getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataset.getDataverseName());
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
ITypedAdapterFactory adapterFactory =
AdapterFactoryProvider.getAdapterFactory(getApplicationContext().getServiceContext(), adapterName,
configuration, itemType, metaType, warningCollector);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
Gerrit-Change-Number: 12383
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Murtadha Hubail <mh...@apache.org>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-MessageType: merged
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Hussain Towaileb <hu...@gmail.com>:
Hussain Towaileb has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
---
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
3 files changed, 0 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/12383/1
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 8d13752..7872cef 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
@@ -208,13 +208,8 @@
}
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
public static DataverseName getDatasetDataverse(Map<String, String> configuration) throws AsterixException {
return DataverseName.createFromCanonicalForm(configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE));
-=======
- public static String getDataverse(Map<String, String> configuration) {
- return configuration.get(ExternalDataConstants.KEY_DATASET_DATAVERSE);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
}
public static String getParserFactory(Map<String, String> configuration) {
@@ -339,11 +334,7 @@
if (!configuration.containsKey(ExternalDataConstants.KEY_IS_FEED)) {
configuration.put(ExternalDataConstants.KEY_IS_FEED, ExternalDataConstants.TRUE);
}
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName.getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataverseName);
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
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 66b27a6..f18992f 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
@@ -844,12 +844,8 @@
Map<String, String> configuration, ARecordType itemType, ARecordType metaType,
IWarningCollector warningCollector) throws AlgebricksException {
try {
-<<<<<<< HEAD (c5da08 [NO ISSUE] Fix rr diagram generation)
configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE,
dataset.getDataverseName().getCanonicalForm());
-=======
- configuration.put(ExternalDataConstants.KEY_DATASET_DATAVERSE, dataset.getDataverseName());
->>>>>>> BRANCH (02ea04 [NO ISSUE][EXT] Rename dataset's dataverse property to datas)
ITypedAdapterFactory adapterFactory =
AdapterFactoryProvider.getAdapterFactory(getApplicationContext().getServiceContext(), adapterName,
configuration, itemType, metaType, warningCollector);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
Gerrit-Change-Number: 12383
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <hu...@gmail.com>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Hussain Towaileb <hu...@gmail.com>:
Hussain Towaileb has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
......................................................................
Patch Set 1: Verified+1
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12383
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157
Gerrit-Change-Number: 12383
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Murtadha Hubail <mh...@apache.org>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sun, 18 Jul 2021 17:46:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment