firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Ressurect TriState, replace Nullable<bool> by TriState, remove Nullable.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2023-09-18 20:27:14 -03:00
parent c170e4b089
commit f8ed006057
40 changed files with 297 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/win32/msvc15/common.vcxproj
View File

@ -141,7 +141,6 @@
<ClInclude Include="..\..\..\src\common\classes\MsgPrint.h" />
<ClInclude Include="..\..\..\src\common\classes\NestConst.h" />
<ClInclude Include="..\..\..\src\common\classes\NoThrowTimeStamp.h" />
<ClInclude Include="..\..\..\src\common\classes\Nullable.h" />
<ClInclude Include="..\..\..\src\common\classes\objects_array.h" />
<ClInclude Include="..\..\..\src\common\classes\ParsedList.h" />
<ClInclude Include="..\..\..\src\common\classes\QualifiedName.h" />
@ -159,6 +158,7 @@
<ClInclude Include="..\..\..\src\common\classes\TimerImpl.h" />
<ClInclude Include="..\..\..\src\common\classes\timestamp.h" />
<ClInclude Include="..\..\..\src\common\classes\tree.h" />
<ClInclude Include="..\..\..\src\common\classes\TriState.h" />
<ClInclude Include="..\..\..\src\common\classes\UserBlob.h" />
<ClInclude Include="..\..\..\src\common\classes\VaryStr.h" />
<ClInclude Include="..\..\..\src\common\classes\vector.h" />
@ -356,4 +356,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
builds/win32/msvc15/common.vcxproj.filters
View File

@ -437,9 +437,6 @@
<ClInclude Include="..\..\..\src\common\classes\NestConst.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\Nullable.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\objects_array.h">
<Filter>headers</Filter>
</ClInclude>
@ -479,6 +476,9 @@
<ClInclude Include="..\..\..\src\common\classes\tree.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\TriState.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\UserBlob.h">
<Filter>headers</Filter>
</ClInclude>

1
src/burp/burp.h
View File

@ -43,7 +43,6 @@
#include "../common/classes/array.h"
#include "../common/classes/fb_pair.h"
#include "../common/classes/MetaString.h"
#include "../common/classes/Nullable.h"
#include "../common/SimilarToRegex.h"
#include "../common/status.h"
#include "../common/sha.h"

1
src/common/StatementMetadata.h
View File

@ -28,7 +28,6 @@
#include <optional>
#include "firebird/Interface.h"
#include "iberror.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/array.h"
#include "../common/classes/fb_string.h"
#include "../common/classes/objects_array.h"

183
src/common/classes/Nullable.h
View File

@ -1,183 +0,0 @@
/*
* The contents of this file are subject to the Initial
* Developer's Public License Version 1.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.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
*
* Software distributed under the License is distributed AS IS,
* WITHOUT WARRANTY OF ANY KIND, either express or implied.
* See the License for the specific language governing rights
* and limitations under the License.
*
* The Original Code was created by Adriano dos Santos Fernandes
* for the Firebird Open Source RDBMS project.
*
* Copyright (c) 2010 Adriano dos Santos Fernandes <adrianosf@gmail.com>
* and all contributors signed below.
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#ifndef CLASSES_NULLABLE_H
#define CLASSES_NULLABLE_H
#include "firebird.h"
#include "../common/classes/fb_string.h"
#include "../jrd/constants.h"
// Auxiliary template to build an empty value.
template <typename T> // Generic NullableClear
class NullableClear
{
public:
static void clear(T& v)
{
v = T();
}
};
// Nullable support without constructor, to allow usage in unions (used in the parser).
template <typename T> class BaseNullable
{
public:
static BaseNullable<T> val(const T& v)
{
BaseNullable<T> nullable;
nullable.value = v;
nullable.specified = true;
return nullable;
}
static BaseNullable<T> empty()
{
BaseNullable<T> nullable;
NullableClear<T>::clear(nullable.value);
nullable.specified = false;
return nullable;
}
T orElse(T elseValue) const
{
return specified ? value : elseValue;
}
bool operator ==(const BaseNullable<T>& o) const
{
return (!specified && !o.specified) || (specified == o.specified && value == o.value);
}
bool operator !=(const BaseNullable<T>& o) const
{
return !(*this == o);
}
bool operator ==(const T& o) const
{
return specified && value == o;
}
bool operator !=(const T& o) const
{
return !(*this == o);
}
void operator =(const T& v)
{
this->value = v;
this->specified = true;
}
bool isUnknown() const
{
return !specified;
}
bool isAssigned() const
{
return specified;
}
public:
T value;
bool specified;
};
// NullableClear specializations.
template <typename T>
class NullableClear<BaseNullable<T> >
{
public:
static void clear(BaseNullable<T>& v)
{
v.specified = false;
}
};
template <>
class NullableClear<rel_t>
{
public:
static void clear(rel_t& v)
{
v = rel_persistent;
}
};
// Actual Nullable template.
template <typename T> class Nullable : public BaseNullable<T>
{
public:
explicit Nullable<T>(const T& v)
{
this->value = v;
this->specified = true;
}
Nullable<T>(const Nullable<T>& o)
{
this->value = o.value;
this->specified = o.specified;
}
Nullable<T>()
{
invalidate();
}
void operator =(const BaseNullable<T>& o)
{
this->value = o.value;
this->specified = o.specified;
}
void operator =(const T& v)
{
this->value = v;
this->specified = true;
}
bool assignOnce(const T& v)
{
if (this->specified)
return false;
*this = v;
return true;
}
void invalidate()
{
NullableClear<T>::clear(this->value);
this->specified = false;
}
};
typedef Nullable<bool> TriState;
#endif // CLASSES_NULLABLE_H

133
src/common/classes/TriState.h Normal file
View File

@ -0,0 +1,133 @@
/*
* PROGRAM: Firebird aux classes.
* MODULE: TriState.h
* DESCRIPTION: Firebird's SQL tri-state emulation class.
*
* The contents of this file are subject to the Initial
* Developer's Public License Version 1.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.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
*
* Software distributed under the License is distributed AS IS,
* WITHOUT WARRANTY OF ANY KIND, either express or implied.
* See the License for the specific language governing rights
* and limitations under the License.
*
* The Original Code was created by Claudio Valderrama on 28-Aug-2007
* for the Firebird Open Source RDBMS project.
*
* Copyright (c) 2007 Claudio Valderrama
* and all contributors signed below.
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
*
*/
#ifndef CLASSES_TRISTATE_H
#define CLASSES_TRISTATE_H
class TriState
{
public:
TriState();
explicit TriState(bool input);
bool operator ==(const TriState& o) const
{
return m_init == o.m_init && m_val == o.m_val;
}
bool operator !=(const TriState& o) const
{
return m_init != o.m_init || m_val != o.m_val;
}
void operator=(bool input);
bool asBool() const;
bool valueOr(bool value) const;
void reset();
bool assignOnce(bool input);
bool isUnknown() const;
bool isAssigned() const;
bool toggle();
private:
bool m_init, m_val;
};
// The var is left uninitialized.
inline TriState::TriState()
: m_init(false), m_val(false)
{
}
// The var is initialized to the explicit value.
inline TriState::TriState(bool input)
: m_init(true), m_val(input)
{
}
// The var receives a T/F value.
inline void TriState::operator=(bool input)
{
m_init = true;
m_val = input;
}
// The var is coerced to a T/F value as result.
inline bool TriState::asBool() const
{
return m_init && m_val;
}
inline bool TriState::valueOr(bool otherValue) const
{
return m_init ? m_val : otherValue;
}
// The var is returned to its uninitialized state.
inline void TriState::reset()
{
m_init = m_val = false;
}
// The assignment succeeds only if the var is uninitialized.
inline bool TriState::assignOnce(bool input)
{
if (m_init)
return false;
m_init = true;
m_val = input;
return true;
}
// Tests whether the var is uninitialized.
inline bool TriState::isUnknown() const
{
return !m_init;
}
// Tests whether the var is initialized.
inline bool TriState::isAssigned() const
{
return m_init;
}
// The var is toggled between T and F only if it's already initialized.
inline bool TriState::toggle()
{
if (!m_init)
return false;
m_val = !m_val;
return true;
}
#endif // CLASSES_TRISTATE_H

