Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA49B1805D for ; Tue, 25 Aug 2015 17:45:02 +0000 (UTC) Received: (qmail 9899 invoked by uid 500); 25 Aug 2015 17:45:02 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 9833 invoked by uid 500); 25 Aug 2015 17:45:02 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 9809 invoked by uid 99); 25 Aug 2015 17:45:02 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Aug 2015 17:45:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 20990C009B for ; Tue, 25 Aug 2015 17:45:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.794 X-Spam-Level: X-Spam-Status: No, score=0.794 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id mCbVFRFGLWF8 for ; Tue, 25 Aug 2015 17:44:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id CD289261A5 for ; Tue, 25 Aug 2015 17:44:44 +0000 (UTC) Received: (qmail 79569 invoked by uid 99); 25 Aug 2015 16:44:44 -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; Tue, 25 Aug 2015 16:44:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5C197E35D5; Tue, 25 Aug 2015 16:44:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: imaxon@apache.org To: commits@asterixdb.incubator.apache.org Date: Tue, 25 Aug 2015 16:45:27 -0000 Message-Id: <7f681da3335643f8af5f56bab440b059@git.apache.org> In-Reply-To: <6437d9e69ade468dba7f920558170c53@git.apache.org> References: <6437d9e69ade468dba7f920558170c53@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/51] [partial] incubator-asterixdb git commit: Change Java package from edu.uci.ics to org.apache http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java index 7bfa056..765f95c 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; import java.util.ArrayList; import java.util.HashMap; @@ -23,141 +23,141 @@ import java.util.logging.Logger; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; -import edu.uci.ics.asterix.aql.base.Clause; -import edu.uci.ics.asterix.aql.base.Expression; -import edu.uci.ics.asterix.aql.base.Expression.Kind; -import edu.uci.ics.asterix.aql.expression.CallExpr; -import edu.uci.ics.asterix.aql.expression.CompactStatement; -import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement; -import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement; -import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement; -import edu.uci.ics.asterix.aql.expression.CreateFeedStatement; -import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement; -import edu.uci.ics.asterix.aql.expression.CreateIndexStatement; -import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement; -import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement; -import edu.uci.ics.asterix.aql.expression.DatasetDecl; -import edu.uci.ics.asterix.aql.expression.DataverseDecl; -import edu.uci.ics.asterix.aql.expression.DataverseDropStatement; -import edu.uci.ics.asterix.aql.expression.DeleteStatement; -import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement; -import edu.uci.ics.asterix.aql.expression.DistinctClause; -import edu.uci.ics.asterix.aql.expression.DropStatement; -import edu.uci.ics.asterix.aql.expression.FLWOGRExpression; -import edu.uci.ics.asterix.aql.expression.FeedDropStatement; -import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement; -import edu.uci.ics.asterix.aql.expression.FieldAccessor; -import edu.uci.ics.asterix.aql.expression.FieldBinding; -import edu.uci.ics.asterix.aql.expression.ForClause; -import edu.uci.ics.asterix.aql.expression.FunctionDecl; -import edu.uci.ics.asterix.aql.expression.FunctionDropStatement; -import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair; -import edu.uci.ics.asterix.aql.expression.GroupbyClause; -import edu.uci.ics.asterix.aql.expression.Identifier; -import edu.uci.ics.asterix.aql.expression.IfExpr; -import edu.uci.ics.asterix.aql.expression.IndexAccessor; -import edu.uci.ics.asterix.aql.expression.IndexDropStatement; -import edu.uci.ics.asterix.aql.expression.InsertStatement; -import edu.uci.ics.asterix.aql.expression.JoinClause; -import edu.uci.ics.asterix.aql.expression.LetClause; -import edu.uci.ics.asterix.aql.expression.LimitClause; -import edu.uci.ics.asterix.aql.expression.ListConstructor; -import edu.uci.ics.asterix.aql.expression.ListConstructor.Type; -import edu.uci.ics.asterix.aql.expression.LiteralExpr; -import edu.uci.ics.asterix.aql.expression.LoadStatement; -import edu.uci.ics.asterix.aql.expression.MetaVariableClause; -import edu.uci.ics.asterix.aql.expression.MetaVariableExpr; -import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement; -import edu.uci.ics.asterix.aql.expression.NodegroupDecl; -import edu.uci.ics.asterix.aql.expression.OperatorExpr; -import edu.uci.ics.asterix.aql.expression.OperatorType; -import edu.uci.ics.asterix.aql.expression.OrderbyClause; -import edu.uci.ics.asterix.aql.expression.OrderbyClause.OrderModifier; -import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition; -import edu.uci.ics.asterix.aql.expression.QuantifiedExpression; -import edu.uci.ics.asterix.aql.expression.QuantifiedExpression.Quantifier; -import edu.uci.ics.asterix.aql.expression.QuantifiedPair; -import edu.uci.ics.asterix.aql.expression.Query; -import edu.uci.ics.asterix.aql.expression.RecordConstructor; -import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition; -import edu.uci.ics.asterix.aql.expression.SetStatement; -import edu.uci.ics.asterix.aql.expression.TypeDecl; -import edu.uci.ics.asterix.aql.expression.TypeDropStatement; -import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression; -import edu.uci.ics.asterix.aql.expression.UnaryExpr; -import edu.uci.ics.asterix.aql.expression.UnaryExpr.Sign; -import edu.uci.ics.asterix.aql.expression.UnionExpr; -import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition; -import edu.uci.ics.asterix.aql.expression.UpdateClause; -import edu.uci.ics.asterix.aql.expression.UpdateStatement; -import edu.uci.ics.asterix.aql.expression.VariableExpr; -import edu.uci.ics.asterix.aql.expression.WhereClause; -import edu.uci.ics.asterix.aql.expression.WriteStatement; -import edu.uci.ics.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor; -import edu.uci.ics.asterix.aql.util.FunctionUtils; -import edu.uci.ics.asterix.common.config.DatasetConfig.DatasetType; -import edu.uci.ics.asterix.common.exceptions.AsterixException; -import edu.uci.ics.asterix.common.functions.FunctionConstants; -import edu.uci.ics.asterix.common.functions.FunctionSignature; -import edu.uci.ics.asterix.common.transactions.JobId; -import edu.uci.ics.asterix.formats.base.IDataFormat; -import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider; -import edu.uci.ics.asterix.metadata.declared.FileSplitDataSink; -import edu.uci.ics.asterix.metadata.declared.FileSplitSinkId; -import edu.uci.ics.asterix.metadata.entities.Dataset; -import edu.uci.ics.asterix.metadata.utils.DatasetUtils; -import edu.uci.ics.asterix.om.base.AString; -import edu.uci.ics.asterix.om.constants.AsterixConstantValue; -import edu.uci.ics.asterix.om.functions.AsterixBuiltinFunctions; -import edu.uci.ics.asterix.om.functions.AsterixFunctionInfo; -import edu.uci.ics.asterix.om.types.ARecordType; -import edu.uci.ics.asterix.om.types.BuiltinType; -import edu.uci.ics.asterix.om.types.IAType; -import edu.uci.ics.asterix.translator.CompiledStatements.ICompiledDmlStatement; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.algebricks.common.utils.Triple; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.Counter; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.OperatorAnnotations; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression.FunctionKind; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.BroadcastExpressionAnnotation; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.BroadcastExpressionAnnotation.BroadcastSide; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DistinctOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.InnerJoinOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.LeftOuterJoinOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.LimitOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnionAllOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.WriteOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl; -import edu.uci.ics.hyracks.algebricks.runtime.base.ICopyEvaluatorFactory; +import org.apache.asterix.aql.base.Clause; +import org.apache.asterix.aql.base.Expression; +import org.apache.asterix.aql.base.Expression.Kind; +import org.apache.asterix.aql.expression.CallExpr; +import org.apache.asterix.aql.expression.CompactStatement; +import org.apache.asterix.aql.expression.ConnectFeedStatement; +import org.apache.asterix.aql.expression.CreateDataverseStatement; +import org.apache.asterix.aql.expression.CreateFeedPolicyStatement; +import org.apache.asterix.aql.expression.CreateFeedStatement; +import org.apache.asterix.aql.expression.CreateFunctionStatement; +import org.apache.asterix.aql.expression.CreateIndexStatement; +import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement; +import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement; +import org.apache.asterix.aql.expression.DatasetDecl; +import org.apache.asterix.aql.expression.DataverseDecl; +import org.apache.asterix.aql.expression.DataverseDropStatement; +import org.apache.asterix.aql.expression.DeleteStatement; +import org.apache.asterix.aql.expression.DisconnectFeedStatement; +import org.apache.asterix.aql.expression.DistinctClause; +import org.apache.asterix.aql.expression.DropStatement; +import org.apache.asterix.aql.expression.FLWOGRExpression; +import org.apache.asterix.aql.expression.FeedDropStatement; +import org.apache.asterix.aql.expression.FeedPolicyDropStatement; +import org.apache.asterix.aql.expression.FieldAccessor; +import org.apache.asterix.aql.expression.FieldBinding; +import org.apache.asterix.aql.expression.ForClause; +import org.apache.asterix.aql.expression.FunctionDecl; +import org.apache.asterix.aql.expression.FunctionDropStatement; +import org.apache.asterix.aql.expression.GbyVariableExpressionPair; +import org.apache.asterix.aql.expression.GroupbyClause; +import org.apache.asterix.aql.expression.Identifier; +import org.apache.asterix.aql.expression.IfExpr; +import org.apache.asterix.aql.expression.IndexAccessor; +import org.apache.asterix.aql.expression.IndexDropStatement; +import org.apache.asterix.aql.expression.InsertStatement; +import org.apache.asterix.aql.expression.JoinClause; +import org.apache.asterix.aql.expression.LetClause; +import org.apache.asterix.aql.expression.LimitClause; +import org.apache.asterix.aql.expression.ListConstructor; +import org.apache.asterix.aql.expression.ListConstructor.Type; +import org.apache.asterix.aql.expression.LiteralExpr; +import org.apache.asterix.aql.expression.LoadStatement; +import org.apache.asterix.aql.expression.MetaVariableClause; +import org.apache.asterix.aql.expression.MetaVariableExpr; +import org.apache.asterix.aql.expression.NodeGroupDropStatement; +import org.apache.asterix.aql.expression.NodegroupDecl; +import org.apache.asterix.aql.expression.OperatorExpr; +import org.apache.asterix.aql.expression.OperatorType; +import org.apache.asterix.aql.expression.OrderbyClause; +import org.apache.asterix.aql.expression.OrderbyClause.OrderModifier; +import org.apache.asterix.aql.expression.OrderedListTypeDefinition; +import org.apache.asterix.aql.expression.QuantifiedExpression; +import org.apache.asterix.aql.expression.QuantifiedExpression.Quantifier; +import org.apache.asterix.aql.expression.QuantifiedPair; +import org.apache.asterix.aql.expression.Query; +import org.apache.asterix.aql.expression.RecordConstructor; +import org.apache.asterix.aql.expression.RecordTypeDefinition; +import org.apache.asterix.aql.expression.SetStatement; +import org.apache.asterix.aql.expression.TypeDecl; +import org.apache.asterix.aql.expression.TypeDropStatement; +import org.apache.asterix.aql.expression.TypeReferenceExpression; +import org.apache.asterix.aql.expression.UnaryExpr; +import org.apache.asterix.aql.expression.UnaryExpr.Sign; +import org.apache.asterix.aql.expression.UnionExpr; +import org.apache.asterix.aql.expression.UnorderedListTypeDefinition; +import org.apache.asterix.aql.expression.UpdateClause; +import org.apache.asterix.aql.expression.UpdateStatement; +import org.apache.asterix.aql.expression.VariableExpr; +import org.apache.asterix.aql.expression.WhereClause; +import org.apache.asterix.aql.expression.WriteStatement; +import org.apache.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor; +import org.apache.asterix.aql.util.FunctionUtils; +import org.apache.asterix.common.config.DatasetConfig.DatasetType; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.asterix.common.functions.FunctionConstants; +import org.apache.asterix.common.functions.FunctionSignature; +import org.apache.asterix.common.transactions.JobId; +import org.apache.asterix.formats.base.IDataFormat; +import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.FileSplitDataSink; +import org.apache.asterix.metadata.declared.FileSplitSinkId; +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.types.ARecordType; +import org.apache.asterix.om.types.BuiltinType; +import org.apache.asterix.om.types.IAType; +import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.algebricks.common.utils.Triple; +import org.apache.hyracks.algebricks.core.algebra.base.Counter; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.base.OperatorAnnotations; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression.FunctionKind; +import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.BroadcastExpressionAnnotation; +import org.apache.hyracks.algebricks.core.algebra.expressions.BroadcastExpressionAnnotation.BroadcastSide; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +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; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.DistinctOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.InnerJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.LimitOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnionAllOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteOperator; +import org.apache.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl; +import org.apache.hyracks.algebricks.runtime.base.ICopyEvaluatorFactory; /** * Each visit returns a pair of an operator and a variable. The variable http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java index da66fe4..de3199b 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; import java.io.DataOutput; import java.io.IOException; import java.io.Serializable; -import edu.uci.ics.asterix.om.types.BuiltinType; -import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingPositionWriter; +import org.apache.asterix.om.types.BuiltinType; +import org.apache.hyracks.algebricks.runtime.base.IUnnestingPositionWriter; public class AqlPositionWriter implements IUnnestingPositionWriter, Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/CompiledStatements.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/CompiledStatements.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/CompiledStatements.java index bfa0331..70959ac 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/CompiledStatements.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/CompiledStatements.java @@ -12,36 +12,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; import java.util.ArrayList; import java.util.List; import java.util.Map; -import edu.uci.ics.asterix.aql.base.Clause; -import edu.uci.ics.asterix.aql.base.Expression; -import edu.uci.ics.asterix.aql.base.Statement.Kind; -import edu.uci.ics.asterix.aql.expression.CallExpr; -import edu.uci.ics.asterix.aql.expression.FLWOGRExpression; -import edu.uci.ics.asterix.aql.expression.FieldAccessor; -import edu.uci.ics.asterix.aql.expression.FieldBinding; -import edu.uci.ics.asterix.aql.expression.ForClause; -import edu.uci.ics.asterix.aql.expression.Identifier; -import edu.uci.ics.asterix.aql.expression.LiteralExpr; -import edu.uci.ics.asterix.aql.expression.Query; -import edu.uci.ics.asterix.aql.expression.RecordConstructor; -import edu.uci.ics.asterix.aql.expression.VariableExpr; -import edu.uci.ics.asterix.aql.expression.WhereClause; -import edu.uci.ics.asterix.aql.literal.StringLiteral; -import edu.uci.ics.asterix.common.config.DatasetConfig.IndexType; -import edu.uci.ics.asterix.common.feeds.FeedConnectionRequest; -import edu.uci.ics.asterix.common.functions.FunctionConstants; -import edu.uci.ics.asterix.common.functions.FunctionSignature; -import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider; -import edu.uci.ics.asterix.metadata.entities.Dataset; -import edu.uci.ics.asterix.om.types.ARecordType; -import edu.uci.ics.asterix.om.types.IAType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.asterix.aql.base.Clause; +import org.apache.asterix.aql.base.Expression; +import org.apache.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.expression.CallExpr; +import org.apache.asterix.aql.expression.FLWOGRExpression; +import org.apache.asterix.aql.expression.FieldAccessor; +import org.apache.asterix.aql.expression.FieldBinding; +import org.apache.asterix.aql.expression.ForClause; +import org.apache.asterix.aql.expression.Identifier; +import org.apache.asterix.aql.expression.LiteralExpr; +import org.apache.asterix.aql.expression.Query; +import org.apache.asterix.aql.expression.RecordConstructor; +import org.apache.asterix.aql.expression.VariableExpr; +import org.apache.asterix.aql.expression.WhereClause; +import org.apache.asterix.aql.literal.StringLiteral; +import org.apache.asterix.common.config.DatasetConfig.IndexType; +import org.apache.asterix.common.feeds.FeedConnectionRequest; +import org.apache.asterix.common.functions.FunctionConstants; +import org.apache.asterix.common.functions.FunctionSignature; +import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.entities.Dataset; +import org.apache.asterix.om.types.ARecordType; +import org.apache.asterix.om.types.IAType; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; /** * An AQL statement instance is translated into an instance of type CompileX http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java index dc75889..9e6d974 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java @@ -12,22 +12,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; -import edu.uci.ics.asterix.aql.base.Literal; -import edu.uci.ics.asterix.aql.literal.DoubleLiteral; -import edu.uci.ics.asterix.aql.literal.FloatLiteral; -import edu.uci.ics.asterix.aql.literal.IntegerLiteral; -import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral; -import edu.uci.ics.asterix.aql.literal.StringLiteral; -import edu.uci.ics.asterix.om.base.ABoolean; -import edu.uci.ics.asterix.om.base.ADouble; -import edu.uci.ics.asterix.om.base.AFloat; -import edu.uci.ics.asterix.om.base.AInt32; -import edu.uci.ics.asterix.om.base.AInt64; -import edu.uci.ics.asterix.om.base.ANull; -import edu.uci.ics.asterix.om.base.AString; -import edu.uci.ics.asterix.om.base.IAObject; +import org.apache.asterix.aql.base.Literal; +import org.apache.asterix.aql.literal.DoubleLiteral; +import org.apache.asterix.aql.literal.FloatLiteral; +import org.apache.asterix.aql.literal.IntegerLiteral; +import org.apache.asterix.aql.literal.LongIntegerLiteral; +import org.apache.asterix.aql.literal.StringLiteral; +import org.apache.asterix.om.base.ABoolean; +import org.apache.asterix.om.base.ADouble; +import org.apache.asterix.om.base.AFloat; +import org.apache.asterix.om.base.AInt32; +import org.apache.asterix.om.base.AInt64; +import org.apache.asterix.om.base.ANull; +import org.apache.asterix.om.base.AString; +import org.apache.asterix.om.base.IAObject; public final class ConstantHelper { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationContext.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationContext.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationContext.java index 986b5ca..aa51a5b 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationContext.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationContext.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; import java.util.HashMap; -import edu.uci.ics.asterix.aql.expression.VariableExpr; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.Counter; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.asterix.aql.expression.VariableExpr; +import org.apache.hyracks.algebricks.core.algebra.base.Counter; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; public final class TranslationContext { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationException.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationException.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationException.java index 2819961..5539d5e 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationException.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/TranslationException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; -import edu.uci.ics.asterix.common.exceptions.AsterixException; +import org.apache.asterix.common.exceptions.AsterixException; public class TranslationException extends AsterixException { /** http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java b/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java index e6f3d17..3713d71 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package edu.uci.ics.asterix.translator; +package org.apache.asterix.translator; import java.util.ArrayList; import java.util.HashMap; @@ -21,31 +21,31 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition; -import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition; -import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition.RecordKind; -import edu.uci.ics.asterix.aql.expression.TypeExpression; -import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression; -import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition; -import edu.uci.ics.asterix.common.annotations.IRecordFieldDataGen; -import edu.uci.ics.asterix.common.annotations.RecordDataGenAnnotation; -import edu.uci.ics.asterix.common.exceptions.AsterixException; -import edu.uci.ics.asterix.metadata.MetadataException; -import edu.uci.ics.asterix.metadata.MetadataManager; -import edu.uci.ics.asterix.metadata.MetadataTransactionContext; -import edu.uci.ics.asterix.metadata.entities.AsterixBuiltinTypeMap; -import edu.uci.ics.asterix.metadata.entities.Datatype; -import edu.uci.ics.asterix.om.types.AOrderedListType; -import edu.uci.ics.asterix.om.types.ARecordType; -import edu.uci.ics.asterix.om.types.AUnionType; -import edu.uci.ics.asterix.om.types.AUnorderedListType; -import edu.uci.ics.asterix.om.types.AbstractCollectionType; -import edu.uci.ics.asterix.om.types.AbstractComplexType; -import edu.uci.ics.asterix.om.types.BuiltinType; -import edu.uci.ics.asterix.om.types.IAType; -import edu.uci.ics.asterix.om.types.TypeSignature; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; +import org.apache.asterix.aql.expression.OrderedListTypeDefinition; +import org.apache.asterix.aql.expression.RecordTypeDefinition; +import org.apache.asterix.aql.expression.RecordTypeDefinition.RecordKind; +import org.apache.asterix.aql.expression.TypeExpression; +import org.apache.asterix.aql.expression.TypeReferenceExpression; +import org.apache.asterix.aql.expression.UnorderedListTypeDefinition; +import org.apache.asterix.common.annotations.IRecordFieldDataGen; +import org.apache.asterix.common.annotations.RecordDataGenAnnotation; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.asterix.metadata.MetadataException; +import org.apache.asterix.metadata.MetadataManager; +import org.apache.asterix.metadata.MetadataTransactionContext; +import org.apache.asterix.metadata.entities.AsterixBuiltinTypeMap; +import org.apache.asterix.metadata.entities.Datatype; +import org.apache.asterix.om.types.AOrderedListType; +import org.apache.asterix.om.types.ARecordType; +import org.apache.asterix.om.types.AUnionType; +import org.apache.asterix.om.types.AUnorderedListType; +import org.apache.asterix.om.types.AbstractCollectionType; +import org.apache.asterix.om.types.AbstractComplexType; +import org.apache.asterix.om.types.BuiltinType; +import org.apache.asterix.om.types.IAType; +import org.apache.asterix.om.types.TypeSignature; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.api.exceptions.HyracksDataException; public class TypeTranslator { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-algebra/src/main/javacc/AQLPlus.jj ---------------------------------------------------------------------- diff --git a/asterix-algebra/src/main/javacc/AQLPlus.jj b/asterix-algebra/src/main/javacc/AQLPlus.jj index e9b871e..151ee4e 100644 --- a/asterix-algebra/src/main/javacc/AQLPlus.jj +++ b/asterix-algebra/src/main/javacc/AQLPlus.jj @@ -8,7 +8,7 @@ options { PARSER_BEGIN(AQLPlusParser) -package edu.uci.ics.asterix.aqlplus.parser; +package org.apache.asterix.aqlplus.parser; import java.io.*; import java.util.List; @@ -17,32 +17,32 @@ import java.util.Stack; import java.util.Map; import java.util.HashMap; -import edu.uci.ics.asterix.aql.literal.FloatLiteral; -import edu.uci.ics.asterix.aql.literal.DoubleLiteral; -import edu.uci.ics.asterix.aql.literal.FalseLiteral; -import edu.uci.ics.asterix.aql.base.Literal; -import edu.uci.ics.asterix.aql.literal.IntegerLiteral; -import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral; -import edu.uci.ics.asterix.aql.literal.NullLiteral; -import edu.uci.ics.asterix.aql.literal.StringLiteral; -import edu.uci.ics.asterix.aql.literal.TrueLiteral; -import edu.uci.ics.asterix.aql.parser.ScopeChecker; -import edu.uci.ics.asterix.aql.base.*; -import edu.uci.ics.asterix.aql.expression.*; -import edu.uci.ics.asterix.aql.expression.visitor.AQLPrintVisitor; -import edu.uci.ics.asterix.aql.expression.UnaryExpr.Sign; -import edu.uci.ics.asterix.aql.expression.TypeExpression.TypeExprKind; -import edu.uci.ics.asterix.aql.base.Statement.Kind; -import edu.uci.ics.asterix.aql.context.Scope; -import edu.uci.ics.asterix.aql.context.RootScopeFactory; -import edu.uci.ics.asterix.common.exceptions.AsterixException; -import edu.uci.ics.asterix.om.functions.AsterixFunction; -import edu.uci.ics.asterix.common.functions.FunctionSignature; -import edu.uci.ics.asterix.metadata.bootstrap.MetadataConstants; - -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; +import org.apache.asterix.aql.literal.FloatLiteral; +import org.apache.asterix.aql.literal.DoubleLiteral; +import org.apache.asterix.aql.literal.FalseLiteral; +import org.apache.asterix.aql.base.Literal; +import org.apache.asterix.aql.literal.IntegerLiteral; +import org.apache.asterix.aql.literal.LongIntegerLiteral; +import org.apache.asterix.aql.literal.NullLiteral; +import org.apache.asterix.aql.literal.StringLiteral; +import org.apache.asterix.aql.literal.TrueLiteral; +import org.apache.asterix.aql.parser.ScopeChecker; +import org.apache.asterix.aql.base.*; +import org.apache.asterix.aql.expression.*; +import org.apache.asterix.aql.expression.visitor.AQLPrintVisitor; +import org.apache.asterix.aql.expression.UnaryExpr.Sign; +import org.apache.asterix.aql.expression.TypeExpression.TypeExprKind; +import org.apache.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.context.Scope; +import org.apache.asterix.aql.context.RootScopeFactory; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.asterix.om.functions.AsterixFunction; +import org.apache.asterix.common.functions.FunctionSignature; +import org.apache.asterix.metadata.bootstrap.MetadataConstants; + +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation; +import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation; +import org.apache.hyracks.algebricks.common.utils.Pair; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/pom.xml ---------------------------------------------------------------------- diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml index 25f1ad9..b98b81e 100644 --- a/asterix-app/pom.xml +++ b/asterix-app/pom.xml @@ -14,7 +14,7 @@ 4.0.0 asterix - edu.uci.ics.asterix + org.apache.asterix 0.8.7-SNAPSHOT asterix-app @@ -49,15 +49,15 @@ - edu.uci.ics.asterix.drivers.AsterixWebServer + org.apache.asterix.drivers.AsterixWebServer asterix-web - edu.uci.ics.asterix.drivers.AsterixClientDriver + org.apache.asterix.drivers.AsterixClientDriver asterix-cmd - edu.uci.ics.asterix.drivers.AsterixCLI + org.apache.asterix.drivers.AsterixCLI asterix-cli @@ -112,64 +112,64 @@ compile - edu.uci.ics.hyracks + org.apache.hyracks hyracks-control-cc - edu.uci.ics.hyracks + org.apache.hyracks hyracks-control-nc - edu.uci.ics.hyracks + org.apache.hyracks algebricks-compiler - edu.uci.ics.hyracks + org.apache.hyracks hyracks-client - edu.uci.ics.asterix + org.apache.asterix asterix-algebra 0.8.7-SNAPSHOT compile - edu.uci.ics.asterix + org.apache.asterix asterix-aql 0.8.7-SNAPSHOT jar compile - edu.uci.ics.asterix + org.apache.asterix asterix-om 0.8.7-SNAPSHOT jar compile - edu.uci.ics.asterix + org.apache.asterix asterix-metadata 0.8.7-SNAPSHOT jar compile - edu.uci.ics.asterix + org.apache.asterix asterix-tools 0.8.7-SNAPSHOT jar compile - edu.uci.ics.asterix + org.apache.asterix asterix-common 0.8.7-SNAPSHOT jar compile - edu.uci.ics.asterix + org.apache.asterix asterix-common 0.8.7-SNAPSHOT test-jar @@ -179,7 +179,7 @@ org-apache-commons-io 1.3.1-201002241208 test --> - edu.uci.ics.asterix + org.apache.asterix asterix-transactions 0.8.7-SNAPSHOT compile @@ -210,7 +210,7 @@ test - edu.uci.ics.asterix + org.apache.asterix asterix-test-framework 0.8.7-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java index 8ccc9d5..2fcf28b 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.io.PrintWriter; import java.rmi.RemoteException; @@ -21,59 +21,59 @@ import java.util.List; import org.json.JSONException; -import edu.uci.ics.asterix.api.common.Job.SubmissionMode; -import edu.uci.ics.asterix.aql.base.Statement.Kind; -import edu.uci.ics.asterix.aql.expression.FunctionDecl; -import edu.uci.ics.asterix.aql.expression.Query; -import edu.uci.ics.asterix.aql.expression.visitor.AQLPrintVisitor; -import edu.uci.ics.asterix.aql.rewrites.AqlRewriter; -import edu.uci.ics.asterix.common.config.AsterixCompilerProperties; -import edu.uci.ics.asterix.common.config.AsterixExternalProperties; -import edu.uci.ics.asterix.common.config.OptimizationConfUtil; -import edu.uci.ics.asterix.common.exceptions.ACIDException; -import edu.uci.ics.asterix.common.exceptions.AsterixException; -import edu.uci.ics.asterix.dataflow.data.common.AqlExpressionTypeComputer; -import edu.uci.ics.asterix.dataflow.data.common.AqlMergeAggregationExpressionFactory; -import edu.uci.ics.asterix.dataflow.data.common.AqlNullableTypeComputer; -import edu.uci.ics.asterix.dataflow.data.common.AqlPartialAggregationTypeComputer; -import edu.uci.ics.asterix.formats.base.IDataFormat; -import edu.uci.ics.asterix.jobgen.AqlLogicalExpressionJobGen; -import edu.uci.ics.asterix.metadata.MetadataManager; -import edu.uci.ics.asterix.metadata.MetadataTransactionContext; -import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider; -import edu.uci.ics.asterix.metadata.entities.Dataverse; -import edu.uci.ics.asterix.om.util.AsterixAppContextInfo; -import edu.uci.ics.asterix.optimizer.base.RuleCollections; -import edu.uci.ics.asterix.runtime.job.listener.JobEventListenerFactory; -import edu.uci.ics.asterix.transaction.management.service.transaction.JobIdFactory; -import edu.uci.ics.asterix.translator.AqlExpressionToPlanTranslator; -import edu.uci.ics.asterix.translator.CompiledStatements.ICompiledDmlStatement; -import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder; -import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler; -import edu.uci.ics.hyracks.algebricks.compiler.api.ICompilerFactory; -import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController; -import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.LogicalExpressionJobGenToExpressionRuntimeProviderAdapter; -import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; -import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPlotter; -import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AbstractRuleController; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.job.JobId; -import edu.uci.ics.hyracks.api.job.JobSpecification; +import org.apache.asterix.api.common.Job.SubmissionMode; +import org.apache.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.expression.FunctionDecl; +import org.apache.asterix.aql.expression.Query; +import org.apache.asterix.aql.expression.visitor.AQLPrintVisitor; +import org.apache.asterix.aql.rewrites.AqlRewriter; +import org.apache.asterix.common.config.AsterixCompilerProperties; +import org.apache.asterix.common.config.AsterixExternalProperties; +import org.apache.asterix.common.config.OptimizationConfUtil; +import org.apache.asterix.common.exceptions.ACIDException; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.asterix.dataflow.data.common.AqlExpressionTypeComputer; +import org.apache.asterix.dataflow.data.common.AqlMergeAggregationExpressionFactory; +import org.apache.asterix.dataflow.data.common.AqlNullableTypeComputer; +import org.apache.asterix.dataflow.data.common.AqlPartialAggregationTypeComputer; +import org.apache.asterix.formats.base.IDataFormat; +import org.apache.asterix.jobgen.AqlLogicalExpressionJobGen; +import org.apache.asterix.metadata.MetadataManager; +import org.apache.asterix.metadata.MetadataTransactionContext; +import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.entities.Dataverse; +import org.apache.asterix.om.util.AsterixAppContextInfo; +import org.apache.asterix.optimizer.base.RuleCollections; +import org.apache.asterix.runtime.job.listener.JobEventListenerFactory; +import org.apache.asterix.transaction.management.service.transaction.JobIdFactory; +import org.apache.asterix.translator.AqlExpressionToPlanTranslator; +import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; +import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder; +import org.apache.hyracks.algebricks.compiler.api.ICompiler; +import org.apache.hyracks.algebricks.compiler.api.ICompilerFactory; +import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController; +import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; +import org.apache.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.LogicalExpressionJobGenToExpressionRuntimeProviderAdapter; +import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; +import org.apache.hyracks.algebricks.core.algebra.prettyprint.PlanPlotter; +import org.apache.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter; +import org.apache.hyracks.algebricks.core.rewriter.base.AbstractRuleController; +import org.apache.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory; +import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.job.JobId; +import org.apache.hyracks.api.job.JobSpecification; /** * Provides helper methods for compilation of a query into a JobSpec and submission @@ -205,7 +205,7 @@ public class APIFramework { } } - edu.uci.ics.asterix.common.transactions.JobId asterixJobId = JobIdFactory.generateJobId(); + org.apache.asterix.common.transactions.JobId asterixJobId = JobIdFactory.generateJobId(); queryMetadataProvider.setJobId(asterixJobId); AqlExpressionToPlanTranslator t = new AqlExpressionToPlanTranslator(queryMetadataProvider, varCounter, outputDatasetName, statement); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContext.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContext.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContext.java index 6d7f2a4..ccea25e 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContext.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContext.java @@ -12,61 +12,61 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.io.IOException; import java.util.List; import java.util.logging.Logger; -import edu.uci.ics.asterix.common.api.AsterixThreadExecutor; -import edu.uci.ics.asterix.common.api.IAsterixAppRuntimeContext; -import edu.uci.ics.asterix.common.config.AsterixCompilerProperties; -import edu.uci.ics.asterix.common.config.AsterixExternalProperties; -import edu.uci.ics.asterix.common.config.AsterixFeedProperties; -import edu.uci.ics.asterix.common.config.AsterixMetadataProperties; -import edu.uci.ics.asterix.common.config.AsterixPropertiesAccessor; -import edu.uci.ics.asterix.common.config.AsterixStorageProperties; -import edu.uci.ics.asterix.common.config.AsterixTransactionProperties; -import edu.uci.ics.asterix.common.config.IAsterixPropertiesProvider; -import edu.uci.ics.asterix.common.context.AsterixFileMapManager; -import edu.uci.ics.asterix.common.context.DatasetLifecycleManager; -import edu.uci.ics.asterix.common.exceptions.ACIDException; -import edu.uci.ics.asterix.common.exceptions.AsterixException; -import edu.uci.ics.asterix.common.feeds.api.IFeedManager; -import edu.uci.ics.asterix.common.transactions.IAsterixAppRuntimeContextProvider; -import edu.uci.ics.asterix.common.transactions.ITransactionSubsystem; -import edu.uci.ics.asterix.feeds.FeedManager; -import edu.uci.ics.asterix.metadata.bootstrap.MetadataPrimaryIndexes; -import edu.uci.ics.asterix.transaction.management.resource.PersistentLocalResourceRepository; -import edu.uci.ics.asterix.transaction.management.resource.PersistentLocalResourceRepositoryFactory; -import edu.uci.ics.asterix.transaction.management.service.logging.LogManager; -import edu.uci.ics.asterix.transaction.management.service.transaction.TransactionSubsystem; -import edu.uci.ics.hyracks.api.application.INCApplicationContext; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.api.io.IIOManager; -import edu.uci.ics.hyracks.api.lifecycle.ILifeCycleComponent; -import edu.uci.ics.hyracks.api.lifecycle.ILifeCycleComponentManager; -import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache; -import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AsynchronousScheduler; -import edu.uci.ics.hyracks.storage.am.lsm.common.impls.PrefixMergePolicyFactory; -import edu.uci.ics.hyracks.storage.common.buffercache.BufferCache; -import edu.uci.ics.hyracks.storage.common.buffercache.ClockPageReplacementStrategy; -import edu.uci.ics.hyracks.storage.common.buffercache.DelayPageCleanerPolicy; -import edu.uci.ics.hyracks.storage.common.buffercache.HeapBufferAllocator; -import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache; -import edu.uci.ics.hyracks.storage.common.buffercache.ICacheMemoryAllocator; -import edu.uci.ics.hyracks.storage.common.buffercache.IPageCleanerPolicy; -import edu.uci.ics.hyracks.storage.common.buffercache.IPageReplacementStrategy; -import edu.uci.ics.hyracks.storage.common.file.IFileMapManager; -import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider; -import edu.uci.ics.hyracks.storage.common.file.ILocalResourceRepository; -import edu.uci.ics.hyracks.storage.common.file.ILocalResourceRepositoryFactory; -import edu.uci.ics.hyracks.storage.common.file.ResourceIdFactory; -import edu.uci.ics.hyracks.storage.common.file.ResourceIdFactoryProvider; +import org.apache.asterix.common.api.AsterixThreadExecutor; +import org.apache.asterix.common.api.IAsterixAppRuntimeContext; +import org.apache.asterix.common.config.AsterixCompilerProperties; +import org.apache.asterix.common.config.AsterixExternalProperties; +import org.apache.asterix.common.config.AsterixFeedProperties; +import org.apache.asterix.common.config.AsterixMetadataProperties; +import org.apache.asterix.common.config.AsterixPropertiesAccessor; +import org.apache.asterix.common.config.AsterixStorageProperties; +import org.apache.asterix.common.config.AsterixTransactionProperties; +import org.apache.asterix.common.config.IAsterixPropertiesProvider; +import org.apache.asterix.common.context.AsterixFileMapManager; +import org.apache.asterix.common.context.DatasetLifecycleManager; +import org.apache.asterix.common.exceptions.ACIDException; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.asterix.common.feeds.api.IFeedManager; +import org.apache.asterix.common.transactions.IAsterixAppRuntimeContextProvider; +import org.apache.asterix.common.transactions.ITransactionSubsystem; +import org.apache.asterix.feeds.FeedManager; +import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; +import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository; +import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepositoryFactory; +import org.apache.asterix.transaction.management.service.logging.LogManager; +import org.apache.asterix.transaction.management.service.transaction.TransactionSubsystem; +import org.apache.hyracks.api.application.INCApplicationContext; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.io.IIOManager; +import org.apache.hyracks.api.lifecycle.ILifeCycleComponent; +import org.apache.hyracks.api.lifecycle.ILifeCycleComponentManager; +import org.apache.hyracks.storage.am.common.api.IIndexLifecycleManager; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; +import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache; +import org.apache.hyracks.storage.am.lsm.common.impls.AsynchronousScheduler; +import org.apache.hyracks.storage.am.lsm.common.impls.PrefixMergePolicyFactory; +import org.apache.hyracks.storage.common.buffercache.BufferCache; +import org.apache.hyracks.storage.common.buffercache.ClockPageReplacementStrategy; +import org.apache.hyracks.storage.common.buffercache.DelayPageCleanerPolicy; +import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator; +import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.buffercache.ICacheMemoryAllocator; +import org.apache.hyracks.storage.common.buffercache.IPageCleanerPolicy; +import org.apache.hyracks.storage.common.buffercache.IPageReplacementStrategy; +import org.apache.hyracks.storage.common.file.IFileMapManager; +import org.apache.hyracks.storage.common.file.IFileMapProvider; +import org.apache.hyracks.storage.common.file.ILocalResourceRepository; +import org.apache.hyracks.storage.common.file.ILocalResourceRepositoryFactory; +import org.apache.hyracks.storage.common.file.ResourceIdFactory; +import org.apache.hyracks.storage.common.file.ResourceIdFactoryProvider; public class AsterixAppRuntimeContext implements IAsterixAppRuntimeContext, IAsterixPropertiesProvider { @@ -118,7 +118,7 @@ public class AsterixAppRuntimeContext implements IAsterixAppRuntimeContext, IAst } public void initialize() throws IOException, ACIDException, AsterixException { - Logger.getLogger("edu.uci.ics").setLevel(externalProperties.getLogLevel()); + Logger.getLogger("org.apache").setLevel(externalProperties.getLogLevel()); threadExecutor = new AsterixThreadExecutor(ncApplicationContext.getThreadFactory()); fileMapManager = new AsterixFileMapManager(); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java index 938a8b9..ea5a763 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.util.List; -import edu.uci.ics.asterix.common.api.AsterixThreadExecutor; -import edu.uci.ics.asterix.common.api.IAsterixAppRuntimeContext; -import edu.uci.ics.asterix.common.transactions.IAsterixAppRuntimeContextProvider; -import edu.uci.ics.asterix.common.transactions.ITransactionSubsystem; -import edu.uci.ics.hyracks.api.io.IIOManager; -import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; -import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache; -import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache; -import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider; -import edu.uci.ics.hyracks.storage.common.file.ILocalResourceRepository; -import edu.uci.ics.hyracks.storage.common.file.ResourceIdFactory; +import org.apache.asterix.common.api.AsterixThreadExecutor; +import org.apache.asterix.common.api.IAsterixAppRuntimeContext; +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.common.api.IIndexLifecycleManager; +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.am.lsm.common.api.IVirtualBufferCache; +import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; +import org.apache.hyracks.storage.common.file.ILocalResourceRepository; +import org.apache.hyracks.storage.common.file.ResourceIdFactory; public class AsterixAppRuntimeContextProdiverForRecovery implements IAsterixAppRuntimeContextProvider { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixClientConfig.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixClientConfig.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixClientConfig.java index 9c3223e..4e60c07 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixClientConfig.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixClientConfig.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java index 91aa897..c9aeb9d 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.io.File; import java.util.EnumSet; -import edu.uci.ics.asterix.common.config.GlobalConfig; -import edu.uci.ics.asterix.hyracks.bootstrap.CCApplicationEntryPoint; -import edu.uci.ics.asterix.hyracks.bootstrap.NCApplicationEntryPoint; -import edu.uci.ics.hyracks.api.client.HyracksConnection; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.job.JobFlag; -import edu.uci.ics.hyracks.api.job.JobId; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.control.cc.ClusterControllerService; -import edu.uci.ics.hyracks.control.common.controllers.CCConfig; -import edu.uci.ics.hyracks.control.common.controllers.NCConfig; -import edu.uci.ics.hyracks.control.nc.NodeControllerService; +import org.apache.asterix.common.config.GlobalConfig; +import org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint; +import org.apache.asterix.hyracks.bootstrap.NCApplicationEntryPoint; +import org.apache.hyracks.api.client.HyracksConnection; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.job.JobFlag; +import org.apache.hyracks.api.job.JobId; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.control.cc.ClusterControllerService; +import org.apache.hyracks.control.common.controllers.CCConfig; +import org.apache.hyracks.control.common.controllers.NCConfig; +import org.apache.hyracks.control.nc.NodeControllerService; public class AsterixHyracksIntegrationUtil { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/FeedWorkCollection.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/FeedWorkCollection.java b/asterix-app/src/main/java/org/apache/asterix/api/common/FeedWorkCollection.java index 736a270..c8b7579 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/FeedWorkCollection.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/FeedWorkCollection.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.io.PrintWriter; import java.util.ArrayList; @@ -20,19 +20,19 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import edu.uci.ics.asterix.api.common.SessionConfig.OutputFormat; -import edu.uci.ics.asterix.aql.base.Statement; -import edu.uci.ics.asterix.aql.expression.DataverseDecl; -import edu.uci.ics.asterix.aql.expression.Identifier; -import edu.uci.ics.asterix.aql.expression.SubscribeFeedStatement; -import edu.uci.ics.asterix.aql.translator.AqlTranslator; -import edu.uci.ics.asterix.common.feeds.FeedConnectionRequest; -import edu.uci.ics.asterix.common.feeds.FeedConnectionRequest.ConnectionStatus; -import edu.uci.ics.asterix.common.feeds.api.IFeedWork; -import edu.uci.ics.asterix.common.feeds.api.IFeedWorkEventListener; -import edu.uci.ics.asterix.feeds.FeedCollectInfo; -import edu.uci.ics.asterix.om.util.AsterixAppContextInfo; -import edu.uci.ics.hyracks.api.job.JobId; +import org.apache.asterix.api.common.SessionConfig.OutputFormat; +import org.apache.asterix.aql.base.Statement; +import org.apache.asterix.aql.expression.DataverseDecl; +import org.apache.asterix.aql.expression.Identifier; +import org.apache.asterix.aql.expression.SubscribeFeedStatement; +import org.apache.asterix.aql.translator.AqlTranslator; +import org.apache.asterix.common.feeds.FeedConnectionRequest; +import org.apache.asterix.common.feeds.FeedConnectionRequest.ConnectionStatus; +import org.apache.asterix.common.feeds.api.IFeedWork; +import org.apache.asterix.common.feeds.api.IFeedWorkEventListener; +import org.apache.asterix.feeds.FeedCollectInfo; +import org.apache.asterix.om.util.AsterixAppContextInfo; +import org.apache.hyracks.api.job.JobId; /** * A collection of feed management related task, each represented as an implementation of {@code IFeedWork}. http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/Job.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/Job.java b/asterix-app/src/main/java/org/apache/asterix/api/common/Job.java index f45a6c0..17c66df 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/Job.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/Job.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; -import edu.uci.ics.hyracks.api.job.JobSpecification; +import org.apache.hyracks.api.job.JobSpecification; public class Job { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/common/SessionConfig.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/SessionConfig.java b/asterix-app/src/main/java/org/apache/asterix/api/common/SessionConfig.java index 27d981e..d47b8b9 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/SessionConfig.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/SessionConfig.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.common; +package org.apache.asterix.api.common; import java.io.PrintWriter; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java index 4984741..b756332 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.awt.image.BufferedImage; import java.io.BufferedReader; @@ -30,27 +30,27 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import edu.uci.ics.asterix.api.common.SessionConfig; -import edu.uci.ics.asterix.api.common.SessionConfig.OutputFormat; -import edu.uci.ics.asterix.aql.base.Statement; -import edu.uci.ics.asterix.aql.parser.AQLParser; -import edu.uci.ics.asterix.aql.parser.ParseException; -import edu.uci.ics.asterix.aql.parser.TokenMgrError; -import edu.uci.ics.asterix.aql.translator.AqlTranslator; -import edu.uci.ics.asterix.common.config.GlobalConfig; -import edu.uci.ics.asterix.metadata.MetadataManager; -import edu.uci.ics.asterix.result.ResultReader; -import edu.uci.ics.asterix.result.ResultUtils; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.dataset.IHyracksDataset; -import edu.uci.ics.hyracks.client.dataset.HyracksDataset; +import org.apache.asterix.api.common.SessionConfig; +import org.apache.asterix.api.common.SessionConfig.OutputFormat; +import org.apache.asterix.aql.base.Statement; +import org.apache.asterix.aql.parser.AQLParser; +import org.apache.asterix.aql.parser.ParseException; +import org.apache.asterix.aql.parser.TokenMgrError; +import org.apache.asterix.aql.translator.AqlTranslator; +import org.apache.asterix.common.config.GlobalConfig; +import org.apache.asterix.metadata.MetadataManager; +import org.apache.asterix.result.ResultReader; +import org.apache.asterix.result.ResultUtils; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.dataset.IHyracksDataset; +import org.apache.hyracks.client.dataset.HyracksDataset; public class APIServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private static final String HYRACKS_CONNECTION_ATTR = "edu.uci.ics.asterix.HYRACKS_CONNECTION"; + private static final String HYRACKS_CONNECTION_ATTR = "org.apache.asterix.HYRACKS_CONNECTION"; - private static final String HYRACKS_DATASET_ATTR = "edu.uci.ics.asterix.HYRACKS_DATASET"; + private static final String HYRACKS_DATASET_ATTR = "org.apache.asterix.HYRACKS_DATASET"; @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -112,7 +112,7 @@ public class APIServlet extends HttpServlet { long endTime = System.currentTimeMillis(); duration = (endTime - startTime) / 1000.00; out.println("
Duration of all jobs: " + duration + " sec
"); - } catch (ParseException | TokenMgrError | edu.uci.ics.asterix.aqlplus.parser.TokenMgrError pe) { + } catch (ParseException | TokenMgrError | org.apache.asterix.aqlplus.parser.TokenMgrError pe) { GlobalConfig.ASTERIX_LOGGER.log(Level.INFO, pe.toString(), pe); ResultUtils.webUIParseExceptionHandler(out, pe, query); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java index 60e1261..05e4924 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletRequest; -import edu.uci.ics.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.base.Statement.Kind; public class AQLAPIServlet extends RESTAPIServlet { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java index 267aac5..f70cd2b 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.io.IOException; import java.io.PrintWriter; @@ -29,16 +29,16 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import edu.uci.ics.asterix.feeds.CentralFeedManager; -import edu.uci.ics.asterix.metadata.MetadataManager; -import edu.uci.ics.asterix.metadata.MetadataTransactionContext; -import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider; -import edu.uci.ics.asterix.metadata.entities.Dataset; -import edu.uci.ics.asterix.metadata.utils.DatasetUtils; -import edu.uci.ics.asterix.om.types.ARecordType; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.client.NodeControllerInfo; -import edu.uci.ics.hyracks.dataflow.std.file.FileSplit; +import org.apache.asterix.feeds.CentralFeedManager; +import org.apache.asterix.metadata.MetadataManager; +import org.apache.asterix.metadata.MetadataTransactionContext; +import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.entities.Dataset; +import org.apache.asterix.metadata.utils.DatasetUtils; +import org.apache.asterix.om.types.ARecordType; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.client.NodeControllerInfo; +import org.apache.hyracks.dataflow.std.file.FileSplit; /*** * The REST API that takes a dataverse name and a dataset name as the input @@ -51,7 +51,7 @@ import edu.uci.ics.hyracks.dataflow.std.file.FileSplit; public class ConnectorAPIServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private static final String HYRACKS_CONNECTION_ATTR = "edu.uci.ics.asterix.HYRACKS_CONNECTION"; + private static final String HYRACKS_CONNECTION_ATTR = "org.apache.asterix.HYRACKS_CONNECTION"; @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DDLAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DDLAPIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DDLAPIServlet.java index e43a15a..4edba93 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DDLAPIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DDLAPIServlet.java @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; -import edu.uci.ics.asterix.aql.base.Statement; -import edu.uci.ics.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.base.Statement; +import org.apache.asterix.aql.base.Statement.Kind; public class DDLAPIServlet extends RESTAPIServlet { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServlet.java index 3fe1ff7..fdaf4ef 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServlet.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.awt.image.BufferedImage; import java.io.BufferedReader; @@ -28,13 +28,13 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import edu.uci.ics.asterix.common.feeds.FeedActivity; -import edu.uci.ics.asterix.common.feeds.FeedActivity.FeedActivityDetails; -import edu.uci.ics.asterix.common.feeds.FeedConnectionId; -import edu.uci.ics.asterix.common.feeds.FeedId; -import edu.uci.ics.asterix.common.feeds.api.IFeedLoadManager; -import edu.uci.ics.asterix.common.feeds.api.IFeedRuntime.FeedRuntimeType; -import edu.uci.ics.asterix.feeds.CentralFeedManager; +import org.apache.asterix.common.feeds.FeedActivity; +import org.apache.asterix.common.feeds.FeedActivity.FeedActivityDetails; +import org.apache.asterix.common.feeds.FeedConnectionId; +import org.apache.asterix.common.feeds.FeedId; +import org.apache.asterix.common.feeds.api.IFeedLoadManager; +import org.apache.asterix.common.feeds.api.IFeedRuntime.FeedRuntimeType; +import org.apache.asterix.feeds.CentralFeedManager; public class FeedServlet extends HttpServlet { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServletUtil.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServletUtil.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServletUtil.java index 76e2614..ce1b739 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServletUtil.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FeedServletUtil.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.io.IOException; import java.io.InputStream; @@ -22,9 +22,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; import java.util.logging.Logger; -import edu.uci.ics.asterix.common.feeds.FeedConnectionId; -import edu.uci.ics.asterix.feeds.FeedLifecycleListener; -import edu.uci.ics.asterix.metadata.feeds.RemoteSocketMessageListener; +import org.apache.asterix.common.feeds.FeedConnectionId; +import org.apache.asterix.feeds.FeedLifecycleListener; +import org.apache.asterix.metadata.feeds.RemoteSocketMessageListener; public class FeedServletUtil { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/HyracksProperties.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/HyracksProperties.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/HyracksProperties.java index 2805d7f..7fc76c6 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/HyracksProperties.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/HyracksProperties.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryAPIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryAPIServlet.java index c3dc1f9..e7664d5 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryAPIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryAPIServlet.java @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; -import edu.uci.ics.asterix.aql.base.Statement; -import edu.uci.ics.asterix.aql.base.Statement.Kind; +import org.apache.asterix.aql.base.Statement; +import org.apache.asterix.aql.base.Statement.Kind; public class QueryAPIServlet extends RESTAPIServlet { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java index 3caed6b..cee0449 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.uci.ics.asterix.api.http.servlet; +package org.apache.asterix.api.http.servlet; import java.io.IOException; import java.io.PrintWriter; @@ -25,22 +25,22 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONArray; import org.json.JSONObject; -import edu.uci.ics.asterix.api.common.SessionConfig; -import edu.uci.ics.asterix.result.ResultReader; -import edu.uci.ics.asterix.result.ResultUtils; -import edu.uci.ics.hyracks.api.client.HyracksConnection; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.dataset.IHyracksDataset; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; -import edu.uci.ics.hyracks.api.job.JobId; -import edu.uci.ics.hyracks.client.dataset.HyracksDataset; +import org.apache.asterix.api.common.SessionConfig; +import org.apache.asterix.result.ResultReader; +import org.apache.asterix.result.ResultUtils; +import org.apache.hyracks.api.client.HyracksConnection; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.dataset.IHyracksDataset; +import org.apache.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.job.JobId; +import org.apache.hyracks.client.dataset.HyracksDataset; public class QueryResultAPIServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private static final String HYRACKS_CONNECTION_ATTR = "edu.uci.ics.asterix.HYRACKS_CONNECTION"; + private static final String HYRACKS_CONNECTION_ATTR = "org.apache.asterix.HYRACKS_CONNECTION"; - private static final String HYRACKS_DATASET_ATTR = "edu.uci.ics.asterix.HYRACKS_DATASET"; + private static final String HYRACKS_DATASET_ATTR = "org.apache.asterix.HYRACKS_DATASET"; @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {