← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/command_reader.cc

Per Stew's suggestions in code review:

* Added assert()s in command_reader on field and value sizes
* Changed from string to bytes scalar types in transaction.proto definitions for Command
* Ensure writes in network byte order for the length of the written protos
* Fixed unclear cur_field vs. current_field in TransactionServices methods
* Remove delete calls for mem_root allocated Strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/command_reader.cc
24
24
{
25
25
 
26
26
  cout << "INSERT INTO `" << container.schema() << "`.`" << container.table() << "` (";
 
27
  
 
28
  assert(record.insert_field_size() > 0);
 
29
  assert(record.insert_value_size() > 0);
 
30
  assert(record.insert_value_size() % record.insert_field_size() == 0);
27
31
 
28
32
  int32_t num_fields= record.insert_field_size();
29
33
 
74
78
void printDeleteWithPK(const drizzled::message::Command &container, const drizzled::message::DeleteRecord &record)
75
79
{
76
80
  cout << "DELETE FROM `" << container.schema() << "`.`" << container.table() << "`";
 
81
  
 
82
  assert(record.where_field_size() > 0);
 
83
  assert(record.where_value_size() == record.where_field_size());
77
84
 
78
85
  int32_t num_where_fields= record.where_field_size();
79
86
  /* 
102
109
{
103
110
  int32_t num_update_fields= record.update_field_size();
104
111
  int32_t x;
 
112
  
 
113
  assert(record.update_field_size() > 0);
 
114
  assert(record.where_field_size() > 0);
 
115
  assert(record.where_value_size() == record.where_field_size());
105
116
 
106
117
  cout << "UPDATE `" << container.schema() << "`.`" << container.table() << "` SET ";
107
118