2
src/dsql/BoolNodes.cpp
View File

@ -1382,7 +1382,7 @@ bool InListBoolNode::execute(thread_db* tdbb, Request* request) const
const auto res = lookup->find(tdbb, request, arg, argDesc);
if (res.isAssigned())
return res.value;
return res.asBool();
fb_assert(list->items.hasData());
request->req_flags |= req_null;

72
src/dsql/DdlNodes.epp
View File

@ -1695,7 +1695,7 @@ DdlNode* CreateAlterFunctionNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
returnType->type->resolve(dsqlScratch);
// check SQL SECURITY is not set if function declared in package
if (package.hasData() && ssDefiner.specified)
if (package.hasData() && ssDefiner.isAssigned())
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-204) <<
Arg::Gds(isc_invalid_clause) << Arg::Str("SQL SECURITY for functions is prohibit in packages"));
@ -1895,10 +1895,10 @@ bool CreateAlterFunctionNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
FUN.RDB$DETERMINISTIC_FLAG = deterministic ? TRUE : FALSE;
FUN.RDB$RETURN_ARGUMENT = 0;
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
FUN.RDB$SQL_SECURITY.NULL = FALSE;
FUN.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
FUN.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
FUN.RDB$SQL_SECURITY.NULL = TRUE;
@ -2648,7 +2648,7 @@ DdlNode* CreateAlterProcedureNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
returns[i]->type->resolve(dsqlScratch);
// check SQL SECURITY is not set if procedure declared in package
if (package.hasData() && ssDefiner.specified)
if (package.hasData() && ssDefiner.isAssigned())
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-204) <<
Arg::Gds(isc_invalid_clause) << Arg::Str("SQL SECURITY for procedures is prohibit in packages"));
@ -2846,10 +2846,10 @@ bool CreateAlterProcedureNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch
else
P.RDB$PRIVATE_FLAG.NULL = TRUE;
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
P.RDB$SQL_SECURITY.NULL = FALSE;
P.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
P.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
P.RDB$SQL_SECURITY.NULL = TRUE;
@ -3357,7 +3357,7 @@ void TriggerDefinition::store(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch,
TRG.RDB$TRIGGER_TYPE = type.value();
TRG.RDB$TRIGGER_SEQUENCE = position.value_or(0);
TRG.RDB$TRIGGER_INACTIVE = (!active.specified ? 0 : (USHORT) !active.value);
TRG.RDB$TRIGGER_INACTIVE = (active.isUnknown() ? 0 : (USHORT) !active.asBool());
}
END_STORE
@ -3429,8 +3429,8 @@ bool TriggerDefinition::modify(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch
if (position.has_value())
TRG.RDB$TRIGGER_SEQUENCE = position.value();
if (active.specified)
TRG.RDB$TRIGGER_INACTIVE = (USHORT) !active.value;
if (active.isAssigned())
TRG.RDB$TRIGGER_INACTIVE = (USHORT) !active.asBool();
if (external)
{
@ -5007,12 +5007,12 @@ void AlterDomainNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch,
dsqlScratch->getBlrData());
}
if (notNullFlag.specified)
if (notNullFlag.isAssigned())
{
FLD.RDB$NULL_FLAG.NULL = FALSE;
FLD.RDB$NULL_FLAG = notNullFlag.value;
FLD.RDB$NULL_FLAG = notNullFlag.asBool();
if (!notNullFlag.value)
if (!notNullFlag.asBool())
{
AutoRequest request2;
@ -6031,10 +6031,10 @@ void RelationNode::FieldDefinition::store(thread_db* tdbb, jrd_tra* transaction)
RFR.RDB$IDENTITY_TYPE = identityType.value();
}
if (notNullFlag.specified)
if (notNullFlag.isAssigned())
{
RFR.RDB$NULL_FLAG.NULL = FALSE;
RFR.RDB$NULL_FLAG = notNullFlag.value;
RFR.RDB$NULL_FLAG = notNullFlag.asBool();
}
if (defaultSource.hasData())
@ -7354,10 +7354,10 @@ void CreateRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScrat
REL.RDB$FLAGS = REL_sql;
REL.RDB$RELATION_TYPE = relationType.value();
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
REL.RDB$SQL_SECURITY.NULL = FALSE;
REL.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
REL.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
REL.RDB$SQL_SECURITY.NULL = TRUE;
@ -7383,8 +7383,8 @@ void CreateRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScrat
bool replicationEnabled;
if (replicationState.specified)
replicationEnabled = replicationState.value;
if (replicationState.isAssigned())
replicationEnabled = replicationState.asBool();
else
{
// Apply the default replication state to the table being created
@ -7733,10 +7733,10 @@ void AlterRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
{
MODIFY REL
{
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
REL.RDB$SQL_SECURITY.NULL = FALSE;
REL.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
REL.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
REL.RDB$SQL_SECURITY.NULL = TRUE;
@ -7750,9 +7750,9 @@ void AlterRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
case Clause::TYPE_ALTER_PUBLICATION:
{
fb_assert(replicationState.specified);
fb_assert(replicationState.isAssigned());
if (replicationState.value)
if (replicationState.asBool())
{
// Add table to the publication
@ -9430,22 +9430,22 @@ void CreateIndexNode::store(thread_db* tdbb, jrd_tra* transaction, MetaName& nam
}
END_FOR
if (definition.unique.specified)
if (definition.unique.isAssigned())
{
IDX.RDB$UNIQUE_FLAG.NULL = FALSE;
IDX.RDB$UNIQUE_FLAG = SSHORT(definition.unique.value);
IDX.RDB$UNIQUE_FLAG = SSHORT(definition.unique.asBool());
}
if (definition.inactive.specified)
if (definition.inactive.isAssigned())
{
IDX.RDB$INDEX_INACTIVE.NULL = FALSE;
IDX.RDB$INDEX_INACTIVE = SSHORT(definition.inactive.value);
IDX.RDB$INDEX_INACTIVE = SSHORT(definition.inactive.asBool());
}
if (definition.descending.specified)
if (definition.descending.isAssigned())
{
IDX.RDB$INDEX_TYPE.NULL = FALSE;
IDX.RDB$INDEX_TYPE = SSHORT(definition.descending.value);
IDX.RDB$INDEX_TYPE = SSHORT(definition.descending.asBool());
}
request2.reset(tdbb, drq_l_lfield, DYN_REQUESTS);
@ -11038,7 +11038,7 @@ void CreateAlterUserNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScra
if (mode != USER_ADD)
{
if (!password && !firstName && !middleName && !lastName &&
!adminRole.specified && !active.specified && !comment && !properties.hasData())
adminRole.isUnknown() && active.isUnknown() && !comment && !properties.hasData())
{
// 283: ALTER USER requires at least one clause to be specified
status_exception::raise(Arg::PrivateDyn(283));
@ -11093,17 +11093,17 @@ void CreateAlterUserNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScra
if (plugin)
userData->plugin = *plugin;
if (adminRole.specified)
if (adminRole.isAssigned())
{
userData->adm.set(&statusWrapper, adminRole.value);
userData->adm.set(&statusWrapper, adminRole.asBool());
check(&statusWrapper);
userData->adm.setEntered(&statusWrapper, 1);
check(&statusWrapper);
}
if (active.specified)
if (active.isAssigned())
{
userData->act.set(&statusWrapper, (int) active.value);
userData->act.set(&statusWrapper, (int) active.asBool());
check(&statusWrapper);
userData->act.setEntered(&statusWrapper, 1);
check(&statusWrapper);
@ -12645,7 +12645,7 @@ void AlterDatabaseNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
changeBackupMode(tdbb, transaction, CLAUSE_END_BACKUP);
if (setDefaultCharSet.hasData() || setDefaultCollation.hasData() || linger >= 0 ||
ssDefiner.specified)
ssDefiner.isAssigned())
{
AutoCacheRequest request(tdbb, drq_m_database, DYN_REQUESTS);
FOR(REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
@ -12681,10 +12681,10 @@ void AlterDatabaseNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
DBB.RDB$LINGER = linger;
}
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
DBB.RDB$SQL_SECURITY.NULL = FALSE;
DBB.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
DBB.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
END_MODIFY

28
src/dsql/DdlNodes.h
View File

@ -34,7 +34,7 @@
#include "../dsql/NodePrinter.h"
#include "../common/classes/array.h"
#include "../common/classes/ByteChunk.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/TriState.h"
#include "../jrd/Savepoint.h"
#include "../dsql/errd_proto.h"
@ -480,7 +480,7 @@ public:
bool privateScope;
bool preserveDefaults;
SLONG udfReturnPos;
Nullable<bool> ssDefiner;
TriState ssDefiner;
};
@ -614,7 +614,7 @@ public:
MetaName packageOwner;
bool privateScope;
bool preserveDefaults;
Nullable<bool> ssDefiner;
TriState ssDefiner;
};
@ -698,7 +698,7 @@ public:
MetaName name;
MetaName relationName;
std::optional<FB_UINT64> type;
Nullable<bool> active;
TriState active;
std::optional<int> position;
NestConst<ExternalClause> external;
Firebird::string source;
@ -988,7 +988,7 @@ public:
NestConst<ValueSourceClause> setDefault;
MetaName renameTo;
Firebird::AutoPtr<dsql_fld> type;
Nullable<bool> notNullFlag; // true = NOT NULL / false = NULL
TriState notNullFlag; // true = NOT NULL / false = NULL
};
@ -1212,7 +1212,7 @@ public:
MetaName identitySequence;
std::optional<IdentityType> identityType;
std::optional<USHORT> collationId;
Nullable<bool> notNullFlag; // true = NOT NULL / false = NULL
TriState notNullFlag; // true = NOT NULL / false = NULL
std::optional<USHORT> position;
Firebird::string defaultSource;
Firebird::ByteChunk defaultValue;
@ -1551,8 +1551,8 @@ public:
NestConst<RelationSourceNode> dsqlNode;
MetaName name;
Firebird::Array<NestConst<Clause> > clauses;
Nullable<bool> ssDefiner;
Nullable<bool> replicationState;
TriState ssDefiner;
TriState replicationState;
};
@ -1724,9 +1724,9 @@ public:
MetaName relation;
Firebird::ObjectsArray<MetaName> columns;
Nullable<bool> unique;
Nullable<bool> descending;
Nullable<bool> inactive;
TriState unique;
TriState descending;
TriState inactive;
SSHORT type;
bid expressionBlr;
bid expressionSource;
@ -2217,8 +2217,8 @@ public:
Firebird::string* lastName;
MetaName* plugin;
Firebird::string* comment;
Nullable<bool> adminRole;
Nullable<bool> active;
TriState adminRole;
TriState active;
Mode mode;
void addProperty(MetaName* pr, Firebird::string* val = NULL)
@ -2459,7 +2459,7 @@ public:
Firebird::Array<NestConst<DbFileClause> > files;
MetaName cryptPlugin;
MetaName keyName;
Nullable<bool> ssDefiner;
TriState ssDefiner;
Firebird::Array<MetaName> pubTables;
};

4
src/dsql/ExprNodes.cpp
View File

@ -6830,7 +6830,7 @@ ValueExprNode* FieldNode::pass1(thread_db* tdbb, CompilerScratch* csb)
}
AutoSetRestore<jrd_rel*> autoRelationStream(&csb->csb_parent_relation,
relation->rel_ss_definer.value ? relation : NULL);
relation->rel_ss_definer.asBool() ? relation : NULL);
if (relation->rel_view_rse)
{
@ -13047,7 +13047,7 @@ ValueExprNode* UdfCallNode::pass1(thread_db* tdbb, CompilerScratch* csb)
if (!ssRelationId && csb->csb_parent_relation)
{
fb_assert(csb->csb_parent_relation->rel_ss_definer.value);
fb_assert(csb->csb_parent_relation->rel_ss_definer.asBool());
ssRelationId = csb->csb_parent_relation->rel_id;
}

1
src/dsql/ExprNodes.h
View File

@ -28,6 +28,7 @@
#include "../dsql/Nodes.h"
#include "../dsql/NodePrinter.h"
#include "../common/classes/init.h"
#include "../common/classes/TriState.h"
#include "../dsql/pass1_proto.h"
class SysFunction;

8
src/dsql/NodePrinter.h
View File

@ -25,6 +25,7 @@
#include <optional>
#include "../dsql/Nodes.h"
#include "../common/classes/TriState.h"
#define NODE_PRINT(var, property) var.print(STRINGIZE(property), property)
#define NODE_PRINT_ENUM(var, property) var.print(STRINGIZE(property), (int) property)
@ -266,11 +267,10 @@ public:
print(s, *array);
}
template <typename T>
void print(const Firebird::string& s, const BaseNullable<T>& nullable)
void print(const Firebird::string& s, const TriState& triState)
{
if (nullable.specified)
print(s, nullable.value);
if (triState.isAssigned())
print(s, triState.asBool());
}
template <typename T>

9
src/dsql/PackageNodes.epp
View File

@ -33,6 +33,7 @@
#include "../dsql/make_proto.h"
#include "../dsql/pass1_proto.h"
#include "../common/StatusArg.h"
#include "../common/classes/TriState.h"
#include "../jrd/Attachment.h"
#include "../jrd/scl_proto.h"
@ -370,10 +371,10 @@ void CreateAlterPackageNode::executeCreate(thread_db* tdbb, DsqlCompilerScratch*
PKG.RDB$PACKAGE_HEADER_SOURCE.NULL = FALSE;
attachment->storeMetaDataBlob(tdbb, transaction, &PKG.RDB$PACKAGE_HEADER_SOURCE, source);
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
PKG.RDB$SQL_SECURITY.NULL = FALSE;
PKG.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
PKG.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
PKG.RDB$SQL_SECURITY.NULL = TRUE;
@ -444,10 +445,10 @@ bool CreateAlterPackageNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
if (!PKG.RDB$VALID_BODY_FLAG.NULL)
PKG.RDB$VALID_BODY_FLAG = FALSE;
if (ssDefiner.specified)
if (ssDefiner.isAssigned())
{
PKG.RDB$SQL_SECURITY.NULL = FALSE;
PKG.RDB$SQL_SECURITY = ssDefiner.value ? FB_TRUE : FB_FALSE;
PKG.RDB$SQL_SECURITY = ssDefiner.asBool() ? FB_TRUE : FB_FALSE;
}
else
PKG.RDB$SQL_SECURITY.NULL = TRUE;

2
src/dsql/PackageNodes.h
View File

@ -110,7 +110,7 @@ public:
Firebird::Array<Item>* items;
Firebird::SortedArray<MetaName> functionNames;
Firebird::SortedArray<MetaName> procedureNames;
Nullable<bool> ssDefiner;
TriState ssDefiner;
private:
MetaName owner;

39
src/dsql/Parser.h
View File

@ -33,7 +33,7 @@
#include "../dsql/PackageNodes.h"
#include "../dsql/StmtNodes.h"
#include "../jrd/RecordSourceNodes.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/TriState.h"
#include "../common/classes/stack.h"
#include "gen/parse.h"
@ -244,13 +244,6 @@ private:
clause = value;
}
template <typename T>
void setClause(BaseNullable<T>& clause, const char* duplicateMsg, const T& value)
{
checkDuplicateClause(clause, duplicateMsg);
clause = value;
}
template <typename T>
void setClause(std::optional<T>& clause, const char* duplicateMsg, const T& value)
{
@ -258,16 +251,6 @@ private:
clause = value;
}
template <typename T>
void setClause(BaseNullable<T>& clause, const char* duplicateMsg, const BaseNullable<T>& value)
{
if (value.specified)
{
checkDuplicateClause(clause, duplicateMsg);
clause = value.value;
}
}
template <typename T>
void setClause(std::optional<T>& clause, const char* duplicateMsg, const std::optional<T>& value)
{
@ -278,6 +261,21 @@ private:
}
}
void setClause(TriState& clause, const char* duplicateMsg, bool value)
{
checkDuplicateClause(clause, duplicateMsg);
clause = value;
}
void setClause(TriState& clause, const char* duplicateMsg, const TriState& value)
{
if (value.isAssigned())
{
checkDuplicateClause(clause, duplicateMsg);
clause = value;
}
}
template <typename T1, typename T2>
void setClause(NestConst<T1>& clause, const char* duplicateMsg, const T2& value)
{
@ -324,10 +322,9 @@ private:
return clause.hasData();
}
template <typename T>
bool isDuplicateClause(const BaseNullable<T>& clause)
bool isDuplicateClause(const TriState& clause)
{
return clause.specified;
return clause.isAssigned();
}
template <typename T>

