diff options
| author | heretic <heretic@yandex-team.com> | 2022-08-10 19:10:32 +0300 |
|---|---|---|
| committer | heretic <heretic@yandex-team.com> | 2022-08-10 19:10:32 +0300 |
| commit | aaa3ec2a0feb30b37a90df9754f7810c16acecb6 (patch) | |
| tree | 1845cce1ba0a644481829ce0f3021001549e2527 | |
| parent | a2f1bc572320e98df577d27acb0be2216b2a682c (diff) | |
| download | ydb-aaa3ec2a0feb30b37a90df9754f7810c16acecb6.tar.gz | |
Prepare to clang14: fix ydb part 3 -Wbitwise-instead-of-logical
fix ydb -Wbitwise-instead-of-logical
| -rw-r--r-- | ydb/core/tablet_flat/flat_cxx_database.h | 3 | ||||
| -rw-r--r-- | ydb/core/tablet_flat/flat_dbase_apply.cpp | 5 | ||||
| -rw-r--r-- | ydb/core/tx/schemeshard/schemeshard__upgrade_schema.cpp | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ydb/core/tablet_flat/flat_cxx_database.h b/ydb/core/tablet_flat/flat_cxx_database.h index 9e0b41814c8..dc3406f59c9 100644 --- a/ydb/core/tablet_flat/flat_cxx_database.h +++ b/ydb/core/tablet_flat/flat_cxx_database.h @@ -2037,7 +2037,10 @@ struct Schema { template <typename Type, typename... Types> struct SchemaTables: SchemaTables<Types...> { static bool Precharge(TToughDb& database) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" return SchemaTables<Type>::Precharge(database) & SchemaTables<Types...>::Precharge(database); +#pragma clang diagnostic pop } static void Materialize(TToughDb& database, EMaterializationMode mode = EMaterializationMode::All) { diff --git a/ydb/core/tablet_flat/flat_dbase_apply.cpp b/ydb/core/tablet_flat/flat_dbase_apply.cpp index 714fc05edc8..365286d4ddf 100644 --- a/ydb/core/tablet_flat/flat_dbase_apply.cpp +++ b/ydb/core/tablet_flat/flat_dbase_apply.cpp @@ -70,7 +70,8 @@ bool TSchemeModifier::Apply(const TAlterRecord &delta) ui32 large = delta.HasLarge() ? delta.GetLarge() : family.Large; Y_VERIFY(ui32(cache) <= 2, "Invalid pages cache policy value"); - +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" changes |= ChangeTableSetting(table, family.Cache, cache); changes |= ChangeTableSetting(table, family.Codec, codec); changes |= ChangeTableSetting(table, family.Small, small); @@ -93,7 +94,7 @@ bool TSchemeModifier::Apply(const TAlterRecord &delta) changes |= ChangeTableSetting(table, room.Main, main); changes |= ChangeTableSetting(table, room.Blobs, blobs); changes |= ChangeTableSetting(table, room.Outer, outer); - +#pragma clang diagnostic pop } else if (action == TAlterRecord::SetRedo) { const ui32 annex = delta.HasAnnex() ? delta.GetAnnex() : 0; diff --git a/ydb/core/tx/schemeshard/schemeshard__upgrade_schema.cpp b/ydb/core/tx/schemeshard/schemeshard__upgrade_schema.cpp index bcc7e7509ea..c0bdaeb759a 100644 --- a/ydb/core/tx/schemeshard/schemeshard__upgrade_schema.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__upgrade_schema.cpp @@ -97,6 +97,8 @@ struct TSchemeShard::TTxUpgradeSchema : public TTransactionBase<TSchemeShard> { NIceDb::TNiceDb db(txc.DB); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" bool precharged = db.Table<Schema::Paths>().Precharge() & db.Table<Schema::SubDomains>().Precharge() & db.Table<Schema::UserAttributes>().Precharge(); @@ -106,6 +108,7 @@ struct TSchemeShard::TTxUpgradeSchema : public TTransactionBase<TSchemeShard> { } return UpgradeInitState(db, ctx) & ReplaceExtraPathSymbolsAllowed(db, ctx); +#pragma clang diagnostic pop } void Complete(const TActorContext &ctx) override { |