Leave off parens in the explain output for NOW and CURRENT_TIMESTAMP functions
Merge branch 'master' into ddlroundtripfix
Skip hsql params left behind by mistake.
Test ENG-6861 param confusion
Make StatementDMQL compile.
forgot to git add
Merge branch 'ddlroundtripfix' into ENG-6861-ignore-ghost-params
Merge branch 'master' into ENG-6861-ignore-ghost-params
Add type resolution to 'IN ?' params, partly so they won't pass for unused ghost params.
ENG-6897: expose flush on CSVTuple and Bulk iinterface.
Merged changes from ENG-6879-json-set-field: re-enabled the SET_FIELD
function; and simplified tests using the testProcWithValidJSON method in
place of the (almost) same 4 lines of code, repeated over and over.
initial support for AdHoc upsert
Avoid compiling regex in the parameter converter.

Building a regex can be costly in the fast path. Build it once and reuse it.
Merge pull request #1682 from VoltDB/paramconvopt

Avoid compiling regex in the parameter converter.
TestFunctionsForJSON: updated testFIELDFunctionWithInvalidIndexNotation
& testSET_FIELDFunctionWithInvalidIndexNotation, adding tests of very
large array indexes; also, updated testProcWithInvalidJSON to print the
expectedErrorMessage when no error is detected. [I swear I checked this
in before, but it disappeared.]
ENG-6897: flush to drain for -p inserts.
remove redundant upsert plan node and executor and use the insert executor only; add more tests
refactor some stuffs
Merge pull request #1684 from VoltDB/ENG-6922-agg-plan

refactor some stuffs
Add pre-parser support for upsert adhoc