Changeset: d39eb2b0110f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d39eb2b0110f
Removed Files:
monetdb5/scheduler/CMakeLists.txt
monetdb5/scheduler/Tests/All
monetdb5/scheduler/Tests/SingleServer
monetdb5/scheduler/Tests/memo01.maltest
monetdb5/scheduler/Tests/memo02.maltest
monetdb5/scheduler/Tests/mutation00.malC
monetdb5/scheduler/Tests/oct00.malC
monetdb5/scheduler/Tests/oct01.malC
monetdb5/scheduler/Tests/oct02.malC
monetdb5/scheduler/Tests/sched00.maltest
monetdb5/scheduler/run_adder.c
monetdb5/scheduler/run_isolate.c
monetdb5/scheduler/run_memo.c
monetdb5/scheduler/run_pipeline.c
monetdb5/scheduler/run_pipeline.h
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
clients/Tests/exports.stable.out
debian/monetdb5-server.install
monetdb5/CMakeLists.txt
Branch: default
Log Message:
Removed unused run_* modules.
diffs (truncated from 1403 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -826,7 +826,6 @@ install -d -m 0775 %{buildroot}%{_rundir
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5/lib_run_*.so
rm -f %{buildroot}%{_libdir}/monetdb5/lib_microbenchmark*.so
rm -f %{buildroot}%{_libdir}/monetdb5/lib_udf*.so
rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -193,9 +193,9 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('run_' not in x) and
('microbenchmark' not in x) and ('udf' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('microbenchmark' not in x) and
('udf' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('run_' not in x) and ('microbenchmark' not in
x) and ('udf' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('microbenchmark' not in x) and ('udf' not in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
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
@@ -765,7 +765,6 @@ str MALexitClient(Client c);
str MALinitClient(Client c);
str MALoptimizer(Client c);
str MALparser(Client c);
-str MALpipeline(Client c);
str MALreader(Client c);
MALfcn MANIFOLDtypecheck(Client cntxt, MalBlkPtr mb, InstrPtr pci, int
checkprops);
int MCactiveClients(void);
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -2,6 +2,6 @@ debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so.* usr/lib/x86_64-linux-gnu
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
-# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,run_*,sql,udf}.so
+# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,sql,udf}.so
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_generator.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/monetdb5/CMakeLists.txt b/monetdb5/CMakeLists.txt
--- a/monetdb5/CMakeLists.txt
+++ b/monetdb5/CMakeLists.txt
@@ -9,7 +9,6 @@
add_subdirectory(mal)
add_subdirectory(modules)
add_subdirectory(optimizer)
-add_subdirectory(scheduler)
add_subdirectory(tools)
add_subdirectory(extras)
if(WIN32)
diff --git a/monetdb5/scheduler/CMakeLists.txt
b/monetdb5/scheduler/CMakeLists.txt
deleted file mode 100644
--- a/monetdb5/scheduler/CMakeLists.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-#[[
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
-#]]
-
-add_library(run_adder MODULE)
-target_sources(run_adder
- PRIVATE
- run_adder.c)
-target_include_directories(run_adder
- PRIVATE
- $<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:optimizer,INTERFACE_INCLUDE_DIRECTORIES>
- PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-target_link_libraries(run_adder
- PRIVATE
- monetdb_config_header
- bat
- monetdb5)
-set_target_properties(run_adder
- PROPERTIES
- OUTPUT_NAME _run_adder)
-install(TARGETS run_adder
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
- COMPONENT run_adder)
-
-add_library(run_isolate MODULE)
-target_sources(run_isolate
- PRIVATE
- run_isolate.c)
-target_include_directories(run_isolate
- PRIVATE
- $<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:optimizer,INTERFACE_INCLUDE_DIRECTORIES>
- PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-target_link_libraries(run_isolate
- PRIVATE
- monetdb_config_header
- monetdb5)
-set_target_properties(run_isolate
- PROPERTIES
- OUTPUT_NAME _run_isolate)
-install(TARGETS run_isolate
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
- COMPONENT run_isolate)
-
-add_library(run_memo MODULE)
-target_sources(run_memo
- PRIVATE
- run_memo.c)
-target_include_directories(run_memo
- PRIVATE
- $<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:optimizer,INTERFACE_INCLUDE_DIRECTORIES>
- PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-target_link_libraries(run_memo
- PRIVATE
- monetdb_config_header
- bat
- monetdb5)
-set_target_properties(run_memo
- PROPERTIES
- OUTPUT_NAME _run_memo)
-install(TARGETS run_memo
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
- COMPONENT run_memo)
-
-if(WIN32)
- install(FILES
- $<TARGET_PDB_FILE:run_adder>
- $<TARGET_PDB_FILE:run_isolate>
- $<TARGET_PDB_FILE:run_memo>
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
- OPTIONAL)
-endif()
diff --git a/monetdb5/scheduler/Tests/All b/monetdb5/scheduler/Tests/All
deleted file mode 100644
--- a/monetdb5/scheduler/Tests/All
+++ /dev/null
@@ -1,4 +0,0 @@
-sched00
-memo01
-memo02
-#mutation00 was prototype for mutation techniques
diff --git a/monetdb5/scheduler/Tests/SingleServer
b/monetdb5/scheduler/Tests/SingleServer
deleted file mode 100644
--- a/monetdb5/scheduler/Tests/SingleServer
+++ /dev/null
@@ -1,2 +0,0 @@
---loadmodule run_isolate
---loadmodule run_memo
diff --git a/monetdb5/scheduler/Tests/memo01.maltest
b/monetdb5/scheduler/Tests/memo01.maltest
deleted file mode 100644
--- a/monetdb5/scheduler/Tests/memo01.maltest
+++ /dev/null
@@ -1,191 +0,0 @@
-statement ok
-include run_memo
-
-statement ok
- A:= bat.new(:oid)
-
-statement ok
- bat.append(A,1@0)
-
-statement ok
- B:= algebra.copy(A)
-
-statement ok
- bat.setAccess(B,"w")
-
-statement ok
- bat.append(B,2@0)
-
-statement ok
- C:= algebra.copy(B)
-
-statement ok
- bat.setAccess(C,"w")
-
-statement ok
- bat.append(C,3@0)
-
-statement ok
- D:= algebra.copy(C)
-
-statement ok
- bat.setAccess(D,"w")
-
-statement ok
- bat.append(D,3@0)
-
-statement ok
- Acost:= aggr.count(A)
-
-statement ok
- Bcost:= aggr.count(B)
-
-statement ok
- Ccost:= aggr.count(C)
-
-statement ok
- Dcost:= aggr.count(D)
-
-statement ok
- T1cost:= Acost+Bcost
-
-statement ok
- T2cost:= Bcost+Ccost
-
-statement ok
- T3cost:= Ccost+Dcost
-
-query T rowsort
- io.printf("choicepoint 1\n")
-----
-choicepoint 1
-
-statement ok
- run_memo.choice()
-
-statement ok
- T1:= algebra.projection(A,B)
-
-statement ok
- T1cost:= aggr.count(T1)
-
-statement ok
- T2:= algebra.projection(B,C)
-
-statement ok
- T2cost:= aggr.count(T2)
-
-statement ok
- T3:= algebra.projection(C,D)
-
-statement ok
- T3cost:= aggr.count(T3)
-
-query T rowsort
- io.printf("choicepoint 2\n")
-----
-choicepoint 2
-
-statement ok
- run_memo.choice(T1cost,T1, T2cost,T2, T3cost,T3)
-
-statement ok
- T4cost:=T1cost+Ccost
-
-statement ok
- T5cost:=Acost+T2cost
-
-statement ok
- T6cost:=T2cost+Dcost
-
-statement ok
- T7cost:=Bcost+T3cost
-
-statement ok
- T8cost:=Ccost+Dcost
-
-statement ok
- T4:= algebra.projection(T1,C)
-
-statement ok
- T4cost:= aggr.count(T4)
-
-statement ok
- T5:= algebra.projection(A,T2)
-
-statement ok
- T5cost:= aggr.count(T5)
-
-statement ok
- T6:= algebra.projection(T2,D)
-
-statement ok
- T6cost:= aggr.count(T6)
-
-statement ok
- T7:= algebra.projection(B,T3)
-
-statement ok
- T7cost:= aggr.count(T7)
-
-statement ok
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
