1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Reformat all code to coding standard

This commit is contained in:
Andrew Hutchings
2017-10-26 17:18:17 +01:00
parent 4985f3456e
commit 01446d1e22
1296 changed files with 403852 additions and 353747 deletions

View File

@ -45,163 +45,175 @@ using namespace std;
using namespace logging;
using namespace primitiveprocessor;
Stats* gPMStatsPtr=NULL;
bool gPMProfOn=false;
uint32_t gSession=0;
uint32_t lastRangeListIdx=0;
const uint32_t maxLoadBlocks(1024*1024);
Stats* gPMStatsPtr = NULL;
bool gPMProfOn = false;
uint32_t gSession = 0;
uint32_t lastRangeListIdx = 0;
const uint32_t maxLoadBlocks(1024 * 1024);
void timespec_sub(const struct timespec &tv1,
const struct timespec &tv2,
double &tm)
void timespec_sub(const struct timespec& tv1,
const struct timespec& tv2,
double& tm)
{
tm = (double)(tv2.tv_sec - tv1.tv_sec) + 1.e-9*(tv2.tv_nsec - tv1.tv_nsec);
tm = (double)(tv2.tv_sec - tv1.tv_sec) + 1.e-9 * (tv2.tv_nsec - tv1.tv_nsec);
}
namespace primitiveprocessor
{
Logger ml;
Logger ml;
}
class BCTest {
class BCTest
{
public:
struct OidRanges {
OID_t oid;
HWM_t hwm;
LBIDRange_v ranges;
OidRanges(const OID_t o, const HWM_t h, const LBIDRange_v r)
{
oid=o;
hwm=h;
ranges=r;
}
}; //struct OidRanges
struct OidRanges
{
OID_t oid;
HWM_t hwm;
LBIDRange_v ranges;
OidRanges(const OID_t o, const HWM_t h, const LBIDRange_v r)
{
oid = o;
hwm = h;
ranges = r;
}
}; //struct OidRanges
BCTest(const int cacheSz=64*1024, int readThr=2, int readAhead=1024);
BCTest(const int cacheSz = 64 * 1024, int readThr = 2, int readAhead = 1024);
typedef OidRanges OidRanges_t;
typedef vector<OidRanges_t>OidRangesList_t;
OidRangesList_t OidRangesList;
typedef OidRanges OidRanges_t;
typedef vector<OidRanges_t>OidRangesList_t;
OidRangesList_t OidRangesList;
DBRM dbrm;
uint32_t extentSize;
BRM::OID_t maxOid;
DBRM dbrm;
uint32_t extentSize;
BRM::OID_t maxOid;
int fCacheSz;
int fReadThr;
int fReadAhead;
uint32_t maxBlocksAvailable;
uint32_t fExtentSize;
int fCacheSz;
int fReadThr;
int fReadAhead;
uint32_t maxBlocksAvailable;
uint32_t fExtentSize;
void setUp();
int LoadOid(const OidRanges_t& o, uint32_t& loadCount);
void LoadLbid(const BRM::LBID_t lbid, const BRM::VER_t ver);
int ReadOidRanges(const OidRanges_t& v, uint32_t* hits, uint32_t* miss);
void ReadOidLbids(const BRM::LBID_t lbid, const BRM::VER_t ver);
void setUp();
int LoadOid(const OidRanges_t& o, uint32_t& loadCount);
void LoadLbid(const BRM::LBID_t lbid, const BRM::VER_t ver);
int ReadOidRanges(const OidRanges_t& v, uint32_t* hits, uint32_t* miss);
void ReadOidLbids(const BRM::LBID_t lbid, const BRM::VER_t ver);
BlockRequestProcessor BRP;
BlockRequestProcessor BRP;
}; // class BCTest
BCTest::BCTest(int cacheSz, int readThr, int readAhead) :
fCacheSz(cacheSz),
fReadThr(readThr),
fReadAhead(readAhead),
BRP(fCacheSz, fReadThr, fReadAhead)
fCacheSz(cacheSz),
fReadThr(readThr),
fReadAhead(readAhead),
BRP(fCacheSz, fReadThr, fReadAhead)
{
setUp();
setUp();
} // ctor
//
void BCTest::setUp()
{
LBIDRange_v r;
HWM_t hwm;
OID_t oid=1000;
extentSize = dbrm.getExtentSize();
maxBlocksAvailable=0;
int i=0;
fExtentSize=dbrm.getExtentSize();
LBIDRange_v r;
HWM_t hwm;
OID_t oid = 1000;
extentSize = dbrm.getExtentSize();
maxBlocksAvailable = 0;
int i = 0;
fExtentSize = dbrm.getExtentSize();
while ( oid < 5000 )
{
int ret=0;
ret = dbrm.lookup(oid, r);
if (ret==0 && r.size()>0) {
dbrm.getHWM(oid, hwm);
maxBlocksAvailable+=(r.size()*extentSize);
OidRanges_t oid_range(oid, hwm, r);
OidRangesList.push_back(oid_range);
//cout << "Setup i: " << i++ << " o: " << oid
// << " r: " << ret << " s: " << r.size()
// << " m: " << maxBlocksAvailable
// << endl;
hwm=0;
r.clear();
}
oid++;
}
while ( oid < 5000 )
{
int ret = 0;
ret = dbrm.lookup(oid, r);
//cout << "\t" << OidRangesList.size() << " oid ranges loaded " << endl << endl;
i=0;
if (ret == 0 && r.size() > 0)
{
dbrm.getHWM(oid, hwm);
maxBlocksAvailable += (r.size() * extentSize);
OidRanges_t oid_range(oid, hwm, r);
OidRangesList.push_back(oid_range);
//cout << "Setup i: " << i++ << " o: " << oid
// << " r: " << ret << " s: " << r.size()
// << " m: " << maxBlocksAvailable
// << endl;
hwm = 0;
r.clear();
}
oid++;
}
//cout << "\t" << OidRangesList.size() << " oid ranges loaded " << endl << endl;
i = 0;
} // setUp()
int BCTest::LoadOid(const OidRanges_t& o, uint32_t& loadCount)
{
blockCacheClient bc(BRP);
uint32_t rCount=0;
blockCacheClient bc(BRP);
uint32_t rCount = 0;
for (uint32_t i =0; i<o.ranges.size() ; i++)
{
const InlineLBIDRange r={o.ranges[i].start, o.ranges[i].size};
if (r.size>0) {
bc.check(r, 0, rCount);
//cout << "i: " << i << " c: " << rCount << " " << o.ranges[i].size << endl;
loadCount+=rCount;
}
rCount=0;
} // for
for (uint32_t i = 0; i < o.ranges.size() ; i++)
{
const InlineLBIDRange r = {o.ranges[i].start, o.ranges[i].size};
//cout << "hwm: " << o.hwm << " tot: " << loadCount << " " << o.ranges.size() << endl;
if (r.size > 0)
{
bc.check(r, 0, rCount);
//cout << "i: " << i << " c: " << rCount << " " << o.ranges[i].size << endl;
loadCount += rCount;
}
return loadCount;
rCount = 0;
} // for
//cout << "hwm: " << o.hwm << " tot: " << loadCount << " " << o.ranges.size() << endl;
return loadCount;
} // LoadOid
int BCTest::ReadOidRanges(const OidRanges_t& v, uint32_t* hits, uint32_t* miss)
{
blockCacheClient bc(BRP);
uint8_t inBuff[8192];
int32_t readBlocks=0;
int32_t missBlocks=0;
blockCacheClient bc(BRP);
uint8_t inBuff[8192];
int32_t readBlocks = 0;
int32_t missBlocks = 0;
for(uint32_t i=0; i<v.ranges.size(); i++)
{
FileBuffer fb(-1, -1);
const InlineLBIDRange r={v.ranges[i].start, v.ranges[i].size};
for(int j=r.start; readBlocks<fCacheSz && j<r.start+r.size; j++)
{
FileBuffer* ptr =bc.getBlockPtr(j, 0);
if (ptr) {
readBlocks++;
memcpy(inBuff, ptr->getData(), 8192);
}
else
missBlocks++;
}
*hits+=readBlocks;
*miss+=missBlocks;
missBlocks=0;
readBlocks=0;
//cout << " -- Read range idx: " << i << " hits: " << readBlocks << " miss: " << missBlocks << " hwm: " << v.hwm << endl;
}
for (uint32_t i = 0; i < v.ranges.size(); i++)
{
FileBuffer fb(-1, -1);
const InlineLBIDRange r = {v.ranges[i].start, v.ranges[i].size};
return *hits;
for (int j = r.start; readBlocks < fCacheSz && j < r.start + r.size; j++)
{
FileBuffer* ptr = bc.getBlockPtr(j, 0);
if (ptr)
{
readBlocks++;
memcpy(inBuff, ptr->getData(), 8192);
}
else
missBlocks++;
}
*hits += readBlocks;
*miss += missBlocks;
missBlocks = 0;
readBlocks = 0;
//cout << " -- Read range idx: " << i << " hits: " << readBlocks << " miss: " << missBlocks << " hwm: " << v.hwm << endl;
}
return *hits;
} // ReadRange
@ -209,146 +221,151 @@ int BCTest::ReadOidRanges(const OidRanges_t& v, uint32_t* hits, uint32_t* miss)
//
void BCTest::LoadLbid(const BRM::LBID_t lbid, const BRM::VER_t ver)
{
blockCacheClient bc(BRP);
bool b;
bc.check(lbid, ver, false, b);
blockCacheClient bc(BRP);
bool b;
bc.check(lbid, ver, false, b);
} // LoadLbid
// get one block out of block cache
//
void BCTest::ReadOidLbids(const BRM::LBID_t lbid, const BRM::VER_t ver)
{
uint8_t d[8192]={'\0'};
blockCacheClient bc(BRP);
bc.read(lbid, ver, d);
uint8_t d[8192] = {'\0'};
blockCacheClient bc(BRP);
bc.read(lbid, ver, d);
} // ReadLbid
struct loadThr
{
loadThr(BCTest& bc, int reps=1) : fBC(bc), fReps(reps) {}
loadThr(BCTest& bc, int reps = 1) : fBC(bc), fReps(reps) {}
void operator()()
{
uint32_t loadedBlocks=0;
uint32_t readBlocks=0;
uint32_t missBlocks=0;
uint32_t oidBlocks;
uint32_t i=0;
uint32_t rc=0;
void operator()()
{
uint32_t loadedBlocks = 0;
uint32_t readBlocks = 0;
uint32_t missBlocks = 0;
uint32_t oidBlocks;
uint32_t i = 0;
uint32_t rc = 0;
clock_gettime(CLOCK_REALTIME, &tm1);
for(uint32_t j=0; j<fReps; j++)
for(i=0; loadedBlocks<maxLoadBlocks && i<fBC.OidRangesList.size(); i++)
{
oidBlocks=0;
rc = fBC.LoadOid(fBC.OidRangesList[i], oidBlocks);
/**
cout << "."
<< "-- " << i << " " << fBC.OidRangesList[i].oid
<< " h: " << fBC.OidRangesList[i].hwm
<< "/" << oidBlocks
<< endl;
**/
loadedBlocks+=oidBlocks;
readBlocks+=fBC.ReadOidRanges(fBC.OidRangesList[i], &readBlocks, &missBlocks);
clock_gettime(CLOCK_REALTIME, &tm1);
}
for (uint32_t j = 0; j < fReps; j++)
for (i = 0; loadedBlocks < maxLoadBlocks && i < fBC.OidRangesList.size(); i++)
{
oidBlocks = 0;
rc = fBC.LoadOid(fBC.OidRangesList[i], oidBlocks);
/**
cout << "."
<< "-- " << i << " " << fBC.OidRangesList[i].oid
<< " h: " << fBC.OidRangesList[i].hwm
<< "/" << oidBlocks
<< endl;
**/
loadedBlocks += oidBlocks;
readBlocks += fBC.ReadOidRanges(fBC.OidRangesList[i], &readBlocks, &missBlocks);
clock_gettime(CLOCK_REALTIME, &tm2);
double tm3;
timespec_sub(tm1, tm2, tm3);
lastRangeListIdx=i;
}
cout << "loadtest ld: " << loadedBlocks
<< " rd: " << readBlocks << "/" << missBlocks
<< " sz: " << fBC.fCacheSz
//<< " last: " << lastRangeListIdx
<< " tm: " << right << setw(10) << fixed << tm3
<< endl;
clock_gettime(CLOCK_REALTIME, &tm2);
double tm3;
timespec_sub(tm1, tm2, tm3);
lastRangeListIdx = i;
} // operator()
cout << "loadtest ld: " << loadedBlocks
<< " rd: " << readBlocks << "/" << missBlocks
<< " sz: " << fBC.fCacheSz
//<< " last: " << lastRangeListIdx
<< " tm: " << right << setw(10) << fixed << tm3
<< endl;
BCTest& fBC;
uint32_t fReps;
struct timespec tm1;
struct timespec tm2;
} // operator()
BCTest& fBC;
uint32_t fReps;
struct timespec tm1;
struct timespec tm2;
};
struct readThr
{
readThr(BCTest& bc, int reps=1) : fBC(bc), fReps(reps) {}
readThr(BCTest& bc, int reps = 1) : fBC(bc), fReps(reps) {}
void operator()()
{
for (uint32_t k=0; k<fReps; k++) {
}
void operator()()
{
for (uint32_t k = 0; k < fReps; k++)
{
}
} // operator()
} // operator()
BCTest& fBC;
uint32_t fReps;
BCTest& fBC;
uint32_t fReps;
};
void usage()
{
cout << "testbc <cacheSz/1024> <reader threads> <read ahead> <client threads> <reps>" << endl;
cout << "testbc <cacheSz/1024> <reader threads> <read ahead> <client threads> <reps>" << endl;
}
//
int main(int argc, char* argv[]) {
int main(int argc, char* argv[])
{
int cacheSz=128; // K number of blocks
int thr=1;
int ra=1024;
int clients=1;
int reps=1;
int cacheSz = 128; // K number of blocks
int thr = 1;
int ra = 1024;
int clients = 1;
int reps = 1;
if (argc > 1 && atoi(argv[1]) > 0)
cacheSz=atoi(argv[1])*1024;
if (argc > 1 && atoi(argv[1]) > 0)
cacheSz = atoi(argv[1]) * 1024;
if (argc > 2 && atoi(argv[2]) > 0)
thr=atoi(argv[2]);
if (argc > 2 && atoi(argv[2]) > 0)
thr = atoi(argv[2]);
if (argc > 3 && atoi(argv[3]) > 0)
ra=atoi(argv[3]);
if (argc > 3 && atoi(argv[3]) > 0)
ra = atoi(argv[3]);
if (argc > 4 && atoi(argv[4]) > 0)
clients=atoi(argv[4]);
if (argc > 4 && atoi(argv[4]) > 0)
clients = atoi(argv[4]);
if (argc > 5 && atoi(argv[5]) > 0)
reps=atoi(argv[5]);
if (argc > 5 && atoi(argv[5]) > 0)
reps = atoi(argv[5]);
BCTest bc(cacheSz, thr, ra);
BCTest bc(cacheSz, thr, ra);
cout <<
"Cache Size: " << cacheSz <<
" read Threads: " << thr <<
" read Ahead: " << ra <<
" clients: " << clients <<
" repetitions: " << reps <<
" max Blocks: " << bc.maxBlocksAvailable <<
endl;
cout <<
"Cache Size: " << cacheSz <<
" read Threads: " << thr <<
" read Ahead: " << ra <<
" clients: " << clients <<
" repetitions: " << reps <<
" max Blocks: " << bc.maxBlocksAvailable <<
endl;
// loader test
struct loadThr loader1(bc, reps);
vector<boost::thread*> v;
struct loadThr loader1(bc, reps);
vector<boost::thread*> v;
for (int i=0; i<clients;i++) {
boost::thread* th1 = new boost::thread(loader1);
v.push_back(th1);
}
for (int i = 0; i < clients; i++)
{
boost::thread* th1 = new boost::thread(loader1);
v.push_back(th1);
}
for (int i=0; i<clients;i++) {
boost::thread* th1 = v[i];
th1->join();
delete th1;
}
for (int i = 0; i < clients; i++)
{
boost::thread* th1 = v[i];
th1->join();
delete th1;
}
v.clear();
v.clear();
return 0;
return 0;
} // end main