16
src/dsql/StmtNodes.cpp
View File

@ -9018,11 +9018,11 @@ SetTransactionNode* SetTransactionNode::dsqlPass(DsqlCompilerScratch* dsqlScratc
// Stuff some version info.
dsqlScratch->appendUChar(isc_tpb_version1);
if (readOnly.specified)
dsqlScratch->appendUChar(readOnly.value ? isc_tpb_read : isc_tpb_write);
if (readOnly.isAssigned())
dsqlScratch->appendUChar(readOnly.asBool() ? isc_tpb_read : isc_tpb_write);
if (wait.specified)
dsqlScratch->appendUChar(wait.value ? isc_tpb_wait : isc_tpb_nowait);
if (wait.isAssigned())
dsqlScratch->appendUChar(wait.asBool() ? isc_tpb_wait : isc_tpb_nowait);
if (isoLevel.has_value())
{
@ -9046,16 +9046,16 @@ SetTransactionNode* SetTransactionNode::dsqlPass(DsqlCompilerScratch* dsqlScratc
}
}
if (noAutoUndo.specified)
if (noAutoUndo.isAssigned())
dsqlScratch->appendUChar(isc_tpb_no_auto_undo);
if (ignoreLimbo.specified)
if (ignoreLimbo.isAssigned())
dsqlScratch->appendUChar(isc_tpb_ignore_limbo);
if (restartRequests.specified)
if (restartRequests.isAssigned())
dsqlScratch->appendUChar(isc_tpb_restart_requests);
if (autoCommit.specified)
if (autoCommit.isAssigned())
dsqlScratch->appendUChar(isc_tpb_autocommit);
if (lockTimeout.has_value())

13
src/dsql/StmtNodes.h
View File

@ -32,6 +32,7 @@
#include "../dsql/DdlNodes.h"
#include "../dsql/NodePrinter.h"
#include "../common/DecFloat.h"
#include "../common/classes/TriState.h"
namespace Jrd {
@ -1625,12 +1626,12 @@ public:
std::optional<CommitNumber> atSnapshotNumber;
std::optional<unsigned> isoLevel;
std::optional<USHORT> lockTimeout;
Nullable<bool> readOnly;
Nullable<bool> wait;
Nullable<bool> noAutoUndo;
Nullable<bool> ignoreLimbo;
Nullable<bool> restartRequests;
Nullable<bool> autoCommit;
TriState readOnly;
TriState wait;
TriState noAutoUndo;
TriState ignoreLimbo;
TriState restartRequests;
TriState autoCommit;
};

2
src/dsql/btyacc_fb.ske
View File

@ -27,7 +27,7 @@
#include "../dsql/StmtNodes.h"
#include "../dsql/WinNodes.h"
#include "../jrd/RecordSourceNodes.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/TriState.h"
#include "gen/parse.h"
#include "../dsql/Parser.h"

2
src/dsql/gen.cpp
View File

@ -608,7 +608,7 @@ void GEN_rse(DsqlCompilerScratch* dsqlScratch, RseNode* rse)
if (rse->firstRows.isAssigned())
{
dsqlScratch->appendUChar(blr_optimize);
dsqlScratch->appendUChar(rse->firstRows.value);
dsqlScratch->appendUChar(static_cast<UCHAR>(rse->firstRows.asBool()));
}
dsqlScratch->appendUChar(blr_end);

24
src/dsql/parse.y
View File

@ -733,7 +733,7 @@ using namespace Firebird;
{}
std::optional<int> nullableIntVal;
BaseNullable<bool> nullableBoolVal;
TriState triState;
std::optional<Jrd::TriggerDefinition::SqlSecurity> nullableSqlSecurityVal;
std::optional<Jrd::OverrideClause> nullableOverrideClause;
struct { bool first; bool second; } boolPair;
@ -2262,10 +2262,10 @@ sql_security_clause
| SQL SECURITY INVOKER { $$ = false; }
;
%type <nullableBoolVal> sql_security_clause_opt
%type <triState> sql_security_clause_opt
sql_security_clause_opt
: /* nothing */ { $$ = Nullable<bool>::empty(); }
| sql_security_clause { $$ = Nullable<bool>::val($1); }
: /* nothing */ { $$ = TriState(); }
| sql_security_clause { $$ = $1; }
;
%type <boolVal> publication_state
@ -3902,14 +3902,14 @@ replace_trigger_clause
}
;
%type <nullableBoolVal> trigger_active
%type <triState> trigger_active
trigger_active
: ACTIVE
{ $$ = Nullable<bool>::val(true); }
{ $$ = TriState(true); }
| INACTIVE
{ $$ = Nullable<bool>::val(false); }
{ $$ = TriState(false); }
| // nothing
{ $$ = Nullable<bool>::empty(); }
{ $$ = TriState(); }
;
%type <uint64Val> trigger_type(<createAlterTriggerNode>)
@ -4236,7 +4236,7 @@ alter_op($relationNode)
}
| DROP SQL SECURITY
{
setClause($relationNode->ssDefiner, "SQL SECURITY", Nullable<bool>::empty());
setClause($relationNode->ssDefiner, "SQL SECURITY", TriState());
RelationNode::Clause* clause =
newNode<RelationNode::Clause>(RelationNode::Clause::TYPE_ALTER_SQL_SECURITY);
$relationNode->clauses.add(clause);
@ -5836,12 +5836,12 @@ skip_locked_clause_opt
| SKIP LOCKED { $$ = true; }
;
%type <nullableBoolVal> optimize_clause
%type <triState> optimize_clause
optimize_clause
: OPTIMIZE optimize_mode
{ $$ = Nullable<bool>::val($2); }
{ $$ = TriState($2); }
| // nothing
{ $$ = Nullable<bool>::empty(); }
{ $$ = TriState(); }
;
%type <boolVal> optimize_mode

2
src/jrd/Attachment.cpp
View File

@ -1138,7 +1138,7 @@ void Attachment::invalidateReplSet(thread_db* tdbb, bool broadcast)
for (auto relation : *att_relations)
{
if (relation)
relation->rel_repl_state.invalidate();
relation->rel_repl_state.reset();
}
}

