diff options
author | agc <agc> | 2007-11-10 11:33:00 +0000 |
---|---|---|
committer | agc <agc> | 2007-11-10 11:33:00 +0000 |
commit | 77f61a2f9db44a799c0cb83756326d6c60aaaef2 (patch) | |
tree | 8616b76b913a0d1b5905e885a3971bd90da550b9 /databases/cstore | |
parent | c59f23a4470f6ab37eb822a5aa74f78a7c4edff7 (diff) | |
download | pkgsrc-77f61a2f9db44a799c0cb83756326d6c60aaaef2.tar.gz |
Initial import of cstore-0.2, a "column store" relational database,
into the Packages Collection. This package is meant to support data
warehousing in a much more efficient manner than traditional RDBMSs.
C-Store is a read-optimized relational DBMS that contrasts sharply
with most current systems, which are write-optimized. Among the many
differences in its design are:
+ storage of data by column rather than by row,
+ careful coding and packing of objects into storage including main
memory during query processing,
+ storing an overlapping collection of column-oriented projections,
rather than the current fare of tables and indexes,
+ a non-traditional implementation of transactions which includes high
availability and snapshot isolation for read-only transactions,
+ and the extensive use of bitmap indexes to complement B-tree
structures.
Please note that the storage required for this package could be viewed
as being quite extreme - the standard build and data occupies in excess
of 20 GB, and that is all installed into ${PREFIX} at installation
time.
Diffstat (limited to 'databases/cstore')
-rw-r--r-- | databases/cstore/DESCR | 17 | ||||
-rw-r--r-- | databases/cstore/MESSAGE | 8 | ||||
-rw-r--r-- | databases/cstore/Makefile | 73 | ||||
-rw-r--r-- | databases/cstore/PLIST | 69 | ||||
-rw-r--r-- | databases/cstore/distinfo | 26 | ||||
-rw-r--r-- | databases/cstore/patches/patch-aa | 33 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ab | 15 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ac | 15 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ad | 15 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ae | 13 | ||||
-rw-r--r-- | databases/cstore/patches/patch-af | 13 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ag | 16 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ah | 17 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ai | 13 | ||||
-rw-r--r-- | databases/cstore/patches/patch-aj | 9 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ak | 16 | ||||
-rw-r--r-- | databases/cstore/patches/patch-al | 33 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ao | 23 | ||||
-rw-r--r-- | databases/cstore/patches/patch-ap | 13 | ||||
-rw-r--r-- | databases/cstore/patches/patch-aq | 13 |
20 files changed, 450 insertions, 0 deletions
diff --git a/databases/cstore/DESCR b/databases/cstore/DESCR new file mode 100644 index 00000000000..56bc63902bb --- /dev/null +++ b/databases/cstore/DESCR @@ -0,0 +1,17 @@ +C-Store is a read-optimized relational DBMS that contrasts sharply +with most current systems, which are write-optimized. Among the many +differences in its design are: + ++ storage of data by column rather than by row, + ++ careful coding and packing of objects into storage including main +memory during query processing, + ++ storing an overlapping collection of column-oriented projections, +rather than the current fare of tables and indexes, + ++ a non-traditional implementation of transactions which includes high +availability and snapshot isolation for read-only transactions, + ++ and the extensive use of bitmap indexes to complement B-tree +structures. diff --git a/databases/cstore/MESSAGE b/databases/cstore/MESSAGE new file mode 100644 index 00000000000..70d412a9ad7 --- /dev/null +++ b/databases/cstore/MESSAGE @@ -0,0 +1,8 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +The storage requirements for this package could be considered to +be quite large - on the order of 20 Gigabytes for the complete +data. + +=========================================================================== diff --git a/databases/cstore/Makefile b/databases/cstore/Makefile new file mode 100644 index 00000000000..0050bc93311 --- /dev/null +++ b/databases/cstore/Makefile @@ -0,0 +1,73 @@ +# $NetBSD: Makefile,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +DISTNAME= cstore0.2 +PKGNAME= cstore-0.2 +CATEGORIES= databases +MASTER_SITES= http://db.lcs.mit.edu/projects/cstore/ +MASTER_SITES+= http://db.csail.mit.edu/data/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} data4.tar.gz D6.data.ros.gz + +MAINTAINER= agc@NetBSD.org +HOMEPAGE= http://db.lcs.mit.edu/projects/cstore/ +COMMENT= Read-optimised column store relational DBMS + +USE_TOOLS+= gmake perl +USE_LANGUAGES+= c c++ +WRKSRC= ${WRKDIR}/cstore + +REPLACE_PERL= Build/BSsrcs + +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= post-patch +SUBST_FILES.prefix= Build/makefile.init +SUBST_SED.prefix+= -e 's|@PREFIX@|'${PREFIX:Q}'|g' + +DATAFILES= D1.data.mini +DATAFILES+= D1.data.retsupp50sort +DATAFILES+= D1.shipdate.mini +DATAFILES+= D1.suppkey.mini +DATAFILES+= D10.data.ros +DATAFILES+= D10.data.wos +DATAFILES+= D2.data +DATAFILES+= D2.data.mini +DATAFILES+= D3.custkey.mini +DATAFILES+= D3.data.mini +DATAFILES+= D4.data +DATAFILES+= D4.data.mini +DATAFILES+= D5.data.mini +DATAFILES+= D6.data.ros +DATAFILES+= D6.data.wos +DATAFILES+= D7.data.ros +DATAFILES+= D7.data.wos +DATAFILES+= D8.data.ros +DATAFILES+= D8.data.wos +DATAFILES+= D9.data.ros +DATAFILES+= D9.data.wos +DATAFILES+= d1.lsuppkey.full +DATAFILES+= deltaPos.test +DATAFILES+= deltaPosTestBig2 +DATAFILES+= lineitem.sorted.full +DATAFILES+= lshipdate.sorted.mini +DATAFILES+= lshipdate.sorted.tiny +DATAFILES+= supp.data + +INSTALLATION_DIRS_FROM_PLIST= yes + +post-extract: + cd ${WRKDIR} && mv ${DATAFILES} ${WRKSRC}/data + +do-build: + cd ${WRKSRC}/src && ${SETENV} ${BUILD_ENV} ${MAKE} debug2 + cd ${WRKSRC}/src && ./cstoreqptest 0 createData.cnf global.cnf + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/cstoreqptest ${PREFIX}/bin/cstoreqp + ${INSTALL_DATA_DIR} ${PREFIX}/cstore/data + cd ${WRKSRC}/data && pax -rwpe . ${PREFIX}/cstore/data + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cstore + cd ${WRKSRC}/doc && pax -rwpe . ${PREFIX}/share/doc/cstore + +.include "../../archivers/lzo/buildlink3.mk" +.include "../../databases/db4/buildlink3.mk" + +.include "../../mk/bsd.pkg.mk" diff --git a/databases/cstore/PLIST b/databases/cstore/PLIST new file mode 100644 index 00000000000..68586ae931e --- /dev/null +++ b/databases/cstore/PLIST @@ -0,0 +1,69 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ +bin/cstoreqp +cstore/data/D1.data.mini +cstore/data/D1.data.retsupp50sort +cstore/data/D1.shipdate.mini +cstore/data/D1.suppkey.mini +cstore/data/D10.data.ros +cstore/data/D10.data.ros.1 +cstore/data/D10.data.ros.2 +cstore/data/D10.data.wos +cstore/data/D2.data +cstore/data/D2.data.1 +cstore/data/D2.data.2 +cstore/data/D2.data.3 +cstore/data/D2.data.mini +cstore/data/D3.custkey.mini +cstore/data/D3.data.mini +cstore/data/D4.data +cstore/data/D4.data.1 +cstore/data/D4.data.2 +cstore/data/D4.data.3 +cstore/data/D4.data.mini +cstore/data/D5.data.mini +cstore/data/D6.data.ros +cstore/data/D6.data.ros.1 +cstore/data/D6.data.ros.2 +cstore/data/D6.data.ros.3 +cstore/data/D6.data.ros.4 +cstore/data/D6.data.ros.5 +cstore/data/D6.data.ros.6 +cstore/data/D6.data.ros.7 +cstore/data/D6.data.ros.8 +cstore/data/D6.data.wos +cstore/data/D7.data.ros +cstore/data/D7.data.ros.1 +cstore/data/D7.data.ros.2 +cstore/data/D7.data.ros.3 +cstore/data/D7.data.wos +cstore/data/D8.data.ros +cstore/data/D8.data.ros.1 +cstore/data/D8.data.ros.2 +cstore/data/D8.data.wos +cstore/data/D9.data.ros +cstore/data/D9.data.ros.1 +cstore/data/D9.data.ros.2 +cstore/data/D9.data.ros.3 +cstore/data/D9.data.wos +cstore/data/d1.lsuppkey.full +cstore/data/d1.lsuppkey.full.1 +cstore/data/deltaPos.test +cstore/data/deltaPosTestBig2 +cstore/data/flushCache +cstore/data/getData +cstore/data/lineitem.sorted.full +cstore/data/lineitem.sorted.full.1 +cstore/data/lshipdate.sorted.mini +cstore/data/lshipdate.sorted.tiny +cstore/data/makeLargeFile +cstore/data/supp.data +share/doc/cstore/CatalogPersistent.txt +share/doc/cstore/PlanGenerator_20050628.doc +share/doc/cstore/README +share/doc/cstore/ReleaseOverview.txt +share/doc/cstore/Union.doc +share/doc/cstore/thesis.pdf +share/doc/cstore/vldb.pdf +@dirrm share/doc/cstore +@dirrm cstore/data +@dirrm cstore diff --git a/databases/cstore/distinfo b/databases/cstore/distinfo new file mode 100644 index 00000000000..5ec7c4df89b --- /dev/null +++ b/databases/cstore/distinfo @@ -0,0 +1,26 @@ +$NetBSD: distinfo,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +SHA1 (D6.data.ros.gz) = 3efe5c0b4675dcdc2c89cf9a1b6f305663d153a5 +RMD160 (D6.data.ros.gz) = 20b99b066b953424dcb0b5435e9731806fac5d52 +Size (D6.data.ros.gz) = 992143667 bytes +SHA1 (cstore0.2.tar.gz) = 51f3eac1adde49f72c454ed3895f5954ee17ad46 +RMD160 (cstore0.2.tar.gz) = bb510ddcd3dbc5683059f313e6fb0335ad7c71dd +Size (cstore0.2.tar.gz) = 4292918 bytes +SHA1 (data4.tar.gz) = aa07edc8a13bb194774af49cd6a1f5a95574aefd +RMD160 (data4.tar.gz) = 9914cae55abfef9d880f14a004f4f608180ec905 +Size (data4.tar.gz) = 1348695152 bytes +SHA1 (patch-aa) = 52f482fa451a16f85c727cd9953510ccb04836ab +SHA1 (patch-ab) = 92bb9855f834ffb7b54f0ca99efd8f1bf3c9c65e +SHA1 (patch-ac) = b495ba01f725c3b35ac1cd92a640a5978510dc19 +SHA1 (patch-ad) = 4abd94414fb16281db481626a048fcd12d38a3eb +SHA1 (patch-ae) = c5fa606caafa61c0feac0ce12c3b479a124f392d +SHA1 (patch-af) = 8dbdc8d20bc56643a86bcbdff7ee631daadbad9a +SHA1 (patch-ag) = eb72568f71ec1372e0b69cad3e8b2f7d830597e4 +SHA1 (patch-ah) = fca6811c7a53662e5cf41956867b39c974a96876 +SHA1 (patch-ai) = a294ac30adf46ec031925363a0174c8dcd8b4c2a +SHA1 (patch-aj) = d99dfbd23487bce2ae97f48474790d341437d7d4 +SHA1 (patch-ak) = 3c57bc19f340b49e88b4ae605cb0e04ec8f3a0ce +SHA1 (patch-al) = a0683ed97a61438bfa4cae734955905cc97d6410 +SHA1 (patch-ao) = ad649ccb0c599b8ad46ba7120d0b074e7eabda27 +SHA1 (patch-ap) = c7058ab97051c8421e26344431929fb420ca0076 +SHA1 (patch-aq) = 827992abf73b976d9ac2dd121d14212f7a61452c diff --git a/databases/cstore/patches/patch-aa b/databases/cstore/patches/patch-aa new file mode 100644 index 00000000000..33920fcf551 --- /dev/null +++ b/databases/cstore/patches/patch-aa @@ -0,0 +1,33 @@ +$NetBSD: patch-aa,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- Build/makefile.init 2007/10/01 11:20:34 1.1 ++++ Build/makefile.init 2007/10/01 11:24:09 +@@ -1,10 +1,11 @@ + CC:=$(WTF) g++ + + CSTORE_INCLUDE := src +-SLEEPYCAT_DIRECTORY := /usr/local/BerkeleyDB.4.2 +-SLEEPYCAT_INCLUDE := $(SLEEPYCAT_DIRECTORY)/include/ ++SLEEPYCAT_DIRECTORY := @PREFIX@ ++SLEEPYCAT_INCLUDE := $(SLEEPYCAT_DIRECTORY)/include/db4 + SLEEPYCAT_LIB := $(SLEEPYCAT_DIRECTORY)/lib +-LZO_LIB := /home/dna/huff/lzo-1.08/src/.libs ++LZO_INCLUDE := @PREFIX@/include/lzo ++LZO_LIB := @PREFIX@/lib + + CFLAGS := -O0 -g3 -Wall -c -Wno-deprecated -fmessage-length=0 + #override CFLAGS with optimization flags if so desired +@@ -17,10 +18,10 @@ + endif + + RULEFLAGS := -MM -MG -P -w +-IFLAGS := -I$(SLEEPYCAT_INCLUDE) -I$(CSTORE_INCLUDE) +-LFLAGS := -L$(SLEEPYCAT_LIB) -L$(LZO_LIB) ++IFLAGS := -I$(SLEEPYCAT_INCLUDE) -I$(CSTORE_INCLUDE) -I$(LZO_INCLUDE) ++LFLAGS := -L$(SLEEPYCAT_LIB) -L$(LZO_LIB) -Wl,-R$(SLEEPYCAT_LIB) -Wl,-R$(LZO_LIB) + OPTS := -Wl,--demangle +-LIBS := -ldb-4.2 -ldb_cxx-4.2 -lpthread -llzo ++LIBS := -ldb4-4.5 -ldb4_cxx-4.5 -lpthread -llzo2 + #override OPTS with gprof flags + ifdef __CSTORE_GPROF__ + OPTS := -pg -Wl,--demangle diff --git a/databases/cstore/patches/patch-ab b/databases/cstore/patches/patch-ab new file mode 100644 index 00000000000..453a5c83935 --- /dev/null +++ b/databases/cstore/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/UnitTests/BAndOpTest.h 2007/11/07 20:18:13 1.1 ++++ src/UnitTests/BAndOpTest.h 2007/11/07 20:19:06 +@@ -60,8 +60,8 @@ + BAndOpTest(); + virtual ~BAndOpTest(); + bool run(Globals* g, const vector<string>&); +- bool BAndOpTest::runTestCase1(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); +- bool BAndOpTest::runTestCase2(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); ++ bool runTestCase1(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); ++ bool runTestCase2(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); + }; + + #endif //_BANDOPTEST_H_ diff --git a/databases/cstore/patches/patch-ac b/databases/cstore/patches/patch-ac new file mode 100644 index 00000000000..9eff5317c53 --- /dev/null +++ b/databases/cstore/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/UnitTests/BOrOpTest.h 2007/11/07 20:19:59 1.1 ++++ src/UnitTests/BOrOpTest.h 2007/11/07 20:20:14 +@@ -60,8 +60,8 @@ + BOrOpTest(); + virtual ~BOrOpTest(); + bool run(Globals* g, const vector<string>&); +- bool BOrOpTest::runTestCase1(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); +- bool BOrOpTest::runTestCase2(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); ++ bool runTestCase1(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); ++ bool runTestCase2(unsigned int leftRunLengthDiff_, unsigned int rightRunLengthDiff_, unsigned int leftStartPosDiff_, unsigned int rightStartPosDiff_); + }; + + #endif //_BOROPTEST_H_ diff --git a/databases/cstore/patches/patch-ad b/databases/cstore/patches/patch-ad new file mode 100644 index 00000000000..c231ef43034 --- /dev/null +++ b/databases/cstore/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/UnitTests/BNotOpTest.h 2007/11/07 20:21:01 1.1 ++++ src/UnitTests/BNotOpTest.h 2007/11/07 20:21:17 +@@ -59,8 +59,8 @@ + BNotOpTest(); + virtual ~BNotOpTest(); + bool run(Globals* g, const vector<string>&); +- bool BNotOpTest::runTestCase1(unsigned int leftRunLengthDiff_, unsigned int leftStartPosDiff_); +- bool BNotOpTest::runTestCase2(unsigned int leftRunLengthDiff_, unsigned int leftStartPosDiff_); ++ bool runTestCase1(unsigned int leftRunLengthDiff_, unsigned int leftStartPosDiff_); ++ bool runTestCase2(unsigned int leftRunLengthDiff_, unsigned int leftStartPosDiff_); + }; + + #endif //_BNOTOPTEST_H_ diff --git a/databases/cstore/patches/patch-ae b/databases/cstore/patches/patch-ae new file mode 100644 index 00000000000..897ca663e25 --- /dev/null +++ b/databases/cstore/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/AM/CatalogInstance.h 2007/11/07 20:24:04 1.1 ++++ src/AM/CatalogInstance.h 2007/11/07 20:24:30 +@@ -156,7 +156,7 @@ + CatalogInstance(); // class Projection* proj ); + ~CatalogInstance(); + +- list<class TVariable*> CatalogInstance::getColumns(); ++ list<class TVariable*> getColumns(); + class TVariable* getCol( string name ); + void setAlias( string alias ); + string getAlias(); diff --git a/databases/cstore/patches/patch-af b/databases/cstore/patches/patch-af new file mode 100644 index 00000000000..1c0a2e61331 --- /dev/null +++ b/databases/cstore/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/parser/ListProjections.h 2007/11/07 20:25:20 1.1 ++++ src/parser/ListProjections.h 2007/11/07 20:25:31 +@@ -71,7 +71,7 @@ + TVariable* getTuple(string projectionName, string tupleName ); + void dump_env(); + void add(Projection* e); +- void ListProjections::addTupleAlias( string pname, string tname, string alias ); ++ void addTupleAlias( string pname, string tname, string alias ); + list<Projection*> getProjections(); + string toString(); + diff --git a/databases/cstore/patches/patch-ag b/databases/cstore/patches/patch-ag new file mode 100644 index 00000000000..f32370d33ec --- /dev/null +++ b/databases/cstore/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/common/DataSource.cpp 2007/11/07 20:39:43 1.1 ++++ src/common/DataSource.cpp 2007/11/07 20:40:46 +@@ -279,9 +279,11 @@ + case Predicate::OP_EQUAL: + lookupOnValue=true; + //for now assume value is an integer ... fix later ... ++ { + ValPos* vp = pred->getRHS(); + assert(vp->type == ValPos::INTTYPE); + value=*(int*)vp->value; ++ } + break; + case Predicate::OP_LESS_THAN: + case Predicate::OP_LESS_THAN_OR_EQUAL: diff --git a/databases/cstore/patches/patch-ah b/databases/cstore/patches/patch-ah new file mode 100644 index 00000000000..8dbf6f1a773 --- /dev/null +++ b/databases/cstore/patches/patch-ah @@ -0,0 +1,17 @@ +$NetBSD: patch-ah,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/common/DatasourceFilters.cpp 2007/11/07 20:41:58 1.1 ++++ src/common/DatasourceFilters.cpp 2007/11/07 20:42:15 +@@ -114,10 +114,12 @@ + case Predicate::OP_GREATER_THAN_OR_EQUAL: + case Predicate::OP_EQUAL: + lookupOnValue=true; ++ { + //for now assume value is an integer ... fix later ... + ValPos* vp = pred->getRHS(); + assert(vp->type == ValPos::INTTYPE); + value=*(int*)vp->value; ++ } + break; + case Predicate::OP_LESS_THAN: + case Predicate::OP_LESS_THAN_OR_EQUAL: diff --git a/databases/cstore/patches/patch-ai b/databases/cstore/patches/patch-ai new file mode 100644 index 00000000000..74a435a7916 --- /dev/null +++ b/databases/cstore/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/common/PosBlockArray.cpp 2007/11/07 20:44:15 1.1 ++++ src/common/PosBlockArray.cpp 2007/11/07 20:47:35 +@@ -28,6 +28,8 @@ + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ ++#include <cassert> ++ + #include "PosBlockArray.h" + + PosBlockArray::PosBlockArray(PosBlock** pba, int numEntries) diff --git a/databases/cstore/patches/patch-aj b/databases/cstore/patches/patch-aj new file mode 100644 index 00000000000..e83386694d2 --- /dev/null +++ b/databases/cstore/patches/patch-aj @@ -0,0 +1,9 @@ +$NetBSD: patch-aj,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/Wrappers/PosArrayBlock.cpp 2007/11/07 20:58:59 1.1 ++++ src/Wrappers/PosArrayBlock.cpp 2007/11/07 20:59:17 +@@ -1,3 +1,4 @@ ++#include <cassert> + #include "PosArrayBlock.h" + #include <iostream.h> + diff --git a/databases/cstore/patches/patch-ak b/databases/cstore/patches/patch-ak new file mode 100644 index 00000000000..21dd1bc0314 --- /dev/null +++ b/databases/cstore/patches/patch-ak @@ -0,0 +1,16 @@ +$NetBSD: patch-ak,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/Util/StopWatch.cpp 2007/11/07 21:13:19 1.1 ++++ src/Util/StopWatch.cpp 2007/11/07 21:19:10 +@@ -52,6 +52,11 @@ + r1 = times(&t); + } + ++// XXX would be better to get this value from sysctl ++#ifndef HZ ++#define HZ 100 ++#endif ++ + double StopWatch::stop() { + //clock_t diff = clock()-watch; + r2 = times(&u); diff --git a/databases/cstore/patches/patch-al b/databases/cstore/patches/patch-al new file mode 100644 index 00000000000..9207ae034ea --- /dev/null +++ b/databases/cstore/patches/patch-al @@ -0,0 +1,33 @@ +$NetBSD: patch-al,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/Util/BDBFile.cpp 2007/11/07 21:22:30 1.1 ++++ src/Util/BDBFile.cpp 2007/11/07 21:37:32 +@@ -275,6 +275,7 @@ + + void BDBFile::showStats() + { ++#if 0 + DB_BTREE_STAT *pStat; + + dbHandle->stat(&pStat, 0); +@@ -284,10 +285,12 @@ + cout << bdbFileName << " contains " + << pStat->bt_ndata << " records\n"; + free(pStat); ++#endif + } + + u_long BDBFile::getRecordCount() + { ++#if 0 + DB_BTREE_STAT *pStat; + + dbHandle->stat(&pStat, 0); +@@ -297,6 +300,7 @@ + u_long cnt = pStat->bt_ndata; + free(pStat); + return cnt; ++#endif + } + + void BDBFile::dumpDB() diff --git a/databases/cstore/patches/patch-ao b/databases/cstore/patches/patch-ao new file mode 100644 index 00000000000..6b928e5a73a --- /dev/null +++ b/databases/cstore/patches/patch-ao @@ -0,0 +1,23 @@ +$NetBSD: patch-ao,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- Build/parser/subdir.mk 2007/11/08 10:39:53 1.1 ++++ Build/parser/subdir.mk 2007/11/08 10:40:29 +@@ -1,6 +1,6 @@ + LEX = flex + LEXFLAGS = -i +-YACC = bison ++YACC = yacc + YACCFLAGS = -d + + # intermediate things to be deleted if "make clean" +@@ -13,8 +13,8 @@ + + $(ROOT)/parser/grammar.cpp $(ROOT)/parser/grammar.h: $(ROOT)/parser/grammar.y + @echo 'Building: $@' +- $(YACC) $(YACCFLAGS) -o$@ $< +- mv $(ROOT)/parser/grammar.hpp $(ROOT)/parser/grammar.h ++ $(YACC) $(YACCFLAGS) -o $(ROOT)/parser/grammar.cpp $< ++ @echo > /dev/null mv $(ROOT)/parser/grammar.hpp $(ROOT)/parser/grammar.h + @echo 'Finished building: $<' + @echo ' ' + diff --git a/databases/cstore/patches/patch-ap b/databases/cstore/patches/patch-ap new file mode 100644 index 00000000000..a19289702f8 --- /dev/null +++ b/databases/cstore/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/parser/lexer.l 2007/11/08 11:04:34 1.1 ++++ src/parser/lexer.l 2007/11/08 11:09:26 +@@ -17,6 +17,8 @@ + int lineno = 1; + extern "C" void yyerror(char *s); + ++extern YYSTYPE yylval; ++ + %} + + %% diff --git a/databases/cstore/patches/patch-aq b/databases/cstore/patches/patch-aq new file mode 100644 index 00000000000..a625b800e48 --- /dev/null +++ b/databases/cstore/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $ + +--- src/makefile.targets 2007/11/08 11:15:50 1.1 ++++ src/makefile.targets 2007/11/08 11:16:53 +@@ -11,7 +11,7 @@ + + # emacs-style TAGS file + TAGS: SRCS +- etags -l c++ - <SRCS ++ @echo > /dev/null etags -l c++ - <SRCS + + # lines of code report file + LOC: SRCS |