Skip to content

Fix TPC-C initial population to match the specification #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zinal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix TPC-C initial population to match the specification #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions src/import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,27 @@ size_t EstimatePerWarehouseDataSize() {

//-----------------------------------------------------------------------------

std::string RandomStringBenchbase(int strLen, char baseChar = 'a') {
if (strLen > 1) {
int actualLength = strLen - 1;
std::string result;
result.reserve(actualLength);
for (int i = 0; i < actualLength; ++i) {
result += static_cast<char>(baseChar + RandomNumber(0, 25));
}
return result;
// TPC-C §4.3.2.2: random a-string of the requested length (letters only here).
std::string RandomString(int strLen, char baseChar = 'a') {
if (strLen <= 0) {
return "";
}
std::string result;
result.reserve(strLen);
for (int i = 0; i < strLen; ++i) {
result += static_cast<char>(baseChar + RandomNumber(0, 25));
}
return "";
return result;
}

std::string RandomAlphaString(int minLength, int maxLength) {
int length = RandomNumber(minLength, maxLength);
return RandomStringBenchbase(length, 'a');
return RandomString(length, 'a');
}

std::string RandomUpperAlphaString(int minLength, int maxLength) {
int length = RandomNumber(minLength, maxLength);
return RandomStringBenchbase(length, 'A');
return RandomString(length, 'A');
}

std::string RandomNumericString(int length) {
Expand Down Expand Up @@ -139,10 +139,10 @@ void LoadItems(pqxx::connection& conn) {
int randPct = RandomNumber(1, 100);
int len = RandomNumber(26, 50);
if (randPct > 10) {
data = RandomStringBenchbase(len);
data = RandomString(len);
} else {
int startOrig = RandomNumber(2, len - 8);
data = RandomStringBenchbase(startOrig) + "ORIGINAL" + RandomStringBenchbase(len - startOrig - 8);
data = RandomString(startOrig) + "ORIGINAL" + RandomString(len - startOrig - 8);
}

stream.write_values(
Expand Down Expand Up @@ -178,8 +178,8 @@ void LoadWarehouses(pqxx::connection& conn, int startId, int lastId) {
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomUpperAlphaString(3, 3),
std::string("123456789")
RandomUpperAlphaString(2, 2),
RandomNumericString(4) + "11111"
);
}

Expand Down Expand Up @@ -209,8 +209,8 @@ void LoadDistricts(pqxx::connection& conn, int startId, int lastId) {
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomUpperAlphaString(3, 3),
std::string("123456789")
RandomUpperAlphaString(2, 2),
RandomNumericString(4) + "11111"
);
}
}
Expand All @@ -235,10 +235,10 @@ void LoadStock(pqxx::connection& conn, int wh) {
int randPct = RandomNumber(1, 100);
int len = RandomNumber(26, 50);
if (randPct > 10) {
data = RandomStringBenchbase(len);
data = RandomString(len);
} else {
int startOrig = RandomNumber(2, len - 8);
data = RandomStringBenchbase(startOrig) + "ORIGINAL" + RandomStringBenchbase(len - startOrig - 8);
data = RandomString(startOrig) + "ORIGINAL" + RandomString(len - startOrig - 8);
}

stream.write_values(
Expand All @@ -249,16 +249,16 @@ void LoadStock(pqxx::connection& conn, int wh) {
0,
0,
data,
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24),
RandomStringBenchbase(24)
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24),
RandomString(24)
);
}

Expand Down Expand Up @@ -294,7 +294,7 @@ void LoadCustomers(pqxx::connection& conn, int wh, int district) {
wh,
district,
cid,
RandomNumber(1, 5000) / 10000.0,
RandomNumber(0, 5000) / 10000.0,
credit,
last,
RandomAlphaString(8, 16),
Expand All @@ -306,7 +306,7 @@ void LoadCustomers(pqxx::connection& conn, int wh, int district) {
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomAlphaString(10, 20),
RandomUpperAlphaString(3, 3),
RandomUpperAlphaString(2, 2),
RandomNumericString(4) + "11111",
RandomNumericString(16),
ts,
Expand Down Expand Up @@ -339,7 +339,7 @@ void LoadHistory(pqxx::connection& conn, int wh, int district) {
wh,
ts,
10.00,
RandomAlphaString(10, 24)
RandomAlphaString(12, 24)
);
}

Expand Down Expand Up @@ -423,7 +423,7 @@ void LoadOrders(pqxx::connection& conn, int wh, int district) {

stream.write_values(
wh, district, oid, lineNum, itemId, deliveryDate,
amount, wh, 5.0, RandomStringBenchbase(24)
amount, wh, 5.0, RandomString(24)
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ CREATE TABLE stock (
s_w_id int NOT NULL,
s_i_id int NOT NULL,
s_quantity int NOT NULL,
s_ytd decimal(8, 2) NOT NULL,
s_ytd decimal(8, 0) NOT NULL,
s_order_cnt int NOT NULL,
s_remote_cnt int NOT NULL,
s_data varchar(50) NOT NULL,
Expand Down
Loading