Skip to content

Commit 40b62bd

Browse files
authored
Update terminology to be more inclusive (#300)
1 parent 79321c5 commit 40b62bd

File tree

12 files changed

+22
-22
lines changed

12 files changed

+22
-22
lines changed

code/common/help.q

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ TXT,:(enlist`cmdline)!enlist(
4545
"-P N printdigits, default 7, 0=>all";
4646
"-q quiet, no startup banner text";
4747
"-r :H:P replicate from :host:port ";
48-
"-s N slaves for parallel execution";
48+
"-s N secondary processes for parallel execution";
4949
"-t N timer milliseconds";
5050
"-T N timeout seconds(applies to all client queries)";
5151
"-u F usr:pwd file, no access above start directory";
@@ -275,7 +275,7 @@ TXT,:(enlist`syscmd)!enlist(
275275
"\\p [i] port (0 turns off)";
276276
"\\P [7] print digits(0-all)";
277277
"\\r old new unix mv ";
278-
"\\s number of slaves (query only) ";
278+
"\\s number of secondary processes (query only) ";
279279
"\\S [-314159] seed";
280280
"\\t [i] timer [x] milliseconds (1st fire after delay)";
281281
"\\t expr time expression ";

code/handlers/permissions.q

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ err[`size]:{"pm: returned value exceeds maximum permitted size"}
2323
/ determine whether the system outputs booleans (permission check only) or evaluates query
2424
runmode:@[value;`runmode;1b]
2525

26-
/ determine whether unlisted variables are auto-whitelisted
26+
/ determine whether unlisted variables are auto-allowlisted
2727
permissivemode:@[value; `permissivemode; 0b]
2828

2929
/ schema

code/processes/wdb.q

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ tpconnsleepintv:@[value;`tpconnsleepintv;10]; /-num
3838
tpcheckcycles:@[value;`tpcheckcycles;0W]; /-number of attempts to connect to tp before process is killed
3939

4040
sorttypes:@[value;`sorttypes;`sort]; /-list of sort types to look for upon a sort
41-
sortslavetypes:@[value;`sortslavetypes;`sortslave]; /-list of sort types to look for upon a sort being called with slave process
41+
sortworkertypes:@[value;`sortworkertypes;`sortworker]; /-list of sort types to look for upon a sort being called with worker process
4242

4343
subtabs:@[value;`subtabs;`]; /-list of tables to subscribe for
4444
subsyms:@[value;`subsyms;`]; /-list of syms to subscription to
@@ -73,10 +73,10 @@ eodwaittime:@[value;`eodwaittime;0D00:00:10.000]; /-len
7373

7474
/ - end of default parameters
7575

76-
/ - define .z.pd in order to connect to any slave processes
76+
/ - define .z.pd in order to connect to any worker processes
7777
.z.pd:{$[.z.K<3.3;
7878
`u#`int$();
79-
`u#exec w from .servers.getservers[`proctype;sortslavetypes;()!();1b;0b]]
79+
`u#exec w from .servers.getservers[`proctype;sortworkertypes;()!();1b;0b]]
8080
}
8181

