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
a083748c
Commit
a083748c
authored
17 years ago
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
parents
17944ace
85b607cc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
85 additions
and
19 deletions
+85
-19
ndb/src/common/transporter/Packer.cpp
ndb/src/common/transporter/Packer.cpp
+5
-0
ndb/src/common/transporter/TCP_Transporter.hpp
ndb/src/common/transporter/TCP_Transporter.hpp
+4
-0
ndb/src/common/transporter/TransporterRegistry.cpp
ndb/src/common/transporter/TransporterRegistry.cpp
+21
-19
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+17
-0
ndb/test/ndbapi/testNdbApi.cpp
ndb/test/ndbapi/testNdbApi.cpp
+34
-0
ndb/test/run-test/daily-basic-tests.txt
ndb/test/run-test/daily-basic-tests.txt
+4
-0
No files found.
ndb/src/common/transporter/Packer.cpp
View file @
a083748c
...
@@ -20,7 +20,12 @@
...
@@ -20,7 +20,12 @@
#include <TransporterCallback.hpp>
#include <TransporterCallback.hpp>
#include <RefConvert.hpp>
#include <RefConvert.hpp>
#ifdef ERROR_INSERT
Uint32
MAX_RECEIVED_SIGNALS
=
1024
;
#else
#define MAX_RECEIVED_SIGNALS 1024
#define MAX_RECEIVED_SIGNALS 1024
#endif
Uint32
Uint32
TransporterRegistry
::
unpack
(
Uint32
*
readPtr
,
TransporterRegistry
::
unpack
(
Uint32
*
readPtr
,
Uint32
sizeOfData
,
Uint32
sizeOfData
,
...
...
This diff is collapsed.
Click to expand it.
ndb/src/common/transporter/TCP_Transporter.hpp
View file @
a083748c
...
@@ -102,6 +102,10 @@ private:
...
@@ -102,6 +102,10 @@ private:
virtual
void
updateReceiveDataPtr
(
Uint32
bytesRead
);
virtual
void
updateReceiveDataPtr
(
Uint32
bytesRead
);
virtual
Uint32
get_free_buffer
()
const
;
virtual
Uint32
get_free_buffer
()
const
;
inline
bool
hasReceiveData
()
const
{
return
receiveBuffer
.
sizeOfData
>
0
;
}
protected:
protected:
/**
/**
* Setup client/server and perform connect/accept
* Setup client/server and perform connect/accept
...
...
This diff is collapsed.
Click to expand it.
ndb/src/common/transporter/TransporterRegistry.cpp
View file @
a083748c
...
@@ -841,6 +841,7 @@ TransporterRegistry::poll_OSE(Uint32 timeOutMillis)
...
@@ -841,6 +841,7 @@ TransporterRegistry::poll_OSE(Uint32 timeOutMillis)
Uint32
Uint32
TransporterRegistry
::
poll_TCP
(
Uint32
timeOutMillis
)
TransporterRegistry
::
poll_TCP
(
Uint32
timeOutMillis
)
{
{
bool
hasdata
=
false
;
if
(
false
&&
nTCPTransporters
==
0
)
if
(
false
&&
nTCPTransporters
==
0
)
{
{
tcpReadSelectReply
=
0
;
tcpReadSelectReply
=
0
;
...
@@ -885,6 +886,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
...
@@ -885,6 +886,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
// Put the connected transporters in the socket read-set
// Put the connected transporters in the socket read-set
FD_SET
(
socket
,
&
tcpReadset
);
FD_SET
(
socket
,
&
tcpReadset
);
}
}
hasdata
|=
t
->
hasReceiveData
();
}
}
// The highest socket value plus one
// The highest socket value plus one
...
@@ -901,7 +903,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
...
@@ -901,7 +903,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
}
}
#endif
#endif
return
tcpReadSelectReply
;
return
tcpReadSelectReply
||
hasdata
;
}
}
#endif
#endif
...
@@ -937,26 +939,26 @@ TransporterRegistry::performReceive()
...
@@ -937,26 +939,26 @@ TransporterRegistry::performReceive()
#endif
#endif
#ifdef NDB_TCP_TRANSPORTER
#ifdef NDB_TCP_TRANSPORTER
if
(
tcpReadSelectReply
>
0
)
for
(
int
i
=
0
;
i
<
nTCPTransporters
;
i
++
)
{
{
for
(
int
i
=
0
;
i
<
nTCPTransporters
;
i
++
)
checkJobBuffer
();
{
TCP_Transporter
*
t
=
theTCPTransporters
[
i
];
checkJobBuffer
();
const
NodeId
nodeId
=
t
->
getRemoteNodeId
();
TCP_Transporter
*
t
=
theTCPTransporters
[
i
]
;
const
NDB_SOCKET_TYPE
socket
=
t
->
getSocket
()
;
const
NodeId
nodeId
=
t
->
getRemoteNodeId
();
if
(
is_connected
(
nodeId
)){
const
NDB_SOCKET_TYPE
socket
=
t
->
getSocket
();
if
(
t
->
isConnected
())
if
(
is_connected
(
nodeId
))
{
{
if
(
t
->
isConnected
()
&&
FD_ISSET
(
socket
,
&
tcpReadset
))
if
(
FD_ISSET
(
socket
,
&
tcpReadset
))
{
{
const
int
receiveSize
=
t
->
doReceive
();
t
->
doReceive
();
if
(
receiveSize
>
0
)
}
{
Uint32
*
ptr
;
if
(
t
->
hasReceiveData
())
Uint32
sz
=
t
->
getReceiveData
(
&
ptr
);
{
transporter_recv_from
(
callbackObj
,
nodeId
)
;
Uint32
*
ptr
;
Uint32
szUsed
=
unpack
(
ptr
,
sz
,
nodeId
,
ioStates
[
nodeId
]
);
Uint32
sz
=
t
->
getReceiveData
(
&
ptr
);
t
->
updateReceiveDataPtr
(
szUsed
);
Uint32
szUsed
=
unpack
(
ptr
,
sz
,
nodeId
,
ioStates
[
nodeId
]
);
}
t
->
updateReceiveDataPtr
(
szUsed
);
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View file @
a083748c
...
@@ -132,6 +132,7 @@ Cmvmi::~Cmvmi()
...
@@ -132,6 +132,7 @@ Cmvmi::~Cmvmi()
#ifdef ERROR_INSERT
#ifdef ERROR_INSERT
NodeBitmask
c_error_9000_nodes_mask
;
NodeBitmask
c_error_9000_nodes_mask
;
extern
Uint32
MAX_RECEIVED_SIGNALS
;
#endif
#endif
void
Cmvmi
::
execNDB_TAMPER
(
Signal
*
signal
)
void
Cmvmi
::
execNDB_TAMPER
(
Signal
*
signal
)
...
@@ -161,6 +162,22 @@ void Cmvmi::execNDB_TAMPER(Signal* signal)
...
@@ -161,6 +162,22 @@ void Cmvmi::execNDB_TAMPER(Signal* signal)
kill
(
getpid
(),
SIGABRT
);
kill
(
getpid
(),
SIGABRT
);
}
}
#endif
#endif
#ifdef ERROR_INSERT
if
(
signal
->
theData
[
0
]
==
9003
)
{
if
(
MAX_RECEIVED_SIGNALS
<
1024
)
{
MAX_RECEIVED_SIGNALS
=
1024
;
}
else
{
MAX_RECEIVED_SIGNALS
=
rand
()
%
128
;
}
ndbout_c
(
"MAX_RECEIVED_SIGNALS: %d"
,
MAX_RECEIVED_SIGNALS
);
CLEAR_ERROR_INSERT_VALUE
;
}
#endif
}
//execNDB_TAMPER()
}
//execNDB_TAMPER()
void
Cmvmi
::
execSET_LOGLEVELORD
(
Signal
*
signal
)
void
Cmvmi
::
execSET_LOGLEVELORD
(
Signal
*
signal
)
...
...
This diff is collapsed.
Click to expand it.
ndb/test/ndbapi/testNdbApi.cpp
View file @
a083748c
...
@@ -1306,6 +1306,36 @@ int runTestExecuteAsynch(NDBT_Context* ctx, NDBT_Step* step){
...
@@ -1306,6 +1306,36 @@ int runTestExecuteAsynch(NDBT_Context* ctx, NDBT_Step* step){
template
class
Vector
<
NdbScanOperation
*
>;
template
class
Vector
<
NdbScanOperation
*
>;
int
runBug28443
(
NDBT_Context
*
ctx
,
NDBT_Step
*
step
)
{
int
result
=
NDBT_OK
;
int
records
=
ctx
->
getNumRecords
();
NdbRestarter
restarter
;
restarter
.
insertErrorInAllNodes
(
9003
);
for
(
Uint32
i
=
0
;
i
<
ctx
->
getNumLoops
();
i
++
)
{
HugoTransactions
hugoTrans
(
*
ctx
->
getTab
());
if
(
hugoTrans
.
loadTable
(
GETNDB
(
step
),
records
,
2048
)
!=
0
)
{
result
=
NDBT_FAILED
;
goto
done
;
}
if
(
runClearTable
(
ctx
,
step
)
!=
0
)
{
result
=
NDBT_FAILED
;
goto
done
;
}
}
done:
restarter
.
insertErrorInAllNodes
(
9003
);
return
result
;
}
NDBT_TESTSUITE
(
testNdbApi
);
NDBT_TESTSUITE
(
testNdbApi
);
TESTCASE
(
"MaxNdb"
,
TESTCASE
(
"MaxNdb"
,
...
@@ -1396,6 +1426,10 @@ TESTCASE("ExecuteAsynch",
...
@@ -1396,6 +1426,10 @@ TESTCASE("ExecuteAsynch",
"Check that executeAsync() works (BUG#27495)
\n
"
){
"Check that executeAsync() works (BUG#27495)
\n
"
){
INITIALIZER
(
runTestExecuteAsynch
);
INITIALIZER
(
runTestExecuteAsynch
);
}
}
TESTCASE
(
"Bug28443"
,
""
){
INITIALIZER
(
runBug28443
);
}
NDBT_TESTSUITE_END
(
testNdbApi
);
NDBT_TESTSUITE_END
(
testNdbApi
);
int
main
(
int
argc
,
const
char
**
argv
){
int
main
(
int
argc
,
const
char
**
argv
){
...
...
This diff is collapsed.
Click to expand it.
ndb/test/run-test/daily-basic-tests.txt
View file @
a083748c
...
@@ -629,6 +629,10 @@ max-time: 500
...
@@ -629,6 +629,10 @@ max-time: 500
cmd: testNdbApi
cmd: testNdbApi
args: -n ExecuteAsynch T1
args: -n ExecuteAsynch T1
max-time: 1000
cmd: testNdbApi
args: -n BugBug28443
#max-time: 500
#max-time: 500
#cmd: testInterpreter
#cmd: testInterpreter
#args: T1
#args: T1
...
...
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