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 0f3fb3b0b639f58544f4b7209056e0ff376addfa Merge: f5fe409130 47e2613e0c Author: Michael Blow <[email protected]> AuthorDate: Fri Jul 28 12:25:11 2023 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I0b56219450da9db28ef21cd5266dbf1e440424c7 .../http/server/NCQueryCancellationServlet.java | 3 + .../api/http/server/NCQueryServiceServlet.java | 3 +- .../app/active/ActiveEntityEventsListener.java | 10 +- .../app/active/ActiveNotificationHandler.java | 52 +++++----- .../asterix/app/message/CancelQueryRequest.java | 8 +- .../message/ExecuteStatementRequestMessage.java | 4 +- .../org/apache/asterix/app/nc/HaltCallback.java | 4 +- .../apache/asterix/app/nc/NCAppRuntimeContext.java | 16 +--- .../asterix/app/translator/QueryTranslator.java | 4 + .../rebalance/IDatasetRebalanceCallback.java | 8 +- .../rebalance/NoOpDatasetRebalanceCallback.java | 3 +- .../org/apache/asterix/utils/RebalanceUtil.java | 42 +++++--- .../resources/{cc.conf => cc-cloud-storage.conf} | 3 +- asterixdb/asterix-app/src/main/resources/cc.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc2.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc3.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc4.conf | 2 +- .../asterix-app/src/main/resources/cc_no_cbo.conf | 2 +- .../{cc.conf => cc_static_partitioning.conf} | 3 +- .../asterix/test/common/ResultExtractor.java | 4 +- .../test/resources/{cc.conf => cc-analyze.conf} | 11 +-- .../src/test/resources/cc-batch-lookup.conf | 3 +- .../resources/{cc.conf => cc-cloud-storage.conf} | 3 +- .../src/test/resources/cc-compression.conf | 2 +- .../src/test/resources/cc-multipart.conf | 2 +- ...{cc-batch-lookup.conf => cc-single-lookup.conf} | 5 +- .../asterix-app/src/test/resources/cc-single.conf | 2 +- .../test/resources/cc-small-txn-log-partition.conf | 2 +- .../asterix-app/src/test/resources/cc-ssl.conf | 4 +- .../asterix-app/src/test/resources/cc-storage.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc.conf | 2 +- .../api/cluster_state_1/cluster_state_1.1.regexadm | 1 + .../cluster_state_1_full.1.regexadm | 1 + .../cluster_state_1_less.1.regexadm | 1 + .../common/api/IDatasetLifecycleManager.java | 6 +- .../asterix/common/config/StorageProperties.java | 1 + .../common/context/BaseOperationTracker.java | 8 +- .../apache/asterix/common/context/DatasetInfo.java | 31 +++++- .../common/context/DatasetLifecycleManager.java | 4 +- .../context/PrimaryIndexOperationTracker.java | 11 +-- .../ioopcallbacks/LSMIOOperationCallback.java | 6 +- .../ioopcallbacks/LSMIOOperationCallbackTest.java | 7 ++ .../apache/asterix/metadata/RMIClientFactory.java | 13 ++- .../apache/asterix/metadata/RMIServerFactory.java | 25 ++++- .../metadata/bootstrap/AsterixStateProxy.java | 15 +-- .../asterix/metadata/entities/NodeGroup.java | 3 +- .../apache/asterix/metadata/utils/DatasetUtil.java | 5 +- .../replication/api/ReplicationDestination.java | 32 +++++++ .../management/IndexReplicationManager.java | 99 +++++++++---------- .../management/ReplicationOperation.java | 106 +++++++++++++++++++++ .../replication/sync/ReplicaSynchronizer.java | 2 +- .../SecondaryIndexOperationTrackerFactory.java | 4 +- .../service/logging/LogManagerWithReplication.java | 19 +++- asterixdb/pom.xml | 4 +- .../appended-resources/supplemental-models.xml | 97 +++++++++---------- ....com_netty_netty_netty-4.1.94.Final_NOTICE.txt} | 0 ...ent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt | 16 ++++ .../apache/hyracks/api/comm/NetworkAddress.java | 7 +- .../api/network/INetworkSecurityConfig.java | 9 ++ .../org/apache/hyracks/api/util/InvokeUtil.java | 40 +++++++- .../hyracks/control/cc/work/CancelJobWork.java | 5 + .../cc/work/JobletCleanupNotificationWork.java | 7 +- .../hyracks/control/cc/work/RegisterNodeWork.java | 6 +- .../control/cc/work/WaitForJobCompletionWork.java | 5 + .../hyracks/control/nc/NodeControllerService.java | 2 +- .../hyracks/control/nc/work/AbortTasksWork.java | 5 + .../hyracks/control/nc/work/CleanupJobletWork.java | 7 +- .../hyracks/control/nc/work/StartTasksWork.java | 5 + .../hyracks/http/server/ChunkedResponse.java | 57 +++++++---- .../ipc/security/NetworkSecurityConfig.java | 7 ++ .../impls/AbstractAsynchronousScheduler.java | 52 +++++++++- .../org/apache/hyracks/util/IOThrowingAction.java | 29 ++---- hyracks-fullstack/pom.xml | 25 ++++- 73 files changed, 709 insertions(+), 291 deletions(-) diff --cc asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf index dc6e5a2075,a61ac87783..be9bd544ea --- a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf @@@ -65,3 -66,6 +64,5 @@@ compiler.sort.parallel=fals compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 + cloud.deployment=true + storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --cc asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf index dc6e5a2075,e3e779e17d..3923222c56 --- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf +++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf @@@ -65,3 -66,6 +64,5 @@@ compiler.sort.parallel=fals compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 + storage.buffercache.pagesize=32KB + storage.partitioning=static ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --cc asterixdb/asterix-app/src/test/resources/cc-analyze.conf index 9532849649,d8b35122a1..16fa0aeea4 --- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf @@@ -53,11 -54,6 +52,5 @@@ credential.file=src/test/resources/secu [common] log.dir = logs/ log.level = INFO - compiler.framesize=32KB - compiler.sortmemory=320KB - compiler.groupmemory=160KB - compiler.joinmemory=256KB - compiler.textsearchmemory=160KB - compiler.windowmemory=192KB - messaging.frame.size=4096 - messaging.frame.count=512 + compiler.groupmemory=64MB + storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --cc asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf index 6e10481dc4,18627b4e83..7d3aa5241b --- a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf @@@ -59,7 -60,8 +58,7 @@@ compiler.groupmemory=160K compiler.joinmemory=256KB compiler.textsearchmemory=160KB compiler.windowmemory=192KB +compiler.batch.lookup=true messaging.frame.size=4096 messaging.frame.count=512 - -cloud.deployment=true + storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --cc asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf index 9532849649,18627b4e83..6373eaeec6 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf @@@ -61,3 -62,6 +60,5 @@@ compiler.textsearchmemory=160K compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 + cloud.deployment=true + storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --cc asterixdb/asterix-app/src/test/resources/cc-compression.conf index 373d9bb770,373d9bb770..bc4ea4a728 --- a/asterixdb/asterix-app/src/test/resources/cc-compression.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-compression.conf @@@ -35,7 -35,7 +35,6 @@@ address=127.0.0. command=asterixnc app.class=org.apache.asterix.hyracks.bootstrap.NCApplication jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory" --storage.buffercache.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@@ -58,3 -58,3 +57,4 @@@ compiler.windowmemory=192K messaging.frame.size=4096 messaging.frame.count=512 storage.compression.block=snappy ++storage.buffercache.pagesize=32KB diff --cc asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf index 6e10481dc4,1b006b3180..d59d4d58c5 --- a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf @@@ -59,7 -60,8 +58,7 @@@ compiler.groupmemory=160K compiler.joinmemory=256KB compiler.textsearchmemory=160KB compiler.windowmemory=192KB - compiler.batch.lookup=true + compiler.batch.lookup=false messaging.frame.size=4096 messaging.frame.count=512 - + storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf)
