Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see
ChangeSet
1.1941 05/07/13 15:05:46 joreland (AT) mysql (DOT) com +5 -0
ndb diskdata
support scan wo/ reading disk at all
(in ScanFragReq atleast, used by LCP)
1.68 05/07/13 15:05:41 joreland (AT) mysql (DOT) com +2 -1
Impl. noDiskFlag for ScanFragReq
1.86 05/07/13 15:05:41 joreland (AT) mysql (DOT) com +7 -6
Impl. noDiskFlag for ScanFragReq
1.49 05/07/13 15:05:41 joreland (AT) mysql (DOT) com +1 -1
Impl. noDiskFlag for ScanFragReq
1.44 05/07/13 15:05:41 joreland (AT) mysql (DOT) com +1 -0
Impl. noDiskFlag for ScanFragReq
1.13 05/07/13 15:05:41 joreland (AT) mysql (DOT) com +18 -1
Impl. noDiskFlag for ScanFragReq
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:joreland
# Host:eel.(none)
# Root:/
2005-05-24 17:30:57 +02:00
2005-07-13 15:05:41 +02:00
@@ -60,6 +60,7 @@
static Uint32 getTupScanFlag(const Uint32 & requestInfo);
static Uint32 getAttrLen(const Uint32 & requestInfo);
static Uint32 getScanPrio(const Uint32 & requestInfo);
+ static Uint32 getNoDiskFlag(const Uint32 & requestInfo);
static void setLockMode(Uint32 & requestInfo, Uint32 lockMode);
static void setHoldLockFlag(Uint32 & requestInfo, Uint32 holdLock);
@@ -70,6 +71,7 @@
static void setTupScanFlag(Uint32 & requestInfo, Uint32 tupScan);
static void setAttrLen(Uint32 & requestInfo, Uint32 attrLen);
static void setScanPrio(Uint32& requestInfo, Uint32 prio);
+ static void setNoDiskFlag(Uint32& requestInfo, Uint32 val);
};
class KeyInfo20 {
@@ -196,6 +198,7 @@
* Request Info
*
* a = Length of attrinfo - 16 Bits (16-31)
+ * d = No disk - 1 Bit 4
* l = Lock Mode - 1 Bit 5
* h = Hold lock - 1 Bit 7
* k = Keyinfo - 1 Bit 8
@@ -207,11 +210,12 @@
*
* 1111111111222222222233
*
- * lxhkrztppppaaaaaaaaaaaaaaaa
+ * dlxhkrztppppaaaaaaaaaaaaaaaa
*/
#define SF_LCK_MDE_SHIFT (5)
#define SF_LCK_MDE_MASK (1)
+#define SF_NDISK_SHIFT (4)
#define SF_HLD_LCK_SHIFT (7)
#define SF_KEYINFSHIFT (8)
#define SF_READ_CMMITTED_SHIFT (9)
@@ -340,6 +344,19 @@
ScanFragReq::setAttrLen(UintR & requestInfo, UintR val){
ASSERT_MAX(val, SF_ATTR_LEN_MASK, "ScanFragReq::setAttrLen");
requestInfo |= (val << SF_ATTR_LEN_SHIFT);
+}
+
+inline
+Uint32
+ScanFragReq::getNoDiskFlag(const Uint32 & requestInfo){
+ return (requestInfo >SF_NDISK_SHIFT) & 1;
+}
+
+inline
+void
+ScanFragReq::setNoDiskFlag(UintR & requestInfo, UintR val){
+ ASSERT_BL(val, "ScanFragReq::setNoDiskFlag");
+ requestInfo |= (val << SF_NDISK_SHIFT);
}
inline
2005-07-07 16:56:39 +02:00
2005-07-13 15:05:41 +02:00
@@ -3335,6 +3335,7 @@
{
ScanFragReq::setScanPrio(req->requestInfo, 1);
ScanFragReq::setTupScanFlag(req->requestInfo, 1);
+ ScanFragReq::setNoDiskFlag(req->requestInfo, 1);
}
req->transId1 = 0;
req->transId2 = (BACKUP << 20) + (NodeId() << 8);
2005-07-07 16:56:39 +02:00
2005-07-13 15:05:41 +02:00
@@ -2214,7 +2214,7 @@
void sendLqhAttrinfoSignal(Signal* signal);
void sendKeyinfoAcc(Signal* signal, Uint32 pos);
Uint32 initScanrec(const class ScanFragReq *);
- void initScanTc(Signal* signal,
+ void initScanTc(const class ScanFragReq *,
Uint32 transid1,
Uint32 transid2,
Uint32 fragId,
2005-07-13 10:55:43 +02:00
2005-07-13 15:05:41 +02:00
@@ -7576,7 +7576,7 @@
}//if
ndbrequire(c_scanRecordPool.seize(scanptr));
- initScanTc(signal,
+ initScanTc(scanFragReq,
transid1,
transid2,
fragId,
@@ -8228,7 +8228,7 @@
}
else
{
- next_scanconf_tupkeyreq(signal, scanptr, tcConnectptr.p, fragPtrP, 0);
+ next_scanconf_tupkeyreq(signal, scanptr, tcConnectptr.p, fragPtrP, RNIL);
}
}
@@ -8816,7 +8816,7 @@
*
* SUBRUTINE SHRT NAME = IST
* */
-void Dblqh::initScanTc(Signal* signal,
+void Dblqh::initScanTc(const ScanFragReq* req,
Uint32 transid1,
Uint32 transid2,
Uint32 fragId,
@@ -8846,8 +8846,9 @@
TablerecPtr tTablePtr;
tTablePtr.i = tabptr.p->primaryTableId;
ptrCheckGuard(tTablePtr, ctabrecFileSize, tablerec);
- tcConnectptr.p->m_disk_table = tTablePtr.p->m_disk_table;
-
+ tcConnectptr.p->m_disk_table = tTablePtr.p->m_disk_table &&
+ (!req || !ScanFragReq::getNoDiskFlag(req->requestInfo));
+
tabptr.p->usageCount++;
}//Dblqh::initScanTc()
@@ -9223,7 +9224,7 @@
fragptr.p->m_scanNumberMask.clear(NR_ScanNo);
scanptr.p->scanBlockref = DBACC_REF;
- initScanTc(signal,
+ initScanTc(0,
0,
(DBLQH << 20) + (cownNodeid << 8),
fragId,
2005-07-13 10:55:43 +02:00
2005-07-13 15:05:41 +02:00
@@ -865,7 +865,8 @@
if (Roptype == ZREAD) {
jam();
- if (setup_read(&req_struct, Ptr, regFragPtr, regTabPtr, true))
+ if (setup_read(&req_struct, Ptr, regFragPtr, regTabPtr,
+ disk_page != RNIL))
{
if(handleReadReq(signal, Ptr, regTabPtr, &req_struct) != -1)
{