Navigation Menu

Skip to content

Commit

Permalink
dump: split a long condition
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Apr 3, 2015
1 parent ed5f703 commit aacc1ec
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions lib/proc.c
Expand Up @@ -2982,22 +2982,24 @@ dump_records(grn_ctx *ctx, grn_obj *outbuf, grn_obj *table)
if (GRN_OBJ_INDEX_COLUMNP(columns[i])) {
continue;
}

GRN_BULK_REWIND(&column_name);
grn_column_name_(ctx, columns[i], &column_name);
if (((table->header.type == GRN_TABLE_HASH_KEY ||
table->header.type == GRN_TABLE_PAT_KEY ||
table->header.type == GRN_TABLE_DAT_KEY) &&
GRN_TEXT_LEN(&column_name) == GRN_COLUMN_NAME_ID_LEN &&
!memcmp(GRN_TEXT_VALUE(&column_name),
GRN_COLUMN_NAME_ID,
GRN_COLUMN_NAME_ID_LEN)) ||
(table->header.type == GRN_TABLE_NO_KEY &&
GRN_TEXT_LEN(&column_name) == GRN_COLUMN_NAME_KEY_LEN &&
!memcmp(GRN_TEXT_VALUE(&column_name),
GRN_COLUMN_NAME_KEY,
GRN_COLUMN_NAME_KEY_LEN))) {
if (GRN_TEXT_LEN(&column_name) == GRN_COLUMN_NAME_ID_LEN &&
memcmp(GRN_TEXT_VALUE(&column_name),
GRN_COLUMN_NAME_ID,
GRN_COLUMN_NAME_ID_LEN) == 0) {
continue;
}

if (table->header.type == GRN_TABLE_NO_KEY &&
GRN_TEXT_LEN(&column_name) == GRN_COLUMN_NAME_KEY_LEN &&
memcmp(GRN_TEXT_VALUE(&column_name),
GRN_COLUMN_NAME_KEY,
GRN_COLUMN_NAME_KEY_LEN) == 0) {
continue;
}

GRN_PTR_PUT(ctx, &use_columns, columns[i]);
}

Expand Down

0 comments on commit aacc1ec

Please sign in to comment.