Changeset: ebf5d419db46 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebf5d419db46 Removed Files: sql/benchmarks/as3ap/NJAMD sql/benchmarks/as3ap/as3ap-load.sql sql/benchmarks/as3ap/as3ap-queries.sql sql/benchmarks/as3ap/as3ap-schema.sql sql/benchmarks/as3ap/as3ap.c sql/benchmarks/as3ap/as3ap.sh sql/benchmarks/as3ap/as3ap.sql sql/benchmarks/as3ap/drop.sql sql/benchmarks/as3ap/hundred.dat sql/benchmarks/as3ap/hundred.fmt sql/benchmarks/as3ap/run.all sql/benchmarks/as3ap/tenpct.dat sql/benchmarks/as3ap/tenpct.fmt sql/benchmarks/as3ap/uniques.dat sql/benchmarks/as3ap/uniques.fmt sql/benchmarks/as3ap/updates.dat sql/benchmarks/as3ap/updates.fmt Branch: default Log Message:
Remove very old code. diffs (truncated from 42007 to 300 lines): diff --git a/sql/benchmarks/as3ap/NJAMD b/sql/benchmarks/as3ap/NJAMD deleted file mode 100755 --- a/sql/benchmarks/as3ap/NJAMD +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# root should echo 65536000 > /proc/sys/vm/max_map_count - -export NJAMD_NO_TRACE=0 -export NJAMD_PROT=underflow -export NJAMD_CHK_FREE=error -export NJAMD_TRACE_LIBS=1 -export NJAMD_DUMP_LEAKS_ON_EXIT=6 -export NJAMD_DUMP_STATS_ON_EXIT=1 - diff --git a/sql/benchmarks/as3ap/as3ap-load.sql b/sql/benchmarks/as3ap/as3ap-load.sql deleted file mode 100644 --- a/sql/benchmarks/as3ap/as3ap-load.sql +++ /dev/null @@ -1,4 +0,0 @@ -COPY INTO uniques from 'PWD/uniques.dat' USING DELIMITERS ','; -COPY INTO hundred from 'PWD/hundred.dat' USING DELIMITERS ','; -COPY INTO tenpct from 'PWD/tenpct.dat' USING DELIMITERS ','; -COPY INTO updates from 'PWD/updates.dat' USING DELIMITERS ','; diff --git a/sql/benchmarks/as3ap/as3ap-queries.sql b/sql/benchmarks/as3ap/as3ap-queries.sql deleted file mode 100644 --- a/sql/benchmarks/as3ap/as3ap-queries.sql +++ /dev/null @@ -1,63 +0,0 @@ -create table tiny(k integer not null); -insert into tiny(k)values(0); -create view _AS3AP_o_mode_tiny as select * from tiny; -create view _AS3AP_sel_1_cl as select k, i, si, code, d, name from updates where k=1000; -create view _AS3AP_o_mode_1k as select * from updates where k<=10; -create view _AS3AP_o_mode_10k as select * from hundred where k<=100; -create view _AS3AP_o_mode_100k as select * from hundred where k<=1000; -create table _AS3AP_join_3_cl(us integer , ud date , hs integer , hd date , ts integer , td date ); -insert into _AS3AP_join_3_cl select uniques.si, uniques.date, hundred.si, hundred.date, tenpct.si, tenpct.date from uniques, hundred, tenpct where uniques.k=hundred.k and uniques.k=tenpct.k and uniques.k=1000; -create view _AS3AP_sel_100_ncl as select k, i, si, code, d, name from updates where k<=100; -create view _AS3AP_table_scan as select * from uniques where i=1; -create view _AS3AP_func_agg as select min(k)from hundred group by name; -create view _AS3AP_scal_agg as select min(k)from uniques; -create view _AS3AP_sel_100_cl as select k, i, si, code, d, name from updates where k<=100; -create table _AS3AP_join_3_ncl(us integer , ud date , hs integer , hd date , ts integer , td date ); -insert into _AS3AP_join_3_ncl select uniques.si, uniques.date, hundred.si, hundred.date, tenpct.si, tenpct.date from uniques, hundred, tenpct where uniques.code=hundred.code and uniques.code=tenpct.code and uniques.code='BENCHMARKS'; -create view _AS3AP_sel_10pct_ncl as select k, i, si, code, d, name from tenpct where name='THE+ASAP+BENCHMARKS+'; -create view _AS3AP_sel_10pct_cl as select k, i, si, code, d, name from uniques where k<=100000000; -create view _AS3AP_report as select avg(updates.decim)from updates where updates.decim in(select updates.decim from updates, hundred where hundred.k=updates.k and updates.decim>980000000); -create view _AS3AP_info_retrieval as select count(k)from tenpct where name='THE+ASAP+BENCHMARKS+' and i<=100000000 and si>0 and si<100000000 and(f< -450000000 or f>450000000)and d>600000000 and decim< -600000000; -create view reportview(k, si, date, decim, name, code, i) as select updates.k, updates.si, updates.date, updates.decim, hundred.name, hundred.code, hundred.i from updates, hundred where updates.k=hundred.k; -create view _AS3AP_subtotal_report as select avg(si), min(si), max(si), max(date), min(date), count(distinct name), count(name), code, i from reportview where decim>980000000 group by code, i; -create view _AS3AP_total_report as select avg(si), min(si), max(si), max(date), min(date), count(distinct name), count(name), count(code), count(i)from reportview where decim>980000000; -create table _AS3AP_join_1_10(uk integer , un char(20) , tn char(20) , ts integer ); -insert into _AS3AP_join_1_10 select uniques.k, uniques.name, tenpct.name, tenpct.si from uniques, tenpct where uniques.k=tenpct.si and(uniques.k=500000000 or uniques.k=600000000 or uniques.k=700000000 or uniques.k=800000000 or uniques.k=900000000); -create table _AS3AP_join_2_cl(us integer , un char(20) , hs integer , hn char(20) ); -insert into _AS3AP_join_2_cl select uniques.si, uniques.name, hundred.si, hundred.name from uniques, hundred where uniques.k=hundred.k and uniques.k=1000; -create table _AS3AP_join_2(us integer , un char(20) , hs integer , hn char(20) ); -insert into _AS3AP_join_2 select uniques.si, uniques.name, hundred.si, hundred.name from uniques, hundred where uniques.address=hundred.address and uniques.address='SILICON VALLEY'; -create view _AS3AP_varselectlow as select k, i, si, code, d, name from tenpct where si<40; -create view _AS3AP_varselecthigh as select k, i, si, code, d, name from tenpct where si<40; -create table _AS3AP_join_4_cl(ud date, hd date , td date , upd date ); -insert into _AS3AP_join_4_cl select uniques.date, hundred.date, tenpct.date, updates.date from uniques, hundred, tenpct, updates where uniques.k=hundred.k and uniques.k=tenpct.k and uniques.k=updates.k and uniques.k=1000; -create view _AS3AP_proj_100 as select distinct address, si from hundred; -create table _AS3AP_join_4_ncl(ud date, hd date , td date , upd date ); -insert into _AS3AP_join_4_ncl select uniques.date, hundred.date, tenpct.date, updates.date from uniques, hundred, tenpct, updates where uniques.code=hundred.code and uniques.code=tenpct.code and uniques.code=updates.code and uniques.code='BENCHMARKS'; -create view _AS3AP_proj_10pct as select distinct si from tenpct; -create view _AS3AP_sel_1_ncl as select k, i, si, code, d, name from updates where code='BENCHMARKS'; -create table _AS3AP_join_2_ncl(us integer , un char(20) , hs integer , hn char(20) ); -insert into _AS3AP_join_2_ncl select uniques.si, uniques.name, hundred.si, hundred.name from uniques, hundred where uniques.code=hundred.code and uniques.code='BENCHMARKS'; -create view tempint as select * from hundred where i=0; -update hundred set si= -500000000 where i=0; -delete from hundred where i=0; -insert into hundred select * from tempint; -delete from updates where k=5005; -create view saveupdates as select * from updates where k between 5010 and 6009; -update updates set k=k -100000 where k between 5010 and 6009; -insert into updates values(6000, 0, 60000, 39997.90, 50005.00, 50005.00, date '11/10/85', 'CONTROLLER', 'ALICE IN WONDERLAND', 'UNIVERSITY OF ILLINOIS AT CHICAGO ', 'Krabbe'); -delete from updates where k=6000 and i=0; -insert into updates values(5005, 5005, 50005, 50005.00, 50005.00, 50005.00, date '1/1/88', 'CONTROLLER', 'ALICE IN WONDERLAND', 'UNIVERSITY OF ILLINOIS AT CHICAGO ', 'Krabbe'); -update updates set k= -5000 where k=5005; -delete from updates where k= -5000; -insert into updates values(1000000001, 50005, 50005, 50005.00, 50005.00, 50005.00, date '1/1/88', 'CONTROLLER', 'ALICE IN WONDERLAND', 'UNIVERSITY OF ILLINOIS AT CHICAGO ', 'Krabbe'); -update updates set k= -1000 where k=1000000001; -delete from updates where k= -1000; -insert into updates values(5005, 5005, 50005, 50005.00, 50005.00, 50005.00, date '1/1/88', 'CONTROLLER', 'ALICE IN WONDERLAND', 'UNIVERSITY OF ILLINOIS AT CHICAGO ', 'Krabbe'); -update updates set code='SQL+GROUPS' where k=5005; -delete from updates where k=5005; -insert into updates values(5005, 5005, 50005, 50005.00, 50005.00, 50005.00, date '1/1/88', 'CONTROLLER', 'ALICE IN WONDERLAND', 'UNIVERSITY OF ILLINOIS AT CHICAGO ', 'Krabbe'); -update updates set i=500015 where k=5005; -delete from updates where k= -5000; -insert into updates select * from saveupdates; -delete from updates where k<0; diff --git a/sql/benchmarks/as3ap/as3ap-schema.sql b/sql/benchmarks/as3ap/as3ap-schema.sql deleted file mode 100644 --- a/sql/benchmarks/as3ap/as3ap-schema.sql +++ /dev/null @@ -1,5 +0,0 @@ -/*database as3ap*/ -create table uniques(k integer not null, i integer not null, si integer , f float not null,d double not null, decim integer not null, date date not null, code char(10) not null, name char(20) not null, address string not null, fill char(6) not null); -create table hundred(k integer not null, i integer not null, si integer , f float not null, d double not null, decim integer not null, date date not null, code char(10) not null, name char(20) not null, address string not null, fill char(6) not null); -create table tenpct(k integer not null, i integer not null, si integer , f float not null, d double not null, decim integer not null, date date not null, code char(10) not null, name char(20) not null, address string not null, fill char(6) not null); -create table updates(k integer not null, i integer not null, si integer , f float not null, d double not null, decim integer not null, date date not null, code char(10) not null, name char(20) not null, address string not null, fill char(6) not null); diff --git a/sql/benchmarks/as3ap/as3ap.c b/sql/benchmarks/as3ap/as3ap.c deleted file mode 100644 --- a/sql/benchmarks/as3ap/as3ap.c +++ /dev/null @@ -1,1621 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 2008-2015 MonetDB B.V. - */ - -@T The AS3AP generator -@a - -@c - -/*----------------------------------------------------------------+ -| | -| AS3APgen.c | -| | -| Version 0.9 Beta | -| | -| Generates data for the four tables: | -| hundred, uniques, tenpct, updates | -| | -| Created 8 June 1992 | -| | -| at: School of Information Systems | -| University of East Anglia | -| Norwich NR4 7TJ | -| United Kingdom Phone +44 603 56161 | -| | -| by: Aram Balian b...@uk.ac.uea.sys Ext. 3171 | -| Jens Krabbe j...@uk.ac.uea.sys Ext. 3171 | -| Dan Smith d...@uk.ac.uea.sys Ext. 2608 | -| | -| | -| | -| | -| Known problems: | -| | -| Memory allocation: Memory is not freed between generation | -| of individual tables. | -| Solution: Generate only one table at time. | -| | -| Optimization: Many similar data are re-generated | -| where they could have been re-used. | -| | -+----------------------------------------------------------------*/ - -#include <math.h> -#include <stdio.h> - -static int ANINT = (-1000000008); -static int INIT = (-1); -static int NORMAL = 1; - -float ran1(), gasdev(), poidev(); - -#define DATELEN 12 -#define CODELEN 11 -#define NAMELEN 21 -#define ADDRLEN 81 - -/*****************************/ -/*** MEM allocation header ***/ - -#ifndef C_ARGS -#ifdef CPP -#define C_ARGS(arglist) arglist -#else CPP -#define C_ARGS(arglist) () -#endif CPP -#endif C_ARGS - -#ifndef MEMALLOC_CORPS -#define C_EXT extern -#else MEMALLOC_CORPS -#define C_EXT -#endif MEMALLOC_CORPS - -typedef struct elem -{ - char *buff; - struct elem *next; - struct elem *prev; -} ELEM; - -typedef struct -{ - ELEM *last; - ELEM *first; -} MEM_BUFF; - - -/************************************************************************/ -/*--------------------------EXPORTED FUNCTIONS--------------------------*/ -/************************************************************************/ - -C_EXT MEM_BUFF *memgraph; -C_EXT MEM_BUFF *MEM_alloc C_ARGS((unsigned size)); -C_EXT void MEM_free C_ARGS((MEM_BUFF *mem_buff)); -C_EXT char *MEM_get C_ARGS((MEM_BUFF *mem_buff, unsigned size)); -C_EXT void MEM_unget C_ARGS((MEM_BUFF *mem_buff, char *elem)); - -#undef C_EXT - -#endif MEMALLOC_HEADER - -/*** end MEM alloc header ***/ -/****************************/ - -static MEM_BUFF *tampon; - /* tampon allocation memoire */ -static unsigned gest_mem; - -int (*intcompar)(); - -static int intcompare(i,j) int *i, *j; -{ - return(*i - *j); -} -@ - -@c -main( argc, argv ) int argc; char *argv[]; -{ - int ntup; - - if ( ( argc < 2 ) || ( argc > 3 ) ) { - printf( "Usage: %s <numberoftuples> [<tablename>]\n", argv[0] ); - printf( " where <numberoftuples> should be divisible with 10000\n" ); - printf( " and the optional <tablename> must be one of:\n" ); - printf( " \"tenpct\" \"uniques\" \"updates\" \"hundred\"\n" ); - exit(1); - } - - ntup = atoi( argv[1] ); - - if ( argc == 2 ) { - generate_hundred( ntup ); - generate_tenpct ( ntup ); - generate_uniques( ntup ); - generate_updates( ntup ); - } - - if ( argc == 3 ) { - if ( ! strcmp( argv[2], "hundred" ) ) generate_hundred( ntup ); - if ( ! strcmp( argv[2], "tenpct" ) ) generate_tenpct ( ntup ); - if ( ! strcmp( argv[2], "uniques" ) ) generate_uniques( ntup ); - if ( ! strcmp( argv[2], "updates" ) ) generate_updates( ntup ); - } -} -@ - -@c -generate_tenpct(ntup) int ntup; -{ - FILE * OutputFile; - int ** iarray; - char ** datearray; - char ** codearray; - char ** namearray; - char ** addressarray; - int i, ia=6; /* number of int arrays */ - - gest_mem = ( ( ntup * sizeof ( char* ) ) + ( ntup * sizeof(char) * DATELEN ) ); - gest_mem += ( ( ntup * sizeof ( char* ) ) + ( ntup * sizeof(char) * CODELEN ) ); - gest_mem += ( ( ntup * sizeof ( char* ) ) + ( ntup * sizeof(char) * NAMELEN ) ); - gest_mem += ( ( ntup * sizeof ( char* ) ) + ( ntup * sizeof(char) * ADDRLEN ) ); - gest_mem += ( ( ia * sizeof ( int* ) ) + ( ia * sizeof(int ) * ntup ) ); - - gest_mem += ( ( sizeof (int) * ntup ) * 4 ) ; /* pour appeler toutes - /* les fonctions date_gen,code_gen,tenpct_name et tenpct_address */ - - - - tampon = ( MEM_BUFF* ) MEM_alloc (gest_mem); - - datearray= (char **) MEM_get(tampon, ( ntup * sizeof ( char* ) ) ); - for(i=0;i<ntup;i++) { - datearray[i] = (char *) MEM_get(tampon, (sizeof(char) * DATELEN) ); - if( datearray[i] == 0) { - fprintf(stdout,"Error: Memory allocation: tenpct.date array\n"); - fflush(stdout); - exit(1); - } - } - - codearray= (char **) MEM_get(tampon, ( ntup * sizeof ( char* ) ) ); - for(i=0;i<ntup; i++) { - codearray[i] = (char *) MEM_get(tampon, (sizeof(char) * CODELEN) ); - if( codearray[i] == 0) { - fprintf(stdout,"Error: Memory allocation: tenpct.code array\n"); - fflush(stdout); - exit(1); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
