From f4a739e85593f1aefc021a3f31d4b9ee0aa1bb5b Mon Sep 17 00:00:00 2001 From: Angerszhuuuu Date: Fri, 1 Dec 2023 13:09:37 +0800 Subject: [PATCH] [KYUUBI #5780][AUTHZ][FOLLOWUP] Format PermanentViewMarker tree string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # :mag: Description ## Issue References ๐Ÿ”— This pull request fixes #5780 ## Describe Your Solution ๐Ÿ”ง Format PermanentViewMarker tree string ## Types of changes :bookmark: - [ ] Bugfix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan ๐Ÿงช #### Behavior Without This Pull Request :coffin: ``` Project [new_id2#100] +- Project [new_id#102 AS new_id2#100] +- RamPermanentViewMarker View (`test_default`.`my_view`, [new_id#102]), `test_default`.`my_view`, org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe ``` #### Behavior With This Pull Request :tada: ``` Project [new_id2#100] +- Project [new_id#102 AS new_id2#100] +- RamPermanentViewMarker +- View (`test_default`.`my_view`, [new_id#102]) +- Project [cast(new_id#101 as int) AS new_id#102] +- Project [id#103 AS new_id#101] +- SubqueryAlias spark_catalog.test_default.v1 +- HiveTableRelation [`test_default`.`v1`, org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, Data Cols: [id#103, name#104, grade#105, sex#106], Partition Cols: []] ``` #### Related Unit Tests --- # Checklists ## ๐Ÿ“ Author Self Checklist - [x] My code follows the [style guidelines](https://kyuubi.readthedocs.io/en/master/contributing/code/style.html) of this project - [x] I have performed a self-review - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) ## ๐Ÿ“ Committer Pre-Merge Checklist - [ ] Pull request title is okay. - [ ] No license issues. - [ ] Milestone correctly set? - [ ] Test coverage is ok - [ ] Assignees are selected. - [ ] Minimum number of approvals - [ ] No changes are requested **Be nice. Be informative.** Closes #5792 from AngersZhuuuu/KYUUBI-5780-FOLLOWUP. Closes #5780 d38b7d1fc [Angerszhuuuu] trigger 3073f6efd [Angerszhuuuu] Update PermanentViewMarker.scala a3f025bad [Angerszhuuuu] Update PermanentViewMarker.scala 432f1b5e1 [Angerszhuuuu] Update PermanentViewMarker.scala 6175e905c [Angerszhuuuu] [KYUUBI-5780][FOLLOWUP] Format PermanentViewMarker tree string Authored-by: Angerszhuuuu Signed-off-by: Cheng Pan --- .../spark/authz/rule/permanentview/PermanentViewMarker.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/rule/permanentview/PermanentViewMarker.scala b/extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/rule/permanentview/PermanentViewMarker.scala index dd198c8b4..b84599e81 100644 --- a/extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/rule/permanentview/PermanentViewMarker.scala +++ b/extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/rule/permanentview/PermanentViewMarker.scala @@ -19,9 +19,14 @@ package org.apache.kyuubi.plugin.spark.authz.rule.permanentview import org.apache.spark.sql.catalyst.catalog.CatalogTable import org.apache.spark.sql.catalyst.expressions.Attribute +import org.apache.spark.sql.catalyst.plans.QueryPlan import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan} case class PermanentViewMarker(child: LogicalPlan, catalogTable: CatalogTable) extends LeafNode { override def output: Seq[Attribute] = child.output + + override def argString(maxFields: Int): String = "" + + override def innerChildren: Seq[QueryPlan[_]] = child :: Nil }