Skip to content

Commit 7e40fa8

Browse files
committed
wenchen feedback and try to fix build errors
1 parent a714d35 commit 7e40fa8

File tree

6 files changed

+11
-37
lines changed

6 files changed

+11
-37
lines changed

common/utils/src/main/resources/error/error-conditions.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4607,12 +4607,6 @@
46074607
],
46084608
"sqlState" : "42K03"
46094609
},
4610-
"PERSISTED_VIEW_READS_FROM_TEMPORARY_VIEW" : {
4611-
"message" : [
4612-
"Persisted view <persistedViewName> cannot reference temporary view <temporaryViewName> that will not be available outside the pipeline scope. Either make the persisted view temporary or persist the temporary view."
4613-
],
4614-
"sqlState" : "42K0F"
4615-
},
46164610
"PIPE_OPERATOR_AGGREGATE_EXPRESSION_CONTAINS_NO_AGGREGATE_FUNCTION" : {
46174611
"message" : [
46184612
"Non-grouping expression <expr> is provided as an argument to the |> AGGREGATE pipe operator but does not contain any aggregate function; please update it to include an aggregate function and then retry the query again."

sql/pipelines/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
<groupId>org.apache.spark</groupId>
6060
<artifactId>spark-sql_${scala.binary.version}</artifactId>
6161
<version>${project.version}</version>
62-
<exclusions>
63-
<exclusion>
64-
<groupId>org.apache.spark</groupId>
65-
<artifactId>spark-connect-shims_${scala.binary.version}</artifactId>
66-
</exclusion>
67-
</exclusions>
6862
</dependency>
6963
<dependency>
7064
<groupId>org.apache.spark</groupId>

sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/graph/Flow.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ case class ResolvedInput(input: Input, aliasIdentifier: AliasIdentifier)
6868
trait FlowFunction extends Logging {
6969

7070
/**
71-
* This function defines the transformations performed by a flow, expressed as a [[DataFrame]].
71+
* This function defines the transformations performed by a flow, expressed as a DataFrame.
7272
*
7373
* @param allInputs the set of identifiers for all the [[Input]]s defined in the
7474
* [[DataflowGraph]].
7575
* @param availableInputs the list of all [[Input]]s available to this flow
7676
* @param configuration the spark configurations that apply to this flow.
7777
* @param queryContext The context of the query being evaluated.
78-
* @return the inputs actually used, and the [[DataFrame]] expression for the flow
78+
* @return the inputs actually used, and the DataFrame expression for the flow
7979
*/
8080
def call(
8181
allInputs: Set[TableIdentifier],

sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/graph/GraphErrors.scala

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,22 +128,4 @@ object GraphErrors {
128128
cause = Option(cause.orNull)
129129
)
130130
}
131-
132-
/**
133-
* Throws an error when a persisted view is trying to read from a temporary view.
134-
*
135-
* @param persistedViewIdentifier the identifier of the persisted view
136-
* @param temporaryViewIdentifier the identifier of the temporary view
137-
*/
138-
def persistedViewReadsFromTemporaryView(
139-
persistedViewIdentifier: TableIdentifier,
140-
temporaryViewIdentifier: TableIdentifier): AnalysisException = {
141-
new AnalysisException(
142-
"PERSISTED_VIEW_READS_FROM_TEMPORARY_VIEW",
143-
Map(
144-
"persistedViewName" -> persistedViewIdentifier.toString,
145-
"temporaryViewName" -> temporaryViewIdentifier.toString
146-
)
147-
)
148-
}
149131
}

sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/graph/GraphValidations.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,13 @@ trait GraphValidations extends Logging {
252252
.flatMap(view.get)
253253
.foreach {
254254
case tempView: TemporaryView =>
255-
throw GraphErrors.persistedViewReadsFromTemporaryView(
256-
persistedViewIdentifier = persistedView.identifier,
257-
temporaryViewIdentifier = tempView.identifier
255+
throw new AnalysisException(
256+
errorClass = "INVALID_TEMP_OBJ_REFERENCE",
257+
messageParameters = Map(
258+
"persistedViewName" -> persistedView.identifier.toString,
259+
"temporaryViewName" -> tempView.identifier.toString
260+
),
261+
cause = null
258262
)
259263
case _ =>
260264
}

sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/graph/elements.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ trait GraphElement {
6767
trait Input extends GraphElement {
6868

6969
/**
70-
* Returns a [[DataFrame]] that is a result of loading data from this [[Input]].
70+
* Returns a DataFrame that is a result of loading data from this [[Input]].
7171
* @param readOptions Type of input. Used to determine streaming/batch
72-
* @return Streaming or batch [[DataFrame]] of this Input's data.
72+
* @return Streaming or batch DataFrame of this Input's data.
7373
*/
7474
def load(readOptions: InputReadOptions): DataFrame
7575
}

0 commit comments

Comments
 (0)