Skip to content

Commit

Permalink
Shim spark error-classes.json
Browse files Browse the repository at this point in the history
  • Loading branch information
scottsand-db committed Apr 22, 2024
1 parent 161ff39 commit a419aa6
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (2024) The Delta Lake Project Authors.
*
* Licensed 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.delta

object DeltaThrowableHelperShims {
/**
* Handles a breaking change (SPARK-46810) between Spark 3.5 and Spark Master (4.0) where
* `error-classes.json` was renamed to `error-conditions.json`.
*/
val SPARK_ERROR_CLASS_SOURCE_FILE = "error/error-classes.json"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (2021) The Delta Lake Project Authors.
*
* Licensed 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.delta

object DeltaThrowableHelperShims {
/**
* Handles a breaking change (SPARK-46810) between Spark 3.5 and Spark Master (4.0) where
* `error-classes.json` was renamed to `error-conditions.json`.
*/
val SPARK_ERROR_CLASS_SOURCE_FILE = "error/error-conditions.json"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package org.apache.spark.sql.delta
import java.io.FileNotFoundException
import java.net.URL

import org.apache.spark.sql.delta.DeltaThrowableHelperShims._

import org.apache.spark.ErrorClassesJsonReader
import org.apache.spark.util.Utils

Expand All @@ -42,7 +44,7 @@ object DeltaThrowableHelper
}

lazy val sparkErrorClassSource: URL = {
safeGetErrorClassesSource("error/error-classes.json")
safeGetErrorClassesSource(SPARK_ERROR_CLASS_SOURCE_FILE)
}

def deltaErrorClassSource: URL = {
Expand Down

0 comments on commit a419aa6

Please sign in to comment.