Changeset: 277224e313e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=277224e313e2
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/atoms/streams.h
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/batstr.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: default
Log Message:
Remove duplicates.
diffs (102 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -851,7 +851,6 @@ str ALGtsort(int *result, int *bid);
str ALGtsort_rev(int *result, int *bid);
str ALGtunion(int *result, int *lid, int *rid);
str ALGtunique(int *result, int *bid);
-str ALGtunique(int *result, int *bid);
str ALGuselect(int *result, int *bid, ptr low, ptr high);
str ALGuselect1(int *result, int *bid, ptr value);
str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin,
bit *rin);
@@ -2172,7 +2171,6 @@ str STRbatRstrSearchcst(bat *ret, bat *l
str STRbatRtrim(bat *ret, bat *l);
str STRbatStrip(bat *ret, bat *l);
str STRbatSubstitutecst(bat *ret, bat *l, str *arg2, str *arg3, bit *rep);
-str STRbatSubstitutecst(bat *ret, bat *l, str *arg2, str *arg3, bit *rep);
str STRbatSuffix(bat *ret, bat *l, bat *r);
str STRbatSuffixcst(bat *ret, bat *l, str *cst);
str STRbatTail(bat *ret, bat *l, bat *r);
@@ -2746,7 +2744,6 @@ str markTRef;
str mark_grpRef;
str matRef;
str materializeRef;
-str materializeRef;
str maxRef;
str max_no_nilRef;
void mdbClrBreakRequest(Client cntxt, str name);
@@ -2785,10 +2782,8 @@ str mnstr_open_wastreamwrap(Stream *S, s
str mnstr_open_wstreamwrap(Stream *S, str *filename);
int mnstr_readInt_wrap(int *data, Stream *S);
str mnstr_readIntwrap(int *ret, Stream *S);
-str mnstr_readIntwrap(int *ret, Stream *S);
int mnstr_read_string(str *res, Stream *S);
str mnstr_read_stringwrap(str *res, Stream *s);
-str mnstr_read_stringwrap(str *res, Stream *s);
str mnstr_socket_rastreamwrap(Stream *S, int *socket, str *name);
str mnstr_socket_rstreamwrap(Stream *S, int *socket, str *name);
str mnstr_socket_wastreamwrap(Stream *S, int *socket, str *name);
diff --git a/monetdb5/modules/atoms/streams.h b/monetdb5/modules/atoms/streams.h
--- a/monetdb5/modules/atoms/streams.h
+++ b/monetdb5/modules/atoms/streams.h
@@ -56,8 +56,6 @@ streams_export str open_block_streamwrap
streams_export str bstream_create_wrapwrap(Bstream *Bs, Stream *S, int
*bufsize);
streams_export str bstream_destroy_wrapwrap(int *ret, Bstream *BS);
streams_export str bstream_read_wrapwrap(int *res, Bstream *BS, int *size);
-streams_export str mnstr_readIntwrap(int *ret, Stream *S);
-streams_export str mnstr_read_stringwrap(str *res, Stream *s);
streams_export str mnstr_open_rstreamwrap(Stream *S, str *filename);
streams_export str mnstr_open_wstreamwrap(Stream *S, str *filename);
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -112,7 +112,6 @@ algebra_export str ALGtdiff(int *result,
algebra_export str ALGsample(int *result, int* bid, int *param);
algebra_export str ALGsubsample(int *result, int* bid, int *param);
-algebra_export str ALGtunique(int *result, int *bid);
algebra_export str ALGtsort(int *result, int *bid);
algebra_export str ALGtsort_rev(int *result, int *bid);
algebra_export str ALGhsort(int *result, int *bid);
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -82,7 +82,6 @@ batstr_export str STRbatLength(bat *ret,
batstr_export str STRbatstringLength(bat *ret, bat *l);
batstr_export str STRbatBytes(bat *ret, bat *l);
-batstr_export str STRbatSubstitutecst(bat *ret, bat *l, str *arg2, str *arg3,
bit *rep);
batstr_export str STRbatlike_uselect(bat *ret, bat *bid, str *pat, str *esc);
batstr_export str STRbatlike_uselect2(bat *ret, bat *bid, str *pat);
batstr_export str STRbatsubstringcst(bat *ret, bat *bid, int *start, int
*length);
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -145,7 +145,6 @@ str mark_grpRef;
str materializeRef;
str mtimeRef;
str dense_rank_grpRef;
-str materializeRef;
str matRef;
str max_no_nilRef;
str maxRef;
@@ -413,7 +412,6 @@ void optimizerInit(void){
materializeRef = putName("materialize", 11);
mtimeRef = putName("mtime", 5);
dense_rank_grpRef = putName("dense_rank_grp", 14);
- materializeRef = putName("materialize", 11);
matRef = putName("mat", 3);
max_no_nilRef = putName("max_no_nil", 10);
maxRef = putName("max", 3);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -144,7 +144,6 @@ opt_export str mark_grpRef;
opt_export str materializeRef;
opt_export str mtimeRef;
opt_export str dense_rank_grpRef;
-opt_export str materializeRef;
opt_export str matRef;
opt_export str max_no_nilRef;
opt_export str maxRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
