[jira] [Commented] (FLINK-4639) Make Calcite features more pluggable

2016-10-25 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/FLINK-4639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15605430#comment-15605430
 ] 

ASF GitHub Bot commented on FLINK-4639:
---

Github user asfgit closed the pull request at:

https://github.com/apache/flink/pull/2521


> Make Calcite features more pluggable
> 
>
> Key: FLINK-4639
> URL: https://issues.apache.org/jira/browse/FLINK-4639
> Project: Flink
>  Issue Type: New Feature
>  Components: Table API & SQL
>Reporter: Timo Walther
>Assignee: Timo Walther
>
> Some users might want to extend the feature set of the Table API by adding or 
> replacing Calcite optimizer rules, modifying the parser etc. It would be good 
> to have means to hook into the Table API and change Calcite behavior. We 
> should implement something like a {{CalciteConfigBuilder}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (FLINK-4639) Make Calcite features more pluggable

2016-10-25 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/FLINK-4639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15604972#comment-15604972
 ] 

ASF GitHub Bot commented on FLINK-4639:
---

Github user fhueske commented on the issue:

https://github.com/apache/flink/pull/2521
  
Merging


> Make Calcite features more pluggable
> 
>
> Key: FLINK-4639
> URL: https://issues.apache.org/jira/browse/FLINK-4639
> Project: Flink
>  Issue Type: New Feature
>  Components: Table API & SQL
>Reporter: Timo Walther
>Assignee: Timo Walther
>
> Some users might want to extend the feature set of the Table API by adding or 
> replacing Calcite optimizer rules, modifying the parser etc. It would be good 
> to have means to hook into the Table API and change Calcite behavior. We 
> should implement something like a {{CalciteConfigBuilder}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (FLINK-4639) Make Calcite features more pluggable

2016-10-24 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/FLINK-4639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15601597#comment-15601597
 ] 

ASF GitHub Bot commented on FLINK-4639:
---

Github user fhueske commented on the issue:

https://github.com/apache/flink/pull/2521
  
PR looks good to me, except for some methods of the added `CalciteConfig`. 
Will fix these issues and merge the PR.


> Make Calcite features more pluggable
> 
>
> Key: FLINK-4639
> URL: https://issues.apache.org/jira/browse/FLINK-4639
> Project: Flink
>  Issue Type: New Feature
>  Components: Table API & SQL
>Reporter: Timo Walther
>Assignee: Timo Walther
>
> Some users might want to extend the feature set of the Table API by adding or 
> replacing Calcite optimizer rules, modifying the parser etc. It would be good 
> to have means to hook into the Table API and change Calcite behavior. We 
> should implement something like a {{CalciteConfigBuilder}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (FLINK-4639) Make Calcite features more pluggable

2016-10-24 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/FLINK-4639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15601578#comment-15601578
 ] 

ASF GitHub Bot commented on FLINK-4639:
---

Github user fhueske commented on a diff in the pull request:

https://github.com/apache/flink/pull/2521#discussion_r84659763
  
--- Diff: 
flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/CalciteConfig.scala
 ---