8282
/- fix any backslashes on windows
@@ -269,10 +269,10 @@ endofdaysortdate:{[dir;pt;tablist;hdbsettings]
269269
/- sort the table and garbage collect (if enabled)
270270
.lg.o[`sort;"starting to sort data"];
271271
$[count[.z.pd[]]&0>system"s";
272-
[.lg.o[`sort;"sorting on slave sort", string .z.p];
272+
[.lg.o[`sort;"sorting on worker sort", string .z.p];
273273
{(neg x)(`.wdb.reloadsymfile;y);(neg x)(::)}[;.Q.dd[hdbsettings `hdbdir;`sym]] each .z.pd[];
274274
{[x;compression] setcompression compression;.sort.sorttab x;if[gc;.gc.run[]]}[;hdbsettings`compression] peach tablist,'.Q.par[dir;pt;] each tablist];
275-
[.lg.o[`sort;"sorting on master sort"];
275+
[.lg.o[`sort;"sorting on main sort"];
276276
reloadsymfile[.Q.dd[hdbsettings `hdbdir;`sym]];
277277
{[x] .sort.sorttab[x];if[gc;.gc.run[]]} each tablist,'.Q.par[dir;pt;] each tablist]];
278278
.lg.o[`sort;"finished sorting data"];
@@ -332,10 +332,10 @@ merge:{[dir;pt;tableinfo;mergelimits;hdbsettings]
332332
endofdaymerge:{[dir;pt;tablist;mergelimits;hdbsettings]
333333
/- merge data from partitons
334334
$[(0 < count .z.pd[]) and ((system "s")<0);
335-
[.lg.o[`merge;"merging on slave"];
335+
[.lg.o[`merge;"merging on worker"];
336336
{(neg x)(`.wdb.reloadsymfile;y);(neg x)(::)}[;.Q.dd[hdbsettings `hdbdir;`sym]] each .z.pd[];
337337
merge[dir;pt;;mergelimits;hdbsettings] peach flip (key tablist;value tablist)];
338-
[.lg.o[`merge;"merging on master"];
338+
[.lg.o[`merge;"merging on main"];
339339
reloadsymfile[.Q.dd[hdbsettings `hdbdir;`sym]];
340340
merge[dir;pt;;mergelimits;hdbsettings] each flip (key tablist;value tablist)]];
341341
/- if path exists, delete it
@@ -511,7 +511,7 @@ getsortparams:{[]
511511
.wdb.currentpartition:.wdb.getpartition[];
512512

513513
/- make sure to request connections for all the correct types
514-
.servers.CONNECTIONS:(distinct .servers.CONNECTIONS,.wdb.hdbtypes,.wdb.rdbtypes,.wdb.gatewaytypes,.wdb.tickerplanttypes,.wdb.sorttypes,.wdb.sortslavetypes) except `
514+
.servers.CONNECTIONS:(distinct .servers.CONNECTIONS,.wdb.hdbtypes,.wdb.rdbtypes,.wdb.gatewaytypes,.wdb.tickerplanttypes,.wdb.sorttypes,.wdb.sortworkertypes) except `
515515

516516
/- setting the upd and .u.end functions as the .wdb versions
517517
.u.end:{[pt]

config/passwords/sortslave.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/passwords/sortworker.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sortworker:pass

config/permissions/default.q

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
.pm.adduser[`chainedtp;`local;`md5;md5"pass"]
8989
.pm.assignrole[`chainedtp;`systemuser]
9090
.pm.addtogroup[`chainedtp;`systemuser]
91-
.pm.adduser[`sortslave;`local;`md5;md5"pass"]
92-
.pm.assignrole[`sortslave;`systemuser]
93-
.pm.addtogroup[`sortslave;`systemuser]
91+
.pm.adduser[`sortworker;`local;`md5;md5"pass"]
92+
.pm.assignrole[`sortworker;`systemuser]
93+
.pm.addtogroup[`sortworker;`systemuser]
9494
.pm.adduser[`discovery;`local;`md5;md5"pass"]
9595
.pm.assignrole[`discovery;`systemuser]
9696
.pm.addtogroup[`discovery;`systemuser]

config/settings/sortslave.q renamed to config/settings/sortworker.q

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Sort Slave config
1+
// Sort Worker config
22

33
\d .wdb
44
savedir:hsym`$getenv[`TORQHOME],"/wdbhdb" // location to save wdb data
@@ -21,10 +21,10 @@ mergenumtab:`quote`trade!10000 50000 // specify number of rows per table
2121
hdbdir:`:hdb // move wdb database to different location
2222
sortcsv:hsym first .proc.getconfigfile["sort.csv"] // location of csv file
2323
gc:1b // garbage collect at appropriate points (after each table save and after sorting data)
24-
tickerplanttypes:rdbtypes:hdbtypes:gatewaytypes:sorttypes:sortslavetypes:() // sortslaves don't need these connections
24+
tickerplanttypes:rdbtypes:hdbtypes:gatewaytypes:sorttypes:sortworkertypes:() // sortworkers don't need these connections
2525

2626
// Server connection details
2727
\d .servers
28-
CONNECTIONS:() // sortslave doesn't need to connect to other processes
28+
CONNECTIONS:() // sortworker doesn't need to connect to other processes
2929
STARTUP:1b // create connections
3030

datadog/Example_TorQ_Monitoring_Dashboard.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

datadog/monitors/monitors.zip

492 Bytes
Binary file not shown.

docs/Processes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ r result value passes the conditions specified by the resultchecker function.
12561256
This example checks whether the trade table within the rdb is larger than 10.
12571257
As this is true, the status has been set to 1h and no error message
12581258
has been returned. This information is inserted into the `checkstatus` table,
1259-
which is the master table where all results are stored.
1259+
which is the primary table where all results are stored.
12601260

12611261
q)checkstatus
12621262
checkid| family metric process lastrun nextrun status executiontime totaltime timerstatus running result

0 commit comments

Comments
 (0)