~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

Committer: Olaf van der Spek
Date: 2011-06-16 20:59:51 UTC
mto: This revision was merged to the branch mainline in revision 2343.
Revision ID: olafvdspek@gmail.com-20110616205951-yad00lon3ka1jz3o

Refactor

files modified:
client/drizzletest.cc

drizzled/dtoa.cc

drizzled/filesort.cc

drizzled/internal/mf_iocache.cc

plugin/myisam/sort.cc

Show diffs side-by-side

added added

removed removed

client/drizzletest.cc

494

495

void replace_append_mem(string& ds, const char *val, int len);

496

void replace_append(string *ds, const char *val);

497

void replace_append_uint(string *ds, uint32_t val);

497

void replace_append_uint(string& ds, uint32_t val);

498

void append_sorted(string& ds, const string& ds_input);

499

500

void handle_error(st_command*,

2896

2897

static void do_save_master_pos()

2898

{

2899

drizzle::connection_c& con= *cur_con;

2900

const char *query= "show master status";

2901

2902

2899

drizzle::result_c res;

2903

dt_query(con, res, query);

2900

dt_query(*cur_con, res, "show master status");

2904

2901

drizzle_row_t row= res.row_next();

2905

2902

if (!row)

2906

2903

die("empty result in show master status");

3442

3439

if (db)

3443

3440

replace_append(&ds_res, db);

3444

3441

ds_res.append(",");

3445

replace_append_uint(&ds_res, port);

3442

replace_append_uint(ds_res, port);

3446

3443

ds_res.append(",");

3447

3444

if (sock)

3448

3445

replace_append(&ds_res, sock);

4364

4361

Append metadata for fields to output

4365

4362

4366

4363

4367

static void append_metadata(string *ds, drizzle::result_c& res)

4364

static void append_metadata(string& ds, drizzle::result_c& res)

4368

4365

{

4369

ds->append("Catalog\tDatabase\tTable\tTable_alias\tColumn\t"

4370

"Column_alias\tType\tLength\tMax length\tIs_null\t"

4371

"Flags\tDecimals\tCharsetnr\n");

4372

4366

ds += "Catalog\tDatabase\tTable\tTable_alias\tColumn\tColumn_alias\tType\tLength\tMax length\tIs_null\tFlags\tDecimals\tCharsetnr\n";

4373

4367

res.column_seek(0);

4374

4368

while (drizzle_column_st* column= res.column_next())

4375

4369

{

4376

ds->append(drizzle_column_catalog(column), strlen(drizzle_column_catalog(column)));

4377

*ds += "\t";

4378

ds->append(drizzle_column_db(column), strlen(drizzle_column_db(column)));

4379

*ds += "\t";

4380

ds->append(drizzle_column_orig_table(column), strlen(drizzle_column_orig_table(column)));

4381

*ds += "\t";

4382

ds->append(drizzle_column_table(column), strlen(drizzle_column_table(column)));

4383

*ds += "\t";

4384

ds->append(drizzle_column_orig_name(column), strlen(drizzle_column_orig_name(column)));

4385

*ds += "\t";

4386

ds->append(drizzle_column_name(column), strlen(drizzle_column_name(column)));

4387

*ds += "\t";

4370

ds += drizzle_column_catalog(column);

4371

ds += "\t";

4372

ds += drizzle_column_db(column);

4373

ds += "\t";

4374

ds += drizzle_column_orig_table(column);

4375

ds += "\t";

4376

ds += drizzle_column_table(column);

4377

ds += "\t";

4378

ds += drizzle_column_orig_name(column);

4379

ds += "\t";

4380

ds += drizzle_column_name(column);

4381

ds += "\t";

4388

4382

replace_append_uint(ds, drizzle_column_type_drizzle(column));

4389

*ds += "\t";

4383

ds += "\t";

4390

4384

replace_append_uint(ds, drizzle_column_size(column));

4391

*ds += "\t";

4385

ds += "\t";

4392

4386

replace_append_uint(ds, drizzle_column_type(column) == DRIZZLE_COLUMN_TYPE_TINY ? 1 : drizzle_column_max_size(column));

4393

*ds += "\t";

4394

ds->append((drizzle_column_flags(column) & DRIZZLE_COLUMN_FLAGS_NOT_NULL) ? "N" : "Y", 1);

4395

*ds += "\t";

4387

ds += "\t";

4388

ds.append((drizzle_column_flags(column) & DRIZZLE_COLUMN_FLAGS_NOT_NULL) ? "N" : "Y", 1);

4389

ds += "\t";

4396

4390

replace_append_uint(ds, drizzle_column_flags(column));

4397

*ds += "\t";

4391

ds += "\t";

4398

4392

replace_append_uint(ds, drizzle_column_decimals(column));

4399

*ds += "\t";

4393

ds += "\t";

4400

4394

replace_append_uint(ds, drizzle_column_charset(column));

4401

*ds += "\n";

4395

ds += "\n";

4402

4396

}

4403

4397

}

4404

4398

4551

4545

if (res.column_count())

4552

4546

{

4553

4547

if (display_metadata)

4554

append_metadata(ds, res);

4548

append_metadata(*ds, res);

4555

4549

4556

4550

if (!display_result_vertically)

4557

4551

append_table_headings(*ds, res);

6778

6772

}

6779

6773

6780

6774

/* Append uint32_t to ds, with optional replace */

6781

void replace_append_uint(string *ds, uint32_t val)

6775

void replace_append_uint(string& ds, uint32_t val)

6782

6776

{

6783

6777

ostringstream buff;

6784

6778

buff << val;

6785

replace_append_mem(*ds, buff.str().c_str(), buff.str().size());

6779

replace_append_mem(ds, buff.str().c_str(), buff.str().size());

6786

6780

6787

6781

}

6788

6782

Older »