@@ -0,0 +1,146 @@
+/*
+ * 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.api.table
+
+import org.apache.calcite.sql.SqlOperatorTable
+import org.apache.calcite.sql.parser.SqlParser
+import org.apache.calcite.tools.RuleSet
+import org.apache.flink.util.Preconditions
+
+/**
+  * Builder for creating a Calcite configuration.
+  */
+class CalciteConfigBuilder {
+  private var replaceRuleSet: Option[RuleSet] = None
+  private var chainRuleSet: Option[RuleSet] = None
+
+  private var replaceSqlOperatorTable: Option[SqlOperatorTable] = None
+  private var chainSqlOperatorTable: Option[SqlOperatorTable] = None
+
+  private var replaceSqlParserConfig: Option[SqlParser.Config] = None
+
+  /**
+* Replaces the built-in rule set with the given rule set.
+*/
+  def replaceRuleSet(ruleSet: RuleSet): CalciteConfigBuilder = {
+Preconditions.checkNotNull(ruleSet)
+replaceRuleSet = Some(ruleSet)
+chainRuleSet = None
+this
+  }
+
+  /**
+* Appends the given rule set to the built-in rule set.
+*/
+  def addRuleSet(ruleSet: RuleSet): CalciteConfigBuilder = {
+Preconditions.checkNotNull(ruleSet)
+replaceRuleSet = None
+chainRuleSet = Some(ruleSet)
+this
+  }
+
+  /**
+* Replaces the built-in SQL operator table with the given table.
+*/
+  def replaceSqlOperatorTable(sqlOperatorTable: SqlOperatorTable): 
CalciteConfigBuilder = {
+Preconditions.checkNotNull(sqlOperatorTable)
+replaceSqlOperatorTable = Some(sqlOperatorTable)
+chainSqlOperatorTable = None
+this
+  }
+
+  /**
+* Appends the given table to the built-in SQL operator table.
+*/
+  def addSqlOperatorTable(sqlOperatorTable: SqlOperatorTable): 
CalciteConfigBuilder = {
+Preconditions.checkNotNull(sqlOperatorTable)
+replaceSqlOperatorTable = None
+chainSqlOperatorTable = Some(sqlOperatorTable)
--- End diff --

operator table would be replaced and not added if `addSqlOperatorTable` is 
called twice.


> Make Calcite features more pluggable
> 
>
> Key: FLINK-4639
> URL: https://issues.apache.org/jira/browse/FLINK-4639
> Project: Flink
>  Issue Type: New Feature
>  Components: Table API & SQL
>Reporter: Timo Walther
>Assignee: Timo Walther
>
> Some users might want to extend the feature set of the Table API by adding or 
> replacing Calcite optimizer rules, modifying the parser etc. It would be good 
> to have means to hook into the Table API and change Calcite behavior. We 
> should implement something like a {{CalciteConfigBuilder}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (FLINK-4639) Make Calcite features more pluggable

2016-09-20 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/FLINK-4639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15506607#comment-15506607
 ] 

ASF GitHub Bot commented on FLINK-4639:
---

GitHub user twalthr opened a pull request:

https://github.com/apache/flink/pull/2521

[FLINK-4639] [table] Make Calcite features more pluggable

Thanks for contributing to Apache Flink. Before you open your pull request, 
please take the following check list into consideration.
If your changes take all of the items into account, feel free to open your 
pull request. For more information and/or questions please refer to the [How To 
Contribute guide](http://flink.apache.org/how-to-contribute.html).
In addition to going through the list, please provide a meaningful 
description of your changes.

- [x] General
  - The pull request references the related JIRA issue ("[FLINK-XXX] Jira 
title text")
  - The pull request addresses only one issue
  - Each commit in the PR has a meaningful commit message (including the 
JIRA id)

- [x] Documentation
  - Documentation has been added for new functionality
  - Old documentation affected by the pull request has been updated
  - JavaDoc for public methods has been added

- [x] Tests & Build
  - Functionality added by the pull request is covered by tests
  - `mvn clean verify` has been executed successfully locally or a Travis 
build has passed

This PR adds some means to modify Calcites behavior within the Table/SQL 
API. It introduces a `CalciteConfig` which is available through 
`tEnv.getConfig().getCalciteConfig()`. It allows to append/replace a rule set, 
append/replace SQL operators and replace the SQL parser so far. 

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/twalthr/flink FLINK-4639

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/flink/pull/2521.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #2521


commit eaff44e29f09ecd0eb5e722df06bb9b2dc492d15
Author: twalthr 
Date:   2016-09-20T09:35:25Z

[FLINK-4639] [table] Make Calcite features more pluggable




> Make Calcite features more pluggable
> 
>
> Key: FLINK-4639
> URL: https://issues.apache.org/jira/browse/FLINK-4639
> Project: Flink
>  Issue Type: New Feature
>  Components: Table API & SQL
>Reporter: Timo Walther
>Assignee: Timo Walther
>
> Some users might want to extend the feature set of the Table API by adding or 
> replacing Calcite optimizer rules, modifying the parser etc. It would be good 
> to have means to hook into the Table API and change Calcite behavior. We 
> should implement something like a {{CalciteConfigBuilder}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)