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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a259bceb
Commit
a259bceb
authored
Mar 28, 2005
by
pekka@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
parents
55d3d94c
5dea61b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
16 deletions
+28
-16
ndb/src/kernel/blocks/dbacc/Dbacc.hpp
ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+1
-1
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+27
-15
No files found.
ndb/src/kernel/blocks/dbacc/Dbacc.hpp
View file @
a259bceb
...
...
@@ -1076,7 +1076,7 @@ private:
void
storeLongKeysAtPos
(
Signal
*
signal
);
void
reorgLongPage
(
Signal
*
signal
);
void
getElement
(
Signal
*
signal
);
void
searchLongKey
(
Signal
*
signal
);
void
searchLongKey
(
Signal
*
signal
,
bool
verify
);
void
getdirindex
(
Signal
*
signal
);
void
commitdelete
(
Signal
*
signal
,
bool
systemRestart
);
void
deleteElement
(
Signal
*
signal
);
...
...
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
a259bceb
...
...
@@ -4685,7 +4685,7 @@ void Dbacc::getElement(Signal* signal)
/* --------------------------------------------------------------------------------- */
tslcPageIndex
=
gePageptr
.
p
->
word32
[
tgeKeyptr
]
&
0x3ff
;
tslcPagedir
=
gePageptr
.
p
->
word32
[
tgeKeyptr
]
>>
10
;
searchLongKey
(
signal
);
searchLongKey
(
signal
,
true
);
if
(
tslcResult
==
ZTRUE
)
{
register
Uint32
TlocData1
,
TlocData2
;
jam
();
...
...
@@ -4728,6 +4728,14 @@ void Dbacc::getElement(Signal* signal)
Uint32
TgeIndex
=
TdataIndex
+
tgeForward
;
operationRecPtr
.
p
->
localdata
[
0
]
=
gePageptr
.
p
->
word32
[
TdataIndex
];
operationRecPtr
.
p
->
localdata
[
1
]
=
gePageptr
.
p
->
word32
[
TgeIndex
];
if
(
fragrecptr
.
p
->
keyLength
==
0
)
{
// set up long key variables in operation record
tslcPageIndex
=
gePageptr
.
p
->
word32
[
tgeKeyptr
]
&
0x3ff
;
tslcPagedir
=
gePageptr
.
p
->
word32
[
tgeKeyptr
]
>>
10
;
// no verification since we have no key data
searchLongKey
(
signal
,
false
);
}
return
;
}
//if
if
(
tgeRemLen
<=
ZCON_HEAD_SIZE
)
{
...
...
@@ -4775,7 +4783,7 @@ void Dbacc::getElement(Signal* signal)
/* TSLC_RESULT */
/* DESCRIPTION: SEARCH FOR AN ELEMENT IN A LONG_KEY_PAGE. */
/* --------------------------------------------------------------------------------- */
void
Dbacc
::
searchLongKey
(
Signal
*
signal
)
void
Dbacc
::
searchLongKey
(
Signal
*
signal
,
bool
verify
)
{
DirRangePtr
slcOverflowrangeptr
;
DirectoryarrayPtr
slcOverflowDirptr
;
...
...
@@ -4801,23 +4809,27 @@ void Dbacc::searchLongKey(Signal* signal)
dbgWord32
(
slcPageptr
,
ZWORDS_IN_PAGE
-
tslcPageIndex
,
(
int
)
slcPageptr
.
p
->
word32
[
ZWORDS_IN_PAGE
-
tslcPageIndex
]
&
0xffff
);
dbgWord32
(
slcPageptr
,
ZWORDS_IN_PAGE
-
tslcPageIndex
,
slcPageptr
.
p
->
word32
[
ZWORDS_IN_PAGE
-
tslcPageIndex
]
>>
16
);
tslcIndexValue
=
slcPageptr
.
p
->
word32
[
ZWORDS_IN_PAGE
-
tslcPageIndex
];
if
((
tslcIndexValue
>>
16
)
!=
operationRecPtr
.
p
->
tupkeylen
)
{
jam
();
tslcResult
=
ZFALSE
;
return
;
}
//if
tslcStartIndex
=
tslcIndexValue
&
0xffff
;
guard30
=
operationRecPtr
.
p
->
tupkeylen
-
1
;
arrGuard
(
guard30
,
2048
);
arrGuard
(
guard30
+
tslcStartIndex
,
2048
);
for
(
tslcIndex
=
0
;
tslcIndex
<=
guard30
;
tslcIndex
++
)
{
dbgWord32
(
slcPageptr
,
tslcIndex
+
tslcStartIndex
,
slcPageptr
.
p
->
word32
[
tslcIndex
+
tslcStartIndex
]);
if
(
slcPageptr
.
p
->
word32
[
tslcIndex
+
tslcStartIndex
]
!=
Tkeydata
[
tslcIndex
])
{
if
(
verify
)
{
if
((
tslcIndexValue
>>
16
)
!=
operationRecPtr
.
p
->
tupkeylen
)
{
jam
();
tslcResult
=
ZFALSE
;
return
;
}
//if
}
//for
}
tslcStartIndex
=
tslcIndexValue
&
0xffff
;
guard30
=
operationRecPtr
.
p
->
tupkeylen
-
1
;
arrGuard
(
guard30
,
2048
);
arrGuard
(
guard30
+
tslcStartIndex
,
2048
);
if
(
verify
)
{
for
(
tslcIndex
=
0
;
tslcIndex
<=
guard30
;
tslcIndex
++
)
{
dbgWord32
(
slcPageptr
,
tslcIndex
+
tslcStartIndex
,
slcPageptr
.
p
->
word32
[
tslcIndex
+
tslcStartIndex
]);
if
(
slcPageptr
.
p
->
word32
[
tslcIndex
+
tslcStartIndex
]
!=
Tkeydata
[
tslcIndex
])
{
jam
();
tslcResult
=
ZFALSE
;
return
;
}
//if
}
//for
}
jam
();
tslcResult
=
ZTRUE
;
operationRecPtr
.
p
->
longPagePtr
=
slcPageptr
.
i
;
...
...
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