christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge "import-/prune-trace: primary keys reordered"

Browse Source
This commit is contained in:
Horst Schirmeier
2013-07-04 10:35:01 +02:00
committed by Gerrit Code Review
parent c74c8a2e30 501384b0f4
commit 286f5a27a1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/import-trace/Importer.cc
View File

@ -30,7 +30,7 @@ bool Importer::create_database() {
" data_address int(10) unsigned NOT NULL," " data_address int(10) unsigned NOT NULL,"
" width tinyint(3) unsigned NOT NULL," " width tinyint(3) unsigned NOT NULL,"
" accesstype enum('R','W') NOT NULL," " accesstype enum('R','W') NOT NULL,"
" PRIMARY KEY (variant_id,instr2,data_address)" " PRIMARY KEY (variant_id,data_address,instr2)"
") engine=MyISAM "; ") engine=MyISAM ";
return db->query(create_statement.c_str()); return db->query(create_statement.c_str());
} }

4
tools/prune-trace/Pruner.cc
View File

@ -59,7 +59,7 @@ bool Pruner::create_database() {
" data_address int(10) unsigned NOT NULL," " data_address int(10) unsigned NOT NULL,"
" fspmethod_id int(11) NOT NULL," " fspmethod_id int(11) NOT NULL,"
" PRIMARY KEY (id)," " PRIMARY KEY (id),"
" KEY fspmethod_id (fspmethod_id,variant_id,instr2,data_address)" " KEY fspmethod_id (fspmethod_id,variant_id,data_address,instr2)"
") engine=MyISAM "; ") engine=MyISAM ";
bool success = (bool) db->query(create_statement.c_str()); bool success = (bool) db->query(create_statement.c_str());
if (!success) return false; if (!success) return false;
@ -70,7 +70,7 @@ bool Pruner::create_database() {
" data_address int(10) unsigned NOT NULL," " data_address int(10) unsigned NOT NULL,"
" fspmethod_id int(11) NOT NULL," " fspmethod_id int(11) NOT NULL,"
" pilot_id int(11) NOT NULL," " pilot_id int(11) NOT NULL,"
" PRIMARY KEY (variant_id, instr2, data_address, fspmethod_id, pilot_id)," " PRIMARY KEY (variant_id, data_address, instr2, fspmethod_id, pilot_id),"
" KEY joinresults (pilot_id,fspmethod_id)) engine=MyISAM"; " KEY joinresults (pilot_id,fspmethod_id)) engine=MyISAM";
return db->query(create_statement.c_str()); return db->query(create_statement.c_str());