Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
390b782e
Commit
390b782e
authored
18 years ago
by
jonas@eel.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb - dbacc - unused variables
parent
dda17f09
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
39 deletions
+8
-39
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+0
-4
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+8
-35
No files found.
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
View file @
390b782e
...
...
@@ -477,7 +477,6 @@ struct Fragmentrec {
/* OPERATIONREC */
/* --------------------------------------------------------------------------------- */
struct
Operationrec
{
Uint32
keydata
[
8
];
Uint32
localdata
[
2
];
Uint32
elementIsforward
;
Uint32
elementPage
;
...
...
@@ -487,16 +486,13 @@ struct Operationrec {
Uint32
hashvaluePart
;
Uint32
hashValue
;
Uint32
insertDeleteLen
;
Uint32
keyinfoPage
;
Uint32
nextLockOwnerOp
;
Uint32
nextOp
;
Uint32
nextParallelQue
;
Uint32
nextQueOp
;
Uint32
nextSerialQue
;
Uint32
prevOp
;
Uint32
prevLockOwnerOp
;
Uint32
prevParallelQue
;
Uint32
prevQueOp
;
Uint32
prevSerialQue
;
Uint32
scanRecPtr
;
Uint32
transId1
;
...
...
This diff is collapsed.
Click to expand it.
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
390b782e
...
...
@@ -974,12 +974,9 @@ void Dbacc::initOpRec(Signal* signal)
operationRecPtr
.
p
->
fragptr
=
fragrecptr
.
i
;
operationRecPtr
.
p
->
nextParallelQue
=
RNIL
;
operationRecPtr
.
p
->
prevParallelQue
=
RNIL
;
operationRecPtr
.
p
->
prevQueOp
=
RNIL
;
operationRecPtr
.
p
->
nextQueOp
=
RNIL
;
operationRecPtr
.
p
->
nextSerialQue
=
RNIL
;
operationRecPtr
.
p
->
prevSerialQue
=
RNIL
;
operationRecPtr
.
p
->
elementPage
=
RNIL
;
operationRecPtr
.
p
->
keyinfoPage
=
RNIL
;
operationRecPtr
.
p
->
lockOwner
=
ZFALSE
;
operationRecPtr
.
p
->
insertIsDone
=
ZFALSE
;
operationRecPtr
.
p
->
elementIsDisappeared
=
ZFALSE
;
...
...
@@ -990,13 +987,6 @@ void Dbacc::initOpRec(Signal* signal)
operationRecPtr
.
p
->
isAccLockReq
=
(
Treqinfo
>>
31
)
&
0x1
;
// undo log is not run via ACCKEYREQ
if
(
ERROR_INSERTED
(
5900
)
||
ERROR_INSERTED
(
5901
))
{
for
(
unsigned
i
=
0
;
i
<
8
&&
i
<
signal
->
theData
[
4
];
i
++
){
operationRecPtr
.
p
->
keydata
[
i
]
=
signal
->
theData
[
i
+
7
];
}
}
}
//Dbacc::initOpRec()
/* --------------------------------------------------------------------------------- */
...
...
@@ -1640,13 +1630,6 @@ void Dbacc::placeSerialQueueWrite(Signal* signal)
/* ------------------------------------------------------------------------- */
void
Dbacc
::
acckeyref1Lab
(
Signal
*
signal
,
Uint32
result_code
)
{
if
(
operationRecPtr
.
p
->
keyinfoPage
!=
RNIL
)
{
jam
();
rpPageptr
.
i
=
operationRecPtr
.
p
->
keyinfoPage
;
ptrCheckGuard
(
rpPageptr
,
cpagesize
,
page8
);
releasePage
(
signal
);
operationRecPtr
.
p
->
keyinfoPage
=
RNIL
;
}
//if
operationRecPtr
.
p
->
transactionstate
=
WAIT_COMMIT_ABORT
;
/* ************************<< */
/* ACCKEYREF */
...
...
@@ -4040,12 +4023,9 @@ void Dbacc::insertLockOwnersList(Signal* signal,
insOperPtr
.
p
->
lockOwner
=
ZTRUE
;
insOperPtr
.
p
->
prevLockOwnerOp
=
RNIL
;
tmpOperPtr
.
i
=
fragrecptr
.
p
->
lockOwnersList
;
const
Uint32
seq
=
fragrecptr
.
p
->
m_current_sequence_no
;
insOperPtr
.
p
->
nextLockOwnerOp
=
tmpOperPtr
.
i
;
insOperPtr
.
p
->
m_sequence_no
=
seq
;
fragrecptr
.
p
->
lockOwnersList
=
insOperPtr
.
i
;
fragrecptr
.
p
->
m_current_sequence_no
=
seq
+
1
;
if
(
tmpOperPtr
.
i
==
RNIL
)
{
return
;
}
else
{
...
...
@@ -6014,9 +5994,6 @@ void Dbacc::initScanOpRec(Signal* signal)
operationRecPtr
.
p
->
prevParallelQue
=
RNIL
;
operationRecPtr
.
p
->
nextSerialQue
=
RNIL
;
operationRecPtr
.
p
->
prevSerialQue
=
RNIL
;
operationRecPtr
.
p
->
prevQueOp
=
RNIL
;
operationRecPtr
.
p
->
nextQueOp
=
RNIL
;
operationRecPtr
.
p
->
keyinfoPage
=
RNIL
;
// Safety precaution
operationRecPtr
.
p
->
transId1
=
scanPtr
.
p
->
scanTrid1
;
operationRecPtr
.
p
->
transId2
=
scanPtr
.
p
->
scanTrid2
;
operationRecPtr
.
p
->
lockOwner
=
ZFALSE
;
...
...
@@ -6036,7 +6013,6 @@ void Dbacc::initScanOpRec(Signal* signal)
tisoLocalPtr
=
tisoLocalPtr
+
tisoIsforward
;
}
//for
arrGuard
(
tisoLocalPtr
,
2048
);
operationRecPtr
.
p
->
keydata
[
0
]
=
isoPageptr
.
p
->
word32
[
tisoLocalPtr
];
operationRecPtr
.
p
->
tupkeylen
=
fragrecptr
.
p
->
keyLength
;
operationRecPtr
.
p
->
xfrmtupkeylen
=
0
;
// not used
}
//Dbacc::initScanOpRec()
...
...
@@ -7410,21 +7386,18 @@ Dbacc::execDUMP_STATE_ORD(Signal* signal)
infoEvent
(
"fid=%d, fragptr=%d, hashvaluePart=%d "
,
tmpOpPtr
.
p
->
fid
,
tmpOpPtr
.
p
->
fragptr
,
tmpOpPtr
.
p
->
hashvaluePart
);
infoEvent
(
"hashValue=%d, insertDeleteLen=%d, keyinfoPage=%d "
,
tmpOpPtr
.
p
->
hashValue
,
tmpOpPtr
.
p
->
insertDeleteLen
,
tmpOpPtr
.
p
->
keyinfoPage
);
infoEvent
(
"hashValue=%d, insertDeleteLen=%d"
,
tmpOpPtr
.
p
->
hashValue
,
tmpOpPtr
.
p
->
insertDeleteLen
);
infoEvent
(
"nextLockOwnerOp=%d, nextOp=%d, nextParallelQue=%d "
,
tmpOpPtr
.
p
->
nextLockOwnerOp
,
tmpOpPtr
.
p
->
nextOp
,
tmpOpPtr
.
p
->
nextParallelQue
);
infoEvent
(
"next
QueOp=%d, next
SerialQue=%d, prevOp=%d "
,
tmpOpPtr
.
p
->
next
QueOp
,
tmpOpPtr
.
p
->
next
SerialQue
,
infoEvent
(
"nextSerialQue=%d, prevOp=%d "
,
tmpOpPtr
.
p
->
nextSerialQue
,
tmpOpPtr
.
p
->
prevOp
);
infoEvent
(
"prevLockOwnerOp=%d, prevParallelQue=%d, prevQueOp=%d "
,
tmpOpPtr
.
p
->
prevLockOwnerOp
,
tmpOpPtr
.
p
->
nextParallelQue
,
tmpOpPtr
.
p
->
prevQueOp
);
infoEvent
(
"prevSerialQue=%d, scanRecPtr=%d, longPagePtr=%d "
,
tmpOpPtr
.
p
->
prevSerialQue
,
tmpOpPtr
.
p
->
scanRecPtr
,
tmpOpPtr
.
p
->
longPagePtr
);
infoEvent
(
"prevLockOwnerOp=%d, prevParallelQue=%d"
,
tmpOpPtr
.
p
->
prevLockOwnerOp
,
tmpOpPtr
.
p
->
nextParallelQue
);
infoEvent
(
"prevSerialQue=%d, scanRecPtr=%d"
,
tmpOpPtr
.
p
->
prevSerialQue
,
tmpOpPtr
.
p
->
scanRecPtr
);
infoEvent
(
"transactionstate=%d, elementIsDisappeared=%d, insertIsDone=%d "
,
tmpOpPtr
.
p
->
transactionstate
,
tmpOpPtr
.
p
->
elementIsDisappeared
,
tmpOpPtr
.
p
->
insertIsDone
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment