Changeset: 5a33a53d270b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a33a53d270b
Added Files:
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
Removed Files:
gdk/gdk_bat.h
monetdb5/extras/compiler/Makefile.ag
monetdb5/extras/compiler/Tests/All
monetdb5/extras/compiler/Tests/mal01.mal
monetdb5/extras/compiler/Tests/mal01.stable.err
monetdb5/extras/compiler/Tests/mal01.stable.out
monetdb5/extras/compiler/Tests/sql01.mal
monetdb5/extras/compiler/Tests/sql01.stable.err
monetdb5/extras/compiler/Tests/sql01.stable.out
monetdb5/extras/compiler/mal_compiler.c
monetdb5/extras/compiler/mal_compiler.h
monetdb5/extras/compiler/mal_compiler.mal
monetdb5/modules/kernel/batmtime.mx
monetdb5/modules/mal/histogram.c
monetdb5/modules/mal/histogram.h
monetdb5/modules/mal/histogram.mal
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
clients/Tests/exports.stable.out
common/stream/stream.c
debian/monetdb5-server.install
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_calc.c
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_search.c
gdk/gdk_setop.mx
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/gdk_value.c
monetdb5/ChangeLog
monetdb5/extras/Makefile.ag
monetdb5/extras/jaql/json.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_box.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_properties.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/xid.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_statistics.c
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/dcoperator.c
sql/backends/monet5/datacell/dcsocket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
sql/test/BugTracker-2011/Tests/All
sql/test/testdb/Tests/All
sql/test/testdb/Tests/testdb-dump.SQL.py
testing/Mtest.py.in
testing/listexports.py.in
tools/mserver/mserver5.c
Branch: xid
Log Message:
Merged with default branch.
diffs (truncated from 17784 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -231,12 +231,6 @@
}
"Entry"
{
- "MsmKey" = "8:_419257A6F94841C3B403FCFA5C639B2A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_42F961A1A6FC40DEB3F4C7FBBE294D7A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -411,12 +405,6 @@
}
"Entry"
{
- "MsmKey" = "8:_7B05525F604C409498FC994C11183E6B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_7B3835E35ACA4987A1807A460AE4BD7E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1643,26 +1631,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_419257A6F94841C3B403FCFA5C639B2A"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_mal_compiler.dll"
- "TargetName" = "8:lib_mal_compiler.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42F961A1A6FC40DEB3F4C7FBBE294D7A"
{
"SourcePath" = "8:lib\\monetdb5\\alarm.mal"
@@ -2243,26 +2211,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B05525F604C409498FC994C11183E6B"
- {
- "SourcePath" = "8:lib\\monetdb5\\mal_compiler.mal"
- "TargetName" = "8:mal_compiler.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B3835E35ACA4987A1807A460AE4BD7E"
{
"SourcePath" = "8:lib\\monetdb5\\lsst.sql"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -249,12 +249,6 @@
}
"Entry"
{
- "MsmKey" = "8:_4E6BC23AA3384728BBB4AFB694B0C8B1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_50CAF511744C470CB7C15F5DB190C6FB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -657,12 +651,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C347971CC99F4B0DBB048C93E0C0E6AC"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_C363FFC048BF4A75B417E52CAE5636E5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1703,26 +1691,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4E6BC23AA3384728BBB4AFB694B0C8B1"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_mal_compiler.dll"
- "TargetName" = "8:lib_mal_compiler.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_50CAF511744C470CB7C15F5DB190C6FB"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\22_clients.sql"
@@ -3043,26 +3011,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C347971CC99F4B0DBB048C93E0C0E6AC"
- {
- "SourcePath" = "8:lib\\monetdb5\\mal_compiler.mal"
- "TargetName" = "8:mal_compiler.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C363FFC048BF4A75B417E52CAE5636E5"
{
"SourcePath" = "8:lib\\monetdb5\\factories.mal"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -189,14 +189,10 @@ CONFIGURE_PY = "$(TOPDIR)\..\NT\winconfi
WINCONFIG_INCS = "-I$(TOPDIR)\..\buildtools\conf"
!IFDEF DEBUG
-!IF $(bits) == 64
-ZI = -Zi
+COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG
-RTC1 -Zi
!ELSE
-ZI = -ZI
-!ENDIF
-COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG
-RTC1 $(ZI)
-!ELSE
-COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
+# add -Zi flag (implies -debug, not -D_DEBUG) to get symbol info in .pdb files
+COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox -Zi
!ENDIF
CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
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
@@ -140,7 +140,6 @@ BAT *BATmode(BAT *b, int onoff);
int BATmultiprintf(stream *f, int argc, BAT *argv[], int printoid, int order,
int printorderby);
int BATname(BAT *b, const char *nme);
BAT *BATnew(int hdtype, int tltype, BUN capacity);
-BAT *BATnumber(BAT *b);
BAT *BATorder(BAT *b);
BAT *BATorder_rev(BAT *b);
int BATordered(BAT *b);
@@ -228,9 +227,9 @@ int GDK_vm_trim;
int GDKatomcnt;
int GDKcreatedir(const char *nme);
int GDKdebug;
-int GDKembedded;
int GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKexit(int status);
+int GDKexiting(void);
int GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKfilepath(str path, const char *nme, const char *mode, const char *ext);
void GDKfree(void *blk);
@@ -245,8 +244,6 @@ size_t GDKmem_inuse(void);
void *GDKmmap(const char *path, int mode, off_t off, size_t len);
int GDKms(void);
int GDKnr_threads;
-void GDKprotect(void);
-int GDKprotected;
void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts,
int tpe);
void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int hs, int
ts, int tpe);
void *GDKrealloc(void *pold, size_t size);
@@ -310,7 +307,7 @@ Thread THRget(int tid);
void *THRgetdata(int);
int THRgettid(void);
int THRhighwater(void);
-Thread THRnew(MT_Id pid, str name);
+Thread THRnew(str name);
int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
void THRsetdata(int, ptr);
int TMabort(void);
@@ -658,7 +655,6 @@ str ALGmin_lng(lng *res, int *bid);
str ALGmin_sht(sht *res, int *bid);
str ALGmin_wrd(wrd *res, int *bid);
str ALGminany(ptr result, int *bid);
-str ALGnumber(int *result, int *bid);
str ALGouterjoin(int *result, int *lid, int *rid);
str ALGouterjoinestimate(int *result, int *lid, int *rid, lng *estimate);
str ALGposition(wrd *retval, int *bid, ptr val);
@@ -1537,28 +1533,6 @@ str GRPwindowsum_lng(int *retval, int *b
str GRPwindowsum_oid(int *retval, int *bid, int *size);
str GRPwindowsum_sht(int *retval, int *bid, int *size);
str GRPwindowsum_wrd(int *retval, int *bid, int *size);
-dbl HSTbinrelative(Histogram h1, Histogram h2);
-dbl HSTbinrelativeWhatIf(Histogram h1, Histogram h2, ValPtr val, dbl
*whatIfDistance);
-int HSTbinrelativeWhatIfMove(Histogram h1, Histogram h2, ValPtr val, dbl
*whatIfDistance);
-dbl HSTchebyshev(Histogram h1, Histogram h2);
-dbl HSTchebyshevDelta(Histogram h1, Histogram h2, dbl d, int idx, int cnt);
-dbl HSTcityblock(Histogram h1, Histogram h2);
-dbl HSTcityblockDelta(Histogram h1, Histogram h2, dbl d, int idx, int cnt);
-void HSTdecrement(Histogram h, ValPtr val);
-dbl HSTeuclidian(Histogram h1, Histogram h2);
-dbl HSTeuclidianDelta(Histogram h1, Histogram h2, dbl d, int idx, int cnt);
-dbl HSTeuclidianNorm(Histogram h1, Histogram h2);
-dbl HSTeuclidianNormWhatIf(Histogram h1, Histogram h2, ValPtr val, dbl
*whatIfDistance);
-int HSTeuclidianNormWhatIfMove(Histogram h1, Histogram h2, ValPtr val, dbl
*whatIfDistance);
-int HSTeuclidianWhatIf(Histogram h1, Histogram h2, ValPtr val);
-int HSTeuclidianWhatIfMove(Histogram h1, Histogram h2, ValPtr val);
-int HSTgetIndex(Histogram h, ValPtr val);
-int HSTincrement(Histogram h, ValPtr val);
-Histogram HSTnew(int bins, ValPtr minval, ValPtr maxval);
-void HSTprint(stream *s, Histogram h);
-void HSTprintf(Histogram h);
-int HSTwhichbin(Histogram h1, Histogram h2);
-int HSTwhichbinNorm(Histogram h1, Histogram h2);
str IDentifier(str *retval, str *in);
int IDfromString(str src, int *len, str *retval);
str IDprelude(void);
@@ -1785,60 +1759,6 @@ void MSresetInstructions(MalBlkPtr mb, i
void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start);
void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout);
void MSserveClient(void *dummy);
-str MTIMEbat_date_EQ(int *ret, int *l, int *r);
-str MTIMEbat_date_EQ_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_GE(int *ret, int *l, int *r);
-str MTIMEbat_date_GE_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_GT(int *ret, int *l, int *r);
-str MTIMEbat_date_GT_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_LE(int *ret, int *l, int *r);
-str MTIMEbat_date_LE_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_LT(int *ret, int *l, int *r);
-str MTIMEbat_date_LT_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_NEQ(int *ret, int *l, int *r);
-str MTIMEbat_date_NEQ_cst(int *ret, int *l, date *cst);
-str MTIMEbat_date_cst_EQ(int *ret, date *cst, int *l);
-str MTIMEbat_date_cst_GE(int *ret, date *cst, int *l);
-str MTIMEbat_date_cst_GT(int *ret, date *cst, int *l);
-str MTIMEbat_date_cst_LE(int *ret, date *cst, int *l);
-str MTIMEbat_date_cst_LT(int *ret, date *cst, int *l);
-str MTIMEbat_date_cst_NEQ(int *ret, date *cst, int *l);
-str MTIMEbat_daytime_EQ(int *ret, int *l, int *r);
-str MTIMEbat_daytime_EQ_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_GE(int *ret, int *l, int *r);
-str MTIMEbat_daytime_GE_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_GT(int *ret, int *l, int *r);
-str MTIMEbat_daytime_GT_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_LE(int *ret, int *l, int *r);
-str MTIMEbat_daytime_LE_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_LT(int *ret, int *l, int *r);
-str MTIMEbat_daytime_LT_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_NEQ(int *ret, int *l, int *r);
-str MTIMEbat_daytime_NEQ_cst(int *ret, int *l, daytime *cst);
-str MTIMEbat_daytime_cst_EQ(int *ret, daytime *cst, int *l);
-str MTIMEbat_daytime_cst_GE(int *ret, daytime *cst, int *l);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
