Commit 3d698495 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-fix


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
parents 6aab88c9 9db732eb

ndb/docs/wl2077.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 


100' * (select 1 from T1 (1M rows) where key = rand());

1 host, 1 ndbd, api co-hosted

results in 1000 rows / sec



		       wo/reset bounds  w/ rb

4.1-read committed     a) 4.9		b) 7.4

4.1-read hold lock     c) 4.7		d) 6.7



wl2077-read committed  6.4 (+30%)	10.8 (+45%)

wl2077-read hold lock  4.6 (-1%)	6.7 (+ 0%)



-- Comparision e)

serial pk:	       10.9'

batched (1000):	       59'

serial uniq index:     8.4'

batched (1000):	       33'

index range (1000):    186'



----



load) testScanPerf -c 1 -d 1 T1

a) testScanPerf -s 100000 -c 0 -d 0 -a 1 -l 0 -r 2 -q 0 T1

b) testScanPerf -s 100000 -c 0 -d 0 -a 1 -l 0 -r 2 -q 1 T1

c) testScanPerf -s 100000 -c 0 -d 0 -a 1 -l 1 -r 2 -q 0 T1

d) testScanPerf -s 100000 -c 0 -d 0 -a 1 -l 1 -r 2 -q 1 T1

e) testReadPerf -i 25 -c 0 -d 0 T1



--- music join		1db-co		2db-co

			

4.1			13s		14s

4.1 wo/ blobs		1.7s		3.2s



wl2077			12s		14s

wl2077 wo/ blobs	1.2s (-30%)	2.5s (-22%)

ndb/src/common/debugger/signaldata/ScanTab.cpp

+3 −2
Original line number Diff line number Diff line
@@ -30,13 +30,14 @@ printSCANTABREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiv 
  fprintf(output, " apiConnectPtr: H\'%.8x", 

	  sig->apiConnectPtr);

  fprintf(output, " requestInfo: H\'%.8x:\n",  requestInfo);

  fprintf(output, "  Parallellism: %u, Batch: %u LockMode: %u, Keyinfo: %u Holdlock: %u, RangeScan: %u\n",

  fprintf(output, "  Parallellism: %u, Batch: %u LockMode: %u, Keyinfo: %u Holdlock: %u, RangeScan: %u ReadCommitted: %u\n",

	  sig->getParallelism(requestInfo), 

	  sig->getScanBatch(requestInfo), 

	  sig->getLockMode(requestInfo), 

	  sig->getKeyinfoFlag(requestInfo),

	  sig->getHoldLockFlag(requestInfo), 

	  sig->getRangeScanFlag(requestInfo),

	  sig->getKeyinfoFlag(requestInfo));

	  sig->getReadCommittedFlag(requestInfo));

  

  Uint32 keyLen = (sig->attrLenKeyLen >> 16);

  Uint32 attrLen = (sig->attrLenKeyLen & 0xFFFF);

ndb/src/kernel/blocks/dbdih/Dbdih.hpp

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ public: 
    Uint32 nfConnect;

    Uint32 table;

    Uint32 userpointer;

    Uint32 nodeCount;

    BlockReference userblockref;

  };

  typedef Ptr<ConnectRecord> ConnectRecordPtr;

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+9 −11
Original line number Diff line number Diff line
@@ -7080,24 +7080,22 @@ void Dbdih::execDIGETPRIMREQ(Signal* signal) 
  

  ndbrequire(tabPtr.p->tabStatus == TabRecord::TS_ACTIVE);

  connectPtr.i = signal->theData[0];

  if(connectPtr.i != RNIL){

  if(connectPtr.i != RNIL)

  {

    jam();

    ptrCheckGuard(connectPtr, cconnectFileSize, connectRecord);

    ndbrequire(connectPtr.p->connectState == ConnectRecord::INUSE);

    getFragstore(tabPtr.p, fragId, fragPtr);

    connectPtr.p->nodeCount = extractNodeInfo(fragPtr.p, connectPtr.p->nodes);

    signal->theData[0] = connectPtr.p->userpointer;

    signal->theData[1] = passThrough;

    signal->theData[2] = connectPtr.p->nodes[0];

    sendSignal(connectPtr.p->userblockref, GSN_DIGETPRIMCONF, signal, 3, JBB);

    return;

  }//if

  //connectPtr.i == RNIL -> question without connect record

  }

  else

  {

    jam();

    signal->theData[0] = RNIL;

  }

  

  Uint32 nodes[MAX_REPLICAS];

  getFragstore(tabPtr.p, fragId, fragPtr);

  Uint32 count = extractNodeInfo(fragPtr.p, nodes);

  

  signal->theData[0] = RNIL;

  signal->theData[1] = passThrough;

  signal->theData[2] = nodes[0];

  signal->theData[3] = nodes[1];

ndb/src/kernel/blocks/dblqh/Dblqh.hpp

+19 −0
Original line number Diff line number Diff line
@@ -2925,4 +2925,23 @@ Dblqh::ScanRecord::check_scan_batch_completed() const 
    (max_bytes > 0 && (m_curr_batch_size_bytes >= max_bytes));

}



inline

void

Dblqh::i_get_acc_ptr(ScanRecord* scanP, Uint32* &acc_ptr, Uint32 index)

{

  if (index == 0) {

    acc_ptr= (Uint32*)&scanP->scan_acc_op_ptr[0];

  } else {

    Uint32 attr_buf_index, attr_buf_rec;

    

    AttrbufPtr regAttrPtr;

    jam();

    attr_buf_rec= (index + 31) / 32;

    attr_buf_index= (index - 1) & 31;

    regAttrPtr.i= scanP->scan_acc_op_ptr[attr_buf_rec];

    ptrCheckGuard(regAttrPtr, cattrinbufFileSize, attrbuf);

    acc_ptr= (Uint32*)&regAttrPtr.p->attrbuf[attr_buf_index];

  }

}



#endif