diff --git a/dbgen/Makefile b/dbgen/Makefile index dbe3a59e..3354e785 100644 --- a/dbgen/Makefile +++ b/dbgen/Makefile @@ -103,14 +103,14 @@ CC = gcc # Current values for DATABASE are: INFORMIX, DB2, TDAT (Teradata) # SQLSERVER, SYBASE, ORACLE, VECTORWISE, POSTGRESQL -# Current values for MACHINE are: ATT, DOS, HP, IBM, ICL, MVS, OSX -# SGI, SUN, U2200, VMS, LINUX, WIN32 +# Current values for MACHINE are: ATT, DOS, HP, IBM, ICL, MVS, MACOS +# SGI, SUN, U2200, VMS, LINUX, WIN32 # Current values for WORKLOAD are: TPCH -DATABASE = POSTGRESQL -MACHINE = LINUX +DATABASE = POSTGRESQL +MACHINE = LINUX WORKLOAD = TPCH # -CFLAGS = -g -DDBNAME=\"dss\" -D$(MACHINE) -D$(DATABASE) -D$(WORKLOAD) -DRNG_TEST -D_FILE_OFFSET_BITS=64 +CFLAGS = -g -DDBNAME=\"dss\" -D$(MACHINE) -D$(DATABASE) -D$(WORKLOAD) -DRNG_TEST -D_FILE_OFFSET_BITS=64 LDFLAGS = -O # The OBJ,EXE and LIB macros will need to be changed for compilation under # Windows NT @@ -137,7 +137,7 @@ HDR = $(HDR1) $(HDR2) # SRC1 = build.c driver.c bm_utils.c rnd.c print.c load_stub.c bcd2.c \ speed_seed.c text.c permute.c rng64.c -SRC2 = qgen.c varsub.c +SRC2 = qgen.c varsub.c SRC = $(SRC1) $(SRC2) # OBJ1 = build$(OBJ) driver$(OBJ) bm_utils$(OBJ) rnd$(OBJ) print$(OBJ) \ @@ -147,7 +147,7 @@ OBJ2 = build$(OBJ) bm_utils$(OBJ) qgen$(OBJ) rnd$(OBJ) varsub$(OBJ) \ text$(OBJ) bcd2$(OBJ) permute$(OBJ) speed_seed$(OBJ) rng64$(OBJ) OBJS = $(OBJ1) $(OBJ2) # -SETS = dists.dss +SETS = dists.dss DOC=README HISTORY PORTING.NOTES BUGS DDL = dss.ddl dss.ri WINDOWS_IDE = tpch.dsw dbgen.dsp tpch.sln tpch.vcproj qgen.vcproj @@ -160,7 +160,7 @@ FQD=queries/1.sql queries/2.sql queries/3.sql queries/4.sql queries/5.sql querie queries/8.sql queries/9.sql queries/10.sql queries/11.sql queries/12.sql queries/13.sql \ queries/14.sql queries/15.sql queries/16.sql queries/17.sql queries/18.sql queries/19.sql queries/20.sql \ queries/21.sql queries/22.sql -VARIANTS= variants/8a.sql variants/12a.sql variants/13a.sql variants/14a.sql variants/15a.sql +VARIANTS= variants/8a.sql variants/12a.sql variants/13a.sql variants/14a.sql variants/15a.sql ANS = answers/q1.out answers/q2.out answers/q3.out answers/q4.out answers/q5.out answers/q6.out answers/q7.out answers/q8.out \ answers/q9.out answers/q10.out answers/q11.out answers/q12.out answers/q13.out answers/q14.out answers/q15.out \ answers/q16.out answers/q17.out answers/q18.out answers/q19.out answers/q20.out answers/q21.out answers/q22.out @@ -170,12 +170,12 @@ REFERENCE=reference/[tcR]* REFERENCE_DATA=referenceData/[13]* SCRIPTS= check55.sh column_split.sh dop.sh gen_tasks.sh last_row.sh load_balance.sh new55.sh check_dirs.sh ALLSRC=$(DBGENSRC) $(REFERENCE) $(QSRC) $(SCRIPTS) -JUNK = +JUNK = # all: $(PROGS) -$(PROG1): $(OBJ1) $(SETS) +$(PROG1): $(OBJ1) $(SETS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ1) $(LIBS) -$(PROG2): permute.h $(OBJ2) +$(PROG2): permute.h $(OBJ2) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ2) $(LIBS) clean: rm -f $(PROGS) $(OBJS) $(JUNK) @@ -183,13 +183,13 @@ lint: lint $(CFLAGS) -u -x -wO -Ma -p $(SRC1) lint $(CFLAGS) -u -x -wO -Ma -p $(SRC2) -tar: $(ALLSRC) +tar: $(ALLSRC) tar cvhf - $(ALLSRC) --exclude .svn\*/\* |gzip - > tpch_${VERSION}_${RELEASE}_${PATCH}.tar.gz tar cvhf - $(REFERENCE_DATA) --exclude .svn\*/\* |gzip - > reference_${VERSION}_${RELEASE}_${PATCH}.tar.gz zip: $(ALLSRC) zip -r tpch_${VERSION}_${RELEASE}_${PATCH}.zip $(ALLSRC) -x *.svn* zip -r reference_${VERSION}_${RELEASE}_${PATCH}.zip $(REFERENCE_DATA) -x *.svn* -release: +release: make -f makefile.suite tar make -f makefile.suite zip ( cd tests; sh test_list.sh `date '+%Y%m%d'` ) diff --git a/dbgen/Makefile.osx b/dbgen/Makefile.osx deleted file mode 100644 index c0bbbf9d..00000000 --- a/dbgen/Makefile.osx +++ /dev/null @@ -1,198 +0,0 @@ -# -# $Id: makefile.suite,v 1.25 2009/10/22 19:10:21 jms Exp $ -# -# Revision History -# =================== -# $Log: makefile.suite,v $ -# Revision 1.25 2009/10/22 19:10:21 jms -# update revision to 2.9.0, disable bug55 fix -# -# Revision 1.24 2009/10/22 19:06:10 jms -# update revision to 2.9.0, disable bug55 fix -# -# Revision 1.23 2009/06/28 14:01:08 jms -# bug fix for DOP -# -# Revision 1.22 2008/09/15 16:37:46 jms -# release 2.8.0 makefile.suite -# -# Revision 1.21 2008/03/21 18:26:54 jms -# recursive zip for reference data, chmod for update_release -# -# Revision 1.20 2008/03/21 17:38:39 jms -# changes for 2.6.3 -# -# Revision 1.19 2007/03/08 20:36:03 jms -# update release number to 2.6.1 -# -# Revision 1.18 2007/02/06 18:15:56 jms -# remove update release from general target -# -# Revision 1.17 2007/01/25 19:35:50 jms -# add sln file used by VS2005 -# -# Revision 1.16 2007/01/05 20:05:41 jms -# update release number -# -# Revision 1.15 2006/09/07 17:25:57 jms -# correct dss.ddl -# -# Revision 1.14 2006/08/01 17:21:22 jms -# fix bad merge -# -# Revision 1.13 2006/08/01 16:55:44 jms -# move to 2.4.1 -# -# Revision 1.12 2006/06/29 20:46:17 jms -# 2.4.0 changes from Meikel -# -# Revision 1.10 2006/05/25 22:30:44 jms -# qgen porting for 32b/64b -# -# Revision 1.9 2006/04/26 23:17:09 jms -# checking release.h prior to release build -# -# Revision 1.8 2006/04/26 23:03:00 jms -# release 2.3.4-1 -# -# Revision 1.7 2006/04/12 18:13:58 jms -# release 2.3.3 -# -# Revision 1.6 2006/03/09 18:59:19 jms -# move to version 2.3.2 -# -# Revision 1.5 2006/01/28 23:54:32 jms -# add reference data to release -# -# Revision 1.4 2005/10/28 03:00:32 jms -# fix release target -# -# Revision 1.3 2005/10/28 02:54:14 jms -# increment build count with each release creation -# -# Revision 1.2 2005/01/03 20:08:58 jms -# change line terminations -# -# Revision 1.1.1.1 2004/11/24 23:31:47 jms -# re-establish external server -# -# Revision 1.5 2004/03/26 20:39:23 jms -# add tpch tag to release files -# -# Revision 1.4 2004/03/16 14:45:57 jms -# correct release target in makefile -# -# Revision 1.3 2004/03/02 20:49:01 jms -# simplify distributions, add Windows IDE files -# releases should use make release from now on -# -# Revision 1.2 2004/02/18 14:05:53 jms -# porting changes for LINUX and 64 bit RNG -# -# Revision 1.1.1.1 2003/04/03 18:54:21 jms -# recreation after CVS crash -# -# Revision 1.1.1.1 2003/04/03 18:54:21 jms -# initial checkin -# -# -# -################ -## CHANGE NAME OF ANSI COMPILER HERE -################ -CC = gcc -# Current values for DATABASE are: INFORMIX, DB2, TDAT (Teradata) -# SQLSERVER, SYBASE, ORACLE, VECTORWISE, POSTGRESQL -# Current values for MACHINE are: ATT, DOS, HP, IBM, ICL, MVS, OSX -# SGI, SUN, U2200, VMS, LINUX, WIN32 -# Current values for WORKLOAD are: TPCH -DATABASE = POSTGRESQL -MACHINE = OSX -WORKLOAD = TPCH -# -CFLAGS = -g -DDBNAME=\"dss\" -D$(MACHINE) -D$(DATABASE) -D$(WORKLOAD) -DRNG_TEST -D_FILE_OFFSET_BITS=64 -LDFLAGS = -O -# The OBJ,EXE and LIB macros will need to be changed for compilation under -# Windows NT -OBJ = .o -EXE = -LIBS = -lm -# -# NO CHANGES SHOULD BE NECESSARY BELOW THIS LINE -############### -VERSION=2 -RELEASE=13 -PATCH=0 -BUILD=`grep BUILD release.h | cut -f3 -d' '` -NEW_BUILD=`expr ${BUILD} + 1` -TREE_ROOT=/tmp/tree -# -PROG1 = dbgen$(EXE) -PROG2 = qgen$(EXE) -PROGS = $(PROG1) $(PROG2) -# -HDR1 = dss.h rnd.h config.h dsstypes.h shared.h bcd2.h rng64.h release.h -HDR2 = tpcd.h permute.h -HDR = $(HDR1) $(HDR2) -# -SRC1 = build.c driver.c bm_utils.c rnd.c print.c load_stub.c bcd2.c \ - speed_seed.c text.c permute.c rng64.c -SRC2 = qgen.c varsub.c -SRC = $(SRC1) $(SRC2) -# -OBJ1 = build$(OBJ) driver$(OBJ) bm_utils$(OBJ) rnd$(OBJ) print$(OBJ) \ - load_stub$(OBJ) bcd2$(OBJ) speed_seed$(OBJ) text$(OBJ) permute$(OBJ) \ - rng64$(OBJ) -OBJ2 = build$(OBJ) bm_utils$(OBJ) qgen$(OBJ) rnd$(OBJ) varsub$(OBJ) \ - text$(OBJ) bcd2$(OBJ) permute$(OBJ) speed_seed$(OBJ) rng64$(OBJ) -OBJS = $(OBJ1) $(OBJ2) -# -SETS = dists.dss -DOC=README HISTORY PORTING.NOTES BUGS -DDL = dss.ddl dss.ri -WINDOWS_IDE = tpch.dsw dbgen.dsp tpch.sln tpch.vcproj qgen.vcproj -OTHER=makefile.suite $(SETS) $(DDL) $(WINDOWS_IDE) -# case is *important* in TEST_RES -TEST_RES = O.res L.res c.res s.res P.res S.res n.res r.res -# -DBGENSRC=$(SRC1) $(HDR1) $(OTHER) $(DOC) $(SRC2) $(HDR2) $(SRC3) -FQD=queries/1.sql queries/2.sql queries/3.sql queries/4.sql queries/5.sql queries/6.sql queries/7.sql \ - queries/8.sql queries/9.sql queries/10.sql queries/11.sql queries/12.sql queries/13.sql \ - queries/14.sql queries/15.sql queries/16.sql queries/17.sql queries/18.sql queries/19.sql queries/20.sql \ - queries/21.sql queries/22.sql -VARIANTS= variants/8a.sql variants/12a.sql variants/13a.sql variants/14a.sql variants/15a.sql -ANS = answers/q1.out answers/q2.out answers/q3.out answers/q4.out answers/q5.out answers/q6.out answers/q7.out answers/q8.out \ - answers/q9.out answers/q10.out answers/q11.out answers/q12.out answers/q13.out answers/q14.out answers/q15.out \ - answers/q16.out answers/q17.out answers/q18.out answers/q19.out answers/q20.out answers/q21.out answers/q22.out -QSRC = $(FQD) $(VARIANTS) $(ANS) -TREE_DOC=tree.readme tree.changes appendix.readme appendix.version answers.readme queries.readme variants.readme -REFERENCE=reference/[tcR]* -REFERENCE_DATA=referenceData/[13]* -SCRIPTS= check55.sh column_split.sh dop.sh gen_tasks.sh last_row.sh load_balance.sh new55.sh check_dirs.sh -ALLSRC=$(DBGENSRC) $(REFERENCE) $(QSRC) $(SCRIPTS) -JUNK = -# -all: $(PROGS) -$(PROG1): $(OBJ1) $(SETS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ1) $(LIBS) -$(PROG2): permute.h $(OBJ2) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ2) $(LIBS) -clean: - rm -f $(PROGS) $(OBJS) $(JUNK) -lint: - lint $(CFLAGS) -u -x -wO -Ma -p $(SRC1) - lint $(CFLAGS) -u -x -wO -Ma -p $(SRC2) - -tar: $(ALLSRC) - tar cvhf - $(ALLSRC) --exclude .svn\*/\* |gzip - > tpch_${VERSION}_${RELEASE}_${PATCH}.tar.gz - tar cvhf - $(REFERENCE_DATA) --exclude .svn\*/\* |gzip - > reference_${VERSION}_${RELEASE}_${PATCH}.tar.gz -zip: $(ALLSRC) - zip -r tpch_${VERSION}_${RELEASE}_${PATCH}.zip $(ALLSRC) -x *.svn* - zip -r reference_${VERSION}_${RELEASE}_${PATCH}.zip $(REFERENCE_DATA) -x *.svn* -release: - make -f makefile.suite tar - make -f makefile.suite zip - ( cd tests; sh test_list.sh `date '+%Y%m%d'` ) -rnd$(OBJ): rnd.h -$(OBJ1): $(HDR1) -$(OBJ2): dss.h tpcd.h config.h rng64.h release.h diff --git a/dbgen/config.h b/dbgen/config.h index 044cfd72..4c577fd8 100644 --- a/dbgen/config.h +++ b/dbgen/config.h @@ -51,18 +51,18 @@ * * */ -/* +/* * this file allows the compilation of DBGEN to be tailored to specific - * architectures and operating systems. Some options are grouped + * architectures and operating systems. Some options are grouped * together to allow easier compilation on a given vendor's hardware. - * + * * The following #defines will effect the code: * KILL(pid) -- how to terminate a process in a parallel load * SPAWN -- name of system call to clone an existing process * SET_HANDLER(proc) -- name of routine to handle signals in parallel load * WAIT(res, pid) -- how to await the termination of a child * SEPARATOR -- character used to separate fields in flat files - * STDLIB_HAS_GETOPT -- to prevent confilcts with gloabal getopt() + * STDLIB_HAS_GETOPT -- to prevent confilcts with gloabal getopt() * MDY_DATE -- generate dates as MM-DD-YY * WIN32 -- support for WindowsNT * SUPPORT_64BITS -- compiler defines a 64 bit datatype @@ -79,7 +79,7 @@ * IBM -- posix source inclusion differences * SGI -- getopt() handling * SUN -- getopt() handling - * LINUX + * LINUX * WIN32 -- for WINDOWS * * DATABASE defines @@ -131,8 +131,8 @@ #define STDLIB_HAS_GETOPT #define SUPPORT_64BITS #define DSS_HUGE long long -#define HUGE_FORMAT "%lld" -#define HUGE_DATE_FORMAT "%02lld" +#define HUGE_FORMAT "%lld" +#define HUGE_DATE_FORMAT "%02lld" #define RNG_A 6364136223846793005ull #define RNG_C 1ull #endif /* IBM */ @@ -141,13 +141,13 @@ #define STDLIB_HAS_GETOPT #define SUPPORT_64BITS #define DSS_HUGE long long int -#define HUGE_FORMAT "%lld" -#define HUGE_DATE_FORMAT "%02lld" +#define HUGE_FORMAT "%lld" +#define HUGE_DATE_FORMAT "%02lld" #define RNG_A 6364136223846793005ull #define RNG_C 1ull #endif /* LINUX */ -#ifdef OSX +#ifdef MACOS #define _POSIX_C_SOURCE 200112L #define _POSIX_SOURCE #define STDLIB_HAS_GETOPT @@ -157,7 +157,7 @@ #define HUGE_DATE_FORMAT "%02ld" #define RNG_A 6364136223846793005ull #define RNG_C 1ull -#endif /* OSX */ +#endif /* MACOS */ #ifdef SUN #define STDLIB_HAS_GETOPT @@ -165,8 +165,8 @@ #define RNG_C 1ull #define SUPPORT_64BITS #define DSS_HUGE long long -#define HUGE_FORMAT "%lld" -#define HUGE_DATE_FORMAT "%02lld" +#define HUGE_FORMAT "%lld" +#define HUGE_DATE_FORMAT "%02lld" #endif /* SUN */ #ifdef SGI @@ -200,7 +200,7 @@ /* these are copied from Linux/GNU and need to be verified as part of a rework of */ /* process handling under NT (29 Apr 98) */ #define WIFEXITED(s) ((s & 0xFF) == 0) -#define WIFSIGNALED(s) (((unsigned int)((status)-1) & 0xFFFF) < 0xFF) +#define WIFSIGNALED(s) (((unsigned int)((status)-1) & 0xFFFF) < 0xFF) #define WIFSTOPPED(s) (((s) & 0xff) == 0x7f) #define WTERMSIG(s) ((s) & 0x7f) #define WSTOPSIG(s) (((s) & 0xff00) >> 8) @@ -228,4 +228,3 @@ #ifndef DOUBLE_CAST #define DOUBLE_CAST (double) #endif /* DOUBLE_CAST */ -