You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2021/03/26 11:10:52 UTC
[asterixdb] 09/09: Merge branch 'gerrit/cheshire-cat'
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 471522440a5fbee125ffc691872460a3098b230a
Merge: 5f96514 e2a63b2
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sat Mar 13 11:28:01 2021 -0500
Merge branch 'gerrit/cheshire-cat'
Change-Id: Id09b95763801f6cd9d81cb35b42cd0a6541a21e2
.../asterix/app/translator/QueryTranslator.java | 24 ++-
.../asterix/test/common/ComparisonException.java | 4 +
.../apache/asterix/test/common/TestExecutor.java | 34 ++-
.../org/apache/asterix/test/common/TestHelper.java | 99 +++++++--
.../asterix/test/runtime/SqlppRQGTestBase.java | 2 +-
.../api/cluster_state_1/cluster_state_1.1.get.http | 1 +
.../api/diagnostics_1/diagnostics_1.1.get.http | 1 +
.../api/net-diagnostics/net-diagnostics.1.get.http | 1 +
.../scalar_sum_type/scalar_sum_type.1.query.sqlpp} | 15 +-
.../scalar_sum_type/scalar_sum_type.1.query.sqlpp} | 15 +-
.../add_replica/add_replica.2.pollget.http | 1 +
.../replication/bulkload/bulkload.11.pollget.http | 1 +
.../replication/bulkload/bulkload.3.pollget.http | 1 +
.../replication/bulkload/bulkload.4.pollget.http | 1 +
.../bulkload.11.pollget.http | 1 +
.../bulkload.3.pollget.http | 1 +
.../bulkload.4.pollget.http | 1 +
.../flushed_component.2.pollget.http | 1 +
.../flushed_component.8.pollget.http | 1 +
.../flushed_component_compressed.12.pollget.http | 1 +
.../flushed_component_compressed.3.pollget.http | 1 +
.../flushed_component_compressed.4.pollget.http | 1 +
.../mem_component_recovery.11.pollget.http | 1 +
.../mem_component_recovery.3.pollget.http | 1 +
.../mem_component_recovery.4.pollget.http | 1 +
.../metadata_failover.2.pollget.http | 1 +
.../metadata_failover/metadata_failover.5.get.http | 2 +
.../metadata_failover.8.pollget.http | 1 +
.../release_partition.2.pollget.http | 1 +
.../release_partition/release_partition.4.get.http | 2 +
.../ASTERIXDB-2844_unnest_syntax.1.query.sqlpp} | 6 +-
.../sum/scalar_sum_type/scalar_sum_type.1.adm | 1 +
.../sum/scalar_sum_type/scalar_sum_type.1.adm | 1 +
.../metadata_failover/metadata_failover.11.adm | 4 +-
.../ASTERIXDB-2844_unnest_syntax.1.adm | 4 +
.../test/resources/runtimets/testsuite_sqlpp.xml | 15 ++
.../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 6 +-
.../apache/asterix/metadata/MetadataManager.java | 5 +
.../asterix/om/functions/BuiltinFunctions.java | 29 +--
...puter.java => AggregateResultTypeComputer.java} | 28 +--
.../typecomputer/impl/MinMaxAggTypeComputer.java | 3 +-
.../impl/NumericSumAggTypeComputer.java | 33 +--
.../impl/ScalarVersionOfAggregateResultType.java | 50 +++--
.../management/LogReplicationManager.java | 4 +-
.../functions/ScalarAggregateTypeComputerTest.java | 239 +++++++++++++++++++++
.../reuse_data_port/reuse_data_port.4.pollget.http | 1 +
.../reuse_data_port/reuse_data_port.7.pollget.http | 1 +
...euse_data_port.5.adm => reuse_data_port.4.json} | 0
...euse_data_port.7.adm => reuse_data_port.7.json} | 0
.../resync_failed_replica.10.pollget.http | 1 +
.../resync_failed_replica.13.pollget.http | 1 +
.../resync_failed_replica.2.pollget.http | 1 +
.../resync_failed_replica.5.pollget.http | 1 +
.../resync_failed_replica.6.pollget.http | 1 +
.../resync_failed_replica.8.pollget.http | 1 +
asterixdb/pom.xml | 2 +
.../java/org/apache/hyracks/util/JSONUtil.java | 94 +-------
57 files changed, 525 insertions(+), 225 deletions(-)