Skip to content

Commit 373e7db

Browse files
committed
refactor: rename spark-errors crate to common
1 parent 4fbcfa6 commit 373e7db

11 files changed

Lines changed: 26 additions & 26 deletions

File tree

native/Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

native/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
# under the License.
1717

1818
[workspace]
19-
default-members = ["core", "spark-expr", "spark-errors", "proto", "jni-bridge"]
20-
members = ["core", "spark-expr", "spark-errors", "proto", "jni-bridge", "hdfs", "fs-hdfs"]
19+
default-members = ["core", "spark-expr", "common", "proto", "jni-bridge"]
20+
members = ["core", "spark-expr", "common", "proto", "jni-bridge", "hdfs", "fs-hdfs"]
2121
resolver = "2"
2222

2323
[workspace.package]
@@ -43,7 +43,7 @@ datafusion-datasource = { version = "52.2.0" }
4343
datafusion-physical-expr-adapter = { version = "52.2.0" }
4444
datafusion-spark = { version = "52.2.0" }
4545
datafusion-comet-spark-expr = { path = "spark-expr" }
46-
datafusion-comet-spark-errors = { path = "spark-errors" }
46+
datafusion-comet-common = { path = "common" }
4747
datafusion-comet-jni-bridge = { path = "jni-bridge" }
4848
datafusion-comet-proto = { path = "proto" }
4949
chrono = { version = "0.4", default-features = false, features = ["clock"] }
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
# under the License.
1717

1818
[package]
19-
name = "datafusion-comet-spark-errors"
20-
description = "Apache DataFusion Comet: Spark error types"
19+
name = "datafusion-comet-common"
20+
description = "Apache DataFusion Comet: common types shared across crates"
2121
version = { workspace = true }
2222
homepage = { workspace = true }
2323
repository = { workspace = true }
@@ -36,5 +36,5 @@ serde_json = "1.0"
3636
thiserror = { workspace = true }
3737

3838
[lib]
39-
name = "datafusion_comet_spark_errors"
39+
name = "datafusion_comet_common"
4040
path = "src/lib.rs"

native/jni-bridge/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ lazy_static = "1.4.0"
3939
once_cell = "1.18.0"
4040
paste = "1.0.14"
4141
prost = "0.14.3"
42-
datafusion-comet-spark-errors = { workspace = true }
42+
datafusion-comet-common = { workspace = true }
4343

4444
[dev-dependencies]
4545
jni = { version = "0.21", features = ["invocation"] }

native/jni-bridge/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
use arrow::error::ArrowError;
2121
use datafusion::common::DataFusionError;
22-
use datafusion_comet_spark_errors::{SparkError, SparkErrorWithContext};
22+
use datafusion_comet_common::{SparkError, SparkErrorWithContext};
2323
use jni::errors::{Exception, ToException};
2424
use regex::Regex;
2525

native/spark-expr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ chrono-tz = { workspace = true }
3434
num = { workspace = true }
3535
regex = { workspace = true }
3636
serde_json = "1.0"
37-
datafusion-comet-spark-errors = { workspace = true }
37+
datafusion-comet-common = { workspace = true }
3838
futures = { workspace = true }
3939
twox-hash = "2.1.2"
4040
rand = { workspace = true }

native/spark-expr/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
// Re-export all error types from the spark-errors crate
19-
pub use datafusion_comet_spark_errors::{
18+
// Re-export all error types from the common crate
19+
pub use datafusion_comet_common::{
2020
decimal_overflow_error, SparkError, SparkErrorWithContext, SparkResult,
2121
};

0 commit comments

Comments
 (0)