asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjaco...@apache.org
Subject [11/23] asterixdb git commit: ASTERIXDB-1711: remove more mentions of Asterix
Date Fri, 16 Dec 2016 18:11:57 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixExternalFunctionInfo.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixExternalFunctionInfo.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixExternalFunctionInfo.java
deleted file mode 100644
index 25a8d72..0000000
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixExternalFunctionInfo.java
+++ /dev/null
@@ -1,93 +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.om.functions;
-
-import java.util.List;
-
-import org.apache.asterix.om.typecomputer.base.IResultTypeComputer;
-import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression.FunctionKind;
-
-public class AsterixExternalFunctionInfo extends AsterixFunctionInfo implements IExternalFunctionInfo
{
-
-    private static final long serialVersionUID = 1L;
-
-    private final IResultTypeComputer rtc;
-    private final List<IAType> argumentTypes;
-    private final String body;
-    private final String language;
-    private final FunctionKind kind;
-    private final IAType returnType;
-
-    public AsterixExternalFunctionInfo() {
-        super();
-        rtc = null;
-        argumentTypes = null;
-        body = null;
-        language = null;
-        kind = null;
-        returnType = null;
-
-    }
-
-    public AsterixExternalFunctionInfo(String namespace, AsterixFunction asterixFunction,
FunctionKind kind,
-            List<IAType> argumentTypes, IAType returnType, IResultTypeComputer rtc,
String body, String language) {
-        super(namespace, asterixFunction, true);
-        this.rtc = rtc;
-        this.argumentTypes = argumentTypes;
-        this.body = body;
-        this.language = language;
-        this.kind = kind;
-        this.returnType = returnType;
-    }
-
-    public IResultTypeComputer getResultTypeComputer() {
-        return rtc;
-    }
-
-    public List<IAType> getArgumenTypes() {
-        return argumentTypes;
-    }
-
-    @Override
-    public String getFunctionBody() {
-        return body;
-    }
-
-    @Override
-    public List<IAType> getParamList() {
-        return argumentTypes;
-    }
-
-    @Override
-    public String getLanguage() {
-        return language;
-    }
-
-    @Override
-    public FunctionKind getKind() {
-        return kind;
-    }
-
-    @Override
-    public IAType getReturnType() {
-        return returnType;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java
deleted file mode 100644
index 4d630ec..0000000
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java
+++ /dev/null
@@ -1,61 +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.om.functions;
-
-public class AsterixFunction {
-
-    private final String name;
-    private final int arity;
-    public final static int VARARGS = -1;
-
-    public AsterixFunction(String name, int arity) throws IllegalArgumentException {
-        this.name = name;
-        this.arity = arity;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getArity() {
-        return arity;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        return toString().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof AsterixFunction)) {
-            return false;
-        }
-        if (name.equals(((AsterixFunction) o).getName()) || arity == VARARGS) {
-            return true;
-        }
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionIdentifier.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionIdentifier.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionIdentifier.java
deleted file mode 100644
index 6e6e007..0000000
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionIdentifier.java
+++ /dev/null
@@ -1,48 +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.om.functions;
-
-public class AsterixFunctionIdentifier {
-
-    private final String dataverse;
-    private final AsterixFunction asterixFunction;
-
-    public AsterixFunctionIdentifier(String dataverse, AsterixFunction asterixFunction) {
-        this.dataverse = dataverse;
-        this.asterixFunction = asterixFunction;
-    }
-
-    public AsterixFunctionIdentifier(String dataverse, String name, int arity) {
-        this.dataverse = dataverse;
-        this.asterixFunction = new AsterixFunction(name, arity);
-    }
-
-    public String toString() {
-        return dataverse + ":" + asterixFunction;
-    }
-
-    public String getDataverse() {
-        return dataverse;
-    }
-
-    public AsterixFunction getAsterixFunction() {
-        return asterixFunction;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionInfo.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionInfo.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionInfo.java
deleted file mode 100644
index ef162a1..0000000
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunctionInfo.java
+++ /dev/null
@@ -1,79 +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.om.functions;
-
-import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.hyracks.algebricks.core.algebra.functions.AbstractFunctionInfo;
-import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-
-public class AsterixFunctionInfo extends AbstractFunctionInfo {
-
-    private static final long serialVersionUID = 1L;
-
-    private final FunctionIdentifier functionIdentifier;
-
-    public AsterixFunctionInfo(String namespace, AsterixFunction asterixFunction, boolean
isFunctional) {
-        super(isFunctional);
-        this.functionIdentifier = new FunctionIdentifier(namespace, asterixFunction.getName(),
-                asterixFunction.getArity());
-    }
-
-    public AsterixFunctionInfo() {
-        super(true);
-        functionIdentifier = null;
-    }
-
-    public AsterixFunctionInfo(FunctionIdentifier functionIdentifier, boolean isFunctional)
{
-        super(isFunctional);
-        this.functionIdentifier = functionIdentifier;
-    }
-
-    public AsterixFunctionInfo(FunctionSignature functionSignature, boolean isFunctional)
{
-        super(isFunctional);
-        this.functionIdentifier = new FunctionIdentifier(functionSignature.getNamespace(),
functionSignature.getName(),
-                functionSignature.getArity());
-    }
-
-    @Override
-    public FunctionIdentifier getFunctionIdentifier() {
-        return functionIdentifier;
-    }
-
-    @Override
-    public int hashCode() {
-        return toString().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof AsterixFunctionInfo)) {
-            return false;
-        }
-        AsterixFunctionInfo info = (AsterixFunctionInfo) o;
-        return functionIdentifier.equals(info.getFunctionIdentifier())
-                && functionIdentifier.getArity() == info.getFunctionIdentifier().getArity();
-    }
-
-    @Override
-    public String toString() {
-        return this.functionIdentifier.getNamespace() + ":" + this.functionIdentifier.getName()
+ "@"
-                + this.functionIdentifier.getArity();
-    }
-
-}


Mime
View raw message