>From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20363?usp=email )
Change subject: Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
* [ASTERIXDB-3639]: add datasetName for index
Ext-ref: MB-66444,MB-68042
Change-Id: I7460d88d5cd2c467aed55bc73ff14adce4252546
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
2 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/20363/1
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
index c302a0d..0b82c38 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
@@ -134,7 +134,10 @@
return functionArity;
}
-<<<<<<< HEAD (94d33a Merge branch 'gerrit/trinity' into 'gerrit/phoenix')
+ public String getDatasetName() {
+ return datasetName;
+ }
+
public static boolean isBuiltinFunctionSignature(FunctionSignature fs) {
return
isBuiltinFunctionDataverse(Objects.requireNonNull(fs.getDataverseName()))
||
BuiltinFunctions.getBuiltinFunctionInfo(fs.createFunctionIdentifier()) != null;
@@ -142,10 +145,6 @@
private static boolean isBuiltinFunctionDataverse(DataverseName dataverse)
{
return FunctionConstants.ASTERIX_DV.equals(dataverse) ||
FunctionConstants.ALGEBRICKS_DV.equals(dataverse);
-=======
- public String getDatasetName() {
- return datasetName;
->>>>>>> BRANCH (2eb5dc [ASTERIXDB-3639]: add datasetName for index)
}
public static String getFunctionNameWithArity(String functionName, int
functionArity) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20363?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I7460d88d5cd2c467aed55bc73ff14adce4252546
Gerrit-Change-Number: 20363
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
