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
d2f51fb7
Commit
d2f51fb7
authored
Sep 14, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UtilTransaction::verifyIndex wrt to null handling
parent
29c5bfb2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
84 additions
and
78 deletions
+84
-78
ndb/test/src/UtilTransactions.cpp
ndb/test/src/UtilTransactions.cpp
+84
-78
No files found.
ndb/test/src/UtilTransactions.cpp
View file @
d2f51fb7
...
@@ -1138,19 +1138,33 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1138,19 +1138,33 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
*/
*/
NdbIndexOperation
*
pIndexOp
=
NULL
;
NdbIndexOperation
*
pIndexOp
=
NULL
;
NdbIndexScanOperation
*
pScanOp
=
NULL
;
NdbIndexScanOperation
*
pScanOp
=
NULL
;
NdbOperation
*
pIOp
=
0
;
bool
null_found
=
false
;
for
(
a
=
0
;
a
<
(
int
)
pIndex
->
getNoOfColumns
();
a
++
){
const
NdbDictionary
::
Column
*
col
=
pIndex
->
getColumn
(
a
);
if
(
row
.
attributeStore
(
col
->
getName
())
->
isNULL
())
{
null_found
=
true
;
ndbout_c
(
"null found"
);
break
;
}
}
const
char
*
tabName
=
tab
.
getName
();
if
(
!
null_found
)
{
{
void
*
pOpCheck
=
NULL
;
if
(
indexType
==
NdbDictionary
::
Index
::
UniqueHashIndex
)
{
if
(
indexType
==
NdbDictionary
::
Index
::
UniqueHashIndex
)
{
p
OpCheck
=
pIndexOp
=
pTrans1
->
getNdbIndexOperation
(
indexName
,
tab
.
getName
()
);
p
IOp
=
pIndexOp
=
pTrans1
->
getNdbIndexOperation
(
indexName
,
tabName
);
}
else
{
}
else
{
p
OpCheck
=
pScanOp
=
pTrans1
->
getNdbIndexScanOperation
(
indexName
,
tab
.
getName
()
);
p
IOp
=
pScanOp
=
pTrans1
->
getNdbIndexScanOperation
(
indexName
,
tabName
);
}
}
if
(
p
OpCheck
==
NULL
)
{
if
(
p
IOp
==
NULL
)
{
ERR
(
pTrans1
->
getNdbError
());
ERR
(
pTrans1
->
getNdbError
());
goto
close_all
;
goto
close_all
;
}
}
}
{
{
bool
not_ok
;
bool
not_ok
;
...
@@ -1174,20 +1188,13 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1174,20 +1188,13 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
const
NdbDictionary
::
Column
*
col
=
pIndex
->
getColumn
(
a
);
const
NdbDictionary
::
Column
*
col
=
pIndex
->
getColumn
(
a
);
int
r
;
int
r
;
if
(
pIndexOp
)
r
=
pIndexOp
->
equal
(
col
->
getName
(),
row
.
attributeStore
(
col
->
getName
())
->
aRef
());
else
{
// setBound not possible for null attributes
if
(
!
row
.
attributeStore
(
col
->
getName
())
->
isNULL
()
)
{
if
(
!
row
.
attributeStore
(
col
->
getName
())
->
isNULL
()
)
{
r
=
pScanOp
->
setBound
(
col
->
getName
(),
if
(
pIOp
->
equal
(
col
->
getName
(),
NdbIndexScanOperation
::
BoundEQ
,
row
.
attributeStore
(
col
->
getName
())
->
aRef
())
!=
0
){
row
.
attributeStore
(
col
->
getName
())
->
aRef
());
}
}
if
(
r
!=
0
){
ERR
(
pTrans1
->
getNdbError
());
ERR
(
pTrans1
->
getNdbError
());
goto
close_all
;
goto
close_all
;
}
}
}
#if VERBOSE
#if VERBOSE
printf
(
"%s = %d: "
,
col
->
getName
(),
row
.
attributeStore
(
a
)
->
aRef
());
printf
(
"%s = %d: "
,
col
->
getName
(),
row
.
attributeStore
(
a
)
->
aRef
());
#endif
#endif
...
@@ -1203,12 +1210,8 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1203,12 +1210,8 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
for
(
a
=
0
;
a
<
tab
.
getNoOfColumns
();
a
++
){
for
(
a
=
0
;
a
<
tab
.
getNoOfColumns
();
a
++
){
void
*
pCheck
;
void
*
pCheck
;
if
(
pIndexOp
)
pCheck
=
indexRow
.
attributeStore
(
a
)
=
pIndexOp
->
getValue
(
tab
.
getColumn
(
a
)
->
getName
());
else
pCheck
=
indexRow
.
attributeStore
(
a
)
=
pCheck
=
indexRow
.
attributeStore
(
a
)
=
p
Scan
Op
->
getValue
(
tab
.
getColumn
(
a
)
->
getName
());
p
I
Op
->
getValue
(
tab
.
getColumn
(
a
)
->
getName
());
if
(
pCheck
==
NULL
)
{
if
(
pCheck
==
NULL
)
{
ERR
(
pTrans1
->
getNdbError
());
ERR
(
pTrans1
->
getNdbError
());
...
@@ -1218,6 +1221,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1218,6 +1221,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
printf
(
"%s "
,
tab
.
getColumn
(
a
)
->
getName
());
printf
(
"%s "
,
tab
.
getColumn
(
a
)
->
getName
());
#endif
#endif
}
}
}
#if VERBOSE
#if VERBOSE
printf
(
"
\n
"
);
printf
(
"
\n
"
);
#endif
#endif
...
@@ -1242,6 +1246,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1242,6 +1246,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
/**
/**
* Compare the two rows
* Compare the two rows
*/
*/
if
(
!
null_found
){
if
(
pScanOp
)
{
if
(
pScanOp
)
{
if
(
cursor
->
nextResult
()
!=
0
){
if
(
cursor
->
nextResult
()
!=
0
){
const
NdbError
err
=
pTrans1
->
getNdbError
();
const
NdbError
err
=
pTrans1
->
getNdbError
();
...
@@ -1264,11 +1269,12 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
...
@@ -1264,11 +1269,12 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
goto
close_all
;
goto
close_all
;
}
}
}
}
}
return_code
=
NDBT_OK
;
return_code
=
NDBT_OK
;
goto
close_all
;
goto
close_all
;
}
}
close_all:
close_all:
if
(
cursor
)
if
(
cursor
)
cursor
->
close
();
cursor
->
close
();
if
(
pTrans1
)
if
(
pTrans1
)
...
...
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