Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[60104] firebird/trunk
|
From: <asf...@us...> - 2014-10-12 02:25:14
|
Revision: 60104
http://sourceforge.net/p/firebird/code/60104
Author: asfernandes
Date: 2014-10-12 02:25:02 +0000 (Sun, 12 Oct 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/examples/interfaces/04.print_table.cpp
firebird/trunk/src/alice/alice.h
firebird/trunk/src/alice/exe.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/isc_sync.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DdlNodes.h
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/metd.epp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/inf.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/ods.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/jrd/pag_proto.h
firebird/trunk/src/jrd/validation.cpp
Modified: firebird/trunk/examples/interfaces/04.print_table.cpp
===================================================================
--- firebird/trunk/examples/interfaces/04.print_table.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/examples/interfaces/04.print_table.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -260,7 +260,7 @@
char segbuf[16];
unsigned len;
// read data segment by segment
- for(;;)
+ for (;;)
{
int cc = blob->getSegment(st, sizeof(segbuf), segbuf, &len);
if (cc != IStatus::FB_OK && cc != IStatus::FB_SEGMENT)
Modified: firebird/trunk/src/alice/alice.h
===================================================================
--- firebird/trunk/src/alice/alice.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/alice/alice.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -35,7 +35,7 @@
enum val_errors {
VAL_INVALID_DB_VERSION = 0,
-
+
VAL_RECORD_ERRORS = 1,
VAL_BLOB_PAGE_ERRORS = 2,
VAL_DATA_PAGE_ERRORS = 3,
Modified: firebird/trunk/src/alice/exe.cpp
===================================================================
--- firebird/trunk/src/alice/exe.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/alice/exe.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -56,7 +56,7 @@
{
isc_info_page_errors, isc_info_record_errors, isc_info_bpage_errors,
isc_info_dpage_errors, isc_info_ipage_errors, isc_info_ppage_errors,
- isc_info_tpage_errors,
+ isc_info_tpage_errors,
fb_info_page_warns, fb_info_record_warns, fb_info_bpage_warns,
fb_info_dpage_warns, fb_info_ipage_warns, fb_info_ppage_warns,
fb_info_tpage_warns, fb_info_pip_errors, fb_info_pip_warns,
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/StatusHolder.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -162,7 +162,6 @@
ISC_STATUS save(const IStatus* status);
void clear();
-
ISC_STATUS getError() const
{
return value()[1];
Modified: firebird/trunk/src/common/isc_sync.cpp
===================================================================
--- firebird/trunk/src/common/isc_sync.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/isc_sync.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -961,7 +961,7 @@
void handler()
{
- for(;;)
+ for (;;)
{
union semun arg;
arg.val = 0;
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/unicode_util.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -1144,7 +1144,7 @@
if (lastError.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
(Arg::Gds(isc_random) << "Could not find acceptable ICU library"
- << Arg::StatusVector(lastError.getErrors())).raise();
+ << Arg::StatusVector(lastError.getErrors())).raise();
}
else
(Arg::Gds(isc_random) << "Could not find acceptable ICU library").raise();
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/utils.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -1016,7 +1016,9 @@
if (! bootBuild())
{
- if (prefType != Firebird::IConfigManager::FB_DIR_CONF && prefType != Firebird::IConfigManager::FB_DIR_MSG && configDir[prefType][0])
+ if (prefType != Firebird::IConfigManager::FB_DIR_CONF &&
+ prefType != Firebird::IConfigManager::FB_DIR_MSG &&
+ configDir[prefType][0])
{
// Value is set explicitly and is not environment overridable
PathUtils::concatPath(s, configDir[prefType], name);
@@ -1171,7 +1173,7 @@
Firebird::Arg::StatusVector sv(from);
sv.copyTo(to);
}
- catch(const Firebird::BadAlloc& ex)
+ catch (const Firebird::BadAlloc& ex)
{
ex.stuffException(to);
}
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -9900,7 +9900,7 @@
msg->getMetadata(), msg->getBuffer(), NULL, NULL);
check(s);
}
- catch(const Exception&)
+ catch (const Exception&)
{
if (st.getStatus() & IStatus::FB_HAS_ERRORS)
{
@@ -10624,7 +10624,7 @@
if (userType != obj_sql_role && userType != obj_user)
{
(Arg::Gds(isc_wish_list) << Arg::Gds(isc_random) <<
- "Only grants to USER or ROLE are supported for CREATE DATABASE").raise();
+ "Only grants to USER or ROLE are supported for CREATE DATABASE").raise();
}
CreateDbJob job(userType, user);
Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/DdlNodes.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -2061,8 +2061,8 @@
struct CreateDbJob
{
CreateDbJob(SSHORT a_userType, const Firebird::MetaName& a_user)
- : allOnAll(false), grantErased(false), badGrantor(false),
- userType(a_userType), user(a_user)
+ : allOnAll(false), grantErased(false), badGrantor(false),
+ userType(a_userType), user(a_user)
{ }
bool allOnAll, grantErased, badGrantor;
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -10579,6 +10579,7 @@
{
desc->dsc_ttype() = dsqlFunction->udf_character_set_id;
+ // UNICODE_FSS_HACK
// Fix UNICODE_FSS wrong length used in system tables.
if ((dsqlFunction->udf_flags & UDF_sys_based) && (desc->dsc_ttype() == CS_UNICODE_FSS))
desc->dsc_length *= 3;
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -2842,7 +2842,8 @@
catch (const Exception& ex)
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
- trace.finish(false, noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ trace.finish(false,
+ noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/dsql.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -716,7 +716,8 @@
catch (const Exception&)
{
status = tdbb->tdbb_status_vector[1];
- *traceResult = (status == isc_no_priv ? ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ *traceResult = status == isc_no_priv ?
+ ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED;
}
// restore warnings (if there are any)
Modified: firebird/trunk/src/dsql/metd.epp
===================================================================
--- firebird/trunk/src/dsql/metd.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/metd.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -919,15 +919,15 @@
userFunc->udf_character_set_id = F.RDB$CHARACTER_SET_ID;
}
- if ((!X.RDB$ARGUMENT_MECHANISM.NULL) && X.RDB$ARGUMENT_MECHANISM == prm_mech_type_of &&
- (!X.RDB$FIELD_NAME.NULL) && X.RDB$FIELD_NAME[0] &&
- (!X.RDB$RELATION_NAME.NULL) && X.RDB$RELATION_NAME[0])
+ if (!X.RDB$ARGUMENT_MECHANISM.NULL && X.RDB$ARGUMENT_MECHANISM == prm_mech_type_of &&
+ !X.RDB$FIELD_NAME.NULL && X.RDB$FIELD_NAME[0] &&
+ !X.RDB$RELATION_NAME.NULL && X.RDB$RELATION_NAME[0])
{
// type of column used in declaration
if (isSystemRelation(tdbb, transaction, X.RDB$RELATION_NAME))
userFunc->udf_flags |= UDF_sys_based;
}
- else if ((!X.RDB$FIELD_SOURCE.NULL) && X.RDB$FIELD_SOURCE[0])
+ else if (!X.RDB$FIELD_SOURCE.NULL && X.RDB$FIELD_SOURCE[0])
{
// domain used in declaration
if (isSystemDomain(tdbb, transaction, X.RDB$FIELD_SOURCE))
Modified: firebird/trunk/src/jrd/dpm.epp
===================================================================
--- firebird/trunk/src/jrd/dpm.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/dpm.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -844,9 +844,9 @@
// Data page is still empty and still in the relation. Eliminate the
// pointer to the data page then release the page.
- // here we have to look at 3 cases:
+ // here we have to look at 3 cases:
// - empty page is not a part of extent - release it as is
- // - empty page is a part of non-empty extent - mark it as empty at PP
+ // - empty page is a part of non-empty extent - mark it as empty at PP
// - empty page is a part of empty extent - release all pages of such extent
UCHAR* bits = (UCHAR*) (ppage->ppg_page + dbb->dbb_dp_per_pp);
@@ -883,7 +883,7 @@
pages.add(ppage->ppg_page[s]);
}
- if (i < PAGES_IN_EXTENT)
+ if (i < PAGES_IN_EXTENT)
{
extent = false;
pages.clear();
@@ -968,7 +968,7 @@
// Earlier, we make sure that the pointer page is written after the data
// page being released.
- PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(),
+ PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(),
pwindow.win_page.getPageNum());
}
@@ -1070,10 +1070,10 @@
}
const UCHAR pag_flags = ppage->ppg_header.pag_flags;
CCH_RELEASE_TAIL(tdbb, &window);
-
+
pages.add(window.win_page.getPageNum());
PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(), 0);
-
+
if (pag_flags & ppg_eof)
{
break;
@@ -2647,7 +2647,7 @@
**************************************
*
* Functional description
- * Extend a relation.
+ * Extend a relation.
* This routine returns a window on the datapage locked for write
*
**************************************/
@@ -2778,7 +2778,7 @@
UCHAR* bits = (UCHAR*) (ppage->ppg_page + dbb->dbb_dp_per_pp);
PPG_DP_BIT_CLEAR(bits, slot, PPG_DP_ALL_BITS);
-
+
if (type != DPM_primary) {
PPG_DP_BIT_SET(bits, slot, ppg_dp_secondary);
}
@@ -2787,7 +2787,7 @@
{
fb_assert(ppage->ppg_page[slot + i] == 0);
ppage->ppg_page[slot + i] = firstPage.getPageNum() + i;
-
+
PPG_DP_BIT_CLEAR(bits, slot + i, PPG_DP_ALL_BITS);
PPG_DP_BIT_SET(bits, slot + i, ppg_dp_empty);
}
@@ -2932,7 +2932,7 @@
if (page->dpg_count == 1)
{
- if (type == DPM_primary)
+ if (type == DPM_primary)
page->dpg_header.pag_flags &= ~dpg_secondary;
else
page->dpg_header.pag_flags |= dpg_secondary;
@@ -3110,11 +3110,11 @@
// Look for space anywhere
// Make few tries to lock consecutive data pages without waiting. In highly
- // concurrent environment with shared page cache it could be faster then wait
+ // concurrent environment with shared page cache it could be faster then wait
// in OS for first candidate page.
int tries = dbb->dbb_config->getSharedCache() ? 8 : 0;
- USHORT pp_sequence =
+ USHORT pp_sequence =
(type == DPM_primary ? relPages->rel_pri_data_space : relPages->rel_sec_data_space);
for (;; pp_sequence++)
{
@@ -3124,7 +3124,7 @@
else
relPages->rel_sec_data_space = pp_sequence;
- const pointer_page* ppage =
+ const pointer_page* ppage =
get_pointer_page(tdbb, relation, relPages, window, pp_sequence, ppLock);
if (!ppage)
{
@@ -3154,7 +3154,7 @@
continue;
}
- // hvlad: if data page is empty, we could change its primary\secondary
+ // hvlad: if data page is empty, we could change its primary\secondary
// type as needed (i.e. to be same as "type" passed). Also, we must clear
// ppg_dp_empty bit. To do it, we need to re-fetch PP with write lock.
bool dp_is_empty = PPG_DP_BIT_TEST(bits, slot, ppg_dp_empty);
@@ -3165,12 +3165,12 @@
if (ppLock == LCK_read)
{
CCH_RELEASE(tdbb, window);
-
+
ppLock = LCK_write;
ppage = get_pointer_page(tdbb, relation, relPages, window, pp_sequence, ppLock);
if (!ppage)
BUGCHECK(254);
-
+
// retry with the same slot
slot--;
continue;
@@ -3393,7 +3393,7 @@
}
bit = PPG_DP_BIT_MASK(slot, ppg_dp_empty);
- if (dpEmpty)
+ if (dpEmpty)
{
*byte |= bit;
ppage->ppg_min_space = MIN(slot, ppage->ppg_min_space);
Modified: firebird/trunk/src/jrd/inf.cpp
===================================================================
--- firebird/trunk/src/jrd/inf.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/inf.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -628,7 +628,7 @@
case fb_info_record_warns:
case fb_info_bpage_warns:
case fb_info_dpage_warns:
- case fb_info_ipage_warns:
+ case fb_info_ipage_warns:
case fb_info_ppage_warns:
case fb_info_tpage_warns:
case fb_info_pip_errors:
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/jrd.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -6643,7 +6643,7 @@
if (!(attach->att_flags & ATT_security_db))
{
atts++;
- found = true;
+ found = true;
}
}
Modified: firebird/trunk/src/jrd/ods.cpp
===================================================================
--- firebird/trunk/src/jrd/ods.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/ods.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -102,7 +102,7 @@
{
// Compute the number of data pages per pointer page. Each data page requires
// a 32 bit pointer (BITS_PER_LONG) and a 8 bit control field (PPG_DP_BITS_NUM).
- // Also, don't allow extent of data pages (8 pages) to cross PP boundary to
+ // Also, don't allow extent of data pages (8 pages) to cross PP boundary to
// simplify code a bit.
ULONG ret = static_cast<ULONG>((page_size - offsetof(pointer_page, ppg_page[0])) * 8 / (BITS_PER_LONG + PPG_DP_BITS_NUM));
Modified: firebird/trunk/src/jrd/pag.cpp
===================================================================
--- firebird/trunk/src/jrd/pag.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/pag.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -488,8 +488,8 @@
**************************************
*
* Functional description
- * Allocate number of consecutive pages and fake a read with a write lock for
- * the first allocated page. If aligned is true, ensure first allocated page
+ * Allocate number of consecutive pages and fake a read with a write lock for
+ * the first allocated page. If aligned is true, ensure first allocated page
* is at extent boundary.
* This is the universal sequence when allocating pages.
*
@@ -510,13 +510,13 @@
ULONG sequence = (cntAlloc >= PAGES_IN_EXTENT ? pageSpace->pipWithExtent : pageSpace->pipHighWater);
for (; toAlloc > 0; sequence++)
{
- WIN pip_window(pageSpace->pageSpaceID,
+ WIN pip_window(pageSpace->pageSpaceID,
(sequence == 0) ? pageSpace->pipFirst : sequence * dbb->dbb_page_manager.pagesPerPIP - 1);
page_inv_page* pip_page = (page_inv_page*) CCH_FETCH(tdbb, &pip_window, LCK_write, pag_pages);
ULONG firstBit = MAX_ULONG, lastBit = MAX_ULONG;
-
+
ULONG pipUsed = pip_page->pip_used;
ULONG pipMin = (cntAlloc >= PAGES_IN_EXTENT ? pip_page->pip_min : dbb->dbb_page_manager.pagesPerPIP);
ULONG pipExtent = MAX_ULONG;
@@ -622,7 +622,7 @@
}
if (!toAlloc)
- break;
+ break;
}
if (!toAlloc)
@@ -630,7 +630,7 @@
fb_assert(lastBit - firstBit + 1 == cntAlloc);
if (lastBit + 1 > pipUsed) {
- pipUsed = ensureDiskSpace(tdbb, &pip_window,
+ pipUsed = ensureDiskSpace(tdbb, &pip_window,
PageNumber(pageSpace->pageSpaceID, lastBit + sequence * pageMgr.pagesPerPIP));
}
@@ -660,11 +660,11 @@
if (pipExtent == MAX_ULONG)
pipExtent = pip_page->pip_extent;
- // If we found free extent on the PIP page and allocated some pages of it,
+ // If we found free extent on the PIP page and allocated some pages of it,
// set free extent mark after just allocated pages
// assume PAGES_IN_EXTENT == 8 (i.e. one byte of bits at PIP)
const ULONG extentByte = pipExtent / PAGES_IN_EXTENT;
- if (extentByte >= firstBit / PAGES_IN_EXTENT &&
+ if (extentByte >= firstBit / PAGES_IN_EXTENT &&
extentByte <= lastBit / PAGES_IN_EXTENT)
{
pipExtent = FB_ALIGN(lastBit + 1, PAGES_IN_EXTENT);
@@ -701,7 +701,7 @@
if (pipExtent >= pageMgr.pagesPerPIP)
pageSpace->pipWithExtent.compareExchange(sequence, sequence + 1);
- if (pipMin != pip_page->pip_min || pipExtent != pip_page->pip_extent ||
+ if (pipMin != pip_page->pip_min || pipExtent != pip_page->pip_extent ||
pipUsed != pip_page->pip_used || extraPages.getCount())
{
if (toAlloc)
@@ -719,7 +719,7 @@
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
- "\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
+ "\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
bit + sequence * pageMgr.pagesPerPIP);
#endif
}
@@ -765,7 +765,7 @@
if (!(dbb->dbb_flags & DBB_no_reserve))
{
const int minExtendPages = MIN_EXTEND_BYTES / dbb->dbb_page_size;
-
+
init_pages = sequence ? 64 : MIN(pip_page->pip_used / 16, 64);
// don't touch pages belongs to the next PIP
@@ -1551,8 +1551,8 @@
* Release a page to the free page page.
*
**************************************/
-
- fb_assert(number.getPageSpaceID() == prior_page.getPageSpaceID() ||
+
+ fb_assert(number.getPageSpaceID() == prior_page.getPageSpaceID() ||
prior_page == ZERO_PAGE_NUMBER);
const ULONG pgNum = number.getPageNum();
@@ -1560,7 +1560,7 @@
}
-void PAG_release_pages(thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
+void PAG_release_pages(thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
const ULONG* pgNums, const ULONG prior_page)
{
/**************************************
@@ -1573,7 +1573,7 @@
* Release a few pages to the free page page.
*
**************************************/
-
+
SET_TDBB(tdbb);
Database* dbb = tdbb->getDatabase();
CHECK_DBB(dbb);
@@ -1588,7 +1588,7 @@
for (int i = 0; i < cntRelease; i++)
{
#ifdef VIO_DEBUG
- VIO_trace(DEBUG_WRITES_INFO,
+ VIO_trace(DEBUG_WRITES_INFO,
"\tPAG_release_pages: about to release page %"SLONGFORMAT"\n", pgNums[i]);
#endif
@@ -1596,7 +1596,7 @@
if (!pages || seq != sequence)
{
- if (pages)
+ if (pages)
{
pageSpace->pipHighWater.exchangeLower(sequence);
if (pages->pip_extent < pageMgr.pagesPerPIP)
@@ -1606,7 +1606,7 @@
}
sequence = seq;
- pip_window.win_page = (sequence == 0) ?
+ pip_window.win_page = (sequence == 0) ?
pageSpace->pipFirst : sequence * pageMgr.pagesPerPIP - 1;
pages = (page_inv_page*) CCH_FETCH(tdbb, &pip_window, LCK_write, pag_pages);
Modified: firebird/trunk/src/jrd/pag_proto.h
===================================================================
--- firebird/trunk/src/jrd/pag_proto.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/pag_proto.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -58,7 +58,7 @@
void PAG_init2(Jrd::thread_db*, USHORT);
SLONG PAG_last_page(Jrd::thread_db* tdbb);
void PAG_release_page(Jrd::thread_db* tdbb, const Jrd::PageNumber&, const Jrd::PageNumber&);
-void PAG_release_pages(Jrd::thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
+void PAG_release_pages(Jrd::thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
const ULONG* pgNums, const ULONG prior_page);
void PAG_set_force_write(Jrd::thread_db* tdbb, bool);
void PAG_set_no_reserve(Jrd::thread_db* tdbb, bool);
Modified: firebird/trunk/src/jrd/validation.cpp
===================================================================
--- firebird/trunk/src/jrd/validation.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/validation.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -589,28 +589,28 @@
if (bits & ppg_dp_large)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("large");
}
if (bits & ppg_dp_swept)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("swept");
}
if (bits & ppg_dp_secondary)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("secondary");
}
- if (bits & ppg_dp_empty)
+ if (bits & ppg_dp_empty)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("empty");
}
@@ -676,8 +676,8 @@
{true, isc_info_bpage_errors, "Blob %"SQUADFORMAT" has unknown level %d instead of {0, 1, 2}"},
{false, fb_info_ipage_warns, "Index %d has inconsistent left sibling pointer, page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT},
{false, fb_info_ipage_warns, "Index %d misses node on page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT}, // 30
- {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_min (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
- {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_extent (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
+ {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_min (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
+ {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_extent (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_used (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_ppage_warns, "Pointer page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} bits {0x%02X %s} are not consistent with data page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} state {0x%02X %s}"}
};
@@ -716,7 +716,7 @@
Database* dbb = tdbb->getDatabase();
Firebird::PathName fileName = tdbb->getAttachment()->att_filename;
- try
+ try
{
val_pool = dbb->createPool();
Jrd::ContextPoolHolder context(tdbb, val_pool);
@@ -751,7 +751,7 @@
cleanup();
- gds__log("Database: %s\n\tValidation finished: %d errors, %d warnings, %d fixed",
+ gds__log("Database: %s\n\tValidation finished: %d errors, %d warnings, %d fixed",
fileName.c_str(), vdr_errors, vdr_warns, vdr_fixed);
} // try
catch (const Firebird::Exception& ex)
@@ -858,7 +858,7 @@
return rtn_corrupt;
}
-Validation::FETCH_CODE Validation::fetch_page(bool mark, ULONG page_number,
+Validation::FETCH_CODE Validation::fetch_page(bool mark, ULONG page_number,
USHORT type, WIN* window, void* apage_pointer)
{
/**************************************
@@ -1081,7 +1081,7 @@
}
#endif
-Validation::RTN Validation::walk_blob(jrd_rel* relation, const blh* header, USHORT length,
+Validation::RTN Validation::walk_blob(jrd_rel* relation, const blh* header, USHORT length,
RecordNumber number)
{
/**************************************
@@ -1169,7 +1169,7 @@
return rtn_ok;
}
-Validation::RTN Validation::walk_chain(jrd_rel* relation, const rhd* header,
+Validation::RTN Validation::walk_chain(jrd_rel* relation, const rhd* header,
RecordNumber head_number)
{
/**************************************
@@ -1268,7 +1268,7 @@
CCH_RELEASE(vdr_tdbb, &window);
}
-Validation::RTN Validation::walk_data_page(jrd_rel* relation, ULONG page_number,
+Validation::RTN Validation::walk_data_page(jrd_rel* relation, ULONG page_number,
ULONG sequence, UCHAR& pp_bits)
{
/**************************************
@@ -1308,7 +1308,7 @@
// Evaluate what flags should be set on PP
- if (dp_flags & dpg_full)
+ if (dp_flags & dpg_full)
pp_bits |= ppg_dp_full;
if (dp_flags & dpg_large)
@@ -1908,8 +1908,8 @@
if (*bytes == 0xFF && pipExtent == MAX_ULONG)
pipExtent = (bytes - page->pip_bits) * 8;
-
- if (pipMin == MAX_ULONG)
+
+ if (pipMin == MAX_ULONG)
{
UCHAR mask = 1;
for (int i = 0; i < 8; i++, mask <<= 1)
@@ -1945,19 +1945,19 @@
}
bool fixme = false;
- if (pipMin < page->pip_min)
+ if (pipMin < page->pip_min)
{
corrupt(VAL_PIP_WRONG_MIN, NULL, page_number, sequence, page->pip_min, pipMin);
fixme = (vdr_flags & VDR_update);
}
- if (pipExtent < page->pip_extent)
+ if (pipExtent < page->pip_extent)
{
corrupt(VAL_PIP_WRONG_EXTENT, NULL, page_number, sequence, page->pip_extent, pipExtent);
fixme = (vdr_flags & VDR_update);
}
- if (pipUsed > page->pip_used)
+ if (pipUsed > page->pip_used)
{
corrupt(VAL_PIP_WRONG_USED, NULL, page_number, sequence, page->pip_used, pipUsed);
fixme = (vdr_flags & VDR_update);
@@ -2064,8 +2064,8 @@
explain_pp_bits(pp_bits, s_pp);
explain_pp_bits(new_pp_bits, s_dp);
- corrupt(VAL_P_PAGE_WRONG_BITS, relation,
- page->ppg_header.pag_pageno, sequence, pp_bits, s_pp.c_str(),
+ corrupt(VAL_P_PAGE_WRONG_BITS, relation,
+ page->ppg_header.pag_pageno, sequence, pp_bits, s_pp.c_str(),
*pages, seq, new_pp_bits, s_dp.c_str());
if ((vdr_flags & VDR_update))
@@ -2105,7 +2105,7 @@
}
-Validation::RTN Validation::walk_record(jrd_rel* relation, const rhd* header, USHORT length,
+Validation::RTN Validation::walk_record(jrd_rel* relation, const rhd* header, USHORT length,
RecordNumber number, bool delta_flag)
{
/**************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
