Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions tpch-dbgen/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
/* main driver for dss banchmark */

#define DECLARER /* EXTERN references get defined here */
#define NO_FUNC (int (*) ()) NULL /* to clean up tdefs */
#define NO_LFUNC (long (*) ()) NULL /* to clean up tdefs */

static long no_lfunc(int, long long int) {}

#include "config.h"
#include "release.h"
Expand Down Expand Up @@ -179,25 +179,25 @@ long sd_part_psupp (int child, DSS_HUGE skip_count);
tdef tdefs[] =
{
{"part.tbl", "part table", 200000,
pr_part, sd_part, PSUPP, 0},
(int (*)(void *, int))pr_part, sd_part, PSUPP, 0},
{"partsupp.tbl", "partsupplier table", 200000,
pr_psupp, sd_psupp, NONE, 0},
(int (*)(void *, int))pr_psupp, sd_psupp, NONE, 0},
{"supplier.tbl", "suppliers table", 10000,
pr_supp, sd_supp, NONE, 0},
(int (*)(void *, int))pr_supp, sd_supp, NONE, 0},
{"customer.tbl", "customers table", 150000,
pr_cust, sd_cust, NONE, 0},
(int (*)(void *, int))pr_cust, sd_cust, NONE, 0},
{"orders.tbl", "order table", 150000,
pr_order, sd_order, LINE, 0},
(int (*)(void *, int))pr_order, sd_order, LINE, 0},
{"lineitem.tbl", "lineitem table", 150000,
pr_line, sd_line, NONE, 0},
(int (*)(void *, int))pr_line, sd_line, NONE, 0},
{"orders.tbl", "orders/lineitem tables", 150000,
pr_order_line, sd_order, LINE, 0},
(int (*)(void *, int))pr_order_line, sd_order, LINE, 0},
{"part.tbl", "part/partsupplier tables", 200000,
pr_part_psupp, sd_part, PSUPP, 0},
(int (*)(void *, int))pr_part_psupp, sd_part, PSUPP, 0},
{"nation.tbl", "nation table", NATIONS_MAX,
pr_nation, NO_LFUNC, NONE, 0},
(int (*)(void *, int))pr_nation, no_lfunc, NONE, 0},
{"region.tbl", "region table", NATIONS_MAX,
pr_region, NO_LFUNC, NONE, 0},
(int (*)(void *, int))pr_region, no_lfunc, NONE, 0},
};

/*
Expand Down
4 changes: 2 additions & 2 deletions tpch-dbgen/dss.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ typedef struct
char *name;
char *comment;
DSS_HUGE base;
int (*loader) ();
long (*gen_seed)();
int (*loader) (void*, int);
long (*gen_seed)(int, long long int);
int child;
DSS_HUGE vtotal;
} tdef;
Expand Down