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
21f7111f
Commit
21f7111f
authored
Nov 02, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bugs in new distr handling
parent
c690398a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
15 deletions
+6
-15
ndb/src/common/debugger/signaldata/TcKeyReq.cpp
ndb/src/common/debugger/signaldata/TcKeyReq.cpp
+1
-4
ndb/src/ndbapi/NdbOperationSearch.cpp
ndb/src/ndbapi/NdbOperationSearch.cpp
+5
-11
No files found.
ndb/src/common/debugger/signaldata/TcKeyReq.cpp
View file @
21f7111f
...
@@ -68,11 +68,8 @@ printTCKEYREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiver
...
@@ -68,11 +68,8 @@ printTCKEYREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiver
if
(
sig
->
getInterpretedFlag
(
requestInfo
)){
if
(
sig
->
getInterpretedFlag
(
requestInfo
)){
fprintf
(
output
,
"Interpreted "
);
fprintf
(
output
,
"Interpreted "
);
}
}
if
(
sig
->
getDistributionGroupFlag
(
requestInfo
)){
fprintf
(
output
,
"DGroup = %d "
,
sig
->
distrGroupHashValue
);
}
if
(
sig
->
getDistributionKeyFlag
(
sig
->
requestInfo
)){
if
(
sig
->
getDistributionKeyFlag
(
sig
->
requestInfo
)){
fprintf
(
output
,
"
DKey = %d "
,
sig
->
distributionKeySize
);
fprintf
(
output
,
"
d-key"
);
}
}
fprintf
(
output
,
"
\n
"
);
fprintf
(
output
,
"
\n
"
);
}
}
...
...
ndb/src/ndbapi/NdbOperationSearch.cpp
View file @
21f7111f
...
@@ -146,6 +146,7 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo,
...
@@ -146,6 +146,7 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo,
if
(
cs
!=
0
)
{
if
(
cs
!=
0
)
{
// current limitation: strxfrm does not increase length
// current limitation: strxfrm does not increase length
assert
(
cs
->
strxfrm_multiply
==
1
);
assert
(
cs
->
strxfrm_multiply
==
1
);
((
Uint32
*
)
xfrmData
)[
sizeInBytes
>>
2
]
=
0
;
unsigned
n
=
unsigned
n
=
(
*
cs
->
coll
->
strnxfrm
)(
cs
,
(
*
cs
->
coll
->
strnxfrm
)(
cs
,
(
uchar
*
)
xfrmData
,
sizeof
(
xfrmData
),
(
uchar
*
)
xfrmData
,
sizeof
(
xfrmData
),
...
@@ -230,13 +231,10 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo,
...
@@ -230,13 +231,10 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo,
tErrorLine
++
;
tErrorLine
++
;
theErrorLine
=
tErrorLine
;
theErrorLine
=
tErrorLine
;
if
(
tNoKeysDef
==
0
)
{
if
(
tDistrKey
)
if
(
tDistrKey
&&
handle_distribution_key
((
Uint64
*
)
aValue
,
totalSizeInWords
);
handle_distribution_key
((
Uint64
*
)
aValue
,
totalSizeInWords
))
{
return
-
1
;
}
if
(
tNoKeysDef
==
0
)
{
if
(
tOpType
==
UpdateRequest
)
{
if
(
tOpType
==
UpdateRequest
)
{
if
(
tInterpretInd
==
1
)
{
if
(
tInterpretInd
==
1
)
{
theStatus
=
GetValue
;
theStatus
=
GetValue
;
...
@@ -521,19 +519,15 @@ NdbOperation::handle_distribution_key(const Uint64* value, Uint32 len)
...
@@ -521,19 +519,15 @@ NdbOperation::handle_distribution_key(const Uint64* value, Uint32 len)
if
(
theDistrKeyIndicator_
==
1
||
if
(
theDistrKeyIndicator_
==
1
||
(
theNoOfTupKeyLeft
>
0
&&
m_accessTable
->
m_noOfDistributionKeys
>
1
))
(
theNoOfTupKeyLeft
>
0
&&
m_accessTable
->
m_noOfDistributionKeys
>
1
))
{
{
ndbout_c
(
"handle_distribution_key - exit"
);
return
0
;
return
0
;
}
}
if
(
m_accessTable
->
m_noOfDistributionKeys
==
1
)
if
(
m_accessTable
->
m_noOfDistributionKeys
==
1
)
{
{
setPartitionHash
(
value
,
len
);
setPartitionHash
(
value
,
len
);
ndbout_c
(
"handle_distribution_key - 1 key"
);
}
}
else
else
{
{
ndbout_c
(
"handle_distribution_key - long"
);
/**
/**
* Copy distribution key to linear memory
* Copy distribution key to linear memory
*/
*/
...
...
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