1
src/jrd/Attachment.h
View File

@ -42,6 +42,7 @@
#include "../common/classes/stack.h"
#include "../common/classes/timestamp.h"
#include "../common/classes/TimerImpl.h"
#include "../common/classes/TriState.h"
#include "../common/ThreadStart.h"
#include "../common/TimeZoneUtil.h"

4
src/jrd/Database.cpp
View File

@ -420,14 +420,14 @@ namespace Jrd
}
}
return dbb_repl_state.value;
return dbb_repl_state.asBool();
}
void Database::invalidateReplState(thread_db* tdbb, bool broadcast)
{
SyncLockGuard guard(&dbb_repl_sync, SYNC_EXCLUSIVE, FB_FUNCTION);
dbb_repl_state.invalidate();
dbb_repl_state.reset();
if (broadcast)
{

1
src/jrd/Database.h
View File

@ -54,6 +54,7 @@
#include "../common/classes/GenericMap.h"
#include "../common/classes/RefCounted.h"
#include "../common/classes/semaphore.h"
#include "../common/classes/TriState.h"
#include "../common/classes/XThreadMutex.h"
#include "../common/utils_proto.h"
#include "../jrd/RandomGenerator.h"

9
src/jrd/ExtEngineManager.cpp
View File

@ -932,9 +932,10 @@ void ExtEngineManager::Trigger::execute(thread_db* tdbb, Request* request, unsig
record_param* oldRpb, record_param* newRpb) const
{
EngineAttachmentInfo* attInfo = extManager->getEngineAttachment(tdbb, engine);
const Nullable<bool>& ssDefiner = trg->ssDefiner.specified ? trg->ssDefiner :
(trg->relation && trg->relation->rel_ss_definer.specified ? trg->relation->rel_ss_definer : Nullable<bool>() );
const MetaString& userName = ssDefiner.specified && ssDefiner.value ? trg->relation->rel_owner_name.c_str() : "";
const TriState& ssDefiner = trg->ssDefiner.isAssigned() ? trg->ssDefiner :
(trg->relation && trg->relation->rel_ss_definer.isAssigned() ? trg->relation->rel_ss_definer : TriState());
const MetaString& userName = ssDefiner.asBool() ?
trg->relation->rel_owner_name.c_str() : "";
ContextManager<IExternalTrigger> ctxManager(tdbb, attInfo, trigger,
CallerName(obj_trigger, trg->name, userName));
@ -1606,7 +1607,7 @@ void ExtEngineManager::makeTrigger(thread_db* tdbb, CompilerScratch* csb, Jrd::T
entryPointTrimmed.trim();
EngineAttachmentInfo* attInfo = getEngineAttachment(tdbb, engine);
const MetaString& userName = trg->ssDefiner.specified && trg->ssDefiner.value ? trg->owner.c_str() : "";
const MetaString& userName = trg->ssDefiner.asBool() ? trg->owner.c_str() : "";
ContextManager<IExternalTrigger> ctxManager(tdbb, attInfo, attInfo->adminCharSet,
CallerName(obj_trigger, trg->name, userName));

6
src/jrd/Function.epp
View File

@ -224,7 +224,7 @@ Function* Function::loadMetadata(thread_db* tdbb, USHORT id, bool noscan, USHORT
(X.RDB$PACKAGE_NAME.NULL ? NULL : X.RDB$PACKAGE_NAME)));
function->owner = X.RDB$OWNER_NAME;
Nullable<bool> ssDefiner;
TriState ssDefiner;
if (!X.RDB$SECURITY_CLASS.NULL)
{
@ -250,7 +250,7 @@ Function* Function::loadMetadata(thread_db* tdbb, USHORT id, bool noscan, USHORT
END_FOR
}
if (!ssDefiner.specified)
if (!ssDefiner.isAssigned())
{
if (!X.RDB$SQL_SECURITY.NULL)
ssDefiner = (bool) X.RDB$SQL_SECURITY;
@ -258,7 +258,7 @@ Function* Function::loadMetadata(thread_db* tdbb, USHORT id, bool noscan, USHORT
ssDefiner = MET_get_ss_definer(tdbb);
}
if (ssDefiner.orElse(false))
if (ssDefiner.asBool())
function->invoker = attachment->getUserId(function->owner);
size_t count = 0;

1
src/jrd/ProfilerManager.h
View File

@ -29,7 +29,6 @@
#include "../common/PerformanceStopWatch.h"
#include "../common/classes/auto.h"
#include "../common/classes/fb_string.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/RefCounted.h"
#include "../common/classes/TimerImpl.h"
#include "../jrd/recsrc/RecordSource.h"

2
src/jrd/Relation.cpp
View File

@ -49,7 +49,7 @@ bool jrd_rel::isReplicating(thread_db* tdbb)
if (rel_repl_state.isUnknown())
rel_repl_state = MET_get_repl_state(tdbb, rel_name);
return rel_repl_state.value;
return rel_repl_state.asBool();
}
RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, TraNumber tran, bool allocPages)

3
src/jrd/Relation.h
View File

@ -29,6 +29,7 @@
#include "../jrd/pag.h"
#include "../jrd/val.h"
#include "../jrd/Attachment.h"
#include "../common/classes/TriState.h"
namespace Jrd
{
@ -263,7 +264,7 @@ public:
TrigVector* rel_post_store; // Post-operation store trigger
prim rel_primary_dpnds; // foreign dependencies on this relation's primary key
frgn rel_foreign_refs; // foreign references to other relations' primary keys
Nullable<bool> rel_ss_definer;
TriState rel_ss_definer;
TriState rel_repl_state; // replication state

1
src/jrd/Routine.h
View File

@ -28,7 +28,6 @@
#include "../jrd/QualifiedName.h"
#include "../common/classes/NestConst.h"
#include "../common/MsgMetadata.h"
#include "../common/classes/Nullable.h"
namespace Jrd
{

6
src/jrd/Statement.cpp
View File

@ -779,7 +779,7 @@ void Statement::verifyTriggerAccess(thread_db* tdbb, jrd_rel* ownerRelation,
if (view && (view->rel_flags & REL_sql_relation))
userName = view->rel_owner_name;
}
else if (t.ssDefiner.specified && t.ssDefiner.value)
else if (t.ssDefiner.asBool())
userName = t.owner;
Attachment* attachment = tdbb->getAttachment();
@ -808,7 +808,7 @@ inline void Statement::triggersExternalAccess(thread_db* tdbb, ExternalAccessLis
if (t.statement)
{
const MetaName& userName = (t.ssDefiner.specified && t.ssDefiner.value) ? t.owner : user;
const MetaName& userName = t.ssDefiner.asBool() ? t.owner : user;
t.statement->buildExternalAccess(tdbb, list, userName);
}
}
@ -874,7 +874,7 @@ void Statement::buildExternalAccess(thread_db* tdbb, ExternalAccessList& list, c
continue; // should never happen, silence the compiler
}
item->user = relation->rel_ss_definer.orElse(false) ? relation->rel_owner_name : user;
item->user = relation->rel_ss_definer.asBool() ? relation->rel_owner_name : user;
if (list.find(*item, i))
continue;
list.insert(i, *item);

2
src/jrd/jrd.cpp
View File

@ -941,7 +941,7 @@ void Trigger::compile(thread_db* tdbb)
}
statement->triggerName = name;
if (ssDefiner.orElse(false))
if (ssDefiner.asBool())
statement->triggerInvoker = att->getUserId(owner);
if (sysTrigger)

2
src/jrd/jrd.h
View File

@ -148,7 +148,7 @@ public:
Firebird::string entryPoint; // External trigger entrypoint
Firebird::string extBody; // External trigger body
ExtEngineManager::Trigger* extTrigger; // External trigger
Nullable<bool> ssDefiner;
TriState ssDefiner;
MetaName owner; // Owner for SQL SECURITY
bool isActive() const;

22
src/jrd/met.epp
View File

@ -116,7 +116,7 @@ static int partners_ast_relation(void*);
static int rescan_ast_relation(void*);
static ULONG get_rel_flags_from_FLAGS(USHORT);
static void get_trigger(thread_db*, jrd_rel*, bid*, bid*, TrigVector**, const TEXT*, FB_UINT64, bool,
USHORT, const MetaName&, const string&, const bid*, Nullable<bool> ssDefiner);
USHORT, const MetaName&, const string&, const bid*, TriState ssDefiner);
static bool get_type(thread_db*, USHORT*, const UCHAR*, const TEXT*);
static void lookup_view_contexts(thread_db*, jrd_rel*);
static void make_relation_scope_name(const TEXT*, const USHORT, string& str);
@ -125,7 +125,7 @@ static BoolExprNode* parse_field_validation_blr(thread_db* tdbb, bid* blob_id, c
static bool resolve_charset_and_collation(thread_db*, USHORT*, const UCHAR*, const UCHAR*);
static void save_trigger_data(thread_db*, TrigVector**, jrd_rel*, Statement*, blb*, blb*,
const TEXT*, FB_UINT64, bool, USHORT, const MetaName&, const string&,
const bid*, Nullable<bool> ssDefiner);
const bid*, TriState ssDefiner);
static void scan_partners(thread_db*, jrd_rel*);
static bool verify_TRG_ignore_perm(thread_db*, const MetaName&);
@ -2025,7 +2025,7 @@ void MET_load_trigger(thread_db* tdbb,
if (!TRG.RDB$ENTRYPOINT.NULL) // ODS_12_0
entryPoint = TRG.RDB$ENTRYPOINT;
Nullable<bool> ssDefiner;
TriState ssDefiner;
// If SQL SECURITY for relation was not specified it will re-use DB default so we should not care about it
if (!TRG.RDB$SQL_SECURITY.NULL)
@ -3351,7 +3351,7 @@ void MET_parse_sys_trigger(thread_db* tdbb, jrd_rel* relation)
statement->flags |= Statement::FLAG_IGNORE_PERM;
save_trigger_data(tdbb, ptr, relation, statement, NULL, NULL, NULL, type, true, 0, "",
"", NULL, Nullable<bool>());
"", NULL, TriState());
}
}
END_FOR
@ -3506,7 +3506,7 @@ jrd_prc* MET_procedure(thread_db* tdbb, USHORT id, bool noscan, USHORT flags)
}
procedure->setId(P.RDB$PROCEDURE_ID);
Nullable<bool> ssDefiner;
TriState ssDefiner;
if (!P.RDB$SECURITY_CLASS.NULL)
procedure->setSecurityName(P.RDB$SECURITY_CLASS);
@ -3527,7 +3527,7 @@ jrd_prc* MET_procedure(thread_db* tdbb, USHORT id, bool noscan, USHORT flags)
END_FOR
}
if (!ssDefiner.specified)
if (ssDefiner.isUnknown())
{
if (!P.RDB$SQL_SECURITY.NULL)
ssDefiner = (bool) P.RDB$SQL_SECURITY;
@ -3537,7 +3537,7 @@ jrd_prc* MET_procedure(thread_db* tdbb, USHORT id, bool noscan, USHORT flags)
procedure->owner = P.RDB$OWNER_NAME;
if (ssDefiner.orElse(false))
if (ssDefiner.asBool())
procedure->invoker = attachment->getUserId(procedure->owner);
procedure->setImplemented(true);
@ -4714,7 +4714,7 @@ static void get_trigger(thread_db* tdbb, jrd_rel* relation,
const TEXT* name, FB_UINT64 type,
bool sys_trigger, USHORT flags,
const MetaName& engine, const string& entryPoint,
const bid* body, Nullable<bool> ssDefiner)
const bid* body, TriState ssDefiner)
{
/**************************************
*
@ -5096,7 +5096,7 @@ static void save_trigger_data(thread_db* tdbb, TrigVector** ptr, jrd_rel* relati
const TEXT* name, FB_UINT64 type,
bool sys_trigger, USHORT flags,
const MetaName& engine, const string& entryPoint,
const bid* body, Nullable<bool> ssDefiner)
const bid* body, TriState ssDefiner)
{
/**************************************
*
@ -5644,7 +5644,7 @@ int MET_get_linger(thread_db* tdbb)
return rc;
}
Nullable<bool> MET_get_ss_definer(Jrd::thread_db* tdbb)
TriState MET_get_ss_definer(Jrd::thread_db* tdbb)
{
/**************************************
*
@ -5658,7 +5658,7 @@ Nullable<bool> MET_get_ss_definer(Jrd::thread_db* tdbb)
**************************************/
SET_TDBB(tdbb);
Attachment* attachment = tdbb->getAttachment();
Nullable<bool> r;
TriState r;
AutoCacheRequest request(tdbb, irq_dbb_ss_definer, IRQ_REQUESTS);

2
src/jrd/met_proto.h
View File

@ -148,6 +148,6 @@ void MET_store_dependencies(Jrd::thread_db*, Firebird::Array<Jrd::CompilerScratc
const Jrd::jrd_rel*, const Jrd::MetaName&, int, Jrd::jrd_tra*);
int MET_get_linger(Jrd::thread_db*);
Nullable<bool> MET_get_ss_definer(Jrd::thread_db*);
TriState MET_get_ss_definer(Jrd::thread_db*);
#endif // JRD_MET_PROTO_H

2
src/jrd/optimizer/Optimizer.cpp
View File

@ -565,7 +565,7 @@ namespace
Optimizer::Optimizer(thread_db* aTdbb, CompilerScratch* aCsb, RseNode* aRse, bool parentFirstRows)
: PermanentStorage(*aTdbb->getDefaultPool()),
tdbb(aTdbb), csb(aCsb), rse(aRse),
firstRows(rse->firstRows.orElse(parentFirstRows)),
firstRows(rse->firstRows.valueOr(parentFirstRows)),
compileStreams(getPool()),
bedStreams(getPool()),
keyStreams(getPool()),

2
src/jrd/optimizer/Optimizer.h
View File

@ -418,7 +418,7 @@ public:
const auto defaultFirstRows = dbb->dbb_config->getOptimizeForFirstRows();
const auto attachment = tdbb->getAttachment();
firstRows = attachment->att_opt_first_rows.orElse(defaultFirstRows);
firstRows = attachment->att_opt_first_rows.valueOr(defaultFirstRows);
}
return Optimizer(tdbb, csb, rse, firstRows).compile(nullptr);

