Skip to content

Commit

Permalink
[FLINK-14711][table] add alter and show function ddl
Browse files Browse the repository at this point in the history
this closes apache#10231.
  • Loading branch information
HuangZhenQiu authored and bowenli86 committed Nov 19, 2019
1 parent 21c6b85 commit 2f0177e
Show file tree
Hide file tree
Showing 5 changed files with 276 additions and 2 deletions.
11 changes: 9 additions & 2 deletions flink-table/flink-sql-parser/src/main/codegen/data/Parser.tdd
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
"org.apache.flink.sql.parser.ddl.SqlCreateDatabase",
"org.apache.flink.sql.parser.ddl.SqlDropDatabase",
"org.apache.flink.sql.parser.ddl.SqlAlterDatabase",
"org.apache.flink.sql.parser.ddl.SqlAlterFunction",
"org.apache.flink.sql.parser.dml.RichSqlInsert",
"org.apache.flink.sql.parser.dml.RichSqlInsertKeyword",
"org.apache.flink.sql.parser.dql.SqlShowCatalogs",
"org.apache.flink.sql.parser.dql.SqlDescribeCatalog",
"org.apache.flink.sql.parser.dql.SqlShowDatabases",
"org.apache.flink.sql.parser.dql.SqlShowFunctions",
"org.apache.flink.sql.parser.dql.SqlDescribeDatabase",
"org.apache.flink.sql.parser.type.ExtendedSqlBasicTypeNameSpec",
"org.apache.flink.sql.parser.type.ExtendedSqlCollectionTypeNameSpec",
Expand All @@ -68,7 +70,9 @@
"CATALOGS",
"USE",
"DATABASES",
"EXTENDED"
"FUNCTIONS",
"EXTENDED",
"SCALA"
]

# List of keywords from "keywords" section that are not reserved.
Expand Down Expand Up @@ -162,6 +166,7 @@
"FORTRAN"
"FOUND"
"FRAC_SECOND"
"FUNCTIONS"
"G"
"GENERAL"
"GENERATED"
Expand Down Expand Up @@ -397,7 +402,9 @@
"SqlShowDatabases()",
"SqlUseDatabase()",
"SqlAlterDatabase()",
"SqlDescribeDatabase()"
"SqlDescribeDatabase()",
"SqlAlterFunction()",
"SqlShowFunctions()"
]

# List of methods for parsing custom literals.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,61 @@ SqlDescribeDatabase SqlDescribeDatabase() :

}

SqlAlterFunction SqlAlterFunction() :
{
SqlIdentifier functionIdentifier = null;
SqlCharStringLiteral functionClassName = null;
String functionLanguage = null;
SqlParserPos startPos;
boolean ifExists = false;
boolean isTemporary = false;
boolean isSystemFunction = false;
}
{
<ALTER>

[ <TEMPORARY> { isTemporary = true; }
[ <SYSTEM> { isSystemFunction = true; } ]
]

<FUNCTION> { startPos = getPos(); }

[ <IF> <EXISTS> { ifExists = true; } ]

functionIdentifier = CompoundIdentifier()

<AS> <QUOTED_STRING> {
String p = SqlParserUtil.parseString(token.image);
functionClassName = SqlLiteral.createCharString(p, getPos());
}

[<LANGUAGE>
( <JAVA> { functionLanguage = "JAVA"; }
|
<SCALA> { functionLanguage = "SCALA"; }
|
<SQL> { functionLanguage = "SQL"; }
)
]
{
return new SqlAlterFunction(startPos.plus(getPos()), functionIdentifier, functionClassName,
functionLanguage, ifExists, isTemporary, isSystemFunction);
}
}

SqlShowFunctions SqlShowFunctions() :
{
SqlIdentifier database = null;
SqlParserPos pos;
}
{
<SHOW> <FUNCTIONS> { pos = getPos();}
[database = CompoundIdentifier()]
{
return new SqlShowFunctions(pos, database);
}
}

