Changeset: f3c0113caadd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3c0113caadd
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/vaults/mseed.c
sql/backends/monet5/vaults/mseed.h
sql/backends/monet5/vaults/mseed.mal
sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
Branch: default
Log Message:
Another headless rollforward
diffs (100 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
@@ -1374,13 +1374,6 @@ str CURLgetRequest(str *retval, str *url
str CURLpostRequest(str *retval, str *url);
str CURLputRequest(str *retval, str *url);
str CemptySet(int *k, int *bid);
-str DICTbind(int *idx, int *val, str *nme);
-str DICTcompress(int *idx, str *nme, int *bid);
-str DICTdecompress(int *ret, str *nme);
-str DICTencode(int *ridx, int *val, int *bid);
-str DICTexpand(int *rval, int *val, int *bid);
-str DICTgroupid(int *ret, int *idx, int *val);
-str DICTinitialize(int *ret);
str FCTgetArrival(int *ret);
str FCTgetCaller(int *ret);
str FCTgetDeparture(int *ret);
@@ -1785,7 +1778,6 @@ int OPTconstantsImplementation(Client cn
int OPTcostModelImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-int OPTdictionaryImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTdumpQEPImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTemptySetImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
diff --git a/sql/backends/monet5/vaults/mseed.c
b/sql/backends/monet5/vaults/mseed.c
--- a/sql/backends/monet5/vaults/mseed.c
+++ b/sql/backends/monet5/vaults/mseed.c
@@ -292,33 +292,6 @@ wrapup:
}
str
-MseedLoadSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- int *ret = (int*) getArgReference(stk,pci,0);
- str *targetfile = (str*) getArgReference(stk,pci,1);
- str msg = MAL_SUCCEED;
- BAT *btime, *bdata, *table;
-
- (void) cntxt;
- (void) mb;
-
-/* XXX: BATs of BATs are no longer allowed and this code hasn't worked
- * for quite some time anyway */
- table = BATnew(TYPE_str,TYPE_bat,0);
- if ( table == NULL)
- throw(MAL, "mseed.load", MAL_MALLOC_FAIL);
- msg = MseedLoadIntern(&btime, &bdata, *targetfile);
- if ( msg == MAL_SUCCEED){
- BUNins(table, (ptr)"time", (ptr)&btime->batCacheid, FALSE);
- BUNins(table, (ptr)"data", (ptr)&bdata->batCacheid, FALSE);
- BBPreleaseref(btime->batCacheid);
- BBPreleaseref(bdata->batCacheid);
- BBPkeepref(*ret= table->batCacheid);
- }
- return msg;
-}
-
-str
MseedLoad(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int *ret0 = (int*) getArgReference(stk,pci,0);
diff --git a/sql/backends/monet5/vaults/mseed.h
b/sql/backends/monet5/vaults/mseed.h
--- a/sql/backends/monet5/vaults/mseed.h
+++ b/sql/backends/monet5/vaults/mseed.h
@@ -84,7 +84,6 @@
#endif
vault_export str MseedImport(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-vault_export str MseedLoadSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
vault_export str MseedLoad(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
#define _MSEED_DEBUG_
diff --git a/sql/backends/monet5/vaults/mseed.mal
b/sql/backends/monet5/vaults/mseed.mal
--- a/sql/backends/monet5/vaults/mseed.mal
+++ b/sql/backends/monet5/vaults/mseed.mal
@@ -23,7 +23,3 @@ comment "Fetch the record descriptors of
pattern load{unsafe}(entry:str)(:bat[:oid,:timestamp],:bat[:oid,:int])
address MseedLoad
comment "Load the content of a mseed file into BATs";
-
-pattern load{unsafe}(entry:str):bat[:str,:bat]
-address MseedLoadSQL
-comment "Load the content of a mseed file into SQL TABLE";
diff --git
a/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
--- a/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
+++ b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
@@ -32,10 +32,11 @@ stderr of test 'constants-optimizer.Bug-
# 00:10:51 > mclient -lsql -ftest -i -e --host=eir --port=37160
# 00:10:51 >
-MAPI = (monetdb) /var/tmp/mtest-29390/.s.monetdb.36773
+MAPI = (monetdb) /var/tmp/mtest-17482/.s.monetdb.35717
QUERY = set optimizer='dictionary_pipe';
+
# 00:10:51 >
# 00:10:51 > Done.
# 00:10:51 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
