Merge branch 'main' into array-access

databendlabs · May 11, 2022 · f600940 · f600940
2 parents 4f73629 + 01a7dbd
commit f600940
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 439 deletions.
diff --git a/.github/workflows/developing.yml b/.github/workflows/developing.yml
@@ -83,12 +83,13 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/test_stateless_standalone_linux
 
-  test_stateless_standalone_macos:
-    runs-on: macos-11
-    needs: build_macos
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/test_stateless_standalone_macos
+  # https://github.com/datafuselabs/databend/issues/5287
+  #test_stateless_standalone_macos:
+  #  runs-on: macos-11
+  #  needs: build_macos
+  #  steps:
+  #    - uses: actions/checkout@v2
+  #    - uses: ./.github/actions/test_stateless_standalone_macos
 
   test_stateless_cluster_linux:
     runs-on: ubuntu-latest

diff --git a/common/management/src/lib.rs b/common/management/src/lib.rs
@@ -14,7 +14,6 @@
 
 mod cluster;
 mod role;
-mod setting;
 mod stage;
 mod udf;
 mod user;
@@ -23,8 +22,6 @@ pub use cluster::ClusterApi;
 pub use cluster::ClusterMgr;
 pub use role::RoleApi;
 pub use role::RoleMgr;
-pub use setting::SettingApi;
-pub use setting::SettingMgr;
 pub use stage::StageApi;
 pub use stage::StageMgr;
 pub use udf::UdfApi;

diff --git a/common/management/src/setting/mod.rs b/common/management/src/setting/mod.rs
diff --git a/common/management/src/setting/setting_api.rs b/common/management/src/setting/setting_api.rs
diff --git a/common/management/src/setting/setting_mgr.rs b/common/management/src/setting/setting_mgr.rs
diff --git a/common/management/tests/it/main.rs b/common/management/tests/it/main.rs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 mod cluster;
-mod setting;
 mod stage;
 mod udf;
 mod user;
diff --git a/common/management/tests/it/setting.rs b/common/management/tests/it/setting.rs
diff --git a/common/meta/types/src/lib.rs b/common/meta/types/src/lib.rs
@@ -46,7 +46,6 @@ mod user_identity;
 mod user_info;
 mod user_privilege;
 mod user_quota;
-mod user_setting;
 mod user_stage;
 
 pub mod error_context;
@@ -191,5 +190,4 @@ pub use user_info::UserOptionFlag;
 pub use user_privilege::UserPrivilegeSet;
 pub use user_privilege::UserPrivilegeType;
 pub use user_quota::UserQuota;
-pub use user_setting::UserSetting;
 pub use user_stage::*;