void TableColumn(TableCreationContext context) :
{
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/*
* 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.flink.sql.parser.ddl;

import org.apache.calcite.sql.SqlCall;
import org.apache.calcite.sql.SqlCharStringLiteral;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlOperator;
import org.apache.calcite.sql.SqlSpecialOperator;
import org.apache.calcite.sql.SqlWriter;
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.calcite.util.ImmutableNullableList;

import javax.annotation.Nonnull;

import java.util.List;

import static java.util.Objects.requireNonNull;

/**
* Alter Function Sql Call.
*/
public class SqlAlterFunction extends SqlCall {

public static final SqlSpecialOperator OPERATOR = new SqlSpecialOperator("ALTER FUNCTION", SqlKind.OTHER);

private final SqlIdentifier functionIdentifier;

private final SqlCharStringLiteral functionClassName;

private final String functionLanguage;

private final boolean ifExists;

private final boolean isSystemFunction;

private final boolean isTemporary;

public SqlAlterFunction(
SqlParserPos pos,
SqlIdentifier functionIdentifier,
SqlCharStringLiteral functionClassName,
String functionLanguage,
boolean ifExists,
boolean isTemporary,
boolean isSystemFunction) {
super(pos);
this.functionIdentifier = requireNonNull(functionIdentifier, "functionIdentifier should not be null");
this.functionClassName = requireNonNull(functionClassName, "functionClassName should not be null");
this.isSystemFunction = requireNonNull(isSystemFunction);
this.isTemporary = isTemporary;
this.functionLanguage = functionLanguage;
this.ifExists = ifExists;

}

@Nonnull
@Override
public SqlOperator getOperator() {
return OPERATOR;
}

@Override
public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
writer.keyword("ALTER");
if (isTemporary) {
writer.keyword("TEMPORARY");
}
if (isSystemFunction) {
writer.keyword("SYSTEM");
}
writer.keyword("FUNCTION");
if (ifExists) {
writer.keyword("IF EXISTS");
}
functionIdentifier.unparse(writer, leftPrec, rightPrec);
writer.keyword("AS");
functionClassName.unparse(writer, leftPrec, rightPrec);
if (functionLanguage != null) {
writer.keyword("LANGUAGE");
writer.keyword(functionLanguage);
}
}

@Nonnull
@Override
public List<SqlNode> getOperandList() {
return ImmutableNullableList.of(functionIdentifier, functionClassName);
}

public String getLanguage() {
return functionLanguage;
}

public String[] getFunctionIdentifier() {
return functionIdentifier.names.toArray(new String[0]);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* 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.flink.sql.parser.dql;

import org.apache.calcite.sql.SqlCall;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlOperator;
import org.apache.calcite.sql.SqlSpecialOperator;
import org.apache.calcite.sql.SqlWriter;
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.calcite.util.ImmutableNullableList;

import java.util.List;

/**
* SHOW FUNCTION Sql Call.
*/
public class SqlShowFunctions extends SqlCall {

public static final SqlSpecialOperator OPERATOR = new SqlSpecialOperator("SHOW FUNCTIONS", SqlKind.OTHER);

private final SqlIdentifier databaseName;

public SqlShowFunctions(SqlParserPos pos, SqlIdentifier database) {
super(pos);
this.databaseName = database;
}

@Override
public SqlOperator getOperator() {
return OPERATOR;
}

@Override
public List<SqlNode> getOperandList() {
return ImmutableNullableList.of(databaseName);
}

@Override
public void unparse(
SqlWriter writer,
int leftPrec,
int rightPrec) {
writer.keyword("SHOW FUNCTIONS");
if (databaseName != null) {
databaseName.unparse(writer, leftPrec, rightPrec);
}
}

public String[] getDatabasePath() {
return databaseName.names.toArray(new String[0]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,31 @@ public void testDescribeDatabase() {
check("describe database extended db1", "DESCRIBE DATABASE EXTENDED `DB1`");
}

@Test
public void testAlterFunction() {
check("alter function function1 as 'org.apache.fink.function.function1'",
"ALTER FUNCTION `FUNCTION1` AS 'org.apache.fink.function.function1'");

check("alter temporary function function1 as 'org.apache.fink.function.function1'",
"ALTER TEMPORARY FUNCTION `FUNCTION1` AS 'org.apache.fink.function.function1'");

check("alter temporary function function1 as 'org.apache.fink.function.function1' language scala",
"ALTER TEMPORARY FUNCTION `FUNCTION1` AS 'org.apache.fink.function.function1' LANGUAGE SCALA");

check ("alter temporary system function function1 as 'org.apache.fink.function.function1'",
"ALTER TEMPORARY SYSTEM FUNCTION `FUNCTION1` AS 'org.apache.fink.function.function1'");

check("alter temporary system function function1 as 'org.apache.fink.function.function1' language java",
"ALTER TEMPORARY SYSTEM FUNCTION `FUNCTION1` AS 'org.apache.fink.function.function1' LANGUAGE JAVA");
}

@Test
public void testShowFuntions() {
check("show functions", "SHOW FUNCTIONS");
check("show functions db1", "SHOW FUNCTIONS `DB1`");
check("show functions catalog1.db1", "SHOW FUNCTIONS `CATALOG1`.`DB1`");
}

@Test
public void testCreateTable() {
check("CREATE TABLE tbl1 (\n" +
Expand Down

0 comments on commit 2f0177e

Please sign in to comment.