This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 4265a1d3cddd7185981d4a131d238712b0b8ae7f
Merge: 78ebed0d37 b4a7d81b99
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Fri Dec 1 11:21:23 2023 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Change-Id: Ia94fc0878d6468495233cb06268132fdee71b7f1

 .../IntroduceSecondaryIndexInsertDeleteRule.java   | 58 +++++++++++++++-------
 .../optimizer/rules/am/AccessMethodUtils.java      |  2 +-
 .../rules/am/array/ArrayIndexStructureMatcher.java |  6 ++-
 .../index-bad-fields.000.ddl.sqlpp                 | 32 +++++-------
 .../index-bad-fields.001.update.sqlpp              | 39 +++++++++++++++
 .../index-bad-fields.002.query.sqlpp               | 21 +-------
 .../index-bad-fields.003.query.sqlpp               | 24 ++-------
 .../index-bad-fields.004.query.sqlpp               | 24 ++-------
 .../index-bad-fields.005.query.sqlpp               | 24 ++-------
 .../index-bad-fields.006.query.sqlpp               | 24 ++-------
 .../index-bad-fields.007.query.sqlpp               | 24 ++-------
 .../index-bad-fields.008.ddl.sqlpp                 | 29 ++++-------
 .../index-bad-fields.009.query.sqlpp               | 24 ++-------
 .../index-bad-fields.010.query.sqlpp               | 24 ++-------
 .../index-bad-fields.011.query.sqlpp               | 24 ++-------
 .../index-bad-fields.012.query.sqlpp               | 24 ++-------
 .../index-bad-fields.013.query.sqlpp               | 24 ++-------
 .../index-bad-fields.999.ddl.sqlpp                 | 21 +-------
 .../string/invalid-unicode/test.000.query.sqlpp    | 33 ++++++------
 .../index-bad-fields.006.adm                       |  1 +
 .../index-bad-fields/index-bad-fields.002.adm      |  1 +
 .../index-bad-fields/index-bad-fields.003.adm      | 10 ++++
 .../index-bad-fields/index-bad-fields.004.adm      |  2 +
 .../index-bad-fields/index-bad-fields.005.adm      |  1 +
 .../index-bad-fields/index-bad-fields.006.adm      |  2 +
 .../index-bad-fields/index-bad-fields.007.adm      |  1 +
 .../index-bad-fields/index-bad-fields.009.adm      | 10 ++++
 .../index-bad-fields/index-bad-fields.010.adm      |  2 +
 .../index-bad-fields/index-bad-fields.011.adm      |  1 +
 .../index-bad-fields/index-bad-fields.012.adm      |  2 +
 .../index-bad-fields/index-bad-fields.013.adm      |  1 +
 .../results/global-aggregate/q06/q06.3.adm         | 10 ++++
 .../group-by/sugar-01-negative/core-01.1.adm       |  1 +
 .../query-ASTERIXDB-2886.3.adm                     |  0
 .../results/string/invalid-unicode/result.000.adm  |  1 +
 .../test/resources/runtimets/testsuite_sqlpp.xml   | 32 +++++++++---
 .../asterix/common/exceptions/ErrorCode.java       |  1 +
 .../src/main/resources/asx_errormsg/en.properties  |  1 +
 .../asterix/metadata/utils/ArrayIndexUtil.java     | 20 +++++---
 .../SecondaryArrayIndexBTreeOperationsHelper.java  | 32 ++++++------
 .../utils/SecondaryIndexOperationsHelper.java      | 21 +++++++-
 .../asterix/om/exceptions/ExceptionUtil.java       | 16 ++++++
 .../scalar/AbstractScalarAggregateDescriptor.java  |  2 +-
 .../functions/AbstractBinaryStringEval.java        |  7 +++
 .../functions/AbstractUnaryStringStringEval.java   |  7 +++
 .../functions/StringContainsDescriptor.java        |  3 +-
 .../functions/StringLengthDescriptor.java          | 23 +++++----
 .../functions/StringPositionDescriptor.java        |  3 +-
 .../functions/StringPositionOffset1Descriptor.java |  3 +-
 .../functions/StringToCodePointDescriptor.java     | 25 ++++++----
 .../evaluators/functions/utils/StringTrimmer.java  |  8 +--
 .../std/ScanCollectionDescriptor.java              | 14 ++++--
 .../algebricks/algebricks-data/pom.xml             |  5 --
 hyracks-fullstack/hyracks/hyracks-api/pom.xml      |  7 +++
 .../apache/hyracks/api/exceptions/ErrorCode.java   |  1 +
 .../hyracks/api/exceptions/HyracksException.java   |  4 ++
 .../apache/hyracks/api/util/ErrorMessageUtil.java  |  7 +++
 .../apache/hyracks/api/util/ExceptionUtils.java    | 12 +++++
 .../hyracks/util/string/UTF8StringReader.java      |  0
 .../apache/hyracks/util/string/UTF8StringUtil.java | 20 +++++---
 .../hyracks/util/string/UTF8StringWriter.java      |  0
 .../src/main/resources/errormsg/en.properties      |  2 +
 .../api}/string/UTF8StringReaderWriterTest.java    |  4 +-
 .../hyracks/api}/string/UTF8StringUtilTest.java    |  6 ++-
 .../data/std/primitive/UTF8StringPointable.java    | 46 +++++++++--------
 .../std/primitive/UTF8StringPointableTest.java     |  3 +-
 66 files changed, 459 insertions(+), 403 deletions(-)


Reply via email to