Merge remote-tracking branch 'origin/candidate-4.2.2' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.2' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10686 - Need to check subfile after lock retry

Need to check if subfile provided in RemoveSubFile when
rechcking if sub is member of super after dirty lock.
subfile is empty in case of ClearSuperFile(calling RemoveSubFile)

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
HPCC-10693 - Allow CSV,HEADING read in child query.

Normally a CSV with HEADING is marked global, meaning slaves
inter-communicate. However, if in child query, child reads all
parts and it is local.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Community Edition 4.2.2-rc8 Release Candidate 8

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.2' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5296 from jakesmith/hpcc-10686

HPCC-10686 - Need to check subfile after lock retry

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10684 - Prevent close of old + start of new session clashing

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
HPCC-10683 Fix WU connection leak in WsWorkunits and a warning in ESP log

When a new job is submitted, WsWorkunit creates connections to
dali to get information about the WU. Due to a bug, one of the
connections is not released. The same problem also occurs when
a ZAP Report is created. The bug is fixed here.

The WsWorkunits::WUUpdate method is used when a user wants to
modify a wu. The last step of the method is to retrieve/send
back the updated information about the WU. The information
includes possible thor log files for the WU. The WUUpdate method
is also called when a new job is submitted. A Warning line "
WARNING: Cannot find TargetClusterInfo for workunit ..." is
written to esp log when the method trys to retrieve thor log
information. This is because the WU is just created and no
cluster has been specified for the WU yet. This fix skips the
warning code if no cluster has been specified for a WU.
HPCC-10470 Roxie Graphs are not getting merged correctly

The xgmml being returned from control:querystats was not layed out as expected
(an extra graph layer). While this did not cause any problems displaying the
graphs, it prevented the merge code from operating correctly.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10571 Add RemoveOwnedSubFiles to docs

Signed-off-by: JamesDeFabia <James.Defabia@LexisNexis.com>
HPCC-10732 Call sendRoxieControlAllNodes() to send control:querystats

The --lock flag is needed when sending control:querystats to get
correct Accumulated Counts. Inside the sendRoxieControlAllNodes(), the
sendRoxieControlLock() is called to set the flag. I also revised the
xpath for reading xgmml based on the data structure returned from
roxie.

Signed-off-by: Kevin Wang kevin.wang@lexisnexis.com
Merge pull request #5305 from wangkx/roxie_graph_add_lock

HPCC-10732 Call sendRoxieControlAllNodes() to send control:querystats

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5294 from jakesmith/hpcc-10684

HPCC-10684 - Prevent close of old + start of new session clashing

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5298 from jakesmith/hpcc-10693

HPCC-10693 - Allow CSV,HEADING read in child query.

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10628 Fixed typo in EVENTEXTRA docs

Signed-off-by: JamesDeFabia <James.Defabia@LexisNexis.com>
HPCC-10756 DOCS:HTML on PORTAL

Fix HPCC-10756 DOCS:HTML on PORTAL
Fix source code to generate HTML
more consistent with our style for
the Language Reference Manual.

Signed-off-by: g-pan <greg.panagiotatos@lexisnexis.com>
HPCC-10665 Add missing params to File.copy docs

Signed-off-by: JamesDeFabia <James.Defabia@LexisNexis.com>
Merge pull request #5316 from g-pan/H0756-LR_topix

HPCC-10756 DOCS:HTML on PORTAL

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5315 from JamesDeFabia/10628_EVENTEXTRA_doc_typo

HPCC-10628 Fixed typo in EVENTEXTRA docs

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>