Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0D03D200BEE for ; Fri, 16 Dec 2016 19:11:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0A93C160B32; Fri, 16 Dec 2016 18:11:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9F172160B3A for ; Fri, 16 Dec 2016 19:11:50 +0100 (CET) Received: (qmail 53146 invoked by uid 500); 16 Dec 2016 18:11:49 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 52332 invoked by uid 99); 16 Dec 2016 18:11:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2016 18:11:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 364F1E36D9; Fri, 16 Dec 2016 18:11:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjaco002@apache.org To: commits@asterixdb.apache.org Date: Fri, 16 Dec 2016 18:12:06 -0000 Message-Id: <7b69740d60674266a46d040697094477@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/23] asterixdb git commit: ASTERIXDB-1711: remove more mentions of Asterix archived-at: Fri, 16 Dec 2016 18:11:53 -0000 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java index a2f1363..bec5caf 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java @@ -109,8 +109,8 @@ import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.base.AString; import org.apache.asterix.om.constants.AsterixConstantValue; -import org.apache.asterix.om.functions.AsterixBuiltinFunctions; -import org.apache.asterix.om.functions.AsterixFunctionInfo; +import org.apache.asterix.om.functions.BuiltinFunctions; +import org.apache.asterix.om.functions.FunctionInfo; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.om.types.IAType; @@ -411,7 +411,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator Pair> p = aqlExprToAlgExpression(fa.getExpr(), tupSource); LogicalVariable v = context.newVar(); AbstractFunctionCallExpression fldAccess = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_NAME)); fldAccess.getArguments().add(new MutableObject(p.first)); ILogicalExpression faExpr = new ConstantExpression(new AsterixConstantValue(new AString(fa.getIdent().getValue()))); @@ -430,12 +430,12 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator AbstractFunctionCallExpression f; if (ia.isAny()) { f = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.ANY_COLLECTION_MEMBER)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.ANY_COLLECTION_MEMBER)); f.getArguments().add(new MutableObject(p.first)); } else { Pair> indexPair = aqlExprToAlgExpression(ia.getIndexExpr(), tupSource); - f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.GET_ITEM)); + f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_ITEM)); f.getArguments().add(new MutableObject(p.first)); f.getArguments().add(new MutableObject(indexPair.first)); } @@ -478,25 +478,25 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator } FunctionIdentifier fi = new FunctionIdentifier(AlgebricksBuiltinFunctions.ALGEBRICKS_NS, signature.getName()); - AsterixFunctionInfo afi = AsterixBuiltinFunctions.lookupFunction(fi); + FunctionInfo afi = BuiltinFunctions.lookupFunction(fi); FunctionIdentifier builtinAquafi = afi == null ? null : afi.getFunctionIdentifier(); if (builtinAquafi != null) { fi = builtinAquafi; } else { fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, signature.getName()); - FunctionIdentifier builtinAsterixFi = AsterixBuiltinFunctions.getBuiltinFunctionIdentifier(fi); + FunctionIdentifier builtinAsterixFi = BuiltinFunctions.getBuiltinFunctionIdentifier(fi); if (builtinAsterixFi != null) { fi = builtinAsterixFi; } } AbstractFunctionCallExpression f; - if (AsterixBuiltinFunctions.isBuiltinAggregateFunction(fi)) { - f = AsterixBuiltinFunctions.makeAggregateFunctionExpression(fi, args); - } else if (AsterixBuiltinFunctions.isBuiltinUnnestingFunction(fi)) { + if (BuiltinFunctions.isBuiltinAggregateFunction(fi)) { + f = BuiltinFunctions.makeAggregateFunctionExpression(fi, args); + } else if (BuiltinFunctions.isBuiltinUnnestingFunction(fi)) { UnnestingFunctionCallExpression ufce = new UnnestingFunctionCallExpression(FunctionUtil.getFunctionInfo(fi), args); - ufce.setReturnsUniqueValues(AsterixBuiltinFunctions.returnsUniqueValues(fi)); + ufce.setReturnsUniqueValues(BuiltinFunctions.returnsUniqueValues(fi)); f = ufce; } else { f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(fi), args); @@ -553,7 +553,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator List> flArgs = new ArrayList<>(1); flArgs.add(new MutableObject<>(listifyInput.first)); AggregateFunctionCallExpression fListify = - AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.LISTIFY, flArgs); + BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.LISTIFY, flArgs); AggregateOperator agg = new AggregateOperator(mkSingletonArrayList(aggVar), mkSingletonArrayList(new MutableObject<>(fListify))); agg.getInputs().add(listifyInput.second); @@ -611,7 +611,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator LogicalVariable resV = context.newVar(); AbstractFunctionCallExpression concatNonNull = - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.CONCAT_NON_NULL), + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.CONCAT_NON_NULL), new MutableObject(new VariableReferenceExpression(pThen.second)), new MutableObject(new VariableReferenceExpression(pElse.second))); AssignOperator a = new AssignOperator(resV, new MutableObject(concatNonNull)); @@ -770,7 +770,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator if (qe.getQuantifier() == Quantifier.SOME) { s = new SelectOperator(new MutableObject(eo2.first), false, null); s.getInputs().add(eo2.second); - fAgg = AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.NON_EMPTY_STREAM, + fAgg = BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.NON_EMPTY_STREAM, new ArrayList>()); } else { // EVERY List> satExprList = new ArrayList>(1); @@ -778,7 +778,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator s = new SelectOperator(new MutableObject(new ScalarFunctionCallExpression( FunctionUtil.getFunctionInfo(AlgebricksBuiltinFunctions.NOT), satExprList)), false, null); s.getInputs().add(eo2.second); - fAgg = AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.EMPTY_STREAM, + fAgg = BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.EMPTY_STREAM, new ArrayList>()); } LogicalVariable qeVar = context.newVar(); @@ -798,7 +798,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator public Pair visit(RecordConstructor rc, Mutable tupSource) throws AsterixException { AbstractFunctionCallExpression f = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR)); LogicalVariable v1 = context.newVar(); AssignOperator a = new AssignOperator(v1, new MutableObject(f)); Mutable topOp = tupSource; @@ -818,7 +818,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator public Pair visit(ListConstructor lc, Mutable tupSource) throws AsterixException { FunctionIdentifier fid = (lc.getType() == Type.ORDERED_LIST_CONSTRUCTOR) - ? AsterixBuiltinFunctions.ORDERED_LIST_CONSTRUCTOR : AsterixBuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR; + ? BuiltinFunctions.ORDERED_LIST_CONSTRUCTOR : BuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR; AbstractFunctionCallExpression f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(fid)); LogicalVariable v1 = context.newVar(); AssignOperator a = new AssignOperator(v1, new MutableObject(f)); @@ -843,7 +843,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator a = new AssignOperator(v1, new MutableObject(eo.first)); } else { AbstractFunctionCallExpression m = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.NUMERIC_UNARY_MINUS)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.NUMERIC_UNARY_MINUS)); m.getArguments().add(new MutableObject(eo.first)); a = new AssignOperator(v1, new MutableObject(m)); } @@ -948,7 +948,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator List> afcExprs = new ArrayList>(1); afcExprs.add(new MutableObject(new VariableReferenceExpression(lastVar))); AggregateFunctionCallExpression afc = - AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.LISTIFY, afcExprs); + BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.LISTIFY, afcExprs); ArrayList> aggregExprs = new ArrayList>(1); aggregExprs.add(new MutableObject(afc)); AggregateOperator agg = new AggregateOperator(aggregVars, aggregExprs); @@ -998,27 +998,27 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator break; } case MINUS: { - fid = AsterixBuiltinFunctions.NUMERIC_SUBTRACT; + fid = BuiltinFunctions.NUMERIC_SUBTRACT; break; } case MUL: { - fid = AsterixBuiltinFunctions.NUMERIC_MULTIPLY; + fid = BuiltinFunctions.NUMERIC_MULTIPLY; break; } case DIV: { - fid = AsterixBuiltinFunctions.NUMERIC_DIVIDE; + fid = BuiltinFunctions.NUMERIC_DIVIDE; break; } case MOD: { - fid = AsterixBuiltinFunctions.NUMERIC_MOD; + fid = BuiltinFunctions.NUMERIC_MOD; break; } case IDIV: { - fid = AsterixBuiltinFunctions.NUMERIC_IDIV; + fid = BuiltinFunctions.NUMERIC_IDIV; break; } case CARET: { - fid = AsterixBuiltinFunctions.CARET; + fid = BuiltinFunctions.CARET; break; } case AND: { @@ -1030,7 +1030,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator break; } case FUZZY_EQ: { - fid = AsterixBuiltinFunctions.FUZZY_EQ; + fid = BuiltinFunctions.FUZZY_EQ; break; } @@ -1115,8 +1115,8 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator private Pair aggListify(LogicalVariable var, Mutable opRef, boolean bProject) { - AggregateFunctionCallExpression funAgg = AsterixBuiltinFunctions.makeAggregateFunctionExpression( - AsterixBuiltinFunctions.LISTIFY, new ArrayList>()); + AggregateFunctionCallExpression funAgg = BuiltinFunctions.makeAggregateFunctionExpression( + BuiltinFunctions.LISTIFY, new ArrayList>()); funAgg.getArguments().add(new MutableObject(new VariableReferenceExpression(var))); LogicalVariable varListified = context.newVar(); AggregateOperator agg = new AggregateOperator(mkSingletonArrayList(varListified), @@ -1314,7 +1314,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator switch (expr.getExpressionTag()) { case VARIABLE: { return new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), new MutableObject(expr)); } case FUNCTION_CALL: { @@ -1323,7 +1323,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator return expr; } else { return new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), new MutableObject(expr)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java index 977a7b0..fe5e590 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslator; import org.apache.asterix.algebra.operators.CommitOperator; -import org.apache.asterix.common.config.AsterixMetadataProperties; +import org.apache.asterix.common.config.MetadataProperties; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.functions.FunctionConstants; @@ -89,12 +89,12 @@ import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AString; import org.apache.asterix.om.constants.AsterixConstantValue; -import org.apache.asterix.om.functions.AsterixBuiltinFunctions; -import org.apache.asterix.om.functions.AsterixFunctionInfo; +import org.apache.asterix.om.functions.BuiltinFunctions; +import org.apache.asterix.om.functions.FunctionInfo; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.IAType; import org.apache.asterix.runtime.formats.FormatUtils; -import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AppContextInfo; import org.apache.asterix.translator.CompiledStatements.CompiledInsertStatement; import org.apache.asterix.translator.CompiledStatements.CompiledLoadFromFileStatement; import org.apache.asterix.translator.CompiledStatements.CompiledSubscribeFeedStatement; @@ -348,7 +348,7 @@ class LangExpressionToPlanTranslator */ AssignOperator assignCollectionToSequence = new AssignOperator(seqVar, new MutableObject<>(new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.COLLECTION_TO_SEQUENCE), + FunctionUtil.getFunctionInfo(BuiltinFunctions.COLLECTION_TO_SEQUENCE), new MutableObject<>(new VariableReferenceExpression(resVar))))); assignCollectionToSequence.getInputs().add(new MutableObject<>(project.getInputs().get(0).getValue())); project.getInputs().get(0).setValue(assignCollectionToSequence); @@ -483,7 +483,7 @@ class LangExpressionToPlanTranslator metaAndKeysExprs = new ArrayList<>(); if (targetDatasource.getDataset().hasMetaPart()) { // add the meta function - IFunctionInfo finfoMeta = FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.META); + IFunctionInfo finfoMeta = FunctionUtil.getFunctionInfo(BuiltinFunctions.META); ScalarFunctionCallExpression metaFunction = new ScalarFunctionCallExpression(finfoMeta, new MutableObject<>(new VariableReferenceExpression(unnestVar))); // create assign for the meta part @@ -580,7 +580,7 @@ class LangExpressionToPlanTranslator metaAndKeysVars = new ArrayList<>(); metaAndKeysExprs = new ArrayList<>(); // add the meta function - IFunctionInfo finfoMeta = FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.META); + IFunctionInfo finfoMeta = FunctionUtil.getFunctionInfo(BuiltinFunctions.META); ScalarFunctionCallExpression metaFunction = new ScalarFunctionCallExpression(finfoMeta, new MutableObject<>(new VariableReferenceExpression(unnestVar))); // create assign for the meta part @@ -735,7 +735,7 @@ class LangExpressionToPlanTranslator String outputDir = System.getProperty("java.io.tmpDir"); String filePath = outputDir + System.getProperty("file.separator") + OUTPUT_FILE_PREFIX + outputFileID.incrementAndGet(); - AsterixMetadataProperties metadataProperties = AsterixAppContextInfo.INSTANCE.getMetadataProperties(); + MetadataProperties metadataProperties = AppContextInfo.INSTANCE.getMetadataProperties(); return new ManagedFileSplit(metadataProperties.getMetadataNodeName(), filePath); } @@ -765,7 +765,7 @@ class LangExpressionToPlanTranslator Pair> p = langExprToAlgExpression(fa.getExpr(), tupSource); LogicalVariable v = context.newVar(); AbstractFunctionCallExpression fldAccess = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_NAME)); fldAccess.getArguments().add(new MutableObject<>(p.first)); ILogicalExpression faExpr = new ConstantExpression( new AsterixConstantValue(new AString(fa.getIdent().getValue()))); @@ -783,12 +783,12 @@ class LangExpressionToPlanTranslator AbstractFunctionCallExpression f; if (ia.isAny()) { f = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.ANY_COLLECTION_MEMBER)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.ANY_COLLECTION_MEMBER)); f.getArguments().add(new MutableObject<>(p.first)); } else { Pair> indexPair = langExprToAlgExpression(ia.getIndexExpr(), tupSource); - f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.GET_ITEM)); + f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_ITEM)); f.getArguments().add(new MutableObject<>(p.first)); f.getArguments().add(new MutableObject<>(indexPair.first)); } @@ -879,24 +879,24 @@ class LangExpressionToPlanTranslator List> args) { AbstractFunctionCallExpression f; FunctionIdentifier fi = new FunctionIdentifier(AlgebricksBuiltinFunctions.ALGEBRICKS_NS, functionName, arity); - AsterixFunctionInfo afi = AsterixBuiltinFunctions.lookupFunction(fi); + FunctionInfo afi = BuiltinFunctions.lookupFunction(fi); FunctionIdentifier builtinAquafi = afi == null ? null : afi.getFunctionIdentifier(); if (builtinAquafi != null) { fi = builtinAquafi; } else { fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, functionName, arity); - afi = AsterixBuiltinFunctions.lookupFunction(fi); + afi = BuiltinFunctions.lookupFunction(fi); if (afi == null) { return null; } } - if (AsterixBuiltinFunctions.isBuiltinAggregateFunction(fi)) { - f = AsterixBuiltinFunctions.makeAggregateFunctionExpression(fi, args); - } else if (AsterixBuiltinFunctions.isBuiltinUnnestingFunction(fi)) { + if (BuiltinFunctions.isBuiltinAggregateFunction(fi)) { + f = BuiltinFunctions.makeAggregateFunctionExpression(fi, args); + } else if (BuiltinFunctions.isBuiltinUnnestingFunction(fi)) { UnnestingFunctionCallExpression ufce = new UnnestingFunctionCallExpression(FunctionUtil.getFunctionInfo(fi), args); - ufce.setReturnsUniqueValues(AsterixBuiltinFunctions.returnsUniqueValues(fi)); + ufce.setReturnsUniqueValues(BuiltinFunctions.returnsUniqueValues(fi)); f = ufce; } else { f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(fi), args); @@ -926,7 +926,7 @@ class LangExpressionToPlanTranslator LogicalVariable groupVar = context.newVar(gc.getGroupVar()); AssignOperator groupVarAssignOp = new AssignOperator(groupVar, new MutableObject<>(new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR), + FunctionUtil.getFunctionInfo(BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR), groupRecordConstructorArgList))); groupVarAssignOp.getInputs().add(topOp); topOp = new MutableObject<>(groupVarAssignOp); @@ -954,8 +954,8 @@ class LangExpressionToPlanTranslator new MutableObject<>(new NestedTupleSourceOperator(new MutableObject<>(gOp)))); List> flArgs = new ArrayList<>(1); flArgs.add(new MutableObject<>(listifyInput.first)); - AggregateFunctionCallExpression fListify = AsterixBuiltinFunctions - .makeAggregateFunctionExpression(AsterixBuiltinFunctions.LISTIFY, flArgs); + AggregateFunctionCallExpression fListify = BuiltinFunctions + .makeAggregateFunctionExpression(BuiltinFunctions.LISTIFY, flArgs); LogicalVariable aggVar = context.newVar(); AggregateOperator agg = new AggregateOperator(mkSingletonArrayList(aggVar), mkSingletonArrayList(new MutableObject<>(fListify))); @@ -1007,7 +1007,7 @@ class LangExpressionToPlanTranslator arguments.add(new MutableObject<>(new VariableReferenceExpression(opAndVarForThen.second))); arguments.add(new MutableObject<>(new VariableReferenceExpression(opAndVarForElse.second))); AbstractFunctionCallExpression swithCaseExpr = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SWITCH_CASE), arguments); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SWITCH_CASE), arguments); AssignOperator assignOp = new AssignOperator(selectVar, new MutableObject<>(swithCaseExpr)); assignOp.getInputs().add(new MutableObject<>(opAndVarForElse.first)); @@ -1015,7 +1015,7 @@ class LangExpressionToPlanTranslator LogicalVariable unnestVar = context.newVar(); UnnestOperator unnestOp = new UnnestOperator(unnestVar, new MutableObject<>(new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), Collections.singletonList(new MutableObject<>(new VariableReferenceExpression(selectVar)))))); unnestOp.getInputs().add(new MutableObject<>(assignOp)); @@ -1184,7 +1184,7 @@ class LangExpressionToPlanTranslator if (qe.getQuantifier() == Quantifier.SOME) { s = new SelectOperator(new MutableObject<>(eo2.first), false, null); s.getInputs().add(eo2.second); - fAgg = AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.NON_EMPTY_STREAM, + fAgg = BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.NON_EMPTY_STREAM, new ArrayList<>()); } else { // EVERY List> satExprList = new ArrayList<>(1); @@ -1192,7 +1192,7 @@ class LangExpressionToPlanTranslator s = new SelectOperator(new MutableObject<>(new ScalarFunctionCallExpression( FunctionUtil.getFunctionInfo(AlgebricksBuiltinFunctions.NOT), satExprList)), false, null); s.getInputs().add(eo2.second); - fAgg = AsterixBuiltinFunctions.makeAggregateFunctionExpression(AsterixBuiltinFunctions.EMPTY_STREAM, + fAgg = BuiltinFunctions.makeAggregateFunctionExpression(BuiltinFunctions.EMPTY_STREAM, new ArrayList<>()); } LogicalVariable qeVar = context.newVar(); @@ -1212,7 +1212,7 @@ class LangExpressionToPlanTranslator public Pair visit(RecordConstructor rc, Mutable tupSource) throws AsterixException { AbstractFunctionCallExpression f = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR)); LogicalVariable v1 = context.newVar(); AssignOperator a = new AssignOperator(v1, new MutableObject<>(f)); Mutable topOp = tupSource; @@ -1232,7 +1232,7 @@ class LangExpressionToPlanTranslator public Pair visit(ListConstructor lc, Mutable tupSource) throws AsterixException { FunctionIdentifier fid = (lc.getType() == ListConstructor.Type.ORDERED_LIST_CONSTRUCTOR) - ? AsterixBuiltinFunctions.ORDERED_LIST_CONSTRUCTOR : AsterixBuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR; + ? BuiltinFunctions.ORDERED_LIST_CONSTRUCTOR : BuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR; AbstractFunctionCallExpression f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(fid)); LogicalVariable v1 = context.newVar(); AssignOperator a = new AssignOperator(v1, new MutableObject<>(f)); @@ -1259,7 +1259,7 @@ class LangExpressionToPlanTranslator break; case NEGATIVE: AbstractFunctionCallExpression m = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.NUMERIC_UNARY_MINUS)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.NUMERIC_UNARY_MINUS)); m.getArguments().add(new MutableObject<>(eo.first)); a = new AssignOperator(v1, new MutableObject<>(m)); break; @@ -1345,22 +1345,22 @@ class LangExpressionToPlanTranslator fid = AlgebricksBuiltinFunctions.NUMERIC_ADD; break; case MINUS: - fid = AsterixBuiltinFunctions.NUMERIC_SUBTRACT; + fid = BuiltinFunctions.NUMERIC_SUBTRACT; break; case MUL: - fid = AsterixBuiltinFunctions.NUMERIC_MULTIPLY; + fid = BuiltinFunctions.NUMERIC_MULTIPLY; break; case DIV: - fid = AsterixBuiltinFunctions.NUMERIC_DIVIDE; + fid = BuiltinFunctions.NUMERIC_DIVIDE; break; case MOD: - fid = AsterixBuiltinFunctions.NUMERIC_MOD; + fid = BuiltinFunctions.NUMERIC_MOD; break; case IDIV: - fid = AsterixBuiltinFunctions.NUMERIC_IDIV; + fid = BuiltinFunctions.NUMERIC_IDIV; break; case CARET: - fid = AsterixBuiltinFunctions.CARET; + fid = BuiltinFunctions.CARET; break; case AND: fid = AlgebricksBuiltinFunctions.AND; @@ -1369,7 +1369,7 @@ class LangExpressionToPlanTranslator fid = AlgebricksBuiltinFunctions.OR; break; case FUZZY_EQ: - fid = AsterixBuiltinFunctions.FUZZY_EQ; + fid = BuiltinFunctions.FUZZY_EQ; break; default: throw new NotImplementedException("Operator " + t + " is not yet implemented"); @@ -1427,8 +1427,8 @@ class LangExpressionToPlanTranslator protected Pair aggListifyForSubquery(LogicalVariable var, Mutable opRef, boolean bProject) { - AggregateFunctionCallExpression funAgg = AsterixBuiltinFunctions - .makeAggregateFunctionExpression(AsterixBuiltinFunctions.LISTIFY, new ArrayList<>()); + AggregateFunctionCallExpression funAgg = BuiltinFunctions + .makeAggregateFunctionExpression(BuiltinFunctions.LISTIFY, new ArrayList<>()); funAgg.getArguments().add(new MutableObject<>(new VariableReferenceExpression(var))); LogicalVariable varListified = context.newSubplanOutputVar(); @@ -1502,12 +1502,12 @@ class LangExpressionToPlanTranslator case CONSTANT: case VARIABLE: return new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), argRefs); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), argRefs); case FUNCTION_CALL: AbstractFunctionCallExpression fce = (AbstractFunctionCallExpression) expr; return (fce.getKind() == FunctionKind.UNNEST) ? expr : new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), argRefs); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), argRefs); default: return expr; } @@ -1654,7 +1654,7 @@ class LangExpressionToPlanTranslator LogicalVariable branchVar = context.newVar(); AggregateOperator aggOp = new AggregateOperator(Collections.singletonList(branchVar), Collections.singletonList(new MutableObject<>(new AggregateFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.LISTIFY), false, Collections.singletonList( + FunctionUtil.getFunctionInfo(BuiltinFunctions.LISTIFY), false, Collections.singletonList( new MutableObject<>(new VariableReferenceExpression(pBranch.second))))))); aggOp.getInputs().add(new MutableObject<>(pBranch.first)); ILogicalPlan planForBranch = new ALogicalPlanImpl(new MutableObject<>(aggOp)); @@ -1666,10 +1666,10 @@ class LangExpressionToPlanTranslator // Processes EXISTS and NOT EXISTS. private AssignOperator processExists(ILogicalExpression inputExpr, LogicalVariable v1, boolean not) { AbstractFunctionCallExpression count = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCALAR_COUNT)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCALAR_COUNT)); count.getArguments().add(new MutableObject<>(inputExpr)); AbstractFunctionCallExpression comparison = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(not ? AsterixBuiltinFunctions.EQ : AsterixBuiltinFunctions.NEQ)); + FunctionUtil.getFunctionInfo(not ? BuiltinFunctions.EQ : BuiltinFunctions.NEQ)); comparison.getArguments().add(new MutableObject<>(count)); comparison.getArguments() .add(new MutableObject<>(new ConstantExpression(new AsterixConstantValue(new AInt64(0L))))); @@ -1686,9 +1686,9 @@ class LangExpressionToPlanTranslator arguments.add(generateAndNotIsUnknownWrap(inputBooleanExpr)); } Mutable hasBeenExecutedExprRef = new MutableObject<>( - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.OR), arguments)); + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.OR), arguments)); return new MutableObject<>( - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.NOT), + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.NOT), new ArrayList<>(Collections.singletonList(hasBeenExecutedExprRef)))); } @@ -1697,13 +1697,13 @@ class LangExpressionToPlanTranslator List> arguments = new ArrayList<>(); arguments.add(new MutableObject<>(logicalExpr)); Mutable expr = new MutableObject<>( - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.IS_UNKOWN), + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.IS_UNKOWN), new ArrayList<>(Collections.singletonList(new MutableObject<>(logicalExpr))))); arguments.add(new MutableObject<>( - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.NOT), + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.NOT), new ArrayList<>(Collections.singletonList(expr))))); return new MutableObject<>( - new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.AND), arguments)); + new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.AND), arguments)); } // Generates the plan for "UNION ALL" or union expression from its input expressions. @@ -1721,7 +1721,7 @@ class LangExpressionToPlanTranslator args.add(new MutableObject(new VariableReferenceExpression(opAndVar.second))); UnnestOperator unnestOp = new UnnestOperator(unnestVar, new MutableObject(new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), args))); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), args))); unnestOp.getInputs().add(new MutableObject<>(opAndVar.first)); inputOpRefsToUnion.add(new MutableObject(unnestOp)); vars.add(unnestVar); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java index 66a64a4..c3403ee 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java @@ -67,7 +67,7 @@ import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.base.AInt32; import org.apache.asterix.om.base.AString; import org.apache.asterix.om.constants.AsterixConstantValue; -import org.apache.asterix.om.functions.AsterixBuiltinFunctions; +import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.asterix.om.types.BuiltinType; import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang3.mutable.Mutable; @@ -329,7 +329,7 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp if (hasRightPosVar) { // Creates record to get correlation between the two aggregate variables. ScalarFunctionCallExpression recordCreationFunc = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR), + FunctionUtil.getFunctionInfo(BuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR), // Field name for the listified right unnest var. new MutableObject( new ConstantExpression(new AsterixConstantValue(new AString("unnestvar")))), @@ -357,8 +357,8 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp } // Adds an aggregate operator to listfy unnest variables. - AggregateFunctionCallExpression fListify = AsterixBuiltinFunctions - .makeAggregateFunctionExpression(AsterixBuiltinFunctions.LISTIFY, mkSingletonArrayList( + AggregateFunctionCallExpression fListify = BuiltinFunctions + .makeAggregateFunctionExpression(BuiltinFunctions.LISTIFY, mkSingletonArrayList( new MutableObject(new VariableReferenceExpression(varToListify)))); LogicalVariable aggVar = context.newSubplanOutputVar(); @@ -383,12 +383,12 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp if (hasRightPosVar) { ScalarFunctionCallExpression fieldAccessForRightUnnestVar = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX), + FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX), new MutableObject(new VariableReferenceExpression(outerUnnestVar)), new MutableObject( new ConstantExpression(new AsterixConstantValue(new AInt32(0))))); ScalarFunctionCallExpression fieldAccessForRightPosVar = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX), + FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX), new MutableObject(new VariableReferenceExpression(outerUnnestVar)), new MutableObject( new ConstantExpression(new AsterixConstantValue(new AInt32(1))))); @@ -523,7 +523,7 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp // A "THEN" branch can be entered only when the tuple has not enter any other preceding // branches and the current "WHEN" condition is TRUE. branchEntraceConditionExprRef = new MutableObject<>(new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.AND), andArgs)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.AND), andArgs)); } // Translates the corresponding "THEN" expression. @@ -552,7 +552,7 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp } arguments.add(new MutableObject<>(new VariableReferenceExpression(opAndVarForElse.second))); AbstractFunctionCallExpression swithCaseExpr = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SWITCH_CASE), arguments); + FunctionUtil.getFunctionInfo(BuiltinFunctions.SWITCH_CASE), arguments); AssignOperator assignOp = new AssignOperator(selectVar, new MutableObject<>(swithCaseExpr)); assignOp.getInputs().add(new MutableObject<>(opAndVarForElse.first)); @@ -560,7 +560,7 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp LogicalVariable unnestVar = context.newVar(); UnnestOperator unnestOp = new UnnestOperator(unnestVar, new MutableObject<>(new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.SCAN_COLLECTION), Collections + FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), Collections .singletonList(new MutableObject<>(new VariableReferenceExpression(selectVar)))))); unnestOp.getInputs().add(new MutableObject<>(assignOp)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/PlanTranslationUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/PlanTranslationUtil.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/PlanTranslationUtil.java index ea3ec2c..5e70baf 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/PlanTranslationUtil.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/PlanTranslationUtil.java @@ -25,7 +25,7 @@ import org.apache.asterix.om.base.AOrderedList; import org.apache.asterix.om.base.AString; import org.apache.asterix.om.base.IAObject; import org.apache.asterix.om.constants.AsterixConstantValue; -import org.apache.asterix.om.functions.AsterixBuiltinFunctions; +import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; @@ -45,7 +45,7 @@ public class PlanTranslationUtil { List> varRefs, IVariableContext context) { IAObject value = (field.size() > 1) ? new AOrderedList(field) : new AString(field.get(0)); ScalarFunctionCallExpression metaKeyFunction = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.META_KEY)); + FunctionUtil.getFunctionInfo(BuiltinFunctions.META_KEY)); metaKeyFunction.getArguments() .add(new MutableObject(new VariableReferenceExpression(resVar))); metaKeyFunction.getArguments() @@ -76,10 +76,10 @@ public class PlanTranslationUtil { FunctionIdentifier functionIdentifier; IAObject value; if (field.size() > 1) { - functionIdentifier = AsterixBuiltinFunctions.FIELD_ACCESS_NESTED; + functionIdentifier = BuiltinFunctions.FIELD_ACCESS_NESTED; value = new AOrderedList(field); } else { - functionIdentifier = AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME; + functionIdentifier = BuiltinFunctions.FIELD_ACCESS_BY_NAME; value = new AString(field.get(0)); } IFunctionInfo finfoAccess = FunctionUtil.getFunctionInfo(functionIdentifier); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java index 0d8df9e..e27edb1 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java @@ -27,8 +27,8 @@ import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslator; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory; import org.apache.asterix.api.common.Job.SubmissionMode; import org.apache.asterix.app.result.ResultUtil; -import org.apache.asterix.common.config.AsterixCompilerProperties; -import org.apache.asterix.common.config.AsterixExternalProperties; +import org.apache.asterix.common.config.CompilerProperties; +import org.apache.asterix.common.config.ExternalProperties; import org.apache.asterix.common.config.OptimizationConfUtil; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.AsterixException; @@ -50,7 +50,7 @@ import org.apache.asterix.lang.common.statement.FunctionDecl; import org.apache.asterix.lang.common.statement.Query; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.runtime.job.listener.JobEventListenerFactory; -import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AppContextInfo; import org.apache.asterix.transaction.management.service.transaction.JobIdFactory; import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; import org.apache.asterix.translator.IStatementExecutor.Stats; @@ -190,13 +190,13 @@ public class APIFramework { } //print the plot for the logical plan - AsterixExternalProperties xProps = AsterixAppContextInfo.INSTANCE.getExternalProperties(); + ExternalProperties xProps = AppContextInfo.INSTANCE.getExternalProperties(); Boolean plot = xProps.getIsPlottingEnabled(); if (plot) { PlanPlotter.printLogicalPlan(plan); } - AsterixCompilerProperties compilerProperties = AsterixAppContextInfo.INSTANCE.getCompilerProperties(); + CompilerProperties compilerProperties = AppContextInfo.INSTANCE.getCompilerProperties(); int frameSize = compilerProperties.getFrameSize(); int sortFrameLimit = (int) (compilerProperties.getSortMemorySize() / frameSize); int groupFrameLimit = (int) (compilerProperties.getGroupMemorySize() / frameSize); @@ -292,7 +292,7 @@ public class APIFramework { JobEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(asterixJobId, metadataProvider.isWriteTransaction()); - JobSpecification spec = compiler.createJob(AsterixAppContextInfo.INSTANCE, jobEventListenerFactory); + JobSpecification spec = compiler.createJob(AppContextInfo.INSTANCE, jobEventListenerFactory); if (conf.is(SessionConfig.OOB_HYRACKS_JOB)) { printPlanPrefix(conf, "Hyracks job"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AppRuntimeContextProviderForRecovery.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AppRuntimeContextProviderForRecovery.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AppRuntimeContextProviderForRecovery.java new file mode 100644 index 0000000..d8a2fab --- /dev/null +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AppRuntimeContextProviderForRecovery.java @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * 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. + */ +package org.apache.asterix.api.common; + +import org.apache.asterix.app.nc.NCAppRuntimeContext; +import org.apache.asterix.common.api.ThreadExecutor; +import org.apache.asterix.common.api.IAppRuntimeContext; +import org.apache.asterix.common.api.IDatasetLifecycleManager; +import org.apache.asterix.common.transactions.IAppRuntimeContextProvider; +import org.apache.asterix.common.transactions.ITransactionSubsystem; +import org.apache.hyracks.api.io.IIOManager; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; +import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; +import org.apache.hyracks.storage.common.file.ILocalResourceRepository; + +public class AppRuntimeContextProviderForRecovery implements IAppRuntimeContextProvider { + + private final NCAppRuntimeContext asterixAppRuntimeContext; + + public AppRuntimeContextProviderForRecovery(NCAppRuntimeContext asterixAppRuntimeContext) { + this.asterixAppRuntimeContext = asterixAppRuntimeContext; + } + + @Override + public IBufferCache getBufferCache() { + return asterixAppRuntimeContext.getBufferCache(); + } + + @Override + public IFileMapProvider getFileMapManager() { + return asterixAppRuntimeContext.getFileMapManager(); + } + + @Override + public ITransactionSubsystem getTransactionSubsystem() { + return asterixAppRuntimeContext.getTransactionSubsystem(); + } + + @Override + public IDatasetLifecycleManager getDatasetLifecycleManager() { + return asterixAppRuntimeContext.getDatasetLifecycleManager(); + } + + @Override + public double getBloomFilterFalsePositiveRate() { + return asterixAppRuntimeContext.getBloomFilterFalsePositiveRate(); + } + + @Override + public ILSMIOOperationScheduler getLSMIOScheduler() { + return asterixAppRuntimeContext.getLSMIOScheduler(); + } + + @Override + public ILocalResourceRepository getLocalResourceRepository() { + return asterixAppRuntimeContext.getLocalResourceRepository(); + } + + @Override + public IIOManager getIOManager() { + return asterixAppRuntimeContext.getIOManager(); + } + + @Override + public ILSMOperationTracker getLSMBTreeOperationTracker(int datasetID) { + return asterixAppRuntimeContext.getLSMBTreeOperationTracker(datasetID); + } + + @Override + public IAppRuntimeContext getAppContext() { + return asterixAppRuntimeContext; + } + + @Override + public ThreadExecutor getThreadExecutor() { + return asterixAppRuntimeContext.getThreadExecutor(); + } +} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProviderForRecovery.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProviderForRecovery.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProviderForRecovery.java deleted file mode 100644 index ec0aaa8..0000000 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProviderForRecovery.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * 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. - */ -package org.apache.asterix.api.common; - -import org.apache.asterix.app.nc.AsterixNCAppRuntimeContext; -import org.apache.asterix.common.api.AsterixThreadExecutor; -import org.apache.asterix.common.api.IAsterixAppRuntimeContext; -import org.apache.asterix.common.api.IDatasetLifecycleManager; -import org.apache.asterix.common.transactions.IAsterixAppRuntimeContextProvider; -import org.apache.asterix.common.transactions.ITransactionSubsystem; -import org.apache.hyracks.api.io.IIOManager; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; -import org.apache.hyracks.storage.common.buffercache.IBufferCache; -import org.apache.hyracks.storage.common.file.IFileMapProvider; -import org.apache.hyracks.storage.common.file.ILocalResourceRepository; - -public class AsterixAppRuntimeContextProviderForRecovery implements IAsterixAppRuntimeContextProvider { - - private final AsterixNCAppRuntimeContext asterixAppRuntimeContext; - - public AsterixAppRuntimeContextProviderForRecovery(AsterixNCAppRuntimeContext asterixAppRuntimeContext) { - this.asterixAppRuntimeContext = asterixAppRuntimeContext; - } - - @Override - public IBufferCache getBufferCache() { - return asterixAppRuntimeContext.getBufferCache(); - } - - @Override - public IFileMapProvider getFileMapManager() { - return asterixAppRuntimeContext.getFileMapManager(); - } - - @Override - public ITransactionSubsystem getTransactionSubsystem() { - return asterixAppRuntimeContext.getTransactionSubsystem(); - } - - @Override - public IDatasetLifecycleManager getDatasetLifecycleManager() { - return asterixAppRuntimeContext.getDatasetLifecycleManager(); - } - - @Override - public double getBloomFilterFalsePositiveRate() { - return asterixAppRuntimeContext.getBloomFilterFalsePositiveRate(); - } - - @Override - public ILSMIOOperationScheduler getLSMIOScheduler() { - return asterixAppRuntimeContext.getLSMIOScheduler(); - } - - @Override - public ILocalResourceRepository getLocalResourceRepository() { - return asterixAppRuntimeContext.getLocalResourceRepository(); - } - - @Override - public IIOManager getIOManager() { - return asterixAppRuntimeContext.getIOManager(); - } - - @Override - public ILSMOperationTracker getLSMBTreeOperationTracker(int datasetID) { - return asterixAppRuntimeContext.getLSMBTreeOperationTracker(datasetID); - } - - @Override - public IAsterixAppRuntimeContext getAppContext() { - return asterixAppRuntimeContext; - } - - @Override - public AsterixThreadExecutor getThreadExecutor() { - return asterixAppRuntimeContext.getThreadExecutor(); - } -} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java index b0b2e36..bdce0ca 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.asterix.common.config.AsterixPropertiesAccessor; +import org.apache.asterix.common.config.PropertiesAccessor; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint; @@ -61,12 +61,12 @@ public class AsterixHyracksIntegrationUtil { public NodeControllerService[] ncs; public IHyracksClientConnection hcc; - private AsterixPropertiesAccessor propertiesAccessor; + private PropertiesAccessor propertiesAccessor; public void init(boolean deleteOldInstanceData) throws Exception { ncs = new NodeControllerService[0]; // ensure that ncs is not null final CCConfig ccConfig = createCCConfig(); - propertiesAccessor = AsterixPropertiesAccessor.getInstance(ccConfig.getAppConfig()); + propertiesAccessor = PropertiesAccessor.getInstance(ccConfig.getAppConfig()); if (deleteOldInstanceData) { deleteTransactionLogs(); removeTestStorageFiles(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java index 158317b..02be70b 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java @@ -31,8 +31,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.asterix.common.config.AbstractAsterixProperties; -import org.apache.asterix.common.config.AsterixReplicationProperties; +import org.apache.asterix.common.config.AbstractProperties; +import org.apache.asterix.common.config.ReplicationProperties; import org.apache.asterix.runtime.util.ClusterStateManager; import org.json.JSONArray; import org.json.JSONException; @@ -99,8 +99,8 @@ public class ClusterAPIServlet extends HttpServlet { } protected JSONObject getReplicationJSON() throws JSONException { - for (AbstractAsterixProperties props : getPropertiesInstances()) { - if (props instanceof AsterixReplicationProperties) { + for (AbstractProperties props : getPropertiesInstances()) { + if (props instanceof ReplicationProperties) { JSONObject json = new JSONObject(); json.put("config", props.getProperties(key -> REPLICATION_PROPERTY.matcher(key).replaceFirst(""))); return json; @@ -111,16 +111,16 @@ public class ClusterAPIServlet extends HttpServlet { protected Map getAllClusterProperties() { Map allProperties = new HashMap<>(); - for (AbstractAsterixProperties properties : getPropertiesInstances()) { - if (!(properties instanceof AsterixReplicationProperties)) { + for (AbstractProperties properties : getPropertiesInstances()) { + if (!(properties instanceof ReplicationProperties)) { allProperties.putAll(properties.getProperties()); } } return allProperties; } - protected List getPropertiesInstances() { - return AbstractAsterixProperties.getImplementations(); + protected List getPropertiesInstances() { + return AbstractProperties.getImplementations(); } protected JSONObject getClusterStateJSON(HttpServletRequest request, String pathToNode) throws JSONException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java index fd5547c..c709ab5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java @@ -37,7 +37,7 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AppContextInfo; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.json.JSONObject; @@ -83,7 +83,7 @@ public class DiagnosticsAPIServlet extends ClusterNodeDetailsAPIServlet { fixupKeys(new JSONObject(hcc.getNodeDetailsJSON(null, true, false))))); Map>> ncDataMap = new HashMap<>(); - for (String nc : AsterixAppContextInfo.INSTANCE.getMetadataProperties().getNodeNames()) { + for (String nc : AppContextInfo.INSTANCE.getMetadataProperties().getNodeNames()) { Map> ncData = new HashMap<>(); ncData.put("threaddump", executor.submit(() -> fixupKeys(new JSONObject(hcc.getThreadDump(nc))))); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryWebInterfaceServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryWebInterfaceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryWebInterfaceServlet.java index 524c87f..383d8fd 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryWebInterfaceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryWebInterfaceServlet.java @@ -30,8 +30,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.asterix.common.config.AsterixExternalProperties; -import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.common.config.ExternalProperties; +import org.apache.asterix.runtime.util.AppContextInfo; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -109,7 +109,7 @@ public class QueryWebInterfaceServlet extends HttpServlet { public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { response.setCharacterEncoding("utf-8"); response.setContentType("application/json"); - AsterixExternalProperties externalProperties = AsterixAppContextInfo.INSTANCE.getExternalProperties(); + ExternalProperties externalProperties = AppContextInfo.INSTANCE.getExternalProperties(); JSONObject obj = new JSONObject(); try { PrintWriter out = response.getWriter(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/VersionAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/VersionAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/VersionAPIServlet.java index 20ecaa5..c1ce344 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/VersionAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/VersionAPIServlet.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AppContextInfo; import org.json.JSONObject; import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR; @@ -38,7 +38,7 @@ public class VersionAPIServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { ServletContext context = getServletContext(); - AsterixAppContextInfo props = (AsterixAppContextInfo) context.getAttribute(ASTERIX_BUILD_PROP_ATTR); + AppContextInfo props = (AppContextInfo) context.getAttribute(ASTERIX_BUILD_PROP_ATTR); Map buildProperties = props.getBuildProperties().getAllProps(); JSONObject responseObject = new JSONObject(buildProperties); response.setCharacterEncoding("utf-8"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/AsterixResourceIdManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/AsterixResourceIdManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/AsterixResourceIdManager.java deleted file mode 100644 index 99db723..0000000 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/AsterixResourceIdManager.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * 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. - */ -package org.apache.asterix.app.cc; - -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.asterix.common.transactions.IAsterixResourceIdManager; -import org.apache.asterix.runtime.util.ClusterStateManager; - -public class AsterixResourceIdManager implements IAsterixResourceIdManager { - - private final AtomicLong globalResourceId = new AtomicLong(); - private volatile Set reportedNodes = new HashSet<>(); - private volatile boolean allReported = false; - - @Override - public long createResourceId() { - if (!allReported) { - synchronized (this) { - if (!allReported) { - if (reportedNodes.size() < ClusterStateManager.getNumberOfNodes()) { - return -1; - } else { - reportedNodes = null; - allReported = true; - } - } - } - } - return globalResourceId.incrementAndGet(); - } - - @Override - public synchronized boolean reported(String nodeId) { - return allReported || reportedNodes.contains(nodeId); - } - - @Override - public synchronized void report(String nodeId, long maxResourceId) { - if (!allReported) { - globalResourceId.set(Math.max(maxResourceId, globalResourceId.get())); - reportedNodes.add(nodeId); - if (reportedNodes.size() == ClusterStateManager.getNumberOfNodes()) { - reportedNodes = null; - allReported = true; - } - } - } - -} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/ResourceIdManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/ResourceIdManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/ResourceIdManager.java new file mode 100644 index 0000000..7b01169 --- /dev/null +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/ResourceIdManager.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * 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. + */ +package org.apache.asterix.app.cc; + +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.atomic.AtomicLong; + +import org.apache.asterix.common.transactions.IResourceIdManager; +import org.apache.asterix.runtime.util.ClusterStateManager; + +public class ResourceIdManager implements IResourceIdManager { + + private final AtomicLong globalResourceId = new AtomicLong(); + private volatile Set reportedNodes = new HashSet<>(); + private volatile boolean allReported = false; + + @Override + public long createResourceId() { + if (!allReported) { + synchronized (this) { + if (!allReported) { + if (reportedNodes.size() < ClusterStateManager.getNumberOfNodes()) { + return -1; + } else { + reportedNodes = null; + allReported = true; + } + } + } + } + return globalResourceId.incrementAndGet(); + } + + @Override + public synchronized boolean reported(String nodeId) { + return allReported || reportedNodes.contains(nodeId); + } + + @Override + public synchronized void report(String nodeId, long maxResourceId) { + if (!allReported) { + globalResourceId.set(Math.max(maxResourceId, globalResourceId.get())); + reportedNodes.add(nodeId); + if (reportedNodes.size() == ClusterStateManager.getNumberOfNodes()) { + reportedNodes = null; + allReported = true; + } + } + } + +}