-
Notifications
You must be signed in to change notification settings - Fork 1.9k
IGNITE-29034 SQL Calcite: Add support for FROM DUAL queries #13545
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tkalkirill
wants to merge
1
commit into
master
Choose a base branch
from
ignite-29034
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+85
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| import org.apache.calcite.schema.FunctionParameter; | ||
| import org.apache.calcite.schema.SchemaPlus; | ||
| import org.apache.calcite.schema.Table; | ||
| import org.apache.calcite.schema.TableMacro; | ||
| import org.apache.calcite.schema.impl.AbstractSchema; | ||
| import org.apache.calcite.tools.FrameworkConfig; | ||
| import org.apache.ignite.IgniteException; | ||
|
|
@@ -37,6 +38,12 @@ | |
| * Ignite schema. | ||
| */ | ||
| public class IgniteSchema extends AbstractSchema { | ||
| /** */ | ||
| private static final String DUAL_TBL_NAME = "DUAL"; | ||
|
|
||
| /** */ | ||
| private static final String DUAL_TBL_VIEW = "SELECT 'X' AS DUMMY"; | ||
|
|
||
| /** */ | ||
| private final String schemaName; | ||
|
|
||
|
|
@@ -143,6 +150,17 @@ public SchemaPlus register(SchemaPlus parent, FrameworkConfig frameworkCfg) { | |
|
|
||
| viewMap.forEach((name, sql) -> newSchema.add(name, new ViewTableMacroImpl(sql, newSchema, frameworkCfg))); | ||
|
|
||
| registerDualTableIfSupported(newSchema, frameworkCfg); | ||
|
|
||
| return newSchema; | ||
| } | ||
|
|
||
| /** */ | ||
| private static void registerDualTableIfSupported(SchemaPlus schema, FrameworkConfig frameworkCfg) { | ||
| if (frameworkCfg != null && frameworkCfg.getParserConfig().conformance().isSupportedDualTable() | ||
| && schema.tables().get(DUAL_TBL_NAME) == null | ||
| && schema.getFunctions(DUAL_TBL_NAME).stream().noneMatch(TableMacro.class::isInstance)) { | ||
| schema.add(DUAL_TBL_NAME, new ViewTableMacroImpl(DUAL_TBL_VIEW, schema, frameworkCfg)); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I’m not sure whether we really need this, but Calcite supports this property. If we decide to support it, let’s implement it the same way as Calcite does, because its implementation also works with grammars that do not allow SELECT without a FROM clause. |
||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it be more appropriate to use the validator conformance here?