-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
22 changed files
with
895 additions
and
47 deletions.
There are no files selected for viewing
80 changes: 80 additions & 0 deletions
80
...ain/scala/org/apache/spark/sql/catalyst/parser/extensions/RewritePaimonViewCommands.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* 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.spark.sql.catalyst.parser.extensions | ||
|
||
import org.apache.paimon.spark.catalog.SupportView | ||
import org.apache.paimon.spark.catalyst.plans.logical.{CreatePaimonView, DropPaimonView, ResolvedIdentifier, ShowPaimonViews} | ||
|
||
import org.apache.spark.sql.SparkSession | ||
import org.apache.spark.sql.catalyst.analysis.{CTESubstitution, ResolvedNamespace, UnresolvedView} | ||
import org.apache.spark.sql.catalyst.plans.logical._ | ||
import org.apache.spark.sql.catalyst.rules.Rule | ||
import org.apache.spark.sql.connector.catalog.{CatalogManager, LookupCatalog} | ||
|
||
case class RewritePaimonViewCommands(spark: SparkSession) | ||
extends Rule[LogicalPlan] | ||
with LookupCatalog { | ||
|
||
protected lazy val catalogManager: CatalogManager = spark.sessionState.catalogManager | ||
|
||
override def apply(plan: LogicalPlan): LogicalPlan = plan.resolveOperatorsUp { | ||
|
||
case CreateViewStatement( | ||
ResolvedIdent(resolved), | ||
userSpecifiedColumns, | ||
comment, | ||
properties, | ||
Some(originalText), | ||
child, | ||
allowExisting, | ||
replace, | ||
_) => | ||
CreatePaimonView( | ||
child = resolved, | ||
queryText = originalText, | ||
query = CTESubstitution.apply(child), | ||
columnAliases = userSpecifiedColumns.map(_._1), | ||
columnComments = userSpecifiedColumns.map(_._2.orElse(Option.empty)), | ||
comment = comment, | ||
properties = properties, | ||
allowExisting = allowExisting, | ||
replace = replace | ||
) | ||
|
||
case DropView(ResolvedIdent(resolved), ifExists: Boolean) => | ||
DropPaimonView(resolved, ifExists) | ||
|
||
case ShowViews(_, pattern, output) if catalogManager.currentCatalog.isInstanceOf[SupportView] => | ||
ShowPaimonViews( | ||
ResolvedNamespace(catalogManager.currentCatalog, catalogManager.currentNamespace), | ||
pattern, | ||
output) | ||
} | ||
|
||
private object ResolvedIdent { | ||
def unapply(unresolved: Any): Option[ResolvedIdentifier] = unresolved match { | ||
case CatalogAndIdentifier(viewCatalog: SupportView, ident) => | ||
Some(ResolvedIdentifier(viewCatalog, ident)) | ||
case UnresolvedView(CatalogAndIdentifier(viewCatalog: SupportView, ident), _, _, _) => | ||
Some(ResolvedIdentifier(viewCatalog, ident)) | ||
case _ => | ||
None | ||
} | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
...on-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/PaimonViewTest.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* 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.paimon.spark.sql | ||
|
||
class PaimonViewTest extends PaimonViewTestBase {} |
79 changes: 79 additions & 0 deletions
79
...ain/scala/org/apache/spark/sql/catalyst/parser/extensions/RewritePaimonViewCommands.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/* | ||
* 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.spark.sql.catalyst.parser.extensions | ||
|
||
import org.apache.paimon.spark.catalog.SupportView | ||
import org.apache.paimon.spark.catalyst.plans.logical.{CreatePaimonView, DropPaimonView, ResolvedIdentifier, ShowPaimonViews} | ||
|
||
import org.apache.spark.sql.SparkSession | ||
import org.apache.spark.sql.catalyst.analysis.{CTESubstitution, ResolvedNamespace, UnresolvedDBObjectName, UnresolvedView} | ||
import org.apache.spark.sql.catalyst.plans.logical._ | ||
import org.apache.spark.sql.catalyst.rules.Rule | ||
import org.apache.spark.sql.connector.catalog.{CatalogManager, LookupCatalog} | ||
|
||
case class RewritePaimonViewCommands(spark: SparkSession) | ||
extends Rule[LogicalPlan] | ||
with LookupCatalog { | ||
|
||
protected lazy val catalogManager: CatalogManager = spark.sessionState.catalogManager | ||
|
||
override def apply(plan: LogicalPlan): LogicalPlan = plan.resolveOperatorsUp { | ||
|
||
case CreateView( | ||
ResolvedIdent(resolved), | ||
userSpecifiedColumns, | ||
comment, | ||
properties, | ||
Some(queryText), | ||
query, | ||
allowExisting, | ||
replace) => | ||
CreatePaimonView( | ||
child = resolved, | ||
queryText = queryText, | ||
query = CTESubstitution.apply(query), | ||
columnAliases = userSpecifiedColumns.map(_._1), | ||
columnComments = userSpecifiedColumns.map(_._2.orElse(Option.empty)), | ||
comment = comment, | ||
properties = properties, | ||
allowExisting = allowExisting, | ||
replace = replace | ||
) | ||
|
||
case DropView(ResolvedIdent(resolved), ifExists: Boolean) => | ||
DropPaimonView(resolved, ifExists) | ||
|
||
case ShowViews(_, pattern, output) if catalogManager.currentCatalog.isInstanceOf[SupportView] => | ||
ShowPaimonViews( | ||
ResolvedNamespace(catalogManager.currentCatalog, catalogManager.currentNamespace), | ||
pattern, | ||
output) | ||
} | ||
|
||
private object ResolvedIdent { | ||
def unapply(unresolved: Any): Option[ResolvedIdentifier] = unresolved match { | ||
case UnresolvedDBObjectName(CatalogAndIdentifier(viewCatalog: SupportView, ident), _) => | ||
Some(ResolvedIdentifier(viewCatalog, ident)) | ||
case UnresolvedView(CatalogAndIdentifier(viewCatalog: SupportView, ident), _, _, _) => | ||
Some(ResolvedIdentifier(viewCatalog, ident)) | ||
case _ => | ||
None | ||
} | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
...on-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/PaimonViewTest.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* 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.paimon.spark.sql | ||
|
||
class PaimonViewTest extends PaimonViewTestBase {} |
21 changes: 21 additions & 0 deletions
21
...on-spark/paimon-spark-3.4/src/test/scala/org/apache/paimon/spark/sql/PaimonViewTest.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* 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.paimon.spark.sql | ||
|
||
class PaimonViewTest extends PaimonViewTestBase {} |
21 changes: 21 additions & 0 deletions
21
...on-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/PaimonViewTest.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* 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.paimon.spark.sql | ||
|
||
class PaimonViewTest extends PaimonViewTestBase {} |
21 changes: 21 additions & 0 deletions
21
...on-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/PaimonViewTest.scala
This file contains 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 |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* 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.paimon.spark.sql | ||
|
||
class PaimonViewTest extends PaimonViewTestBase {} |
This file contains 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.