pending deletes
diff --git a/asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/BeginFeedStatement.java b/asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/BeginFeedStatement.java
index 422ca79..0ff261f 100644
--- a/asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/BeginFeedStatement.java
+++ b/asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/BeginFeedStatement.java
@@ -53,7 +53,7 @@
builder.append(" let $y:=(" + function.getFunctionBody() + ")" + " return $y");
} else {
builder.append(" (" + " for $x in feed-ingest ('" + datasetName + "') ");
- builder.append(" let $y:=" + function.getName() + "(" + "$x" + ")");
+ builder.append(" let $y:=" + dataset.getDataverseName() + "." + function.getName() + "(" + "$x" + ")");
builder.append(" return $y");
}
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index 5f5915c..e234bb8 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -816,7 +816,9 @@
FunctionSignature appliedFunction=null;
String dataverse;
String functionName;
+ String libraryName;
int arity;
+ Triple<String,String,String> functionCallComponents = null;
}
{
"using"
@@ -829,11 +831,18 @@
}
("apply" "function"
- {
- nameComponents = getDotSeparatedPair();
- dataverse = nameComponents.first != null ? nameComponents.first.getValue() : defaultDataverse;
- functionName = nameComponents.second.getValue();
- }
+ (
+ ( functionCallComponents = getFunctionCallComponents() )
+ {
+ dataverse = functionCallComponents.first == null ? defaultDataverse : functionCallComponents.first;
+ libraryName = functionCallComponents.second;
+ functionName = functionCallComponents.third;
+ if(libraryName != null){
+ functionName = libraryName + ":" + functionName;
+ }
+ }
+ )
+
("@" <INTEGER_LITERAL>
{
arity = Integer.parseInt(token.image);