Changeset: 6810c84c9e0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6810c84c9e0c
Removed Files:
monetdb5/modules/kernel/counters.c
monetdb5/modules/kernel/counters.h
monetdb5/modules/kernel/counters.mal
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_geom.stable.out.int128
clients/Tests/SQL-dump_none.stable.out
clients/Tests/SQL-dump_none.stable.out.int128
clients/Tests/exports.stable.out
configure.ag
debian/rules
monetdb5/modules/kernel/Makefile.ag
sql/test/BugTracker-2014/Tests/All
Branch: datacell
Log Message:
Merge with default branch - pre-datacell removal
diffs (truncated from 34510 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -906,7 +906,6 @@ developer, but if you do want to test, t
--with-ant=no \
--with-bz2=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
- --with-hwcounters=no \
--with-java=no \
--with-mseed=no \
--with-perl=yes \
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
@@ -579,12 +579,6 @@
}
"Entry"
{
- "MsmKey" = "8:_9988D2AABE4741B3A4EB33E65973CBC9"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_9B75C6DF698C491D822B9EF6B70708BD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2904,26 +2898,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9988D2AABE4741B3A4EB33E65973CBC9"
- {
- "SourcePath" = "8:lib\\monetdb5\\counters.mal"
- "TargetName" = "8:counters.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}:_9B75C6DF698C491D822B9EF6B70708BD"
{
"SourcePath" = "8:lib\\monetdb5\\sysmon.mal"
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
@@ -579,12 +579,6 @@
}
"Entry"
{
- "MsmKey" = "8:_9988D2AABE4741B3A4EB33E65973CBC9"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_9B75C6DF698C491D822B9EF6B70708BD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2904,26 +2898,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9988D2AABE4741B3A4EB33E65973CBC9"
- {
- "SourcePath" = "8:lib\\monetdb5\\counters.mal"
- "TargetName" = "8:counters.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}:_9B75C6DF698C491D822B9EF6B70708BD"
{
"SourcePath" = "8:lib\\monetdb5\\sysmon.mal"
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2306,13 +2306,16 @@ command algebra.groupby(gids:bat[:oid,:o
address ALGgroupby;
comment Produces a new BAT with groups identified by the head column. The
result contains tail times the head value, ie the tail contains the result
group sizes.
-function
algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]);
+command
algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid])
+address ILIKEsubjoin1;
command
algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_8:bat[:oid,:oid],X_9:bat[:oid,:oid])
address ILIKEsubjoin;
comment Join the string bat L with the pattern bat Rwith optional candidate
lists SL and SR using pattern escape string ESCand doing a case insensitive
match.The result is two aligned bats with oids of matching rows.
-function
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid];
-function
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]
+address PCRElikesubselect4;
+command
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]
+address PCRElikesubselect1;
command algebra.ilike(s:str,pat:str):bit
address PCREilike2;
command algebra.ilike(s:str,pat:str,esc:str):bit
@@ -2327,20 +2330,6 @@ command algebra.join(left:bat[:oid,:any_
address ALGjoin2;
comment Returns 2 columns with all BUNs, consisting of the head-oids from
'left' and 'right' for which there are BUNs in 'left' and 'right' with
equal tails
-command
algebra.join(l:bat[:any_1,:any_2],rl:bat[:any_3,:any_2],rh:bat[:any_3,:any_2],li:bit,hi:bit):bat[:any_1,:any_3]
-address ALGrangejoin;
-command
algebra.kunion(left:bat[:any_1,:any_2],right:bat[:any_1,:any_2]):bat[:any_1,:any_2]
-address ALGkunion;
-comment Returns the union of two BATs; looking at head-columns only.
Results in all BUNs of 'left' that are not in 'right', plus all BUNs of
'right'. *no* double-elimination is done.
-
-command
algebra.kdifference(left:bat[:any_1,:any_2],right:bat[:any_1,:any]):bat[:any_1,:any_2]
-address ALGkdiff;
-comment Returns the difference taken over only the *head* columns of two BATs.
Results in all BUNs of 'left' that are *not* in 'right'.
It does *not* do double-elimination over the 'left' BUNs. If you
want this, use: 'kdifference(left.kunique,right.kunique)' or:
'kdifference(left,right).kunique'.
-
-command
algebra.kintersect(left:bat[:any_1,:any_2],right:bat[:any_1,:any]):bat[:any_1,:any_2]
-address ALGsemijoin;
-comment Returns the intersection taken over only the *head* columns of two
BATs. Results in all BUNs of 'left' that are also in 'right'.
Does *not* do double- elimination over the 'left' BUNs. If you want
this, use: 'kintersect(kunique(left),kunique(right))' or:
'kunique(kintersect(left,right))'.
-
pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any]
address ALGjoinPath;
comment Routine to handle join paths. The type analysis is rather tricky.
@@ -2349,13 +2338,16 @@ pattern algebra.leftjoinPath(l:bat[:any,
address ALGjoinPath;
comment Routine to handle join paths. The type analysis is rather tricky.
-function
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]);
+command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid])
+address LIKEsubjoin1;
command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_8:bat[:oid,:oid],X_9:bat[:oid,:oid])
address LIKEsubjoin;
comment Join the string bat L with the pattern bat Rwith optional candidate
lists SL and SR using pattern escape string ESCand doing a case sensitive
match.The result is two aligned bats with oids of matching rows.
-function
algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid];
-function
algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command
algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]
+address PCRElikesubselect5;
+command
algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]
+address PCRElikesubselect3;
command
algebra.likesubselect(b:bat[:oid,:str],s:bat[:oid,:oid],pat:str,esc:str,caseignore:bit,anti:bit):bat[:oid,:oid]
address PCRElikesubselect2;
comment Select all head values of the first input BAT for which the tail
value is "like" the given (SQL-style) pattern and for which the head value
occurs in the tail of the second input BAT. Input is a dense-headed BAT,
output is a dense-headed BAT with in the tail the head value of the input
BAT for which the relationship holds. The output BAT is sorted on the tail
value.
@@ -31314,14 +31306,6 @@ command bat.insert(b:bat[:oid,:any_1],sr
address BKCinsert_bat;
comment Insert all BUNs of the second BAT into the first.
-command
bat.insert(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1]
-address BKCinsert_bun_force;
-comment Insert one BUN[h,t] in a BAT.
-
-command bat.insert(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1]
-address BKCinsert_bun;
-comment Insert one BUN[h,t] in a BAT.
-
command bat.load(name:str):bat[:oid,:any_1]
address BKCload;
comment Load a particular BAT from disk
@@ -31408,6 +31392,10 @@ command bat.reverse(b:bat[:any_1,:any_2]
address BKCreverse;
comment Returns the reverse view of a BAT (head is tail and tail is head).
BEWARE no copying is involved; input and output refer to the same
object!
+pattern bat.single(val:any_1):bat[:oid,:any_1]
+address CMDBATsingle;
+comment Create a BAT with a single elemenet
+
command bat.shrinkMap(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid]
address BKCshrinkBATmap;
comment Derive the oid mapping for shrink BAT based on list of to-be-deleted
@@ -40287,10 +40275,6 @@ command pcre.sql2pcre(pat:str,esc:str):s
address PCREsql2pcre;
comment Convert a SQL like pattern with the given escape character into a PCRE
pattern.
-pattern profiler.activate(name:str...):void
-address CMDactivateProfiler;
-comment A list of counters to be activated.
-
command profiler.cpuload(user:lng,nice:lng,sys:lng,idle:lng,iowait:lng)
(cycles:int,io:int)
address CMDcpuloadPercentage;
comment Calculate the average cpu load percentage and io waiting times
@@ -40303,14 +40287,6 @@ command profiler.cleanup():void
address CMDcleanup;
comment Remove the temporary tables for profiling
-pattern profiler.clrFilter(v:any):void
-address CMDsetFilterVariable;
-comment Stop tracing the variable
-
-pattern profiler.clrFilter(mod:str,fcn:str):void
-address CMDclrFilterProfiler;
-comment Clear the performance trace bit of the selected functions.
-
command profiler.closeStream():void
address CMDcloseProfilerStream;
comment Stop sending the event records
@@ -40319,14 +40295,6 @@ command profiler.dumpTrace():void
address CMDdumpTrace;
comment List the events collected
-pattern profiler.deactivate(name:str...):void
-address CMDdeactivateProfiler;
-comment A list of counters to be deactivated.
-
-pattern profiler.getFootprint():lng
-address CMDgetFootprint;
-comment Get the amount of memory claimed and reset the flag
-
command profiler.getSystemTime():lng
address CMDgetSystemTime;
comment Obtain the user timing information.
@@ -40343,10 +40311,6 @@ command profiler.getDiskReads():lng
address CMDgetDiskReads;
comment Obtain the number of physical reads
-pattern profiler.getEvent() (X_1:lng,X_2:lng,X_3:lng)
-address CMDgetEvent;
-comment Retrieve the performance indicators of the previous instruction
-
command profiler.getTrace(e:str):bat[:oid,:any_1]
address CMDgetTrace;
comment Get the trace details of a specific event
@@ -40371,49 +40335,29 @@ command profiler.reset():void
address CMDclearTrace;
comment Clear the profiler traces
+command profiler.setHeartbeat(b:int):void
+address CMDsetHeartbeat;
+comment Set heart beat performance tracing
+
pattern profiler.stop():void
address CMDstopProfiler;
comment Stop performance tracing
-pattern profiler.start():void
-address CMDstartProfiler;
-comment Start performance tracing
-
-pattern profiler.setEndPoint(mod:str,fcn:str):void
-address CMDendPointProfiler;
-comment End performance tracing after mod.fcn
-
-pattern profiler.setStartPoint(mod:str,fcn:str):void
-address CMDstartPointProfiler;
-comment Start performance tracing at mod.fcn
-
-pattern profiler.setFilter(v:any):void
-address CMDsetFilterVariable;
-comment Generate an event record for every instruction where v is used.
-
-pattern profiler.setFilter(mod:str,fcn:str):void
-address CMDsetFilterProfiler;
-comment Generate an event record for all function calls that satisfy the
regular expression mod.fcn. A wildcard (*) can be used as name to identify all
-
-pattern profiler.setNone():void
-address CMDsetNoneProfiler;
-comment Short cut for clrFilter(*,*).
-
-pattern profiler.setAll():void
-address CMDsetAllProfiler;
-comment Short cut for setFilter(*,*).
-
-command profiler.tomograph():void
+command profiler.stethoscope(b:int):void
+address CMDstethoscope;
+comment Start stethoscope profiling with heart beat
+
+command profiler.tomograph(b:int):void
address CMDtomograph;
-comment No-op operation, merely a signal to the tomograph package
-
-pattern
querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int,space:lng):void
+comment Start tomograph profiler with heart beat
+
+pattern
querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int):void
address QLOGcall;
comment Add a new query call to the query log
-pattern querylog.define(q:str,pipe:str,usr:str,tick:timestamp):oid
-address QLOGdefine;
-comment Add a new query call to the query log
+command querylog.define(q:str,pipe:str):void
+address QLOGdefineNaive;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
