Skip to content

Commit

Permalink
Merge branch 'master' into dup_modify_key
Browse files Browse the repository at this point in the history
  • Loading branch information
cjj2010 authored Jul 7, 2024
2 parents 347fa5d + baba531 commit f39ed64
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ suite("load", "p2, nonConcurrent") {
PROPERTIES (
"type"="hdfs",
"fs.defaultFS"="${getHmsHdfsFs()}",
"path_prefix" = "default_vault_ssb_hdfs_vault"
"path_prefix" = "default_vault_ssb_hdfs_vault",
"hadoop.username" = "hadoop"
);
"""

Expand All @@ -37,7 +38,8 @@ suite("load", "p2, nonConcurrent") {
PROPERTIES (
"type"="hdfs",
"fs.defaultFS"="${getHmsHdfsFs()}",
"path_prefix" = "default_vault_ssb_flat_hdfs_vault"
"path_prefix" = "default_vault_ssb_flat_hdfs_vault",
"hadoop.username" = "hadoop"
);
"""

Expand Down
11 changes: 7 additions & 4 deletions regression-test/suites/vaults/create/create.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ suite("create_vault", "nonConcurrent") {
PROPERTIES (
"type"="S3",
"fs.defaultFS"="${getHmsHdfsFs()}",
"path_prefix" = "ssb_sf1_p2"
"path_prefix" = "ssb_sf1_p2",
"hadoop.username" = "hadoop"
);
"""
}, "Missing")
Expand All @@ -38,7 +39,8 @@ suite("create_vault", "nonConcurrent") {
PROPERTIES (
"type"="hdfs",
"s3.bucket"="${getHmsHdfsFs()}",
"path_prefix" = "ssb_sf1_p2"
"path_prefix" = "ssb_sf1_p2",
"hadoop.username" = "hadoop"
);
"""
}, "invalid fs_name")
Expand All @@ -57,7 +59,8 @@ suite("create_vault", "nonConcurrent") {
PROPERTIES (
"type"="hdfs",
"fs.defaultFS"="${getHmsHdfsFs()}",
"path_prefix" = "default_vault_ssb_hdfs_vault"
"path_prefix" = "default_vault_ssb_hdfs_vault",
"hadoop.username" = "hadoop"
);
"""

Expand Down Expand Up @@ -191,4 +194,4 @@ suite("create_vault", "nonConcurrent") {
);
"""
}, "already created")
}
}
5 changes: 3 additions & 2 deletions regression-test/suites/vaults/default/default.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ suite("default_vault", "nonConcurrent") {
PROPERTIES (
"type"="hdfs",
"fs.defaultFS"="${getHmsHdfsFs()}",
"path_prefix" = "default_vault_ssb_hdfs_vault"
"path_prefix" = "default_vault_ssb_hdfs_vault",
"hadoop.username" = "hadoop"
);
"""

Expand Down Expand Up @@ -135,4 +136,4 @@ suite("default_vault", "nonConcurrent") {
} catch (Exception e) {
}

}
}

0 comments on commit f39ed64

Please sign in to comment.