Changeset: 6a30926aca65 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a30926aca65
Added Files:
geom/sql/Tests/T1.modules
geom/sql/Tests/T10.modules
geom/sql/Tests/T11.modules
geom/sql/Tests/T12.modules
geom/sql/Tests/T13.modules
geom/sql/Tests/T14.modules
geom/sql/Tests/T15.modules
geom/sql/Tests/T16.modules
geom/sql/Tests/T17.modules
geom/sql/Tests/T18.modules
geom/sql/Tests/T19.modules
geom/sql/Tests/T2.modules
geom/sql/Tests/T20.modules
geom/sql/Tests/T21.modules
geom/sql/Tests/T22.modules
geom/sql/Tests/T23.modules
geom/sql/Tests/T24.modules
geom/sql/Tests/T25.modules
geom/sql/Tests/T26.modules
geom/sql/Tests/T27.modules
geom/sql/Tests/T28.modules
geom/sql/Tests/T29.modules
geom/sql/Tests/T3.modules
geom/sql/Tests/T30.modules
geom/sql/Tests/T31.modules
geom/sql/Tests/T32.modules
geom/sql/Tests/T33.modules
geom/sql/Tests/T34.modules
geom/sql/Tests/T35.modules
geom/sql/Tests/T36.modules
geom/sql/Tests/T37.modules
geom/sql/Tests/T38.modules
geom/sql/Tests/T39.modules
geom/sql/Tests/T4.modules
geom/sql/Tests/T40.modules
geom/sql/Tests/T41.modules
geom/sql/Tests/T42.modules
geom/sql/Tests/T43.modules
geom/sql/Tests/T44.modules
geom/sql/Tests/T45.modules
geom/sql/Tests/T46.modules
geom/sql/Tests/T47.modules
geom/sql/Tests/T48.modules
geom/sql/Tests/T49.modules
geom/sql/Tests/T5.modules
geom/sql/Tests/T50.modules
geom/sql/Tests/T51.modules
geom/sql/Tests/T52.modules
geom/sql/Tests/T6.modules
geom/sql/Tests/T7.modules
geom/sql/Tests/T8.modules
geom/sql/Tests/T9.modules
geom/sql/Tests/conformance_drop.modules
geom/sql/Tests/conformance_load.modules
monetdb5/modules/mal/Tests/pqueueElim.mal
monetdb5/modules/mal/Tests/pqueueElim.stable.err
monetdb5/modules/mal/Tests/pqueueElim.stable.out
Modified Files:
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
buildtools/ChangeLog.Jan2014
buildtools/doc/windowsbuild.rst
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out.oid32
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
geom/sql/Tests/All
geom/sql/Tests/T13.sql
geom/sql/Tests/T13.stable.out
geom/sql/Tests/T14.sql
geom/sql/Tests/T14.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/pqueue.mal
monetdb5/modules/mal/Tests/pqueue.stable.out
monetdb5/modules/mal/pqueue.c
monetdb5/modules/mal/pqueue.h
monetdb5/modules/mal/pqueue.mal
monetdb5/modules/mal/tokenizer.c
sql/backends/monet5/datacell/50_datacell.sql
sql/backends/monet5/datacell/Tests/datacell00.stable.err
sql/backends/monet5/datacell/Tests/datacell00.stable.out
sql/backends/monet5/datacell/Tests/dctemper00.stable.err
sql/backends/monet5/datacell/Tests/dctemper00.stable.out
sql/backends/monet5/datacell/Tests/scenario01.stable.out
sql/backends/monet5/datacell/Tests/scenario02.stable.out
sql/backends/monet5/datacell/Tests/scenario04.stable.out
sql/backends/monet5/datacell/Tests/scenario05.stable.out
sql/backends/monet5/datacell/Tests/scenario06.stable.err
sql/backends/monet5/datacell/Tests/scenario06.stable.out
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.h
sql/backends/monet5/datacell/datacell.mal
sql/backends/monet5/datacell/dcsocket.c
sql/backends/monet5/datacell/emitter.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/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
Branch: newstorage
Log Message:
merged with default
diffs (truncated from 39353 to 300 lines):
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win32-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win64-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win64-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org>
+- On Windows we now build the geom module against version 3.4.2 of the
+ geos library.
+
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -372,21 +372,23 @@ in the instructions.
.. The actual commands were::
autogen.bat
- nmake /f makefile.vc MSCV_VER=1600
+ nmake /f makefile.vc MSVC_VER=1600
+
+.. On Windows64, add WIN64=YES to the nmake command line.
After this, install the library somewhere, e.g. in
-``C:\geos-3.3.0.win32``::
+``C:\geos-3.4.2.win32``::
- mkdir C:\geos-3.3.0.win32
- mkdir C:\geos-3.3.0.win32\lib
- mkdir C:\geos-3.3.0.win32\bin
- mkdir C:\geos-3.3.0.win32\include
- mkdir C:\geos-3.3.0.win32\include\geos
- copy src\geos_c_i.lib C:\geos-3.3.0.win32\lib
- copy src\geos_c.dll C:\geos-3.3.0.win32\bin
- copy src\include C:\geos-3.3.0.win32\include
- copy src\include\geos C:\geos-3.3.0.win32\include\geos
- copy capi\geos_c.h C:\geos-3.3.0.win32\include
+ mkdir C:\geos-3.4.2.win32
+ mkdir C:\geos-3.4.2.win32\lib
+ mkdir C:\geos-3.4.2.win32\bin
+ mkdir C:\geos-3.4.2.win32\include
+ mkdir C:\geos-3.4.2.win32\include\geos
+ copy src\geos_c_i.lib C:\geos-3.4.2.win32\lib
+ copy src\geos_c.dll C:\geos-3.4.2.win32\bin
+ copy include C:\geos-3.4.2.win32\include
+ copy include\geos C:\geos-3.4.2.win32\include\geos
+ copy capi\geos_c.h C:\geos-3.4.2.win32\include
__ http://geos.refractions.net/
__ http://trac.osgeo.org/geos/wiki/BuildingOnWindowsWithNMake
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -41022,89 +41022,13 @@ command pcre.select(pat:str,strs:bat[:oi
address PCREselectDef;
comment Select tuples based on the pattern
-command pqueue.dequeue_max(h:bat[:oid,:any_1]):void
-address PQdequeue_anymax;
-comment Removes top element of the max-pqueue and updates it
-
-command pqueue.dequeue_min(h:bat[:oid,:any_1]):void
-address PQdequeue_anymin;
-comment Removes top element of the min-pqueue and updates it
-
-command pqueue.dequeue_max(h:bat[:oid,:dbl]):void
-address PQdequeue_dblmax;
-command pqueue.dequeue_min(h:bat[:oid,:dbl]):void
-address PQdequeue_fltmin;
-command pqueue.dequeue_max(h:bat[:oid,:flt]):void
-address PQdequeue_fltmax;
-command pqueue.dequeue_min(h:bat[:oid,:flt]):void
-address PQdequeue_fltmin;
-command pqueue.dequeue_max(h:bat[:oid,:lng]):void
-address PQdequeue_lngmax;
-command pqueue.dequeue_min(h:bat[:oid,:lng]):void
-address PQdequeue_lngmin;
-command pqueue.dequeue_max(h:bat[:oid,:wrd]):void
-address PQdequeue_wrdmax;
-command pqueue.dequeue_min(h:bat[:oid,:wrd]):void
-address PQdequeue_wrdmin;
-command pqueue.dequeue_max(h:bat[:oid,:int]):void
-address PQdequeue_intmax;
-command pqueue.dequeue_min(h:bat[:oid,:int]):void
-address PQdequeue_intmin;
-command pqueue.dequeue_max(h:bat[:oid,:sht]):void
-address PQdequeue_shtmax;
-command pqueue.dequeue_min(h:bat[:oid,:sht]):void
-address PQdequeue_shtmin;
-command pqueue.dequeue_max(h:bat[:oid,:bte]):void
-address PQdequeue_btemax;
-comment Removes top element of the max-pqueue and updates it
-
-command pqueue.dequeue_min(h:bat[:oid,:bte]):void
-address PQdequeue_btemin;
-comment Removes top element of the min-pqueue and updates it
-
-pattern pqueue.enqueue_max(h:bat[:oid,:any_1],id:oid,value:any_1):void
-address PQenqueue_anymax;
-comment Inserts element (oid,any) in the max-pqueue
-
-pattern pqueue.enqueue_min(h:bat[:oid,:any_1],id:oid,value:any_1):void
-address PQenqueue_anymin;
-comment Inserts element (oid,any) in the min-pqueue
-
-command pqueue.enqueue_max(h:bat[:oid,:dbl],id:oid,value:dbl):void
-address PQenqueue_dblmax;
-command pqueue.enqueue_min(h:bat[:oid,:dbl],id:oid,value:flt):void
-address PQenqueue_fltmin;
-command pqueue.enqueue_max(h:bat[:oid,:flt],id:oid,value:flt):void
-address PQenqueue_fltmax;
-command pqueue.enqueue_min(h:bat[:oid,:flt],id:oid,value:flt):void
-address PQenqueue_fltmin;
-command pqueue.enqueue_max(h:bat[:oid,:lng],id:oid,value:lng):void
-address PQenqueue_lngmax;
-command pqueue.enqueue_min(h:bat[:oid,:lng],id:oid,value:lng):void
-address PQenqueue_lngmin;
-command pqueue.enqueue_max(h:bat[:oid,:wrd],id:oid,value:wrd):void
-address PQenqueue_wrdmax;
-command pqueue.enqueue_min(h:bat[:oid,:wrd],id:oid,value:wrd):void
-address PQenqueue_wrdmin;
-command pqueue.enqueue_max(h:bat[:oid,:int],id:oid,value:int):void
-address PQenqueue_intmax;
-command pqueue.enqueue_min(h:bat[:oid,:int],id:oid,value:int):void
-address PQenqueue_intmin;
-command pqueue.enqueue_max(h:bat[:oid,:sht],id:oid,value:sht):void
-address PQenqueue_shtmax;
-command pqueue.enqueue_min(h:bat[:oid,:sht],id:oid,value:sht):void
-address PQenqueue_shtmin;
-command pqueue.enqueue_max(h:bat[:oid,:bte],id:oid,value:bte):void
-address PQenqueue_btemax;
-comment Inserts element (oid,bte) in the max-pqueue
-
-command pqueue.enqueue_min(h:bat[:oid,:bte],id:oid,value:bte):void
-address PQenqueue_btemin;
-comment Inserts element (oid,bte) in the min-pqueue
-
-command pqueue.init(a:bat[:oid,:any_1],maxsize:wrd):bat[:oid,:any_1]
-address PQinit;
-comment Creates an empty pqueue of bat a's tailtype with maximum size maxsize
+pattern pqueue.topn_max(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid]
+address PQtopn_max;
+comment Return the top n elements using a min-pqueue with/without duplicate
elimination
+
+pattern pqueue.topn_min(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid]
+address PQtopn_min;
+comment Return the top n elements using a min-pqueue with/without duplicate
elimination
command
pqueue.topn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid]
address PQtopn2_anymax;
@@ -41118,10 +41042,6 @@ command pqueue.topn_max(t:bat[:oid,:any_
address PQtopn_anymax;
comment Return the topn elements of the bat t using a max-pqueue
-pattern pqueue.topreplace_max(h:bat[:oid,:any_1],id:oid,value:any_1):void
-address PQtopreplace_anymax;
-comment Replaces top element with input and updates max-pqueue
-
command
pqueue.topn_min(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid]
address PQtopn2_anymin;
comment Return the topn elements of the bat t using a min-pqueue
@@ -41134,74 +41054,38 @@ command pqueue.topn_min(t:bat[:oid,:any_
address PQtopn_anymin;
comment Return the topn elements of the bat t using a min-pqueue
-pattern pqueue.topreplace_min(h:bat[:oid,:any_1],id:oid,value:any_1):void
-address PQtopreplace_anymin;
-comment Replaces top element with input and updates min-pqueue
-
command pqueue.topn_max(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid]
address PQtopn_dblmax;
-command pqueue.topreplace_max(h:bat[:oid,:dbl],id:oid,value:dbl):void
-address PQtopreplace_dblmax;
command pqueue.topn_min(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid]
address PQtopn_fltmin;
-command pqueue.topreplace_min(h:bat[:oid,:dbl],id:oid,value:flt):void
-address PQtopreplace_fltmin;
command pqueue.topn_max(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid]
address PQtopn_fltmax;
-command pqueue.topreplace_max(h:bat[:oid,:flt],id:oid,value:flt):void
-address PQtopreplace_fltmax;
command pqueue.topn_min(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid]
address PQtopn_fltmin;
-command pqueue.topreplace_min(h:bat[:oid,:flt],id:oid,value:flt):void
-address PQtopreplace_fltmin;
command pqueue.topn_max(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid]
address PQtopn_lngmax;
-command pqueue.topreplace_max(h:bat[:oid,:lng],id:oid,value:lng):void
-address PQtopreplace_lngmax;
command pqueue.topn_min(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid]
address PQtopn_lngmin;
-command pqueue.topreplace_min(h:bat[:oid,:lng],id:oid,value:lng):void
-address PQtopreplace_lngmin;
command pqueue.topn_max(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid]
address PQtopn_wrdmax;
-command pqueue.topreplace_max(h:bat[:oid,:wrd],id:oid,value:wrd):void
-address PQtopreplace_wrdmax;
command pqueue.topn_min(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid]
address PQtopn_wrdmin;
-command pqueue.topreplace_min(h:bat[:oid,:wrd],id:oid,value:wrd):void
-address PQtopreplace_wrdmin;
command pqueue.topn_max(t:bat[:oid,:int],n:wrd):bat[:oid,:oid]
address PQtopn_intmax;
-command pqueue.topreplace_max(h:bat[:oid,:int],id:oid,value:int):void
-address PQtopreplace_intmax;
command pqueue.topn_min(t:bat[:oid,:int],n:wrd):bat[:oid,:oid]
address PQtopn_intmin;
-command pqueue.topreplace_min(h:bat[:oid,:int],id:oid,value:int):void
-address PQtopreplace_intmin;
command pqueue.topn_max(t:bat[:oid,:sht],n:wrd):bat[:oid,:oid]
address PQtopn_shtmax;
-command pqueue.topreplace_max(h:bat[:oid,:sht],id:oid,value:sht):void
-address PQtopreplace_shtmax;
command pqueue.topn_min(t:bat[:oid,:sht],n:wrd):bat[:oid,:oid]
address PQtopn_shtmin;
-command pqueue.topreplace_min(h:bat[:oid,:sht],id:oid,value:sht):void
-address PQtopreplace_shtmin;
command pqueue.topn_max(t:bat[:oid,:bte],n:wrd):bat[:oid,:oid]
address PQtopn_btemax;
comment Return the topn elements of the bat t using a max-pqueue
-command pqueue.topreplace_max(h:bat[:oid,:bte],id:oid,value:bte):void
-address PQtopreplace_btemax;
-comment Replaces top element with input and updates max-pqueue
-
command pqueue.topn_min(t:bat[:oid,:bte],n:wrd):bat[:oid,:oid]
address PQtopn_btemin;
comment Return the topn elements of the bat t using a min-pqueue
-command pqueue.topreplace_min(h:bat[:oid,:bte],id:oid,value:bte):void
-address PQtopreplace_btemin;
-comment Replaces top element with input and updates min-pqueue
-
command
pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid]
address PQutopn2_anymax;
comment Return the unique topn elements of the bat t using a max-pqueue
diff --git a/clients/Tests/MAL-signatures_gsl.stable.out
b/clients/Tests/MAL-signatures_gsl.stable.out
--- a/clients/Tests/MAL-signatures_gsl.stable.out
+++ b/clients/Tests/MAL-signatures_gsl.stable.out
@@ -41038,89 +41038,13 @@ command pcre.select(pat:str,strs:bat[:oi
address PCREselectDef;
comment Select tuples based on the pattern
-command pqueue.dequeue_max(h:bat[:oid,:any_1]):void
-address PQdequeue_anymax;
-comment Removes top element of the max-pqueue and updates it
-
-command pqueue.dequeue_min(h:bat[:oid,:any_1]):void
-address PQdequeue_anymin;
-comment Removes top element of the min-pqueue and updates it
-
-command pqueue.dequeue_max(h:bat[:oid,:dbl]):void
-address PQdequeue_dblmax;
-command pqueue.dequeue_min(h:bat[:oid,:dbl]):void
-address PQdequeue_fltmin;
-command pqueue.dequeue_max(h:bat[:oid,:flt]):void
-address PQdequeue_fltmax;
-command pqueue.dequeue_min(h:bat[:oid,:flt]):void
-address PQdequeue_fltmin;
-command pqueue.dequeue_max(h:bat[:oid,:lng]):void
-address PQdequeue_lngmax;
-command pqueue.dequeue_min(h:bat[:oid,:lng]):void
-address PQdequeue_lngmin;
-command pqueue.dequeue_max(h:bat[:oid,:wrd]):void
-address PQdequeue_wrdmax;
-command pqueue.dequeue_min(h:bat[:oid,:wrd]):void
-address PQdequeue_wrdmin;
-command pqueue.dequeue_max(h:bat[:oid,:int]):void
-address PQdequeue_intmax;
-command pqueue.dequeue_min(h:bat[:oid,:int]):void
-address PQdequeue_intmin;
-command pqueue.dequeue_max(h:bat[:oid,:sht]):void
-address PQdequeue_shtmax;
-command pqueue.dequeue_min(h:bat[:oid,:sht]):void
-address PQdequeue_shtmin;
-command pqueue.dequeue_max(h:bat[:oid,:bte]):void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
