Changeset: b99a71faeabf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b99a71faeabf Removed Files: sql/backends/monet5/iot/50_iot.mal sql/backends/monet5/iot/50_iot.sql sql/backends/monet5/iot/Makefile.ag sql/backends/monet5/iot/Makefile.am sql/backends/monet5/iot/Makefile.in sql/backends/monet5/iot/Makefile.msc sql/backends/monet5/iot/Tests/.gdk_lock sql/backends/monet5/iot/basket.c sql/backends/monet5/iot/basket.h sql/backends/monet5/iot/basket.mal sql/backends/monet5/iot/iot.c sql/backends/monet5/iot/iot.h sql/backends/monet5/iot/iot.mal sql/backends/monet5/iot/petrinet.c sql/backends/monet5/iot/petrinet.h sql/backends/monet5/iot/petrinet.mal sql/backends/monet5/iot/receptor.c sql/backends/monet5/iot/receptor.h sql/backends/monet5/iot/receptor.mal Branch: default Log Message:
Backed out changeset e48abf466de3 Moved changes to branch iot. diffs (truncated from 3395 to 300 lines): diff --git a/sql/backends/monet5/iot/50_iot.mal b/sql/backends/monet5/iot/50_iot.mal deleted file mode 100644 --- a/sql/backends/monet5/iot/50_iot.mal +++ /dev/null @@ -1,24 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2016 MonetDB B.V. -# All Rights Reserved. - -# This loads the MonetDB/DataCell module -include iot; -include basket; -include petrinet; -include receptor; - -io.printf("# MonetDB/iot loaded\n"); diff --git a/sql/backends/monet5/iot/50_iot.sql b/sql/backends/monet5/iot/50_iot.sql deleted file mode 100644 --- a/sql/backends/monet5/iot/50_iot.sql +++ /dev/null @@ -1,77 +0,0 @@ --- The contents of this file are subject to the MonetDB Public License --- Version 1.1 (the "License"); you may not use this file except in --- compliance with the License. You may obtain a copy of the License at --- http://www.monetdb.org/Legal/MonetDBLicense --- --- Software distributed under the License is distributed on an "AS IS" --- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the --- License for the specific language governing rights and limitations --- under the License. --- --- The Original Code is the MonetDB Database System. --- --- The Initial Developer of the Original Code is CWI. --- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. --- Copyright August 2008-2016 MonetDB B.V. --- All Rights Reserved. - -create schema iot; - -create procedure iot.query(qry string) - external name iot.query; - -create procedure iot.query("schema" string, name string) - external name iot.query; - -create procedure iot.pause () - external name iot.pause; - -create procedure iot.pause ("schema" string, name string) - external name iot.pause; - -create procedure iot.resume () - external name iot.resume; - -create procedure iot.resume ("schema" string, name string) - external name iot.resume; - -create procedure iot.stop () - external name iot.stop; - -create procedure iot."drop" () - external name iot."drop"; - - -create procedure iot.stop ("schema" string, name string) - external name iot.stop; - -create procedure iot.dump() - external name iot.dump; - -create procedure iot.baskets() - external name iot.baskets; - -create procedure iot.petrinet() - external name iot.petrinet; - -create procedure iot.receptors() - external name iot.receptors; - - --- Inspection tables - ---create function iot.baskets() ---returns table( "schema" string, "table" string, threshold int, winsize int, winstride int, timeslice int, timestride int, beat int, seen timestamp, events int) ---external name baskets.table; - -create function iot.queries() -returns table( "schema" string, "function" string, status string, lastrun timestamp, cycles int, events int, time bigint, error string) -external name petrinet.queries; - ---create function iot.receptors() ---returns table( "primary" string, "secondary" string, status string) ---external name receptor."table"; - --- create function iot.errors() --- returns table( "schema" string, "table" string, error string) --- external name iot.errors; diff --git a/sql/backends/monet5/iot/Makefile.ag b/sql/backends/monet5/iot/Makefile.ag deleted file mode 100644 --- a/sql/backends/monet5/iot/Makefile.ag +++ /dev/null @@ -1,75 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2016 MonetDB B.V. -# All Rights Reserved. - -## Process this file with automake to produce Makefile.in - -INCLUDES = .. \ - ../../../include \ - ../../../common \ - ../../../storage \ - ../../../server \ - ../../../../monetdb5/modules/atoms \ - ../../../../monetdb5/modules/kernel \ - ../../../../monetdb5/mal \ - ../../../../monetdb5/modules/mal \ - ../../../../monetdb5/optimizer \ - ../../../../clients/mapilib \ - ../../../../common/options \ - ../../../../common/stream \ - ../../../../gdk - -lib__iot = { - MODULE - DIR = libdir/monetdb5 - SEP = _ - SOURCES = \ - iot.c \ - basket.c \ - receptor.c \ - petrinet.c -# emitter.c - - LIBS = ../../../../monetdb5/tools/libmonetdb5 \ - ../../../../gdk/libbat -} - -scripts_mal = { - HEADERS = mal - DIR = libdir/monetdb5 - SOURCES = basket.mal \ - iot.mal \ - petrinet.mal \ - receptor.mal -# emitter.mal \ -} - -scripts_sql = { - HEADERS = sql - DIR = libdir/monetdb5/createdb - SOURCES = 50_iot.sql -} - -headers_iotautoload = { - HEADERS = mal - DIR = libdir/monetdb5/autoload - SOURCES = 50_iot.mal -} - -EXTRA_DIST = 50_iot.mal 50_iot.sql basket.mal basket.h iot.mal iot.h petrinet.mal petrinet.h receptor.mal receptor.h -# emitter.mal emitter.h - -EXTRA_DIST_DIR = Tests diff --git a/sql/backends/monet5/iot/Makefile.am b/sql/backends/monet5/iot/Makefile.am deleted file mode 100644 --- a/sql/backends/monet5/iot/Makefile.am +++ /dev/null @@ -1,94 +0,0 @@ - -## This file is generated by autogen.py, do not edit -## Process this file with automake to produce Makefile.in -## autogen includes dependencies so automake doesn't need to generated them - -AUTOMAKE_OPTIONS = no-dependencies 1.4 foreign - -script_basket.mal: basket.mal -install-exec-local-basket.mal: basket.mal - -mkdir -p $(DESTDIR)$(libdir)/monetdb5 - -$(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal - $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/basket.mal - -uninstall-local-basket.mal: - $(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal - -script_iot.mal: iot.mal -install-exec-local-iot.mal: iot.mal - -mkdir -p $(DESTDIR)$(libdir)/monetdb5 - -$(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal - $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/iot.mal - -uninstall-local-iot.mal: - $(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal - -script_petrinet.mal: petrinet.mal -install-exec-local-petrinet.mal: petrinet.mal - -mkdir -p $(DESTDIR)$(libdir)/monetdb5 - -$(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal - $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/petrinet.mal - -uninstall-local-petrinet.mal: - $(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal - -script_receptor.mal: receptor.mal -install-exec-local-receptor.mal: receptor.mal - -mkdir -p $(DESTDIR)$(libdir)/monetdb5 - -$(RM) $(DESTDIR)$(libdir)/monetdb5/receptor.mal - $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/receptor.mal - -uninstall-local-receptor.mal: - $(RM) $(DESTDIR)$(libdir)/monetdb5/receptor.mal - -iot.o iot.lo: iot.c iot.h ../../../../monetdb5/optimizer/opt_prelude.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_pipes.h ../../../../monetdb5/optimizer/opt_iot.h ../sql_optimizer.h ../sql_gencode.h -petrinet.o petrinet.lo: petrinet.c iot.h petrinet.h ../../../../monetdb5/mal/mal_builder.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_prelude.h -basket.o basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h receptor.h ../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h ../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h ../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h ../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h ../../../../monetdb5/mal/mal_builder.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_prelude.h -receptor.o receptor.lo: receptor.c receptor.h -script_50_iot.sql: 50_iot.sql -install-exec-local-50_iot.sql: 50_iot.sql - -mkdir -p $(DESTDIR)$(libdir)/monetdb5/createdb - -$(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql - $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql - -uninstall-local-50_iot.sql: - $(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql - -AM_CPPFLAGS = -I$(srcdir) -I.. -I$(srcdir)/.. -I../../../include -I$(srcdir)/../../../include -I../../../common -I$(srcdir)/../../../common -I../../../storage -I$(srcdir)/../../../storage -I../../../server -I$(srcdir)/../../../server -I../../../../monetdb5/modules/atoms -I$(srcdir)/../../../../monetdb5/modules/atoms -I../../../../monetdb5/modules/kernel -I$(srcdir)/../../../../monetdb5/modules/kernel -I../../../../monetdb5/mal -I$(srcdir)/../../../../monetdb5/mal -I../../../../monetdb5/modules/mal -I$(srcdir)/../../../../monetdb5/modules/mal -I../../../../monetdb5/optimizer -I$(srcdir)/../../../../monetdb5/optimizer -I../../../../clients/mapilib -I$(srcdir)/../../../../clients/mapilib -I../../../../common/options -I$(srcdir)/../../../../common/options -I../../../../common/stream -I$(srcdir)/../../../../common/stream -I../../../../gdk -I$(srcdir)/../../../../gdk -install-exec-local-50_iot.mal: 50_iot.mal - -mkdir -p $(DESTDIR)$(libdir)/monetdb5/autoload - -$(RM) $(DESTDIR)$(libdir)/monetdb5/autoload/50_iot.mal - $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/monetdb5/autoload/50_iot.mal - -uninstall-local-50_iot.mal: - $(RM) $(DESTDIR)$(libdir)/monetdb5/autoload/50_iot.mal - -dist-hook: - mkdir -p $(distdir)/Tests - cp -pR $(srcdir)/Tests/* $(distdir)/Tests -lib_iot_la_CFLAGS=-DLIBIOT $(AM_CFLAGS) -iotdir = $(libdir)/monetdb5 -lib_iot_la_LIBADD = ../../../../monetdb5/tools/libmonetdb5.la ../../../../gdk/libbat.la -$(do)install-iotLTLIBRARIES : -lib_iot_la-iot.lo: iot.c iot.h ../../../../monetdb5/optimizer/opt_prelude.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_pipes.h ../../../../monetdb5/optimizer/opt_iot.h ../sql_optimizer.h ../sql_gencode.h - $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS) $(iot_CFLAGS) -c -o lib_iot_la-iot.lo `test -f 'iot.c' || echo '$(srcdir)/'`iot.c -lib_iot_la-basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h receptor.h ../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h ../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h ../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h ../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h ../../../../monetdb5/mal/mal_builder.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_prelude.h - $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS) $(basket_CFLAGS) -c -o lib_iot_la-basket.lo `test -f 'basket.c' || echo '$(srcdir)/'`basket.c -lib_iot_la-receptor.lo: receptor.c receptor.h - $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS) $(receptor_CFLAGS) -c -o lib_iot_la-receptor.lo `test -f 'receptor.c' || echo '$(srcdir)/'`receptor.c -lib_iot_la-petrinet.lo: petrinet.c iot.h petrinet.h ../../../../monetdb5/mal/mal_builder.h ../../../../monetdb5/optimizer/opt_support.h ../../../../monetdb5/optimizer/../mal/mal.h ../../../../monetdb5/optimizer/../mal/mal_function.h ../../../../monetdb5/optimizer/../mal/mal_scenario.h ../../../../monetdb5/optimizer/../mal/mal_builder.h ../../../../monetdb5/optimizer/opt_prelude.h - $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS) $(petrinet_CFLAGS) -c -o lib_iot_la-petrinet.lo `test -f 'petrinet.c' || echo '$(srcdir)/'`petrinet.c -nodist_lib_iot_la_SOURCES = -dist_lib_iot_la_SOURCES = iot.c basket.c receptor.c petrinet.c -lib_iot_la_LDFLAGS = -module -avoid-version -BUILT_SOURCES = 50_iot.sql basket.mal iot.mal petrinet.mal receptor.mal -MOSTLYCLEANFILES = -EXTRA_DIST = Makefile.ag Makefile.msc 50_iot.mal 50_iot.sql basket.c basket.h basket.mal iot.c iot.h iot.mal petrinet.c petrinet.h petrinet.mal receptor.c receptor.h receptor.mal -iot_LTLIBRARIES = lib_iot.la -bin_SCRIPTS = script_50_iot.sql script_basket.mal script_iot.mal script_petrinet.mal script_receptor.mal -install-exec-local-SCRIPTS: -all-local-SCRIPTS: $(bin_SCRIPTS) -uninstall-local: uninstall-local-50_iot.mal uninstall-local-50_iot.sql uninstall-local-basket.mal uninstall-local-iot.mal uninstall-local-petrinet.mal uninstall-local-receptor.mal -install-exec-local: install-exec-local-50_iot.mal install-exec-local-50_iot.sql install-exec-local-basket.mal install-exec-local-iot.mal install-exec-local-petrinet.mal install-exec-local-receptor.mal - - include $(top_srcdir)/buildtools/conf/rules.mk diff --git a/sql/backends/monet5/iot/Makefile.in b/sql/backends/monet5/iot/Makefile.in deleted file mode 100644 --- a/sql/backends/monet5/iot/Makefile.in +++ /dev/null @@ -1,945 +0,0 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2014 Free Software Foundation, Inc. - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