18
src/jrd/tra.cpp
View File

@ -2990,7 +2990,7 @@ static void transaction_options(thread_db* tdbb,
case isc_tpb_wait:
if (!wait.assignOnce(true))
{
if (!wait.value)
if (!wait.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_wait") <<
@ -3071,7 +3071,7 @@ static void transaction_options(thread_db* tdbb,
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_read_consistency") << (rec_version.value ?
Arg::Str("isc_tpb_read_consistency") << (rec_version.asBool() ?
Arg::Str("isc_tpb_rec_version") : Arg::Str("isc_tpb_no_rec_version")) );
}
@ -3079,7 +3079,7 @@ static void transaction_options(thread_db* tdbb,
break;
case isc_tpb_nowait:
if (lock_timeout.value)
if (lock_timeout.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_nowait") <<
@ -3088,7 +3088,7 @@ static void transaction_options(thread_db* tdbb,
if (!wait.assignOnce(false))
{
if (wait.value)
if (wait.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_nowait") <<
@ -3107,7 +3107,7 @@ static void transaction_options(thread_db* tdbb,
case isc_tpb_read:
if (!read_only.assignOnce(true))
{
if (!read_only.value)
if (!read_only.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_read") <<
@ -3133,7 +3133,7 @@ static void transaction_options(thread_db* tdbb,
case isc_tpb_write:
if (!read_only.assignOnce(false))
{
if (read_only.value)
if (read_only.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_write") <<
@ -3159,7 +3159,7 @@ static void transaction_options(thread_db* tdbb,
case isc_tpb_lock_write:
// Cannot set a R/W table reservation if the whole txn is R/O.
if (read_only.value)
if (read_only.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_writelock_after_readtxn));
@ -3285,7 +3285,7 @@ static void transaction_options(thread_db* tdbb,
case isc_tpb_lock_timeout:
{
if (wait.isAssigned() && !wait.value)
if (wait.isAssigned() && !wait.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_conflicting_options) << Arg::Str("isc_tpb_lock_timeout") <<
@ -3419,7 +3419,7 @@ static void transaction_options(thread_db* tdbb,
if (rec_version.isAssigned() && !(transaction->tra_flags & TRA_read_committed))
{
if (rec_version.value)
if (rec_version.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_option_without_rc) << Arg::Str("isc_tpb_rec_version"));

2
src/jrd/val.h
View File

@ -31,7 +31,7 @@
#include "../include/fb_blk.h"
#include "../common/classes/array.h"
#include "../common/classes/Nullable.h"
#include "../common/classes/TriState.h"
#include "../jrd/intl_classes.h"
#include "../jrd/MetaName.h"
#include "../jrd/QualifiedName.h"

6
src/jrd/vio.cpp
View File

@ -6275,7 +6275,7 @@ static PrepareResult prepare_update(thread_db* tdbb, jrd_tra* transaction, TraNu
// Wait as long as it takes (if not skipping locks) for an active
// transaction which has modified the record.
state = writeLockSkipLocked == true ?
state = writeLockSkipLocked.asBool() ?
TRA_wait(tdbb, transaction, rpb->rpb_transaction_nr, jrd_tra::tra_probe) :
wait(tdbb, transaction, rpb);
@ -6309,7 +6309,7 @@ static PrepareResult prepare_update(thread_db* tdbb, jrd_tra* transaction, TraNu
{
tdbb->bumpRelStats(RuntimeStatistics::RECORD_CONFLICTS, relation->rel_id);
if (writeLockSkipLocked == true)
if (writeLockSkipLocked.asBool())
return PrepareResult::SKIP_LOCKED;
// Cannot use Arg::Num here because transaction number is 64-bit unsigned integer
@ -6328,7 +6328,7 @@ static PrepareResult prepare_update(thread_db* tdbb, jrd_tra* transaction, TraNu
// fall thru
case tra_active:
return writeLockSkipLocked == true ? PrepareResult::SKIP_LOCKED : PrepareResult::LOCK_ERROR;
return writeLockSkipLocked.asBool() ? PrepareResult::SKIP_LOCKED : PrepareResult::LOCK_ERROR;
case tra_dead:
break;