Repository: asterixdb Updated Branches: refs/heads/master 8769807ba -> 50860b839
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-4/drop-dependency.4.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-4/drop-dependency.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-4/drop-dependency.4.ddl.sqlpp new file mode 100644 index 0000000..c972efc --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-4/drop-dependency.4.ddl.sqlpp @@ -0,0 +1,56 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under A + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Description : Try to drop a functional dependency + * Expected Res : Error + */ + +drop dataverse B if exists; +drop dataverse C if exists; +create dataverse B; +create dataverse C; +use C; + +create type TweetMessageType as closed { + tweetid: uuid, + sender_location: point, + send_time: datetime, + referred_topics: {{ string }}, + message_text: string, + countA: int32, + countB: int32 +}; + +create dataset TweetMessages(TweetMessageType) +primary key tweetid autogenerated; + +create function f1(message, text){ + contains(message,text) +}; + +use B; + +create function f2(place, text){ + (select m.message_text + from C.TweetMessages m) +}; + +use C; +drop dataset TweetMessages; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-5/drop-dependency.5.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-5/drop-dependency.5.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-5/drop-dependency.5.ddl.sqlpp new file mode 100644 index 0000000..3a7f4dc --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-5/drop-dependency.5.ddl.sqlpp @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under A + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Description : Try to drop a functional dependency + * Expected Res : Error + */ + +drop dataverse B if exists; +drop dataverse C if exists; +create dataverse C; +use C; + +create function f1(message, text){ + contains(message,text) +}; + +create function f0(message, text){ + C.f1(message,text) +}; + +drop function f1@2; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-6/drop-dependency.6.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-6/drop-dependency.6.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-6/drop-dependency.6.ddl.sqlpp new file mode 100644 index 0000000..3ab7b6f --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/drop-dependency-6/drop-dependency.6.ddl.sqlpp @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under A + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Description : Try to drop a functional dependency + * Expected Res : Error + */ + +drop dataverse B if exists; +drop dataverse C if exists; +create dataverse C; +use C; + +create type TweetMessageType as closed { + tweetid: uuid, + sender_location: point, + send_time: datetime, + referred_topics: {{ string }}, + message_text: string, + countA: int32, + countB: int32 +}; + +create dataset TweetMessages(TweetMessageType) +primary key tweetid autogenerated; + +create function f1(message, text){ + contains(message,text) +}; + +create function f2(place, text){ + (select m.message_text + from C.TweetMessages m) +}; + +drop dataset TweetMessages; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/results/external-library/validate-default-library/validate-default-library.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-library/validate-default-library/validate-default-library.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-library/validate-default-library/validate-default-library.1.adm index 8f4c581..403237e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-library/validate-default-library/validate-default-library.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-library/validate-default-library/validate-default-library.1.adm @@ -1,8 +1,8 @@ -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#addHashTags", "Arity": "1", "Params": [ "Tweet" ], "ReturnType": "ProcessedTweet", "Definition": "org.apache.asterix.external.library.AddHashTagsFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#addHashTagsInPlace", "Arity": "1", "Params": [ "Tweet" ], "ReturnType": "ProcessedTweet", "Definition": "org.apache.asterix.external.library.AddHashTagsInPlaceFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#allTypes", "Arity": "1", "Params": [ "AllType" ], "ReturnType": "AllType", "Definition": "org.apache.asterix.external.library.AllTypesFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#echoDelay", "Arity": "1", "Params": [ "TweetMessageType" ], "ReturnType": "TweetMessageType", "Definition": "org.apache.asterix.external.library.EchoDelayFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#getCapital", "Arity": "1", "Params": [ "ASTRING" ], "ReturnType": "CountryCapitalType", "Definition": "org.apache.asterix.external.library.CapitalFinderFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#mysum", "Arity": "2", "Params": [ "AINT32", "AINT32" ], "ReturnType": "AINT32", "Definition": "org.apache.asterix.external.library.SumFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#parseTweet", "Arity": "1", "Params": [ "TweetInputType" ], "ReturnType": "TweetOutputType", "Definition": "org.apache.asterix.external.library.ParseTweetFactory", "Language": "JAVA", "Kind": "SCALAR" } } -{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#toUpper", "Arity": "1", "Params": [ "TextType" ], "ReturnType": "TextType", "Definition": "org.apache.asterix.external.library.UpperCaseFactory", "Language": "JAVA", "Kind": "SCALAR" } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#addHashTags", "Arity": "1", "Params": [ "Tweet" ], "ReturnType": "ProcessedTweet", "Definition": "org.apache.asterix.external.library.AddHashTagsFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#addHashTagsInPlace", "Arity": "1", "Params": [ "Tweet" ], "ReturnType": "ProcessedTweet", "Definition": "org.apache.asterix.external.library.AddHashTagsInPlaceFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#allTypes", "Arity": "1", "Params": [ "AllType" ], "ReturnType": "AllType", "Definition": "org.apache.asterix.external.library.AllTypesFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#echoDelay", "Arity": "1", "Params": [ "TweetMessageType" ], "ReturnType": "TweetMessageType", "Definition": "org.apache.asterix.external.library.EchoDelayFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#getCapital", "Arity": "1", "Params": [ "ASTRING" ], "ReturnType": "CountryCapitalType", "Definition": "org.apache.asterix.external.library.CapitalFinderFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#mysum", "Arity": "2", "Params": [ "AINT32", "AINT32" ], "ReturnType": "AINT32", "Definition": "org.apache.asterix.external.library.SumFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#parseTweet", "Arity": "1", "Params": [ "TweetInputType" ], "ReturnType": "TweetOutputType", "Definition": "org.apache.asterix.external.library.ParseTweetFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } +{ "Function": { "DataverseName": "externallibtest", "Name": "testlib#toUpper", "Arity": "1", "Params": [ "TextType" ], "ReturnType": "TextType", "Definition": "org.apache.asterix.external.library.UpperCaseFactory", "Language": "JAVA", "Kind": "SCALAR", "Dependencies": [ [ ], [ ] ] } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/results/user-defined-functions/check-dependencies-1/check-dependencies-1.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/user-defined-functions/check-dependencies-1/check-dependencies-1.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/user-defined-functions/check-dependencies-1/check-dependencies-1.1.adm new file mode 100644 index 0000000..50f19bb --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/user-defined-functions/check-dependencies-1/check-dependencies-1.1.adm @@ -0,0 +1,6 @@ +{ "DataverseName": "B", "Name": "f0", "Dependencies": [ [ ], [ ] ] } +{ "DataverseName": "B", "Name": "f5", "Dependencies": [ [ [ "C", "TweetMessages" ], [ "B", "TweetMessages2" ] ], [ [ "C", "f1", "2" ], [ "B", "f0", "2" ] ] ] } +{ "DataverseName": "C", "Name": "f1", "Dependencies": [ [ ], [ ] ] } +{ "DataverseName": "C", "Name": "f2", "Dependencies": [ [ [ "C", "TweetMessages" ] ], [ [ "C", "f1", "2" ], [ "B", "f0", "2" ] ] ] } +{ "DataverseName": "C", "Name": "f3", "Dependencies": [ [ ], [ [ "C", "f2", "2" ] ] ] } +{ "DataverseName": "C", "Name": "f4", "Dependencies": [ [ [ "C", "TweetMessages" ] ], [ ] ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index fd47766..14784d6 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -7922,7 +7922,7 @@ <test-case FilePath="user-defined-functions"> <compilation-unit name="bad-function-ddl-9"> <output-dir compare="Text">bad-function-ddl-9</output-dir> - <expected-error>function experiments.good_function@1 depends upon function experiments.function_that_does_not_exist@0 which is undefined</expected-error> + <expected-error>function experiments.function_that_does_not_exist@0 is not defined</expected-error> </compilation-unit> </test-case> <test-case FilePath="user-defined-functions"> @@ -7932,6 +7932,47 @@ </compilation-unit> </test-case> <test-case FilePath="user-defined-functions"> + <compilation-unit name="check-dependencies-1"> + <output-dir compare="Text">check-dependencies-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-1"> + <output-dir compare="Text">drop-dependency-1</output-dir> + <expected-error>Cannot drop dataverse. Function B.f0@2 depends on function C.f1@2</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-2"> + <output-dir compare="Text">drop-dependency-2</output-dir> + <expected-error>Cannot drop dataverse. Function B.f2@2 depends on dataset C.TweetMessages</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-3"> + <output-dir compare="Text">drop-dependency-3</output-dir> + <expected-error>Cannot drop function C.f1@2 being used by function B.f0@2</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-4"> + <output-dir compare="Text">drop-dependency-4</output-dir> + <expected-error>Cannot drop dataset C.TweetMessages being used by function B.f2@2</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-5"> + <output-dir compare="Text">drop-dependency-5</output-dir> + <expected-error>Cannot drop function C.f1@2 being used by function C.f0@2</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> + <compilation-unit name="drop-dependency-6"> + <output-dir compare="Text">drop-dependency-6</output-dir> + <expected-error>Cannot drop dataset C.TweetMessages being used by function C.f2@2</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="user-defined-functions"> <compilation-unit name="single-line-definition"> <output-dir compare="Text">single-line-definition</output-dir> </compilation-unit> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java index 977f6bb..6ab69ad 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java @@ -40,6 +40,7 @@ import org.apache.asterix.lang.common.base.IQueryRewriter; import org.apache.asterix.lang.common.base.IReturningStatement; import org.apache.asterix.lang.common.clause.GroupbyClause; import org.apache.asterix.lang.common.clause.LetClause; +import org.apache.asterix.lang.common.expression.CallExpr; import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair; import org.apache.asterix.lang.common.expression.VariableExpr; import org.apache.asterix.lang.common.rewrites.LangRewritingContext; @@ -68,7 +69,8 @@ class AqlQueryRewriter implements IQueryRewriter { @Override public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement, - MetadataProvider metadataProvider, LangRewritingContext context) throws CompilationException { + MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs) + throws CompilationException { setup(declaredFunctions, topStatement, metadataProvider, context); if (topStatement.isTopLevel()) { wrapInLets(); @@ -130,7 +132,8 @@ class AqlQueryRewriter implements IQueryRewriter { declaredFunctions.removeAll(storedFunctionDecls); } - private Set<FunctionSignature> getFunctionCalls(Expression expression) throws CompilationException { + @Override + public Set<CallExpr> getFunctionCalls(Expression expression) throws CompilationException { GatherFunctionCalls gfc = new GatherFunctionCalls(); expression.accept(gfc, null); return gfc.getCalls(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java index 0c6c04c..f072917 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java @@ -19,8 +19,10 @@ package org.apache.asterix.lang.common.base; import java.util.List; +import java.util.Set; import org.apache.asterix.common.exceptions.CompilationException; +import org.apache.asterix.lang.common.expression.CallExpr; import org.apache.asterix.lang.common.rewrites.LangRewritingContext; import org.apache.asterix.lang.common.statement.FunctionDecl; import org.apache.asterix.metadata.declared.MetadataProvider; @@ -39,6 +41,13 @@ public interface IQueryRewriter { * @param context, * manages ids of variables and guarantees uniqueness of variables. */ - public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topExpr, - MetadataProvider metadataProvider, LangRewritingContext context) throws CompilationException; + void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topExpr, + MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs) + throws CompilationException; + + /** + * Find the function calls used by a given expression + */ + Set<CallExpr> getFunctionCalls(Expression expression) throws CompilationException; + } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java index 1ca9316..3571dcf 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java @@ -20,6 +20,7 @@ package org.apache.asterix.lang.common.util; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Set; @@ -27,13 +28,18 @@ import org.apache.asterix.common.exceptions.CompilationException; import org.apache.asterix.common.functions.FunctionConstants; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.lang.common.base.Expression; +import org.apache.asterix.lang.common.base.IQueryRewriter; +import org.apache.asterix.lang.common.expression.CallExpr; +import org.apache.asterix.lang.common.expression.LiteralExpr; import org.apache.asterix.lang.common.statement.FunctionDecl; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Function; +import org.apache.asterix.metadata.utils.DatasetUtil; import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; @@ -52,7 +58,7 @@ public class FunctionUtil { @FunctionalInterface public interface IFunctionCollector { - Set<FunctionSignature> getFunctionCalls(Expression expression) throws CompilationException; + Set<CallExpr> getFunctionCalls(Expression expression) throws CompilationException; } @FunctionalInterface @@ -95,8 +101,9 @@ public class FunctionUtil { } String value = metadataProvider.getConfig().get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS); boolean includePrivateFunctions = (value != null) ? Boolean.valueOf(value.toLowerCase()) : false; - Set<FunctionSignature> functionCalls = functionCollector.getFunctionCalls(expression); - for (FunctionSignature signature : functionCalls) { + Set<CallExpr> functionCalls = functionCollector.getFunctionCalls(expression); + for (CallExpr functionCall : functionCalls) { + FunctionSignature signature = functionCall.getFunctionSignature(); if (declaredFunctions != null && declaredFunctions.contains(signature)) { continue; } @@ -155,6 +162,35 @@ public class FunctionUtil { return functionDecls; } + public static List<List<List<String>>> getFunctionDependencies(IQueryRewriter rewriter, Expression expression, + MetadataProvider metadataProvider) throws CompilationException { + Set<CallExpr> functionCalls = rewriter.getFunctionCalls(expression); + //Get the List of used functions and used datasets + List<List<String>> datasourceDependencies = new ArrayList<>(); + List<List<String>> functionDependencies = new ArrayList<>(); + for (CallExpr functionCall : functionCalls) { + FunctionSignature signature = functionCall.getFunctionSignature(); + FunctionIdentifier fid = + new FunctionIdentifier(signature.getNamespace(), signature.getName(), signature.getArity()); + if (fid.equals(BuiltinFunctions.DATASET)) { + Pair<String, String> path = DatasetUtil.getDatasetInfo(metadataProvider, + ((LiteralExpr) functionCall.getExprList().get(0)).getValue().getStringValue()); + datasourceDependencies.add(Arrays.asList(path.first, path.second)); + } + + else if (BuiltinFunctions.isBuiltinCompilerFunction(signature, false)) { + continue; + } else { + functionDependencies.add(Arrays.asList(signature.getNamespace(), signature.getName(), + Integer.toString(signature.getArity()))); + } + } + List<List<List<String>>> dependencies = new ArrayList<>(); + dependencies.add(datasourceDependencies); + dependencies.add(functionDependencies); + return dependencies; + } + private static Function lookupUserDefinedFunctionDecl(MetadataTransactionContext mdTxnCtx, FunctionSignature signature) throws AlgebricksException { if (signature.getNamespace() == null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java index 7d8c11e..8ae67d6 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java @@ -347,7 +347,7 @@ public abstract class AbstractInlineUdfsVisitor extends AbstractQueryExpressionV metadataProvider.setDefaultDataverse(fnDataverse); try { IQueryRewriter queryRewriter = rewriterFactory.createQueryRewriter(); - queryRewriter.rewrite(declaredFunctions, wrappedQuery, metadataProvider, context); + queryRewriter.rewrite(declaredFunctions, wrappedQuery, metadataProvider, context, true); return wrappedQuery.getBody(); } finally { metadataProvider.setDefaultDataverse(defaultDataverse); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/GatherFunctionCallsVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/GatherFunctionCallsVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/GatherFunctionCallsVisitor.java index 8842d86..3d149fb 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/GatherFunctionCallsVisitor.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/GatherFunctionCallsVisitor.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Set; import org.apache.asterix.common.exceptions.CompilationException; -import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.clause.GroupbyClause; import org.apache.asterix.lang.common.clause.LetClause; @@ -53,11 +52,11 @@ import org.apache.asterix.lang.common.visitor.base.AbstractQueryExpressionVisito public class GatherFunctionCallsVisitor extends AbstractQueryExpressionVisitor<Void, Void> { - protected final Set<FunctionSignature> calls = new HashSet<FunctionSignature>(); + protected final Set<CallExpr> calls = new HashSet<>(); @Override public Void visit(CallExpr pf, Void arg) throws CompilationException { - calls.add(pf.getFunctionSignature()); + calls.add(pf); for (Expression e : pf.getExprList()) { e.accept(this, arg); } @@ -202,7 +201,7 @@ public class GatherFunctionCallsVisitor extends AbstractQueryExpressionVisitor<V return null; } - public Set<FunctionSignature> getCalls() { + public Set<CallExpr> getCalls() { return calls; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java index a8b3dc6..cd57396 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java @@ -31,7 +31,7 @@ class SqlppFunctionBodyRewriter extends SqlppQueryRewriter { @Override public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement, MetadataProvider metadataProvider, - LangRewritingContext context) throws CompilationException { + LangRewritingContext context, boolean inlineUdfs) throws CompilationException { // Sets up parameters. setup(declaredFunctions, topStatement, metadataProvider, context); @@ -63,6 +63,6 @@ class SqlppFunctionBodyRewriter extends SqlppQueryRewriter { rewriteListInputFunctions(); // Inlines functions recursively. - inlineDeclaredUdfs(); + inlineDeclaredUdfs(inlineUdfs); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java index 3e9a873..befa5ab 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java @@ -28,6 +28,7 @@ import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.base.IQueryRewriter; import org.apache.asterix.lang.common.base.IReturningStatement; import org.apache.asterix.lang.common.clause.LetClause; +import org.apache.asterix.lang.common.expression.CallExpr; import org.apache.asterix.lang.common.rewrites.LangRewritingContext; import org.apache.asterix.lang.common.statement.FunctionDecl; import org.apache.asterix.lang.common.util.FunctionUtil; @@ -86,7 +87,8 @@ class SqlppQueryRewriter implements IQueryRewriter { @Override public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement, - MetadataProvider metadataProvider, LangRewritingContext context) throws CompilationException { + MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs) + throws CompilationException { if (topStatement == null) { return; } @@ -126,7 +128,7 @@ class SqlppQueryRewriter implements IQueryRewriter { rewriteListInputFunctions(); // Inlines functions. - inlineDeclaredUdfs(); + inlineDeclaredUdfs(inlineUdfs); // Rewrites function names. // This should be done after inlineDeclaredUdfs() because user-defined function @@ -213,7 +215,7 @@ class SqlppQueryRewriter implements IQueryRewriter { topExpr.accept(groupByVisitor, null); } - protected void inlineDeclaredUdfs() throws CompilationException { + protected void inlineDeclaredUdfs(boolean inlineUdfs) throws CompilationException { List<FunctionSignature> funIds = new ArrayList<FunctionSignature>(); for (FunctionDecl fdecl : declaredFunctions) { funIds.add(fdecl.getSignature()); @@ -226,7 +228,7 @@ class SqlppQueryRewriter implements IQueryRewriter { signature -> FunctionMapUtil.normalizeBuiltinFunctionSignature(signature, false))); } declaredFunctions.addAll(usedStoredFunctionDecls); - if (!declaredFunctions.isEmpty()) { + if (inlineUdfs && !declaredFunctions.isEmpty()) { SqlppInlineUdfsVisitor visitor = new SqlppInlineUdfsVisitor(context, new SqlppFunctionBodyRewriterFactory() /* the rewriter for function bodies expressions*/, declaredFunctions, metadataProvider); @@ -237,7 +239,8 @@ class SqlppQueryRewriter implements IQueryRewriter { declaredFunctions.removeAll(usedStoredFunctionDecls); } - private Set<FunctionSignature> getFunctionCalls(Expression expression) throws CompilationException { + @Override + public Set<CallExpr> getFunctionCalls(Expression expression) throws CompilationException { GatherFunctionCalls gfc = new GatherFunctionCalls(); expression.accept(gfc, null); return gfc.getCalls(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java index ed3bbe0..6634e51 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java @@ -268,7 +268,6 @@ public class MetadataNode implements IMetadataNode { } } - @SuppressWarnings("unchecked") @Override public <T extends IExtensionMetadataEntity> void addEntity(TxnId txnId, T entity) throws AlgebricksException, RemoteException { @@ -280,7 +279,6 @@ public class MetadataNode implements IMetadataNode { addEntity(txnId, entity, tupleTranslator, index); } - @SuppressWarnings("unchecked") @Override public <T extends IExtensionMetadataEntity> void upsertEntity(TxnId txnId, T entity) throws AlgebricksException, RemoteException { @@ -292,7 +290,6 @@ public class MetadataNode implements IMetadataNode { upsertEntity(txnId, entity, tupleTranslator, index); } - @SuppressWarnings("unchecked") @Override public <T extends IExtensionMetadataEntity> void deleteEntity(TxnId txnId, T entity) throws AlgebricksException, RemoteException { @@ -304,7 +301,6 @@ public class MetadataNode implements IMetadataNode { deleteEntity(txnId, entity, tupleTranslator, index); } - @SuppressWarnings("unchecked") @Override public <T extends IExtensionMetadataEntity> List<T> getEntities(TxnId txnId, IExtensionMetadataSearchKey searchKey) throws AlgebricksException, RemoteException { @@ -527,13 +523,22 @@ public class MetadataNode implements IMetadataNode { confirmDataverseCanBeDeleted(txnId, dataverseName); + // As a side effect, acquires an S lock on the 'Function' dataset + // on behalf of txnId. + List<Function> dataverseFunctions = getDataverseFunctions(txnId, dataverseName); + // Drop all functions in this dataverse. + for (Function function : dataverseFunctions) { + dropFunction(txnId, new FunctionSignature(dataverseName, function.getName(), function.getArity()), + true); + } + List<Dataset> dataverseDatasets; Dataset ds; dataverseDatasets = getDataverseDatasets(txnId, dataverseName); // Drop all datasets in this dataverse. for (int i = 0; i < dataverseDatasets.size(); i++) { ds = dataverseDatasets.get(i); - dropDataset(txnId, dataverseName, ds.getDatasetName()); + dropDataset(txnId, dataverseName, ds.getDatasetName(), true); } // After dropping datasets, drop datatypes @@ -546,14 +551,6 @@ public class MetadataNode implements IMetadataNode { forceDropDatatype(txnId, dataverseName, dataverseDatatypes.get(i).getDatatypeName()); } - // As a side effect, acquires an S lock on the 'Function' dataset - // on behalf of txnId. - List<Function> dataverseFunctions = getDataverseFunctions(txnId, dataverseName); - // Drop all functions in this dataverse. - for (Function function : dataverseFunctions) { - dropFunction(txnId, new FunctionSignature(dataverseName, function.getName(), function.getArity())); - } - // As a side effect, acquires an S lock on the 'Adapter' dataset // on behalf of txnId. List<DatasourceAdapter> dataverseAdapters = getDataverseAdapters(txnId, dataverseName); @@ -609,6 +606,16 @@ public class MetadataNode implements IMetadataNode { @Override public void dropDataset(TxnId txnId, String dataverseName, String datasetName) throws AlgebricksException, RemoteException { + dropDataset(txnId, dataverseName, datasetName, false); + } + + public void dropDataset(TxnId txnId, String dataverseName, String datasetName, boolean force) + throws AlgebricksException, RemoteException { + + if (!force) { + confirmDatasetCanBeDeleted(txnId, dataverseName, datasetName); + } + Dataset dataset = getDataset(txnId, dataverseName, datasetName); if (dataset == null) { throw new AlgebricksException("Cannot drop dataset '" + datasetName + "' because it doesn't exist."); @@ -902,6 +909,19 @@ public class MetadataNode implements IMetadataNode { } } + public List<Function> getAllFunctions(TxnId txnId) throws AlgebricksException, RemoteException { + try { + ITupleReference searchKey = null; + FunctionTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFunctionTupleTranslator(false); + IValueExtractor<Function> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter); + List<Function> results = new ArrayList<>(); + searchIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results); + return results; + } catch (HyracksDataException e) { + throw new AlgebricksException(e); + } + } + public List<Datatype> getAllDatatypes(TxnId txnId) throws AlgebricksException, RemoteException { try { ITupleReference searchKey = null; @@ -932,6 +952,62 @@ public class MetadataNode implements IMetadataNode { + " used by dataset " + set.getDataverseName() + "." + set.getDatasetName()); } } + + // If a function from a DIFFERENT dataverse + // uses functions or datatypes from this dataverse + // throw an error + List<Function> functions = getAllFunctions(txnId); + for (Function function : functions) { + if (function.getDataverseName().equals(dataverseName)) { + continue; + } + for (List<String> datasetDependency : function.getDependencies().get(0)) { + if (datasetDependency.get(0).equals(dataverseName)) { + throw new AlgebricksException("Cannot drop dataverse. Function " + function.getDataverseName() + "." + + function.getName() + "@" + function.getArity() + " depends on dataset " + + datasetDependency.get(0) + "." + datasetDependency.get(1)); + } + } + for (List<String> functionDependency : function.getDependencies().get(1)) { + if (functionDependency.get(0).equals(dataverseName)) { + throw new AlgebricksException( + "Cannot drop dataverse. Function " + function.getDataverseName() + "." + function.getName() + + "@" + function.getArity() + " depends on function " + functionDependency.get(0) + + "." + functionDependency.get(1) + "@" + functionDependency.get(2)); + } + } + } + } + + private void confirmFunctionCanBeDeleted(TxnId txnId, FunctionSignature signature) + throws AlgebricksException, RemoteException { + // If any other function uses this function, throw an error + List<Function> functions = getAllFunctions(txnId); + for (Function function : functions) { + for (List<String> functionalDependency : function.getDependencies().get(1)) { + if (functionalDependency.get(0).equals(signature.getNamespace()) + && functionalDependency.get(1).equals(signature.getName()) + && functionalDependency.get(2).equals(Integer.toString(signature.getArity()))) { + throw new AlgebricksException("Cannot drop function " + signature + " being used by function " + + function.getDataverseName() + "." + function.getName() + "@" + function.getArity()); + } + } + } + } + + private void confirmDatasetCanBeDeleted(TxnId txnId, String dataverseName, String datasetName) + throws AlgebricksException, RemoteException { + // If any function uses this type, throw an error + List<Function> functions = getAllFunctions(txnId); + for (Function function : functions) { + for (List<String> datasetDependency : function.getDependencies().get(0)) { + if (datasetDependency.get(0).equals(dataverseName) && datasetDependency.get(1).equals(datasetName)) { + throw new AlgebricksException("Cannot drop dataset " + dataverseName + "." + datasetName + + " being used by function " + function.getDataverseName() + "." + function.getName() + "@" + + function.getArity()); + } + } + } } private void confirmDatatypeIsUnused(TxnId txnId, String dataverseName, String datatypeName) @@ -1123,6 +1199,15 @@ public class MetadataNode implements IMetadataNode { @Override public void dropFunction(TxnId txnId, FunctionSignature functionSignature) throws AlgebricksException, RemoteException { + dropFunction(txnId, functionSignature, false); + } + + private void dropFunction(TxnId txnId, FunctionSignature functionSignature, boolean force) + throws AlgebricksException, RemoteException { + + if (!force) { + confirmFunctionCanBeDeleted(txnId, functionSignature); + } Function function = getFunction(txnId, functionSignature); @@ -1329,7 +1414,6 @@ public class MetadataNode implements IMetadataNode { // TODO: Can use Hyrack's TupleUtils for this, once we switch to a newer // Hyracks version. public static ITupleReference createTuple(String... fields) { - @SuppressWarnings("unchecked") ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); AMutableString aString = new AMutableString(""); @@ -1836,7 +1920,6 @@ public class MetadataNode implements IMetadataNode { // This method is used to create a search tuple for external data file since the // search tuple has an int value - @SuppressWarnings("unchecked") public ITupleReference createExternalFileSearchTuple(String dataverseName, String datasetName, int fileNumber) throws HyracksDataException { ISerializerDeserializer<AString> stringSerde = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java index 841065b..cb67ee5 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java @@ -158,7 +158,7 @@ public class MetadataTransactionContext extends MetadataCache { public void dropFunction(FunctionSignature signature) { Function function = new Function(signature.getNamespace(), signature.getName(), signature.getArity(), null, - null, null, null, null); + null, null, null, null, null); droppedCache.addFunctionIfNotExists(function); logAndApply(new MetadataLogicalOperation(function, false)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java index e0f925c..e2724e2 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java @@ -48,6 +48,7 @@ public final class MetadataRecordTypes { public static final String FIELD_NAME_DATAVERSE_NAME = "DataverseName"; public static final String FIELD_NAME_DATA_FORMAT = "DataFormat"; public static final String FIELD_NAME_DEFINITION = "Definition"; + public static final String FIELD_NAME_DEPENDENCIES = "Dependencies"; public static final String FIELD_NAME_DERIVED = "Derived"; public static final String FIELD_NAME_DESCRIPTION = "Description"; public static final String FIELD_NAME_EXTERNAL_DETAILS = "ExternalDetails"; @@ -321,16 +322,20 @@ public final class MetadataRecordTypes { public static final int FUNCTION_ARECORD_FUNCTION_DEFINITION_FIELD_INDEX = 5; public static final int FUNCTION_ARECORD_FUNCTION_LANGUAGE_FIELD_INDEX = 6; public static final int FUNCTION_ARECORD_FUNCTION_KIND_FIELD_INDEX = 7; + public static final int FUNCTION_ARECORD_FUNCTION_DEPENDENCIES_FIELD_INDEX = 8; public static final ARecordType FUNCTION_RECORDTYPE = createRecordType( // RecordTypeName RECORD_NAME_FUNCTION, // FieldNames new String[] { FIELD_NAME_DATAVERSE_NAME, FIELD_NAME_NAME, FIELD_NAME_ARITY, FIELD_NAME_PARAMS, - FIELD_NAME_RETURN_TYPE, FIELD_NAME_DEFINITION, FIELD_NAME_LANGUAGE, FIELD_NAME_KIND }, + FIELD_NAME_RETURN_TYPE, FIELD_NAME_DEFINITION, FIELD_NAME_LANGUAGE, FIELD_NAME_KIND, + FIELD_NAME_DEPENDENCIES }, // FieldTypes new IAType[] { BuiltinType.ASTRING, BuiltinType.ASTRING, BuiltinType.ASTRING, new AOrderedListType(BuiltinType.ASTRING, null), BuiltinType.ASTRING, BuiltinType.ASTRING, - BuiltinType.ASTRING, BuiltinType.ASTRING }, + BuiltinType.ASTRING, BuiltinType.ASTRING, + new AOrderedListType(new AOrderedListType(new AOrderedListType(BuiltinType.ASTRING, null), null), + null) }, //IsOpen? true); //------------------------------------------ Adapter ----------------------------------------// http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Function.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Function.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Function.java index 1d1db37..8bdbaba 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Function.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Function.java @@ -18,6 +18,7 @@ */ package org.apache.asterix.metadata.entities; +import java.util.ArrayList; import java.util.List; import org.apache.asterix.metadata.MetadataCache; @@ -36,13 +37,14 @@ public class Function implements IMetadataEntity<Function> { private final String name; private final int arity; private final List<String> params; + private final List<List<List<String>>> dependencies; private final String body; private final String returnType; private final String language; private final String kind; public Function(String dataverseName, String functionName, int arity, List<String> params, String returnType, - String functionBody, String language, String functionKind) { + String functionBody, String language, String functionKind, List<List<List<String>>> dependencies) { this.dataverse = dataverseName; this.name = functionName; this.params = params; @@ -51,6 +53,13 @@ public class Function implements IMetadataEntity<Function> { this.language = language; this.kind = functionKind; this.arity = arity; + if (dependencies == null) { + this.dependencies = new ArrayList<>(); + this.dependencies.add(new ArrayList<>()); + this.dependencies.add(new ArrayList<>()); + } else { + this.dependencies = dependencies; + } } public String getDataverseName() { @@ -65,6 +74,10 @@ public class Function implements IMetadataEntity<Function> { return params; } + public List<List<List<String>>> getDependencies() { + return dependencies; + } + public String getFunctionBody() { return body; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/50860b83/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java index e15805e..273c78a 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java @@ -35,6 +35,7 @@ import org.apache.asterix.om.base.ARecord; import org.apache.asterix.om.base.AString; import org.apache.asterix.om.base.IACursor; import org.apache.asterix.om.types.AOrderedListType; +import org.apache.asterix.om.types.BuiltinType; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -56,7 +57,13 @@ public class FunctionTupleTranslator extends AbstractTupleTranslator<Function> { // Payload field containing serialized Function. public static final int FUNCTION_PAYLOAD_TUPLE_FIELD_INDEX = 3; - @SuppressWarnings("unchecked") + private transient OrderedListBuilder dependenciesListBuilder = new OrderedListBuilder(); + private transient OrderedListBuilder dependencyListBuilder = new OrderedListBuilder(); + private transient OrderedListBuilder dependencyNameListBuilder = new OrderedListBuilder(); + private transient AOrderedListType stringList = new AOrderedListType(BuiltinType.ASTRING, null); + private transient AOrderedListType ListofLists = + new AOrderedListType(new AOrderedListType(BuiltinType.ASTRING, null), null); + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(MetadataRecordTypes.FUNCTION_RECORDTYPE); @@ -104,8 +111,33 @@ public class FunctionTupleTranslator extends AbstractTupleTranslator<Function> { String functionKind = ((AString) functionRecord.getValueByPos(MetadataRecordTypes.FUNCTION_ARECORD_FUNCTION_KIND_FIELD_INDEX)) .getStringValue(); + + IACursor dependenciesCursor = ((AOrderedList) functionRecord + .getValueByPos(MetadataRecordTypes.FUNCTION_ARECORD_FUNCTION_DEPENDENCIES_FIELD_INDEX)).getCursor(); + List<List<List<String>>> dependencies = new ArrayList<>(); + AOrderedList dependencyList; + AOrderedList qualifiedList; + int i = 0; + while (dependenciesCursor.next()) { + dependencies.add(new ArrayList<>()); + dependencyList = (AOrderedList) dependenciesCursor.get(); + IACursor qualifiedDependencyCursor = dependencyList.getCursor(); + int j = 0; + while (qualifiedDependencyCursor.next()) { + qualifiedList = (AOrderedList) qualifiedDependencyCursor.get(); + IACursor qualifiedNameCursor = qualifiedList.getCursor(); + dependencies.get(i).add(new ArrayList<>()); + while (qualifiedNameCursor.next()) { + dependencies.get(i).get(j).add(((AString) qualifiedNameCursor.get()).getStringValue()); + } + j++; + } + i++; + + } + return new Function(dataverseName, functionName, Integer.parseInt(arity), params, returnType, definition, - language, functionKind); + language, functionKind, dependencies); } @@ -185,6 +217,33 @@ public class FunctionTupleTranslator extends AbstractTupleTranslator<Function> { stringSerde.serialize(aString, fieldValue.getDataOutput()); recordBuilder.addField(MetadataRecordTypes.FUNCTION_ARECORD_FUNCTION_KIND_FIELD_INDEX, fieldValue); + // write field 8 + dependenciesListBuilder.reset((AOrderedListType) MetadataRecordTypes.FUNCTION_RECORDTYPE + .getFieldTypes()[MetadataRecordTypes.FUNCTION_ARECORD_FUNCTION_DEPENDENCIES_FIELD_INDEX]); + List<List<List<String>>> dependenciesList = function.getDependencies(); + for (List<List<String>> dependencies : dependenciesList) { + dependencyListBuilder.reset(ListofLists); + for (List<String> dependency : dependencies) { + dependencyNameListBuilder.reset(stringList); + for (String subName : dependency) { + itemValue.reset(); + aString.setValue(subName); + stringSerde.serialize(aString, itemValue.getDataOutput()); + dependencyNameListBuilder.addItem(itemValue); + } + itemValue.reset(); + dependencyNameListBuilder.write(itemValue.getDataOutput(), true); + dependencyListBuilder.addItem(itemValue); + + } + itemValue.reset(); + dependencyListBuilder.write(itemValue.getDataOutput(), true); + dependenciesListBuilder.addItem(itemValue); + } + fieldValue.reset(); + dependenciesListBuilder.write(fieldValue.getDataOutput(), true); + recordBuilder.addField(MetadataRecordTypes.FUNCTION_ARECORD_FUNCTION_DEPENDENCIES_FIELD_INDEX, fieldValue); + // write record recordBuilder.write(tupleBuilder.getDataOutput(), true); tupleBuilder.addFieldEndOffset();
