Change in asterixdb[master]: [ASTERIXDB-2597] Load UDFs via HTTP
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3386 ) Change subject: [ASTERIXDB-2597] Load UDFs via HTTP .. Patch Set 16: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3386 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6be9fef54c010bdb32f5c78af9b973f9843f442f Gerrit-Change-Number: 3386 Gerrit-PatchSet: 16 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Fri, 28 Jun 2019 15:33:55 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2597] Load UDFs via HTTP
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3386 )
Change subject: [ASTERIXDB-2597] Load UDFs via HTTP
..
Patch Set 15:
(3 comments)
https://asterix-gerrit.ics.uci.edu/#/c/3386/15/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/15/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@103
PS15, Line 103:} catch (IOException e) {
: throw e;
delete?
https://asterix-gerrit.ics.uci.edu/#/c/3386/15/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/15/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java@404
PS15, Line 404: "\n"
can we remove this newline too?
https://asterix-gerrit.ics.uci.edu/#/c/3386/15/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java@406
PS15, Line 406: + ", "
should we use File.pathSeparatorChar, since we're dumping a path anyway?
--
To view, visit https://asterix-gerrit.ics.uci.edu/3386
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6be9fef54c010bdb32f5c78af9b973f9843f442f
Gerrit-Change-Number: 3386
Gerrit-PatchSet: 15
Gerrit-Owner: Ian Maxon
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Dmitry Lychagin
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Fri, 28 Jun 2019 12:27:22 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][COMP] Fix the result type for the get-item accessor
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2957 ) Change subject: [NO ISSUE][COMP] Fix the result type for the get-item accessor .. Patch Set 8: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2957 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bcdd7148591a07a08ef0aa898053f72ad8562e3 Gerrit-Change-Number: 2957 Gerrit-PatchSet: 8 Gerrit-Owner: Till Westmann Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 27 Jun 2019 17:05:19 + Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'fa6ce67' from stabilization-f69489
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3465 ) Change subject: Merge commit 'fa6ce67' from stabilization-f69489 .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3465 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e1810f1c44d9ecaf569dd22577c33e8702c682 Gerrit-Change-Number: 3465 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Comment-Date: Thu, 27 Jun 2019 16:57:08 + Gerrit-HasComments: No
Change in asterixdb[master]: DO NOT MERGE: combo patch of forced greedy, concurrent merge policy
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3467
Change subject: DO NOT MERGE: combo patch of forced greedy, concurrent merge
policy
..
DO NOT MERGE: combo patch of forced greedy, concurrent merge policy
Change-Id: I5908f953a18dc98b92bc38cc498b20357f288a72
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StorageConstants.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
5 files changed, 20 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/67/3467/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
index 894dc18..a606cd8 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
@@ -102,6 +102,7 @@
import
org.apache.hyracks.storage.am.lsm.btree.dataflow.ExternalBTreeLocalResource;
import
org.apache.hyracks.storage.am.lsm.btree.dataflow.ExternalBTreeWithBuddyLocalResource;
import org.apache.hyracks.storage.am.lsm.btree.dataflow.LSMBTreeLocalResource;
+import
org.apache.hyracks.storage.am.lsm.common.impls.ConcurrentMergePolicyFactory;
import
org.apache.hyracks.storage.am.lsm.common.impls.ConstantMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
import
org.apache.hyracks.storage.am.lsm.common.impls.NoOpIOOperationCallbackFactory;
@@ -158,6 +159,7 @@
// ILSMMergePolicyFactory
REGISTERED_CLASSES.put("NoMergePolicyFactory",
NoMergePolicyFactory.class);
REGISTERED_CLASSES.put("PrefixMergePolicyFactory",
PrefixMergePolicyFactory.class);
+REGISTERED_CLASSES.put("ConcurrentMergePolicyFactory",
ConcurrentMergePolicyFactory.class);
REGISTERED_CLASSES.put("ConstantMergePolicyFactory",
ConstantMergePolicyFactory.class);
REGISTERED_CLASSES.put("CorrelatedPrefixMergePolicyFactory",
CorrelatedPrefixMergePolicyFactory.class);
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
index 8cf114c..988751e 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
@@ -92,8 +92,8 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.impls.AsynchronousScheduler;
+import
org.apache.hyracks.storage.am.lsm.common.impls.ConcurrentMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.impls.GreedyScheduler;
-import org.apache.hyracks.storage.am.lsm.common.impls.PrefixMergePolicyFactory;
import org.apache.hyracks.storage.common.ILocalResourceRepository;
import org.apache.hyracks.storage.common.buffercache.BufferCache;
import
org.apache.hyracks.storage.common.buffercache.ClockPageReplacementStrategy;
@@ -196,7 +196,7 @@
throw new IllegalStateException("Unknown storage I/O scheduler: "
+ schedulerName + ", options are "
+ AsynchronousScheduler.FACTORY.getName() + ", " +
GreedyScheduler.FACTORY.getName());
}
-metadataMergePolicyFactory = new PrefixMergePolicyFactory();
+metadataMergePolicyFactory = new ConcurrentMergePolicyFactory();
indexCheckpointManagerProvider = new
IndexCheckpointManagerProvider(ioManager);
ILocalResourceRepositoryFactory
persistentLocalResourceRepositoryFactory =
new PersistentLocalResourceRepositoryFactory(ioManager,
indexCheckpointManagerProvider,
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 282c03a..028a313 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -3594,6 +3594,11 @@
+
+using-concurrent-merge-policy
+
+
+
using-correlated-prefix-merge-policy
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StorageConstants.java
Change in asterixdb[master]: [ASTERIXDB-2597] Load UDFs via HTTP
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3386 )
Change subject: [ASTERIXDB-2597] Load UDFs via HTTP
..
Patch Set 12:
(14 comments)
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@56
PS12, Line 56: public final String UDF_TMP_DIR_PREFIX = "udf_temp";
> MAJOR SonarQube violation:
+1
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@57
PS12, Line 57: public final int UDF_RESPONSE_TIMEOUT = 5000;
> MAJOR SonarQube violation:
+1
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@96
PS12, Line 96: raf = new RandomAccessFile(udf, "rw");
> BLOCKER SonarQube violation:
can we wrap this in a try w/ resources, then you can remove the fc.close()
below I think...
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@153
PS12, Line 153: return;
should this be a bad request?
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/UdfApiServlet.java@153
PS12, Line 153: return;
oh, i see this is done above- can we set it here so that we set the statuses
all in one method? (we set OK and 500 below). Should we just throw
IllegalArgumentException or something above and insert a catch clause below?
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java@404
PS12, Line 404: StringBuilder logMesg = new
StringBuilder("Classpath for library " + dataverse + "\n");
: for (URL url : urls) {
: logMesg.append(url.getFile() + "\n");
: }
: LOGGER.info(logMesg.toString());
multi line log entries complicates log post-processing, can we just create a
list of files and emit a single-line for this?
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java@53
PS12, Line 53: http://; + host + ":" + port
i wonder if there are IPv6 implications here
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java@66
PS12, Line 66: http://; + host + ":" + port
same as above
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/LoadUdfMessage.java
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/LoadUdfMessage.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/LoadUdfMessage.java@59
PS12, Line 59: } catch (Exception f) {
> CRITICAL SonarQube violation:
+1
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/library/ILibraryManager.java
File
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/library/ILibraryManager.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/library/ILibraryManager.java@33
PS12, Line 33:
rm
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
File
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java:
https://asterix-gerrit.ics.uci.edu/#/c/3386/12/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java@410
PS12, Line 410: public boolean extractFromArchive() {
isExtract*
Change in asterixdb[master]: [ASTERIXDB-2540] Optimize Storage Disk I/O
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3285 ) Change subject: [ASTERIXDB-2540] Optimize Storage Disk I/O .. Patch Set 9: (5 comments) https://asterix-gerrit.ics.uci.edu/#/c/3285/9/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java: https://asterix-gerrit.ics.uci.edu/#/c/3285/9/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java@99 PS9, Line 99: The maximum disk write rate (bytes/s) for each dataset what does 0 (the default) mean; we should probably indicate that here https://asterix-gerrit.ics.uci.edu/#/c/3285/9/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java@101 PS9, Line 101: for before? https://asterix-gerrit.ics.uci.edu/#/c/3285/9/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java: https://asterix-gerrit.ics.uci.edu/#/c/3285/9/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java@359 PS9, Line 359: populateRateLimiter can we return the rate limiter from this method, to avoid the extra lookup? https://asterix-gerrit.ics.uci.edu/#/c/3285/9/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/FIFOLocalWriter.java File hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/FIFOLocalWriter.java: https://asterix-gerrit.ics.uci.edu/#/c/3285/9/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/FIFOLocalWriter.java@65 PS9, Line 65: F f https://asterix-gerrit.ics.uci.edu/#/c/3285/9/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/FIFOLocalWriter.java@65 PS9, Line 65: A a -- To view, visit https://asterix-gerrit.ics.uci.edu/3285 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f618dc7c186623e860239b4d97640fe3528e75b Gerrit-Change-Number: 3285 Gerrit-PatchSet: 9 Gerrit-Owner: Luo Chen Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Tue, 18 Jun 2019 17:27:14 + Gerrit-HasComments: Yes
Change in asterixdb[stabilization-f69489]: [NO ISSUE][REPL] Wait For Dataset IO Before Replica Sync
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3446 ) Change subject: [NO ISSUE][REPL] Wait For Dataset IO Before Replica Sync .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3446 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: comment Gerrit-Change-Id: I01ed5c9379cf7ae249faeef624d5226ea699cf22 Gerrit-Change-Number: 3446 Gerrit-PatchSet: 2 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Comment-Date: Mon, 17 Jun 2019 17:13:11 + Gerrit-HasComments: No
Change in asterixdb[stabilization-f69489]: [NO ISSUE][REPL] Wait For Dataset IO Before Replica Sync
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3446 ) Change subject: [NO ISSUE][REPL] Wait For Dataset IO Before Replica Sync .. Patch Set 1: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/3446/1/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java: https://asterix-gerrit.ics.uci.edu/#/c/3446/1/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java@138 PS1, Line 138: on-going ongoing https://asterix-gerrit.ics.uci.edu/#/c/3446/1/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java File asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java: https://asterix-gerrit.ics.uci.edu/#/c/3446/1/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java@84 PS1, Line 84: appCtx.getDatasetLifecycleManager().waitForIO(replStrategy); what prevents new IO from starting after ensuring that any ongoing operations are compete? -- To view, visit https://asterix-gerrit.ics.uci.edu/3446 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: comment Gerrit-Change-Id: I01ed5c9379cf7ae249faeef624d5226ea699cf22 Gerrit-Change-Number: 3446 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sun, 16 Jun 2019 15:34:41 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
Michael Blow has submitted this change and it was merged. ( https://asterix-gerrit.ics.uci.edu/2936 ) Change subject: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table .. [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table - user model changes: no - storage format changes: no - interface changes: no - Plan Format: JSON | STRING - Flat Nested Objects - Supporting offline fonts Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c Reviewed-on: https://asterix-gerrit.ics.uci.edu/2936 Contrib: Jenkins Sonar-Qube: Jenkins Tested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Ian Maxon Reviewed-by: Michael Blow --- M asterixdb/LICENSE M asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl A asterixdb/asterix-dashboard/src/main/licenses/dashboard-source-license.ftl M asterixdb/asterix-dashboard/src/node/angular.json M asterixdb/asterix-dashboard/src/node/karma.conf.js M asterixdb/asterix-dashboard/src/node/package.json M asterixdb/asterix-dashboard/src/node/src/app/app.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/appbar.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/appbar.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/apptab.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/apptab.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata-inspector.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata-inspector.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-node-svg.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/query-container.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/query-container.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/effects/query.effects.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/dataverse.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/index.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/query.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/services/async-query.service.ts A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.eot A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.svg A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.woff A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/material-icons.css M asterixdb/asterix-dashboard/src/node/src/index.html M asterixdb/asterix-dashboard/src/node/src/main.scss D asterixdb/asterix-dashboard/src/node/src/styles/_constants.scss M asterixdb/asterix-dashboard/src/node/src/styles/_general.scss M asterixdb/asterix-license/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/src/main/licenses/templates/source_licenses.ftl 52 files changed, 3,137 insertions(+), 308 deletions(-) Approvals: Jenkins: Verified; No violations found; ; Verified Anon. E. Moose (1000171): Ian Maxon: Looks
Change in asterixdb[master]: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2936 ) Change subject: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table .. Patch Set 20: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2936 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c Gerrit-Change-Number: 2936 Gerrit-PatchSet: 20 Gerrit-Owner: Emilio Jose Coronado Lopez Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Fri, 14 Jun 2019 17:15:10 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
Michael Blow has uploaded a new patch set (#20) to the change originally created by Emilio Jose Coronado Lopez. ( https://asterix-gerrit.ics.uci.edu/2936 ) Change subject: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table .. [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table - user model changes: no - storage format changes: no - interface changes: no - Plan Format: JSON | STRING - Flat Nested Objects - Supporting offline fonts Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c --- M asterixdb/LICENSE M asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl A asterixdb/asterix-dashboard/src/main/licenses/dashboard-source-license.ftl M asterixdb/asterix-dashboard/src/node/angular.json M asterixdb/asterix-dashboard/src/node/karma.conf.js M asterixdb/asterix-dashboard/src/node/package.json M asterixdb/asterix-dashboard/src/node/src/app/app.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/appbar.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/appbar.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/apptab.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/apptab.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata-inspector.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata-inspector.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/metadata.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/output.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-node-svg.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-view.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/query-container.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/query-container.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-node.component.ts M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.scss M asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/effects/query.effects.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/dataverse.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/index.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/reducers/query.reducer.ts M asterixdb/asterix-dashboard/src/node/src/app/shared/services/async-query.service.ts A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.eot A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.svg A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.woff A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 A asterixdb/asterix-dashboard/src/node/src/assets/fonts/material-icons/material-icons.css M asterixdb/asterix-dashboard/src/node/src/index.html M asterixdb/asterix-dashboard/src/node/src/main.scss D asterixdb/asterix-dashboard/src/node/src/styles/_constants.scss M asterixdb/asterix-dashboard/src/node/src/styles/_general.scss M asterixdb/asterix-license/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/src/main/licenses/templates/source_licenses.ftl 52 files changed, 3,137 insertions(+), 308 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/36/2936/20 -- To view, visit https://asterix-gerrit.ics.uci.edu/2936 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb
Change in asterixdb[master]: [DO NOT MERGE] Force Greedy Scheduler
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/3440 Change subject: [DO NOT MERGE] Force Greedy Scheduler .. [DO NOT MERGE] Force Greedy Scheduler Change-Id: I7516a1fe8e109946ac947cdbaec9b441d8e214a8 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/40/3440/1 diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java index 02e5e40..a60b140 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java @@ -50,7 +50,7 @@ STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE(DOUBLE, 0.01d), STORAGE_MAX_ACTIVE_WRITABLE_DATASETS(UNSIGNED_INTEGER, 8), STORAGE_COMPRESSION_BLOCK(STRING, "none"), -STORAGE_IO_SCHEDULER(STRING, "async"); +STORAGE_IO_SCHEDULER(STRING, "greedy"); private final IOptionType interpreter; private final Object defaultValue; -- To view, visit https://asterix-gerrit.ics.uci.edu/3440 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7516a1fe8e109946ac947cdbaec9b441d8e214a8 Gerrit-Change-Number: 3440 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3425 ) Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3425 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4 Gerrit-Change-Number: 3425 Gerrit-PatchSet: 3 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Sat, 08 Jun 2019 21:19:11 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3425 )
Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size
..
Patch Set 2:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/3425/2/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
File
asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java:
https://asterix-gerrit.ics.uci.edu/#/c/3425/2/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java@616
PS2, Line 616:
: private static boolean isMatch(DatasetCopyIdentifier
datasetIdentifier, ResourceReference resourceReference) {
: return
resourceReference.getDataverse().equals(datasetIdentifier.getDataverse())
: &&
resourceReference.getDataset().equals(datasetIdentifier.getDataset())
: &&
resourceReference.getRebalance().equals(datasetIdentifier.getRebalance());
: }
remove
--
To view, visit https://asterix-gerrit.ics.uci.edu/3425
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4
Gerrit-Change-Number: 3425
Gerrit-PatchSet: 2
Gerrit-Owner: Murtadha Hubail
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Fri, 07 Jun 2019 17:16:39 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3425 ) Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/3425/1/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java File asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java: https://asterix-gerrit.ics.uci.edu/#/c/3425/1/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java@618 PS1, Line 618: return resourceReference.getDataverse().equals(datasetIdentifier.getDataverse()) : && resourceReference.getDataset().equals(datasetIdentifier.getDataset()) : && resourceReference.getRebalance().equals(datasetIdentifier.getRebalance()); should we locate this logic inside of the DatasetCopyIdentifier, to avoid it getting out of sync should an additional (significant) property be added? -- To view, visit https://asterix-gerrit.ics.uci.edu/3425 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4 Gerrit-Change-Number: 3425 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Fri, 07 Jun 2019 16:06:26 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][COMP] Fix the result type for the get-item accessor
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2957 ) Change subject: [NO ISSUE][COMP] Fix the result type for the get-item accessor .. Patch Set 7: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2957 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bcdd7148591a07a08ef0aa898053f72ad8562e3 Gerrit-Change-Number: 2957 Gerrit-PatchSet: 7 Gerrit-Owner: Till Westmann Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Fri, 07 Jun 2019 16:03:53 + Gerrit-HasComments: No
Change in asterixdb[stabilization-f69489]: [NO ISSUE][OTH] Use Absolute Path in FileReference hashCode/equals
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3430 ) Change subject: [NO ISSUE][OTH] Use Absolute Path in FileReference hashCode/equals .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3430 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: comment Gerrit-Change-Id: Idcb642b3c5396a8319dc0aaf050e8af6fca93039 Gerrit-Change-Number: 3430 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Fri, 07 Jun 2019 03:54:00 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][DOC] Refresh and update text-example
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3356 ) Change subject: [NO ISSUE][DOC] Refresh and update text-example .. Patch Set 5: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3356 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie756e790994cd6d8dad69cce1bb728923cc0398c Gerrit-Change-Number: 3356 Gerrit-PatchSet: 5 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Preston Carman Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Mon, 03 Jun 2019 18:14:48 + Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '79b243' from stabilization-f69489
Michael Blow has submitted this change and it was merged. ( https://asterix-gerrit.ics.uci.edu/3418 ) Change subject: Merge commit '79b243' from stabilization-f69489 .. Merge commit '79b243' from stabilization-f69489 Change-Id: Ie2387663ab0cd4544eb9ec6f12ec2ba74136ef83 --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; Verified Objections: Jenkins: Violations found Anon. E. Moose (1000171): Violations found diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java index bb4c546..1e92f16 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java @@ -218,13 +218,8 @@ IIPCI ciIPCI = new ClientInterfaceIPCI(this, jobIdFactory); clientIPC = new IPCSystem(new InetSocketAddress(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort()), -<<< HEAD (84f734 [ASTERIXDB-2579][DOC] Document uuid/upsert/insert behavior) networkSecurityManager.getSocketChannelFactory(), ciIPCI, new JavaSerializationBasedPayloadSerializerDeserializer()); -webServer = new WebServer(this, ccConfig.getConsoleListenPort()); -=== -ciIPCI, new JavaSerializationBasedPayloadSerializerDeserializer()); ->>> BRANCH (79b243 [NO ISSUE][OTH] Make ClusterControllerService Extensible) clusterIPC.start(); clientIPC.start(); startWebServers(); -- To view, visit https://asterix-gerrit.ics.uci.edu/3418 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie2387663ab0cd4544eb9ec6f12ec2ba74136ef83 Gerrit-Change-Number: 3418 Gerrit-PatchSet: 2 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[stabilization-f69489]: [NO ISSUE][OTH] Make ClusterControllerService Extensible
Michael Blow has removed a vote on this change. Change subject: [NO ISSUE][OTH] Make ClusterControllerService Extensible .. Removed Contrib-2 by Anon. E. Moose (1000171) -- To view, visit https://asterix-gerrit.ics.uci.edu/3416 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: deleteVote Gerrit-Change-Id: Icd2a048a6152105c831183db2440e9dc5b3a1eb5 Gerrit-Change-Number: 3416 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow
Change in asterixdb[stabilization-f69489]: [NO ISSUE][OTH] Make ClusterControllerService Extensible
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3416 ) Change subject: [NO ISSUE][OTH] Make ClusterControllerService Extensible .. Patch Set 1: Contrib+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3416 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: comment Gerrit-Change-Id: Icd2a048a6152105c831183db2440e9dc5b3a1eb5 Gerrit-Change-Number: 3416 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 30 May 2019 11:59:55 + Gerrit-HasComments: No
Change in asterixdb[stabilization-f69489]: [NO ISSUE][CONF] Make Starting Hyracks Console Configurable
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3415 ) Change subject: [NO ISSUE][CONF] Make Starting Hyracks Console Configurable .. Patch Set 1: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/3415/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java: https://asterix-gerrit.ics.uci.edu/#/c/3415/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java@214 PS1, Line 214: ccConfig.isStartWebConsole() new flags are problematic for stabilization branch- can we reserve a negative port as disabled? https://asterix-gerrit.ics.uci.edu/#/c/3415/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java: https://asterix-gerrit.ics.uci.edu/#/c/3415/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java@78 PS1, Line 78: START_WEB_CONSOLE(BOOLEAN, true); new flags are problematic for binary compatibility reasons in stabilization branch, can we reserve a negative port for disabled? -- To view, visit https://asterix-gerrit.ics.uci.edu/3415 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-MessageType: comment Gerrit-Change-Id: If0050b298431b150690959b6d35db69182777ff6 Gerrit-Change-Number: 3415 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 30 May 2019 11:56:58 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3394 )
Change subject: [NO ISSUE][*DB][CLUS] Add support for a rebalance required
cluster state
..
Patch Set 1:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/3394/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
File
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java:
https://asterix-gerrit.ics.uci.edu/#/c/3394/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java@195
PS1, Line 195: if (state != ClusterState.ACTIVE && state !=
ClusterState.RECOVERING) {
: setState(ClusterState.PENDING);
: }
> I doubt this is of any use since any subscribers won't be able to get the c
we explicitly pass the new state to the, there's no need to get the lock in
that case- but we could clean this up later...
--
To view, visit https://asterix-gerrit.ics.uci.edu/3394
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I863f8bf3fe1ce8d59522c9a28a1283006ffa414c
Gerrit-Change-Number: 3394
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Wed, 15 May 2019 20:25:16 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3394 )
Change subject: [NO ISSUE][*DB][CLUS] Add support for a rebalance required
cluster state
..
[NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Allow extensions to mandate that a rebalance is required in order for
the cluster to go active
Change-Id: I863f8bf3fe1ce8d59522c9a28a1283006ffa414c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3394
Contrib: Jenkins
Integration-Tests: Jenkins
Tested-by: Jenkins
Reviewed-by: Murtadha Hubail
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
3 files changed, 55 insertions(+), 22 deletions(-)
Approvals:
Jenkins: Verified; ; Verified
Murtadha Hubail: Looks good to me, approved
Objections:
Jenkins: Violations found
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
index c2d3303..e13756c 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
@@ -30,8 +30,8 @@
PENDING, // the metadata node has not yet joined & initialized
RECOVERING, // global recovery has not yet completed
ACTIVE, // cluster is ACTIVE and ready for requests
-REBALANCING, // replication is processing failbacks
-SHUTTING_DOWN // a shutdown request has been received, and is underway
+SHUTTING_DOWN, // a shutdown request has been received, and is underway
+REBALANCE_REQUIRED // one or more datasets require rebalance before
the cluster is usable
}
WorkType getClusterManagementWorkType();
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 0e62851..6c39372 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
@@ -107,6 +108,14 @@
* @return true if the desired state was reached before timeout occurred
*/
boolean waitForState(ClusterState waitForState, long timeout, TimeUnit
unit)
+throws HyracksDataException, InterruptedException;
+
+/**
+ * Blocks until the cluster state matches supplied predicate, or timeout
is exhausted.
+ *
+ * @return the cluster state matching the predicate if it was satisfied
before timeout occurred, otherwise null
+ */
+ClusterState waitForState(Predicate condition, long timeout,
TimeUnit unit)
throws HyracksDataException, InterruptedException;
/**
@@ -250,4 +259,10 @@
* @return The metadata cluster partitions
*/
ClusterPartition getMetadataPartition();
+
+/**
+ * Indicate whether one or more datasets must be rebalanced before the
cluster becomes ACTIVE
+ * @param rebalanceRequired
+ */
+void setRebalanceRequired(boolean rebalanceRequired) throws
HyracksDataException;
}
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 16a479e..7933cd2 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -28,6 +28,7 @@
import java.util.SortedMap;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
import org.apache.asterix.common.cluster.ClusterPartition;
@@ -75,6 +76,7 @@
private INcLifecycleCoordinator lifecycleCoordinator;
private ICcApplicationContext appCtx;
private ClusterPartition metadataPartition;
+private boolean rebalanceRequired;
@Override
public void setCcAppCtx(ICcApplicationContext appCtx) {
@@ -186,45 +188,55 @@
return;
Change in asterixdb[master]: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Michael Blow has removed Anon. E. Moose (1000171) from this change. ( https://asterix-gerrit.ics.uci.edu/3394 ) Change subject: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state .. Removed reviewer null with the following votes: * Contrib-2 by Anon. E. Moose (1000171) -- To view, visit https://asterix-gerrit.ics.uci.edu/3394 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: I863f8bf3fe1ce8d59522c9a28a1283006ffa414c Gerrit-Change-Number: 3394 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [ASTERIXDB-2567][RT] Fix serializing nullable record fields
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3398 ) Change subject: [ASTERIXDB-2567][RT] Fix serializing nullable record fields .. Patch Set 3: Code-Review+2 (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/3398/3/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java: https://asterix-gerrit.ics.uci.edu/#/c/3398/3/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java@185 PS3, Line 185: int fieldIndex = 0; not changed in your patch, but why not move this into the for-loop initializer? -- To view, visit https://asterix-gerrit.ics.uci.edu/3398 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42105965e69c60bc4b123337296476b4d75f0ad8 Gerrit-Change-Number: 3398 Gerrit-PatchSet: 3 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Wed, 15 May 2019 16:26:29 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3394 )
Change subject: [NO ISSUE][*DB][CLUS] Add support for a rebalance required
cluster state
..
Patch Set 1:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/3394/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
File
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java:
https://asterix-gerrit.ics.uci.edu/#/c/3394/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java@195
PS1, Line 195: if (state != ClusterState.ACTIVE && state !=
ClusterState.RECOVERING) {
: setState(ClusterState.PENDING);
: }
> is this needed? looks like some unnecessary transient state that will be ch
This ensures that we always transition from UNUSABLE -> PENDING -> RECOVERING
-> [REBALANCE_REQUIRED ->] ACTIVE in case of normal startup- this might be
helpful for cluster event subscribers.
--
To view, visit https://asterix-gerrit.ics.uci.edu/3394
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I863f8bf3fe1ce8d59522c9a28a1283006ffa414c
Gerrit-Change-Number: 3394
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Wed, 15 May 2019 11:43:54 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][OTH] Codegen clean up and plugin removal
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3396 )
Change subject: [NO ISSUE][OTH] Codegen clean up and plugin removal
..
Patch Set 1: Code-Review+2
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/3396/1/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/IFunctionCollection.java
File
asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/IFunctionCollection.java:
https://asterix-gerrit.ics.uci.edu/#/c/3396/1/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/IFunctionCollection.java@23
PS1, Line 23: public interface IFunctionCollection extends Serializable {
let's make this a functional interface while we're at it
--
To view, visit https://asterix-gerrit.ics.uci.edu/3396
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c17f9f3f0c73f2ec3048a39da3cbbdd5f24e816
Gerrit-Change-Number: 3396
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Comment-Date: Tue, 14 May 2019 18:22:14 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][CLUS] Ignore Received Heartbeats Before App Initialization
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3395 ) Change subject: [NO ISSUE][CLUS] Ignore Received Heartbeats Before App Initialization .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3395 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65ef92ae3179214f1efecd1bb44da4772b7a3dd9 Gerrit-Change-Number: 3395 Gerrit-PatchSet: 2 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Tue, 14 May 2019 18:20:19 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3394
Change subject: [NO ISSUE][*DB][CLUS] Add support for a rebalance required
cluster state
..
[NO ISSUE][*DB][CLUS] Add support for a rebalance required cluster state
Allow extensions to mandate that a rebalance is required in order for
the cluster to go active
Change-Id: I863f8bf3fe1ce8d59522c9a28a1283006ffa414c
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
3 files changed, 55 insertions(+), 22 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/94/3394/1
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
index c2d3303..e13756c 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
@@ -30,8 +30,8 @@
PENDING, // the metadata node has not yet joined & initialized
RECOVERING, // global recovery has not yet completed
ACTIVE, // cluster is ACTIVE and ready for requests
-REBALANCING, // replication is processing failbacks
-SHUTTING_DOWN // a shutdown request has been received, and is underway
+SHUTTING_DOWN, // a shutdown request has been received, and is underway
+REBALANCE_REQUIRED // one or more datasets require rebalance before
the cluster is usable
}
WorkType getClusterManagementWorkType();
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 0e62851..6c39372 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
@@ -107,6 +108,14 @@
* @return true if the desired state was reached before timeout occurred
*/
boolean waitForState(ClusterState waitForState, long timeout, TimeUnit
unit)
+throws HyracksDataException, InterruptedException;
+
+/**
+ * Blocks until the cluster state matches supplied predicate, or timeout
is exhausted.
+ *
+ * @return the cluster state matching the predicate if it was satisfied
before timeout occurred, otherwise null
+ */
+ClusterState waitForState(Predicate condition, long timeout,
TimeUnit unit)
throws HyracksDataException, InterruptedException;
/**
@@ -250,4 +259,10 @@
* @return The metadata cluster partitions
*/
ClusterPartition getMetadataPartition();
+
+/**
+ * Indicate whether one or more datasets must be rebalanced before the
cluster becomes ACTIVE
+ * @param rebalanceRequired
+ */
+void setRebalanceRequired(boolean rebalanceRequired) throws
HyracksDataException;
}
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 16a479e..7933cd2 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -28,6 +28,7 @@
import java.util.SortedMap;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
import org.apache.asterix.common.cluster.ClusterPartition;
@@ -75,6 +76,7 @@
private INcLifecycleCoordinator lifecycleCoordinator;
private ICcApplicationContext appCtx;
private ClusterPartition metadataPartition;
+private boolean rebalanceRequired;
@Override
public void setCcAppCtx(ICcApplicationContext appCtx) {
@@ -186,45 +188,55 @@
return;
}
// the metadata bootstrap & global recovery must be complete before
the cluster can be active
-if (metadataNodeActive) {
-if (state != ClusterState.ACTIVE && state
Change in asterixdb[master]: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/2936 )
Change subject: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
..
Patch Set 15:
(8 comments)
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/LICENSE
File asterixdb/LICENSE:
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/LICENSE@324
PS15, Line 324:
asterix-dashboard/src/main/resources/asterix-dashboard/src/main/resources/assets/fonts/material-icons/MaterialIcons-Regular.eot,
:
asterix-dashboard/src/main/resources/asterix-dashboard/src/main/resources/assets/fonts/material-icons/MaterialIcons-Regular.svg,
:
asterix-dashboard/src/main/resources/asterix-dashboard/src/main/resources/assets/fonts/material-icons/MaterialIcons-Regular.ttf,
:
asterix-dashboard/src/main/resources/asterix-dashboard/src/main/resources/assets/fonts/material-icons/MaterialIcons-Regular.woff,
:and
:
asterix-dashboard/src/main/resources/asterix-dashboard/src/main/resources/assets/fonts/material-icons/MaterialIcons-Regular.woff2
see comment in template (duplicate asterix-dashboard/src/main/resources/)
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl
File asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@59
PS15, Line 59: <#assign licenseComponent="AsterixDB Dashboard"/>
this is not used, it's overridden in macro use below
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@60
PS15, Line 60: <#assign licenseLocation="${asterixAppLocation!}"/>
: <#assign
licenseFilePrefix="${asterixDashboardResourcesPrefix!'dashboard/'}"/>
it would be cleaner I think to define these as parameters to the license macro,
see comments in main license template
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@63
PS15, Line 63: ASTERIXDB Dashboard JS COMPONENTS
is this correct? (I wonder if we should capitalize all or none, because I
believe we normally refer to *DB as 'AsterixDB' or 'Apache AsterixDB'
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@65
PS15, Line 65: under
: dashboard/static/
remove
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/src/main/licenses/templates/source_licenses.ftl
File asterixdb/src/main/licenses/templates/source_licenses.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/src/main/licenses/templates/source_licenses.ftl@142
PS15, Line 142: Dashbaord
sp
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/src/main/licenses/templates/source_licenses.ftl@143
PS15, Line 143: <#assign licenseLocation="${asterixDashboardLocation!}"/>
: <#assign
licenseFilePrefix="${asterixDashboardResourcesPrefix!'dashboard/'}"/>
it would be cleaner I think to define these as parameters to the license macro,
as is done in the hive license above
https://asterix-gerrit.ics.uci.edu/#/c/2936/15/asterixdb/src/main/licenses/templates/source_licenses.ftl@149
PS15, Line 149: ${licenseFilePrefix}
this results in a duplicate prefix, as the license macro already prepends
'licenseFilePrefix'
--
To view, visit https://asterix-gerrit.ics.uci.edu/2936
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c
Gerrit-Change-Number: 2936
Gerrit-PatchSet: 15
Gerrit-Owner: Emilio Jose Coronado Lopez
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Comment-Date: Fri, 10 May 2019 17:56:26 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/2936 )
Change subject: [NO ISSUE][DASH] Plan Format, Flat Nested Objects on Table
..
Patch Set 15:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/src/main/licenses/templates/source_licenses.ftl
File asterixdb/src/main/licenses/templates/source_licenses.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/src/main/licenses/templates/source_licenses.ftl@141
PS13, Line 141: <#if !asterixDashboardSkip!false>
: <#assign licenseComponent="AsterixDB Dashbaord"/>
: <#assign licenseLocation="${asterixDashboardLocation!}"/>
: <#assign
licenseFilePrefix="${asterixDashboardResourcesPrefix!'dashboard/'}"/>
:
: Embedded fonts in asterix-dashboard are from
material-design-icons (https://github.com/google/material-design-icons)
:
: <@license licenseName="The Apache License, Version 2.0"
component="AsterixDB Dashboard fonts" files=[
:
"${licenseFilePrefix}assets/fonts/material-icons/MaterialIcons-Regular.eot",
:
"${licenseFilePrefix}assets/fonts/material-icons/MaterialIcons-Regular.svg",
:
"${licenseFilePrefix}assets/fonts/material-icons/MaterialIcons-Regular.ttf",
:
"${licenseFilePrefix}assets/fonts/material-icons/MaterialIcons-Regular.woff",
:
"${licenseFilePrefix}assets/fonts/material-icons/MaterialIcons-Regular.woff2"]>
:
: <@indent spaces=3>
: <#list licenses as license>
: <#if license.url ==
"http://www.apache.org/licenses/LICENSE-2.0.txt;>
: ${license.content}
: <#break>
:
:
:
:
:
:
:
:
:
:
> i tried including this, however i don't believe the plugin can access outsi
yes, i think this is why elsewhere we make the parent of hyracks / asterixdb
the basedir
--
To view, visit https://asterix-gerrit.ics.uci.edu/2936
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c
Gerrit-Change-Number: 2936
Gerrit-PatchSet: 15
Gerrit-Owner: Emilio Jose Coronado Lopez
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Comment-Date: Fri, 10 May 2019 17:16:40 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [ASTERIXDB-2555][RT][COMP] Make hash join use logical comparison
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3387 )
Change subject: [ASTERIXDB-2555][RT][COMP] Make hash join use logical comparison
..
Patch Set 2:
(2 comments)
https://asterix-gerrit.ics.uci.edu/#/c/3387/2/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/evaluators/TuplePairEvaluatorFactory.java
File
hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/evaluators/TuplePairEvaluatorFactory.java:
https://asterix-gerrit.ics.uci.edu/#/c/3387/2/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/evaluators/TuplePairEvaluatorFactory.java@78
PS2, Line 78: if (tuplesAreReversed) {
: tuplePairRef.reset(rightAccessor, rightIndex,
leftAccessor, leftIndex);
: } else {
: tuplePairRef.reset(leftAccessor, leftIndex,
rightAccessor, rightIndex);
: }
I think I prefer patch set 1 here- but not with a ton of conviction
https://asterix-gerrit.ics.uci.edu/#/c/3387/2/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/evaluators/TuplePairEvaluatorFactory.java@84
PS2, Line 84: if
(binaryBooleanInspector.getBooleanValue(p.getByteArray(), p.getStartOffset(),
p.getLength())) {
: return 0;
: } else {
: return 1;
: }
should we use a ternary op here?
--
To view, visit https://asterix-gerrit.ics.uci.edu/3387
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If1834967fdd913fdc76003f09636b2450d07cd5e
Gerrit-Change-Number: 3387
Gerrit-PatchSet: 2
Gerrit-Owner: Ali Alsuliman
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Dmitry Lychagin
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Thu, 09 May 2019 22:06:01 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][DOC] Refresh and update text-example
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3356 ) Change subject: [NO ISSUE][DOC] Refresh and update text-example .. Patch Set 3: (8 comments) https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/src/main/conf/README File hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/src/main/conf/README: https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/src/main/conf/README@1 PS3, Line 1: This package holds a very simple Hyracks client program that counts the words in a supplied text file. A prerequisite should we include ASF license header? https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/src/main/conf/README@4 PS3, Line 4: In the in the what? https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README File hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README: https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README@1 PS3, Line 1: This example sets up a very basic Hyracks cluster to be used for counting words in a file with the textclient example. should we include ASF header? https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README@4 PS3, Line 4: conf/nc.conf is this right? (nc.conf) https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README@6 PS3, Line 6: T ...t https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README@8 PS3, Line 8: conf/nc.conf is this right? (nc.conf) https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/README@10 PS3, Line 10: A ...a https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/text.conf File hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/text.conf: https://asterix-gerrit.ics.uci.edu/#/c/3356/3/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/src/main/conf/text.conf@25 PS3, Line 25: app.class = org.apache.hyracks.control.cc.BaseCCApplication redundant -- To view, visit https://asterix-gerrit.ics.uci.edu/3356 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie756e790994cd6d8dad69cce1bb728923cc0398c Gerrit-Change-Number: 3356 Gerrit-PatchSet: 3 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Preston Carman Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Wed, 08 May 2019 15:10:32 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][RT] Improve PreclusteredGroupWriter follow up
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3358 ) Change subject: [NO ISSUE][RT] Improve PreclusteredGroupWriter follow up .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3358 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I524ea3bf347b248fcd7850e212c92ac4a82cec2c Gerrit-Change-Number: 3358 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Mon, 22 Apr 2019 22:45:29 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has uploaded a new patch set (#15) to the change originally created by Hussain Towaileb. ( https://asterix-gerrit.ics.uci.edu/3043 ) Change subject: [NO ISSUE][FUN] Code generator alternative .. [NO ISSUE][FUN] Code generator alternative - user model changes: no - storage format changes: no - interface changes: no Details: - Possible alternative to replace the generated code with a static method that does the NULL and MISSING checking step. - Missing and Null check uses static method and helper methods instead of varargs as a method argument. - NullMissingTest and ExceptionIT manually add the functions that need to be tested, this behavior will be changed later, the functions that need to be tested for the "missing/null in -> missing/null out" behavior will have their own flagging mechanism (annotation or a method) indicating that those methods will be tested, and the manual addition of functions will be removed. Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/NullMissingTest.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/GramTokensEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/WordTokensEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceListIsFilterableDescriptor.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceStringIsFilterableEvaluator.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java M asterixdb/asterix-runtime/pom.xml M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.java M
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3043 ) Change subject: [NO ISSUE][FUN] Code generator alternative .. Patch Set 15: Verified+1 Contrib+1 Code-Review+2 Integration-Tests+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3043 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88 Gerrit-Change-Number: 3043 Gerrit-PatchSet: 15 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Mon, 22 Apr 2019 17:33:56 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3043 ) Change subject: [NO ISSUE][FUN] Code generator alternative .. Patch Set 14: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/3043/14//COMMIT_MSG Commit Message: https://asterix-gerrit.ics.uci.edu/#/c/3043/14//COMMIT_MSG@20 PS14, Line 20: missin -> missing -- To view, visit https://asterix-gerrit.ics.uci.edu/3043 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88 Gerrit-Change-Number: 3043 Gerrit-PatchSet: 14 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Mon, 22 Apr 2019 17:32:57 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3043 ) Change subject: [NO ISSUE][FUN] Code generator alternative .. Patch Set 14: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3043 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88 Gerrit-Change-Number: 3043 Gerrit-PatchSet: 14 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Mon, 22 Apr 2019 17:30:56 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][DASH] Asterixdb-dashboard: Plan Format| Flat Nested Object...
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2936 ) Change subject: [NO ISSUE][DASH] Asterixdb-dashboard: Plan Format| Flat Nested Objects on Table .. Patch Set 13: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/2936/13//COMMIT_MSG Commit Message: https://asterix-gerrit.ics.uci.edu/#/c/2936/13//COMMIT_MSG@7 PS13, Line 7: Asterixdb-dashboard: can probably remove now that we have [DASH] -- To view, visit https://asterix-gerrit.ics.uci.edu/2936 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c Gerrit-Change-Number: 2936 Gerrit-PatchSet: 13 Gerrit-Owner: Emilio Jose Coronado Lopez Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 18 Apr 2019 13:31:40 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][DASH] Asterixdb-dashboard: Plan Format| Flat Nested Object...
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/2936 )
Change subject: [NO ISSUE][DASH] Asterixdb-dashboard: Plan Format| Flat Nested
Objects on Table
..
Patch Set 13:
(4 comments)
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/asterix-dashboard/pom.xml
File asterixdb/asterix-dashboard/pom.xml:
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/asterix-dashboard/pom.xml@161
PS13, Line 161:
:
asterix-dashboard/src/main/resources
:
this shouldn't be here- it should default to dashboard/ for this context
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl
File asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@61
PS13, Line 61: dashboard
looks like the other prefixes (and this one for source license context) include
the trailing slash- so this should be dashboard/
Note, these single quotes should not be here, I had them in my comment to
enclose the literal value.
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@72
PS13, Line 72: licenseFilePrefix
it looks like the other prefixes (and this one for the source license context)
include the trailing slash- so this should be: ${licenseFilePrefix}assets
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/src/main/licenses/templates/source_licenses.ftl
File asterixdb/src/main/licenses/templates/source_licenses.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/13/asterixdb/src/main/licenses/templates/source_licenses.ftl@141
PS13, Line 141: <#assign licenseComponent="AsterixDB Dashbaord"/>
: <#assign licenseLocation="${asterixDashboardLocation!}"/>
: <#assign
licenseFilePrefix="${asterixDashboardResourcesPrefix!'dashboard'}"/>
: ===
:ASTERIXDB Dashboard JS COMPONENTS:
:
: includes a number of packed subcomponents under
: dashboard/static/ with separate copyright
: notices and license terms. Your use of these subcomponents
is subject
: to the terms and condition of the following licenses.
: ===
:
: <@license licenseName="The Apache License, Version 2.0"
component="AsterixDB Dashboard fonts" files=[
:
"${licenseFilePrefix}/assets/fonts/material-icons/MaterialIcons-Regular.eot",
:
"${licenseFilePrefix}/assets/fonts/material-icons/MaterialIcons-Regular.svg",
:
"${licenseFilePrefix}/assets/fonts/material-icons/MaterialIcons-Regular.ttf",
:
"${licenseFilePrefix}/assets/fonts/material-icons/MaterialIcons-Regular.woff",
:
"${licenseFilePrefix}/assets/fonts/material-icons/MaterialIcons-Regular.woff2"]>
: Embedded fonts in asterix-dashboard are from
material-design-icons (https://github.com/google/material-design-icons)
:
: <@indent spaces=3>
: <#list licenses as license>
: <#if license.url ==
"http://www.apache.org/licenses/LICENSE-2.0.txt;>
: ${license.content}
: <#break>
:
:
:
:
I think this would be an include, not copy/pasted here, for easier maintenance
--
To view, visit https://asterix-gerrit.ics.uci.edu/2936
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c
Gerrit-Change-Number: 2936
Gerrit-PatchSet: 13
Gerrit-Owner: Emilio Jose Coronado Lopez
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Comment-Date: Thu, 18 Apr 2019 12:41:14 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Make IOManager more configurable
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3133 ) Change subject: [NO ISSUE] Make IOManager more configurable .. Patch Set 8: Contrib+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3133 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8ad11c2b8b983ef4bf7cf78c2f068accddfff4 Gerrit-Change-Number: 3133 Gerrit-PatchSet: 8 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Wail Alkowaileet Gerrit-Comment-Date: Thu, 18 Apr 2019 12:34:07 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Make IOManager more configurable
Michael Blow has removed a vote on this change. Change subject: [NO ISSUE] Make IOManager more configurable .. Removed Contrib-2 by Anon. E. Moose (1000171) -- To view, visit https://asterix-gerrit.ics.uci.edu/3133 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I1c8ad11c2b8b983ef4bf7cf78c2f068accddfff4 Gerrit-Change-Number: 3133 Gerrit-PatchSet: 8 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Wail Alkowaileet
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3043 )
Change subject: [NO ISSUE][FUN] Code generator alternative
..
Patch Set 12:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java
File
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java:
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java@215
PS12, Line 215:// Pointable2
: switch (checkMissingOrNull(pointable2)) {
: case MISSING:
: setMissing(result);
: return true;
: case NULL:
: isMeetNull = true;
: break;
: }
:
> Done.
sure; and yes this is what I was suggesting
--
To view, visit https://asterix-gerrit.ics.uci.edu/3043
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88
Gerrit-Change-Number: 3043
Gerrit-PatchSet: 12
Gerrit-Owner: Hussain Towaileb
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Dmitry Lychagin
Gerrit-Reviewer: Hussain Towaileb
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Thu, 18 Apr 2019 12:32:55 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Ordering of nodes
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2191 ) Change subject: [NO ISSUE] Ordering of nodes .. Patch Set 8: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/2191/8/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java: https://asterix-gerrit.ics.uci.edu/#/c/2191/8/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java@85 PS8, Line 85: LinkedHashMap this is going to cause each NC to have a different order, as each NC registers himself first. i think this will cause nodes to have conflicting partition numbers... things will need to be reworked so that every node has the same order. -- To view, visit https://asterix-gerrit.ics.uci.edu/2191 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab4555cc1afdf84cc0b16aaadb5807f61965153e Gerrit-Change-Number: 2191 Gerrit-PatchSet: 8 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 17 Apr 2019 15:31:58 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][FUN] Code generator alternative
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/3043 )
Change subject: [NO ISSUE][FUN] Code generator alternative
..
Patch Set 12:
(4 comments)
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java
File
asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java:
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java@73
PS12, Line 73: // MISSING and NULL checks
i'd like to remove these from all these classes- i think it's clear without the
comments... this should be easy enough to do with a sed one-liner hopefully...
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArrayIntersectDescriptor.java
File
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArrayIntersectDescriptor.java:
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArrayIntersectDescriptor.java@231
PS12, Line 231: // If it's not missing, then it's null,
but don't return until all arguments are checked for missing
> MAJOR SonarQube violation:
+1
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java
File
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java:
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java@215
PS12, Line 215:// Pointable2
: switch (checkMissingOrNull(pointable2)) {
: case MISSING:
: setMissing(result);
: return true;
: case NULL:
: isMeetNull = true;
: break;
: }
:
would prefer to move the null check for pointable outside of
checkMissingOrNull, and make the argment @NotNull. I'm afraid that nesting
this might make it more apt for the JIT to not handle this as efficiently as
possible... same applies for pointable3 and 4 below.
https://asterix-gerrit.ics.uci.edu/#/c/3043/12/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java@264
PS12, Line 264: pointable != null
see above comment
--
To view, visit https://asterix-gerrit.ics.uci.edu/3043
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icca2e2128c4b0f2bfd8675655cf5296cbbaeba88
Gerrit-Change-Number: 3043
Gerrit-PatchSet: 12
Gerrit-Owner: Hussain Towaileb
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Dmitry Lychagin
Gerrit-Reviewer: Hussain Towaileb
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Till Westmann
Gerrit-Comment-Date: Wed, 17 Apr 2019 14:28:28 +
Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Make IOManager more configurable
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3133 ) Change subject: [NO ISSUE] Make IOManager more configurable .. Patch Set 7: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/3133/7/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java: https://asterix-gerrit.ics.uci.edu/#/c/3133/7/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java@589 PS7, Line 589: Len Size seems less confusing- Len sounds like current count of items in the queue, not the capacity... https://asterix-gerrit.ics.uci.edu/#/c/3133/7/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/IOManager.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/IOManager.java: https://asterix-gerrit.ics.uci.edu/#/c/3133/7/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/IOManager.java@76 PS7, Line 76: queueLen queueSize -- To view, visit https://asterix-gerrit.ics.uci.edu/3133 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8ad11c2b8b983ef4bf7cf78c2f068accddfff4 Gerrit-Change-Number: 3133 Gerrit-PatchSet: 7 Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Wail Alkowaileet Gerrit-Comment-Date: Wed, 17 Apr 2019 14:12:15 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Asterixdb-dashboard: Plan Format| Flat Nested Objects on T...
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/2936 ) Change subject: [NO ISSUE] Asterixdb-dashboard: Plan Format| Flat Nested Objects on Table .. Patch Set 11: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/2936/11//COMMIT_MSG Commit Message: https://asterix-gerrit.ics.uci.edu/#/c/2936/11//COMMIT_MSG@7 PS11, Line 7: Asterixdb-dashboard should we create a component for dashboard, and use the standard here? e.g. [NO ISSUE][*DB][DASH] or something? -- To view, visit https://asterix-gerrit.ics.uci.edu/2936 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a27a5576ae21b6fda440bfc281d25e62638515c Gerrit-Change-Number: 2936 Gerrit-PatchSet: 11 Gerrit-Owner: Emilio Jose Coronado Lopez Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 17 Apr 2019 13:43:17 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Asterixdb-dashboard: Plan Format| Flat Nested Objects on T...
Michael Blow has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/2936 )
Change subject: [NO ISSUE] Asterixdb-dashboard: Plan Format| Flat Nested
Objects on Table
..
Patch Set 11:
(4 comments)
the dashboard-licnese.ftl needs to be included into source_licenses.ftl for
inclusion in the top-level asterixdb LICENSE. That invocation needs to define
'asterixDashboardResourcesPrefix' with a value appropriate for that context
https://asterix-gerrit.ics.uci.edu/#/c/2936/11/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl
File asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl:
https://asterix-gerrit.ics.uci.edu/#/c/2936/11/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@20
PS11, Line 20: <#list licenses as license>
: <#if license.url ==
"http://www.apache.org/licenses/LICENSE-2.0.txt;>
: ${license.content}
: <#break>
:
:
use this below (should probably extract to a macro, but at least copy / paste)
to avoid hardcoding the license again...
https://asterix-gerrit.ics.uci.edu/#/c/2936/11/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@61
PS11, Line 61: <#assign
licenseFilePrefix="${asterixDashboardResourcesPrefix!}"/>
this should default to 'dashboard' not empty string, since the distinct path to
the resources in the jar is dashboard (e.g.
dashboard/assets/MaterialIcons-Regular.eot)
https://asterix-gerrit.ics.uci.edu/#/c/2936/11/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@72
PS11, Line 72: asterixdb/asterix-dashboard/src/node/src
these should be replaced with ${asterixDashboardResourcesPrefix}, which will be
"dashboard" when included in the dashboard jar, and the source path when
included in the top-level LICENSE file
https://asterix-gerrit.ics.uci.edu/#/c/2936/11/asterixdb/asterix-dashboard/src/main/licenses/dashboard-license.ftl@81
PS11, Line 81: Apache License
:Version 2.0, January 2004
: http://www.apache.org/licenses/
:
:TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
:
:1. Definitions.
:
: "License" shall mean the terms and conditions for use,
reproduction,
: and distribution as defined by Sections 1 through 9 of
this document.
:
: "Licensor" shall mean the copyright owner or entity
authorized by
: the copyright owner that is granting the License.
:
: "Legal Entity" shall mean the union of the acting entity
and all
: other entities that control, are controlled by, or are
under common
: control with that entity. For the purposes of this
definition,
: "control" means (i) the power, direct or indirect, to
cause the
: direction or management of such entity, whether by
contract or
: otherwise, or (ii) ownership of fifty percent (50%) or
more of the
: outstanding shares, or (iii) beneficial ownership of such
entity.
:
: "You" (or "Your") shall mean an individual or Legal Entity
: exercising permissions granted by this License.
:
: "Source" form shall mean the preferred form for making
modifications,
: including but not limited to software source code,
documentation
: source, and configuration files.
:
: "Object" form shall mean any form resulting from mechanical
: transformation or translation of a Source form, including
but
: not limited to compiled object code, generated
documentation,
: and conversions to other media types.
:
: "Work" shall mean the work of authorship, whether in
Source or
: Object form, made available under the License, as
indicated by a
: copyright notice that is included in or attached to the
work
: (an example is provided in the Appendix below).
:
: "Derivative Works" shall mean any work, whether in Source
or Object
: form, that is based on (or derived from) the Work and for
which the
: editorial revisions, annotations, elaborations, or other
modifications
: represent, as a whole, an original work of authorship. For
the purposes
: of this License, Derivative Works shall not include works
that remain
: separable from, or merely link (or bind by
Change in asterixdb[master]: Merge commit 'fab68d291e' from 'stabilization-f69489'
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3337 )
Change subject: Merge commit 'fab68d291e' from 'stabilization-f69489'
..
Merge commit 'fab68d291e' from 'stabilization-f69489'
Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
2 files changed, 0 insertions(+), 2 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Michael Blow: Looks good to me, approved
Objections:
Anon. E. Moose (1000171): Violations found
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
index 702c099..3da845d 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
@@ -83,8 +83,6 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
import org.junit.runners.Parameterized;
public class CheckpointInSecondaryIndexTest {
--
To view, visit https://asterix-gerrit.ics.uci.edu/3337
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f
Gerrit-Change-Number: 3337
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Change in asterixdb[master]: Merge commit 'fab68d291e' from 'stabilization-f69489'
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3337 ) Change subject: Merge commit 'fab68d291e' from 'stabilization-f69489' .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3337 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f Gerrit-Change-Number: 3337 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sat, 13 Apr 2019 00:14:25 + Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'fab68d291e' from 'stabilization-f69489'
Hello Anon. E. Moose (1000171), Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3337 to look at the new patch set (#2). Change subject: Merge commit 'fab68d291e' from 'stabilization-f69489' .. Merge commit 'fab68d291e' from 'stabilization-f69489' Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/37/3337/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3337 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f Gerrit-Change-Number: 3337 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB] Warn (not fail) on running *DB processes on sample start
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3341 )
Change subject: [NO ISSUE][*DB] Warn (not fail) on running *DB processes on
sample start
..
[NO ISSUE][*DB] Warn (not fail) on running *DB processes on sample start
also, fix printing of running processes post sample stop
Change-Id: I84037ad5f64536bafcb7c9500b9a7668e6849156
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3341
Reviewed-by: Ian Maxon
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
---
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
3 files changed, 11 insertions(+), 36 deletions(-)
Approvals:
Ian Maxon: Looks good to me, approved
Jenkins: Verified; No violations found; Verified
Anon. E. Moose (1000171):
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
index 60f5cb5..652abff 100644
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
@@ -32,9 +32,9 @@
if "%1" == "" goto postopts
if "%1" == "-f" (
- set force=1
+ rem ignored, this is always the case
) else if "%1" == "-force" (
- set force=1
+ rem ignored, this is always the case
) else if "%1" == "-usage" (
goto :usage
) else if "%1" == "-help" (
@@ -80,23 +80,12 @@
"name='java.exe' and CommandLine like
'%%org.codehaus.mojo.appassembler.booter.AppassemblerBooter%%' and (CommandLine
like '%%app.name=\"%%[cn]c\"%%' or CommandLine like
'%%app.name=\"%%ncservice\"%%')" ^
GET processid > %tempfile% 2> nul
-set severity=ERROR
-if "%force%" == "1" set severity=WARNING
-
for /F "skip=1" %%P in ('type %tempfile%') DO set found=1
if "%found%" == "1" (
- if "%force%" == "1" (
-echo %severity%: ${PRODUCT} processes are already running; -f[orce]
specified, ignoring
-del %tempfile%
- ) else (
-echo %severity%: ${PRODUCT} processes are already running; aborting"
-echo.
-echo Re-run with -f to ignore, or run stop-sample-cluster.bat -f to
forcibly terminate all running ${PRODUCT} processes:
-for /F "skip=1" %%P in ('type %tempfile%') DO @echo - %%P
-del %tempfile%
-exit /B 1
- )
+ echo WARNING: ${PRODUCT} processes are already running:
+ for /F "skip=1" %%P in ('type %tempfile%') DO @echo - %%P
+ del %tempfile%
)
goto :post_timestamp
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index 34d156c..9268bed 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -20,14 +20,13 @@
function usage() {
echo
- echo Usage: $(basename $0) [-f[orce]]
+ echo Usage: $(basename $0)
echo
- echo " -f[orce] : Forces a start attempt when ${PRODUCT} processes are
found to be running"
}
while [ -n "$1" ]; do
case $1 in
--f|-force) force=1;;
+-f|-force);; # ignored, this is always the case
-help|--help|-usage|--usage) usage; exit 0;;
*) echo "ERROR: unknown argument '$1'"; usage; exit 1;;
esac
@@ -115,22 +114,9 @@
&& echo "ERROR: sample cluster address (localhost:${LISTEN_PORT}) already
in use" && exit 1
if ps -ef | grep
'java.*org\.apache\.hyracks\.control\.[cn]c\.\([CN]CDriver\|service\.NCService\)'
> /tmp/$$_pids; then
- if [ $force ]; then
-severity=WARNING
- else
-severity=ERROR
- fi
- echo -n "${severity}: ${PRODUCT} processes are already running; "
- if [ $force ]; then
-echo "-f[orce] specified, ignoring"
- else
-echo "aborting"
-echo
-echo "Re-run with -f to ignore, or run stop-sample-cluster.sh -f to
forcibly terminate all running ${PRODUCT} processes:"
-cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
-rm /tmp/$$_pids
-exit 1
- fi
+ echo "WARNING: ${PRODUCT} processes are already running:"
+ cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
+ rm /tmp/$$_pids
fi
rm /tmp/$$_pids
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
index 80647d4..97473ac 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
@@ -146,7 +146,7 @@
done
else
echo "re-run with -f|-force to forcibly terminate all ${PRODUCT}
processes:"
-cat /tmp/pids | sed
Change in asterixdb[master]: [NO ISSUE][FUN] Fix type inference and casting in UDFs
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3270 ) Change subject: [NO ISSUE][FUN] Fix type inference and casting in UDFs .. Patch Set 8: Code-Review+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3270 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40506fcca3cd8f14bbd6412359683433256c4c1f Gerrit-Change-Number: 3270 Gerrit-PatchSet: 8 Gerrit-Owner: Xikui Wang Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Comment-Date: Fri, 12 Apr 2019 18:03:48 + Gerrit-HasComments: No
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][CLUS] Add API to return all known nodes atomically
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3340 )
Change subject: [NO ISSUE][*DB][CLUS] Add API to return all known nodes
atomically
..
[NO ISSUE][*DB][CLUS] Add API to return all known nodes atomically
Change-Id: Ie6bb64e331666ef44b07034d430ba2ee563bba82
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3340
Reviewed-by: Murtadha Hubail
Tested-by: Jenkins
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Murtadha Hubail: Looks good to me, approved
Jenkins: Verified
Objections:
Jenkins: Violations found
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index d0d039d..0e62851 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -144,6 +144,11 @@
Set getFailedNodes();
/**
+ * @return the set of cluster nodes
+ */
+Set getNodes();
+
+/**
* Returns the IO devices configured for a Node Controller
*
* @param nodeId
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 720b089..16a479e 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -256,6 +256,13 @@
}
@Override
+public synchronized Set getNodes() {
+Set nodes = new HashSet<>(participantNodes);
+nodes.addAll(failedNodes);
+return nodes;
+}
+
+@Override
public synchronized Set getParticipantNodes(boolean
excludePendingRemoval) {
final Set participantNodesCopy = getParticipantNodes();
if (excludePendingRemoval) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/3340
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6bb64e331666ef44b07034d430ba2ee563bba82
Gerrit-Change-Number: 3340
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Change in asterixdb[stabilization-f69489]: [NO ISSUE][HYR] Use System.nanotime for StopWatch
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3339 )
Change subject: [NO ISSUE][HYR] Use System.nanotime for StopWatch
..
[NO ISSUE][HYR] Use System.nanotime for StopWatch
Change-Id: Ic64f1b938c26161f5fb482af5ee1da6121f49643
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3339
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Ian Maxon
---
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
1 file changed, 7 insertions(+), 12 deletions(-)
Approvals:
Jenkins: Verified; No violations found; Verified
Ian Maxon: Looks good to me, approved
Objections:
Anon. E. Moose (1000171): Violations found
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
index e752cb3..a1a39cb 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
@@ -19,32 +19,27 @@
package org.apache.hyracks.api.util;
+import java.util.concurrent.TimeUnit;
+
public class StopWatch {
private long startTime = 0;
-private long stopTime = 0;
private long elapsedTime = 0;
public void start() {
elapsedTime = 0;
-startTime = System.currentTimeMillis();
+startTime = System.nanoTime();
}
public void stop() {
-stopTime = System.currentTimeMillis();
-elapsedTime += stopTime - startTime;
+elapsedTime += System.nanoTime() - startTime;
}
public void resume() {
-startTime = System.currentTimeMillis();
+startTime = System.nanoTime();
}
-//elaspsed time in milliseconds
-public long getElapsedTime() {
-return elapsedTime;
+public long elapsed(TimeUnit unit) {
+return unit.convert(elapsedTime, TimeUnit.NANOSECONDS);
}
-//elaspsed time in seconds
-public long getElapsedTimeSecs() {
-return elapsedTime / 1000;
-}
}
\ No newline at end of file
--
To view, visit https://asterix-gerrit.ics.uci.edu/3339
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic64f1b938c26161f5fb482af5ee1da6121f49643
Gerrit-Change-Number: 3339
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Till Westmann
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB] Warn (not fail) on running *DB processes on sample start
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3341
Change subject: [NO ISSUE][*DB] Warn (not fail) on running *DB processes on
sample start
..
[NO ISSUE][*DB] Warn (not fail) on running *DB processes on sample start
also, fix printing of running processes post sample stop
Change-Id: I84037ad5f64536bafcb7c9500b9a7668e6849156
---
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
3 files changed, 11 insertions(+), 36 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/41/3341/1
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
index 60f5cb5..652abff 100644
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
@@ -32,9 +32,9 @@
if "%1" == "" goto postopts
if "%1" == "-f" (
- set force=1
+ rem ignored, this is always the case
) else if "%1" == "-force" (
- set force=1
+ rem ignored, this is always the case
) else if "%1" == "-usage" (
goto :usage
) else if "%1" == "-help" (
@@ -80,23 +80,12 @@
"name='java.exe' and CommandLine like
'%%org.codehaus.mojo.appassembler.booter.AppassemblerBooter%%' and (CommandLine
like '%%app.name=\"%%[cn]c\"%%' or CommandLine like
'%%app.name=\"%%ncservice\"%%')" ^
GET processid > %tempfile% 2> nul
-set severity=ERROR
-if "%force%" == "1" set severity=WARNING
-
for /F "skip=1" %%P in ('type %tempfile%') DO set found=1
if "%found%" == "1" (
- if "%force%" == "1" (
-echo %severity%: ${PRODUCT} processes are already running; -f[orce]
specified, ignoring
-del %tempfile%
- ) else (
-echo %severity%: ${PRODUCT} processes are already running; aborting"
-echo.
-echo Re-run with -f to ignore, or run stop-sample-cluster.bat -f to
forcibly terminate all running ${PRODUCT} processes:
-for /F "skip=1" %%P in ('type %tempfile%') DO @echo - %%P
-del %tempfile%
-exit /B 1
- )
+ echo WARNING: ${PRODUCT} processes are already running:
+ for /F "skip=1" %%P in ('type %tempfile%') DO @echo - %%P
+ del %tempfile%
)
goto :post_timestamp
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index 34d156c..9268bed 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -20,14 +20,13 @@
function usage() {
echo
- echo Usage: $(basename $0) [-f[orce]]
+ echo Usage: $(basename $0)
echo
- echo " -f[orce] : Forces a start attempt when ${PRODUCT} processes are
found to be running"
}
while [ -n "$1" ]; do
case $1 in
--f|-force) force=1;;
+-f|-force);; # ignored, this is always the case
-help|--help|-usage|--usage) usage; exit 0;;
*) echo "ERROR: unknown argument '$1'"; usage; exit 1;;
esac
@@ -115,22 +114,9 @@
&& echo "ERROR: sample cluster address (localhost:${LISTEN_PORT}) already
in use" && exit 1
if ps -ef | grep
'java.*org\.apache\.hyracks\.control\.[cn]c\.\([CN]CDriver\|service\.NCService\)'
> /tmp/$$_pids; then
- if [ $force ]; then
-severity=WARNING
- else
-severity=ERROR
- fi
- echo -n "${severity}: ${PRODUCT} processes are already running; "
- if [ $force ]; then
-echo "-f[orce] specified, ignoring"
- else
-echo "aborting"
-echo
-echo "Re-run with -f to ignore, or run stop-sample-cluster.sh -f to
forcibly terminate all running ${PRODUCT} processes:"
-cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
-rm /tmp/$$_pids
-exit 1
- fi
+ echo "WARNING: ${PRODUCT} processes are already running:"
+ cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
+ rm /tmp/$$_pids
fi
rm /tmp/$$_pids
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
index 80647d4..97473ac 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
@@ -146,7 +146,7 @@
done
else
echo "re-run with -f|-force to forcibly terminate all ${PRODUCT}
processes:"
-cat /tmp/pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
+cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\)
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][CLUS] Add API to return all known nodes atomically
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3340
Change subject: [NO ISSUE][*DB][CLUS] Add API to return all known nodes
atomically
..
[NO ISSUE][*DB][CLUS] Add API to return all known nodes atomically
Change-Id: Ie6bb64e331666ef44b07034d430ba2ee563bba82
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/40/3340/1
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index d0d039d..0e62851 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -144,6 +144,11 @@
Set getFailedNodes();
/**
+ * @return the set of cluster nodes
+ */
+Set getNodes();
+
+/**
* Returns the IO devices configured for a Node Controller
*
* @param nodeId
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 720b089..16a479e 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -256,6 +256,13 @@
}
@Override
+public synchronized Set getNodes() {
+Set nodes = new HashSet<>(participantNodes);
+nodes.addAll(failedNodes);
+return nodes;
+}
+
+@Override
public synchronized Set getParticipantNodes(boolean
excludePendingRemoval) {
final Set participantNodesCopy = getParticipantNodes();
if (excludePendingRemoval) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/3340
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6bb64e331666ef44b07034d430ba2ee563bba82
Gerrit-Change-Number: 3340
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Change in asterixdb[stabilization-f69489]: [NO ISSUE][HYR] Use System.nanotime for StopWatch
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3339
Change subject: [NO ISSUE][HYR] Use System.nanotime for StopWatch
..
[NO ISSUE][HYR] Use System.nanotime for StopWatch
Change-Id: Ic64f1b938c26161f5fb482af5ee1da6121f49643
---
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
1 file changed, 7 insertions(+), 12 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/39/3339/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
index e752cb3..a1a39cb 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/StopWatch.java
@@ -19,32 +19,27 @@
package org.apache.hyracks.api.util;
+import java.util.concurrent.TimeUnit;
+
public class StopWatch {
private long startTime = 0;
-private long stopTime = 0;
private long elapsedTime = 0;
public void start() {
elapsedTime = 0;
-startTime = System.currentTimeMillis();
+startTime = System.nanoTime();
}
public void stop() {
-stopTime = System.currentTimeMillis();
-elapsedTime += stopTime - startTime;
+elapsedTime += System.nanoTime() - startTime;
}
public void resume() {
-startTime = System.currentTimeMillis();
+startTime = System.nanoTime();
}
-//elaspsed time in milliseconds
-public long getElapsedTime() {
-return elapsedTime;
+public long elapsed(TimeUnit unit) {
+return unit.convert(elapsedTime, TimeUnit.NANOSECONDS);
}
-//elaspsed time in seconds
-public long getElapsedTimeSecs() {
-return elapsedTime / 1000;
-}
}
\ No newline at end of file
--
To view, visit https://asterix-gerrit.ics.uci.edu/3339
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic64f1b938c26161f5fb482af5ee1da6121f49643
Gerrit-Change-Number: 3339
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Merge commit 'f5ccf50f46' from 'stabilization-f69489'
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/3337 Change subject: Merge commit 'f5ccf50f46' from 'stabilization-f69489' .. Merge commit 'f5ccf50f46' from 'stabilization-f69489' Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/37/3337/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3337 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f Gerrit-Change-Number: 3337 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][CLUS] Add failed nodes API to ClusterStateManager
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3335 )
Change subject: [NO ISSUE][*DB][CLUS] Add failed nodes API to
ClusterStateManager
..
[NO ISSUE][*DB][CLUS] Add failed nodes API to ClusterStateManager
Change-Id: I1b56b29c38f0bbfe54b30ee5781770e90404c528
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3335
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Till Westmann
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jenkins: Verified; Verified
Anon. E. Moose (1000171):
Till Westmann: Looks good to me, approved
Objections:
Jenkins: Violations found
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 5e99eec..d0d039d 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -139,6 +139,11 @@
Set getParticipantNodes();
/**
+ * @return the set of currently failed nodes
+ */
+Set getFailedNodes();
+
+/**
* Returns the IO devices configured for a Node Controller
*
* @param nodeId
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 8d3187b..720b089 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -251,6 +251,11 @@
}
@Override
+public synchronized Set getFailedNodes() {
+return new HashSet<>(failedNodes);
+}
+
+@Override
public synchronized Set getParticipantNodes(boolean
excludePendingRemoval) {
final Set participantNodesCopy = getParticipantNodes();
if (excludePendingRemoval) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/3335
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b56b29c38f0bbfe54b30ee5781770e90404c528
Gerrit-Change-Number: 3335
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint
Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3324 )
Change subject: [NO ISSUE][*DB][STO] indicate null/missing value fix in index
checkpoint
..
[NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint
- user model changes: no
- storage format changes: yes (backwards-compatible)
- interface changes: no
Details:
- add marker on inintial IndexCheckpoint, propagate on subsequent checkpoints
- ignore extra JSON fields when deserializing IndexCheckpoint
Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3324
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Murtadha Hubail
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
2 files changed, 236 insertions(+), 237 deletions(-)
Approvals:
Jenkins: Verified; No violations found; Verified
Murtadha Hubail: Looks good to me, approved
Anon. E. Moose (1000171):
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
index a0ed26e..bb9c10e 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
@@ -54,6 +54,7 @@
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
import
org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorNodePushable;
+import org.apache.asterix.test.base.TestMethodTracer;
import org.apache.asterix.test.common.TestHelper;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -79,7 +80,11 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
import org.junit.runners.Parameterized;
public class CheckpointInSecondaryIndexTest {
@@ -101,7 +106,7 @@
private static final boolean[] UNIQUE_META_FIELDS = null;
private static final int[] KEY_INDEXES = { 0 };
private static final int[] KEY_INDICATORS = { Index.RECORD_INDICATOR };
-private static final List KEY_INDICATORS_LIST = Arrays.asList(new
Integer[] { Index.RECORD_INDICATOR });
+private static final List KEY_INDICATORS_LIST =
Collections.singletonList(Index.RECORD_INDICATOR);
private static final int RECORDS_PER_COMPONENT = 500;
private static final int DATASET_ID = 101;
private static final String DATAVERSE_NAME = "TestDV";
@@ -113,9 +118,9 @@
private static final IFieldValueGenerator[]
SECONDARY_INDEX_VALUE_GENERATOR =
{ new AInt64ValueGenerator(), new AInt32ValueGenerator() };
private static final List> INDEX_FIELD_NAMES =
-Arrays.asList(Arrays.asList(RECORD_TYPE.getFieldNames()[1]));
-private static final List INDEX_FIELD_INDICATORS =
Arrays.asList(Index.RECORD_INDICATOR);
-private static final List INDEX_FIELD_TYPES =
Arrays.asList(BuiltinType.AINT64);
+
Collections.singletonList(Collections.singletonList(RECORD_TYPE.getFieldNames()[1]));
+private static final List INDEX_FIELD_INDICATORS =
Collections.singletonList(Index.RECORD_INDICATOR);
+private static final List INDEX_FIELD_TYPES =
Collections.singletonList(BuiltinType.AINT64);
private static final StorageComponentProvider storageManager = new
StorageComponentProvider();
private static TestNodeController nc;
private static NCAppRuntimeContext ncAppCtx;
@@ -153,6 +158,9 @@
nc.deInit();
TestHelper.deleteExistingInstanceFiles();
}
+
+@Rule
+public TestRule tracer = new TestMethodTracer();
@Before
public void createIndex() throws Exception {
@@ -206,50 +214,47 @@
@Test
public void testCheckpointUpdatedWhenSecondaryIsEmpty() throws Exception {
-try {
-// create secondary
-createSecondaryIndex();
-actor.add(new Request(Request.Action.INSERT_PATCH));
-ensureDone(actor);
-// search now and ensure partition 0 has all the records
-StorageTestUtils.searchAndAssertCount(nc, 0, dataset,
storageManager, RECORDS_PER_COMPONENT);
-// and that secondary index is empty
-
Assert.assertTrue(secondaryLsmBtree.isCurrentMutableComponentEmpty());
-// flush
-actor.add(new Request(Request.Action.FLUSH_DATASET));
-
Change in asterixdb[master]: Merge commit '153b2ce970' from 'stabilization-f69489'
Michael Blow has submitted this change and it was merged.
Change subject: Merge commit '153b2ce970' from 'stabilization-f69489'
..
Merge commit '153b2ce970' from 'stabilization-f69489'
Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
3 files changed, 12 insertions(+), 17 deletions(-)
Approvals:
Michael Blow: Verified; Verified
Murtadha Hubail: Looks good to me, approved
Objections:
Anon. E. Moose #1000171: Violations found
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 1acb190..07da3f9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4820,14 +4820,14 @@
-<<< HEAD (072800 [NO ISSUE][FUN] Make Dump_Index Function Return An
Array of )
core-01
ASX1103: Illegal use of identifier: x
-===
+
+
+
sugar-09
->>> BRANCH (153b2c [NO ISSUE][STO] Ensure Invalid Merged Components Are
Deleted)
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
index 08fd421..3fc5683 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
@@ -36,11 +36,8 @@
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
import org.apache.asterix.lang.common.expression.QuantifiedExpression;
import org.apache.asterix.lang.common.expression.VariableExpr;
-<<< HEAD (072800 [NO ISSUE][FUN] Make Dump_Index Function Return An
Array of )
import org.apache.asterix.lang.common.struct.Identifier;
-===
import org.apache.asterix.lang.common.struct.QuantifiedPair;
->>> BRANCH (153b2c [NO ISSUE][STO] Ensure Invalid Merged Components Are
Deleted)
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.sqlpp.clause.AbstractBinaryCorrelateClause;
import org.apache.asterix.lang.sqlpp.clause.FromClause;
@@ -197,7 +194,15 @@
return bindingVars;
}
-<<< HEAD (072800 [NO ISSUE][FUN] Make Dump_Index Function Return An
Array of )
+public static List getBindingVariables(QuantifiedExpression
qe) {
+List quantifiedList = qe.getQuantifiedList();
+List bindingVars = new
ArrayList<>(quantifiedList.size());
+for (QuantifiedPair qp : quantifiedList) {
+bindingVars.add(qp.getVarExpr());
+}
+return bindingVars;
+}
+
public static Map
createFieldVariableMap(List> fieldList) {
Map fieldVars = new HashMap<>();
for (Pair p : fieldList) {
@@ -211,14 +216,5 @@
VariableExpr newVarExpr = new VariableExpr(var);
newVarExpr.setSourceLocation(varExpr.getSourceLocation());
outFieldList.add(new Pair<>(newVarExpr,
toUserDefinedVariableName(var)));
-===
-public static List getBindingVariables(QuantifiedExpression
qe) {
-List quantifiedList = qe.getQuantifiedList();
-List bindingVars = new
ArrayList<>(quantifiedList.size());
-for (QuantifiedPair qp : quantifiedList) {
-bindingVars.add(qp.getVarExpr());
-}
-return bindingVars;
->>> BRANCH (153b2c [NO ISSUE][STO] Ensure Invalid Merged Components Are
Deleted)
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
index 88a6962..ac390e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
@@ -33,7 +33,6 @@
import
org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
-import org.apache.hyracks.util.annotations.CriticalPath;
Change in asterixdb[master]: Merge commit '153b2ce970' from 'stabilization-f69489'
Michael Blow has posted comments on this change. Change subject: Merge commit '153b2ce970' from 'stabilization-f69489' .. Patch Set 4: Integration-Tests+1 Verified+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3329 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '153b2ce970' from 'stabilization-f69489'
Hello Anon. E. Moose #1000171, Jenkins, Murtadha Hubail, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3329 to look at the new patch set (#4). Change subject: Merge commit '153b2ce970' from 'stabilization-f69489' .. Merge commit '153b2ce970' from 'stabilization-f69489' Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java 3 files changed, 12 insertions(+), 17 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/29/3329/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/3329 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Merge commit '01c8ed5d74' from 'stabilization-f69489'
Michael Blow has posted comments on this change. Change subject: Merge commit '01c8ed5d74' from 'stabilization-f69489' .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3329 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '01c8ed5d74' from 'stabilization-f69489'
Hello Anon. E. Moose #1000171, Jenkins, Murtadha Hubail, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3329 to look at the new patch set (#3). Change subject: Merge commit '01c8ed5d74' from 'stabilization-f69489' .. Merge commit '01c8ed5d74' from 'stabilization-f69489' Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java 3 files changed, 12 insertions(+), 17 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/29/3329/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/3329 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Merge commit '01c8ed5d74' from 'stabilization-f69489'
Michael Blow has abandoned this change. Change subject: Merge commit '01c8ed5d74' from 'stabilization-f69489' .. Abandoned mistake push -- To view, visit https://asterix-gerrit.ics.uci.edu/3330 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ifddae7a808031cdc08300d9d56b9ffb755279964 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: Merge commit '01c8ed5d74' from 'stabilization-f69489'
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3330
Change subject: Merge commit '01c8ed5d74' from 'stabilization-f69489'
..
Merge commit '01c8ed5d74' from 'stabilization-f69489'
Change-Id: Ifddae7a808031cdc08300d9d56b9ffb755279964
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
3 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/30/3330/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 992e499..36bdf77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4820,14 +4820,14 @@
-<<< HEAD (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
core-01
ASX1103: Illegal use of identifier: x
-===
+
+
+
sugar-09
->>> BRANCH (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
index f88a1e3..3fc5683 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
@@ -36,11 +36,8 @@
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
import org.apache.asterix.lang.common.expression.QuantifiedExpression;
import org.apache.asterix.lang.common.expression.VariableExpr;
-<<< HEAD (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
import org.apache.asterix.lang.common.struct.Identifier;
-===
import org.apache.asterix.lang.common.struct.QuantifiedPair;
->>> BRANCH (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.sqlpp.clause.AbstractBinaryCorrelateClause;
import org.apache.asterix.lang.sqlpp.clause.FromClause;
@@ -197,7 +194,15 @@
return bindingVars;
}
-<<< HEAD (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
+public static List getBindingVariables(QuantifiedExpression
qe) {
+List quantifiedList = qe.getQuantifiedList();
+List bindingVars = new
ArrayList<>(quantifiedList.size());
+for (QuantifiedPair qp : quantifiedList) {
+bindingVars.add(qp.getVarExpr());
+}
+return bindingVars;
+}
+
public static Map
createFieldVariableMap(List> fieldList) {
Map fieldVars = new HashMap<>();
for (Pair p : fieldList) {
@@ -211,14 +216,5 @@
VariableExpr newVarExpr = new VariableExpr(var);
newVarExpr.setSourceLocation(varExpr.getSourceLocation());
outFieldList.add(new Pair<>(newVarExpr,
toUserDefinedVariableName(var)));
-===
-public static List getBindingVariables(QuantifiedExpression
qe) {
-List quantifiedList = qe.getQuantifiedList();
-List bindingVars = new
ArrayList<>(quantifiedList.size());
-for (QuantifiedPair qp : quantifiedList) {
-bindingVars.add(qp.getVarExpr());
-}
-return bindingVars;
->>> BRANCH (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
index 88a6962..ac390e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
@@ -33,7 +33,6 @@
import
org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
-import org.apache.hyracks.util.annotations.CriticalPath;
public class
Change in asterixdb[stabilization-f69489]: [NO ISSUE] Fix listing of conflicting procs on sample start
Michael Blow has submitted this change and it was merged.
Change subject: [NO ISSUE] Fix listing of conflicting procs on sample start
..
[NO ISSUE] Fix listing of conflicting procs on sample start
Change-Id: I1d75156e13c1b03e58ebc52bd7f3546265cd5fd3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3328
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Murtadha Hubail
---
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins: Verified; No violations found; Verified
Murtadha Hubail: Looks good to me, approved
Objections:
Anon. E. Moose #1000171: Violations found
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index e0cff32..34d156c 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -127,7 +127,7 @@
echo "aborting"
echo
echo "Re-run with -f to ignore, or run stop-sample-cluster.sh -f to
forcibly terminate all running ${PRODUCT} processes:"
-cat /tmp/pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
+cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
rm /tmp/$$_pids
exit 1
fi
--
To view, visit https://asterix-gerrit.ics.uci.edu/3328
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d75156e13c1b03e58ebc52bd7f3546265cd5fd3
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Reviewer: Till Westmann
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][STO] indicate null/missing value fix in inde...
Michael Blow has posted comments on this change. Change subject: [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint .. Patch Set 3: Contrib+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3324 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'f4c7fe7464' from 'stabilization-f69489'
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3329 to look at the new patch set (#2). Change subject: Merge commit 'f4c7fe7464' from 'stabilization-f69489' .. Merge commit 'f4c7fe7464' from 'stabilization-f69489' Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java 3 files changed, 12 insertions(+), 17 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/29/3329/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3329 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[stabilization-f69489]: [NO ISSUE] Fix listing of conflicting procs on sample start
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3328
Change subject: [NO ISSUE] Fix listing of conflicting procs on sample start
..
[NO ISSUE] Fix listing of conflicting procs on sample start
Change-Id: I1d75156e13c1b03e58ebc52bd7f3546265cd5fd3
---
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/28/3328/1
diff --git
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index e0cff32..34d156c 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -127,7 +127,7 @@
echo "aborting"
echo
echo "Re-run with -f to ignore, or run stop-sample-cluster.sh -f to
forcibly terminate all running ${PRODUCT} processes:"
-cat /tmp/pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
+cat /tmp/$$_pids | sed 's/^ *[0-9]*
\([0-9]*\).*org\.apache\.hyracks\.control\.[cn]c[^ ]*\.\([^ ]*\) .*/\1 - \2/'
rm /tmp/$$_pids
exit 1
fi
--
To view, visit https://asterix-gerrit.ics.uci.edu/3328
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d75156e13c1b03e58ebc52bd7f3546265cd5fd3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Merge commit 'f4c7fe7464' from 'stabilization-f69489'
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3329
Change subject: Merge commit 'f4c7fe7464' from 'stabilization-f69489'
..
Merge commit 'f4c7fe7464' from 'stabilization-f69489'
Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
2 files changed, 11 insertions(+), 16 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/29/3329/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index f6e5055..cd04fe6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4837,14 +4837,14 @@
-<<< HEAD (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
core-01
ASX1103: Illegal use of identifier: x
-===
+
+
+
sugar-09
->>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
index 1cbc940..72686ea 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
@@ -36,11 +36,8 @@
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
import org.apache.asterix.lang.common.expression.QuantifiedExpression;
import org.apache.asterix.lang.common.expression.VariableExpr;
-<<< HEAD (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
import org.apache.asterix.lang.common.struct.Identifier;
-===
import org.apache.asterix.lang.common.struct.QuantifiedPair;
->>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.sqlpp.clause.AbstractBinaryCorrelateClause;
import org.apache.asterix.lang.sqlpp.clause.FromClause;
@@ -197,7 +194,14 @@
return bindingVars;
}
-<<< HEAD (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
+public static List getBindingVariables(QuantifiedExpression
qe) {
+List quantifiedList = qe.getQuantifiedList();
+List bindingVars = new
ArrayList<>(quantifiedList.size());
+for (QuantifiedPair qp : quantifiedList) {
+bindingVars.add(qp.getVarExpr());
+}
+return bindingVars;
+}
public static Map
createFieldVariableMap(List> fieldList) {
Map fieldVars = new HashMap<>();
for (Pair p : fieldList) {
@@ -211,14 +215,5 @@
VariableExpr newVarExpr = new VariableExpr(var);
newVarExpr.setSourceLocation(varExpr.getSourceLocation());
outFieldList.add(new Pair<>(newVarExpr,
toUserDefinedVariableName(var)));
-===
-public static List getBindingVariables(QuantifiedExpression
qe) {
-List quantifiedList = qe.getQuantifiedList();
-List bindingVars = new
ArrayList<>(quantifiedList.size());
-for (QuantifiedPair qp : quantifiedList) {
-bindingVars.add(qp.getVarExpr());
-}
-return bindingVars;
->>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/3329
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow
Change in asterixdb[master]: DO NOT MERGE: ignore me
Michael Blow has abandoned this change. Change subject: DO NOT MERGE: ignore me .. Abandoned -- To view, visit https://asterix-gerrit.ics.uci.edu/3327 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I044674f7171b63c24295dd68e1d5de1b82798b50 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][STO] indicate null/missing value fix in inde...
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3324 to look at the new patch set (#3). Change subject: [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint .. [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint - user model changes: no - storage format changes: yes (backwards-compatible) - interface changes: no Details: - add marker on inintial IndexCheckpoint, propagate on subsequent checkpoints - ignore extra JSON fields when deserializing IndexCheckpoint Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/24/3324/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/3324 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: DO NOT MERGE: ignore me
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3327
Change subject: DO NOT MERGE: ignore me
..
DO NOT MERGE: ignore me
Change-Id: I044674f7171b63c24295dd68e1d5de1b82798b50
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-common/pom.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
3 files changed, 26 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/27/3327/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index c919856..a96e0a1 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -676,5 +676,9 @@
org.apache.hyracks
hyracks-storage-am-lsm-invertedindex
+
+ it.unimi.dsi
+ fastutil
+
diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml
index 760e027..b4681c1 100644
--- a/asterixdb/asterix-common/pom.xml
+++ b/asterixdb/asterix-common/pom.xml
@@ -290,5 +290,9 @@
org.apache.hyracks
hyracks-control-nc
+
+ it.unimi.dsi
+ fastutil
+
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
index cb34600..45b6e96 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
@@ -19,27 +19,33 @@
package org.apache.asterix.common.storage;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.function.LongPredicate;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import it.unimi.dsi.fastutil.longs.Long2LongMap;
+import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
public class IndexCheckpoint {
private static final Logger LOGGER = LogManager.getLogger();
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final long INITIAL_CHECKPOINT_ID = 0;
+// TODO(mblow): remove this marker & related logic once we no longer are
able to read indexes prior to the fix
+private static final long HAS_NULL_MISSING_VALUES_FIX = -1;
private long id;
private long validComponentSequence;
private long lowWatermark;
private long lastComponentId;
-private Map masterNodeFlushMap;
+private Long2LongMap masterNodeFlushMap;
public static IndexCheckpoint first(long lastComponentSequence, long
lowWatermark, long validComponentId) {
IndexCheckpoint firstCheckpoint = new IndexCheckpoint();
@@ -47,7 +53,8 @@
firstCheckpoint.lowWatermark = lowWatermark;
firstCheckpoint.validComponentSequence = lastComponentSequence;
firstCheckpoint.lastComponentId = validComponentId;
-firstCheckpoint.masterNodeFlushMap = new HashMap<>();
+firstCheckpoint.masterNodeFlushMap = new Long2LongOpenHashMap();
+firstCheckpoint.masterNodeFlushMap.put(HAS_NULL_MISSING_VALUES_FIX,
HAS_NULL_MISSING_VALUES_FIX);
return firstCheckpoint;
}
@@ -66,7 +73,8 @@
next.validComponentSequence = validComponentSequence;
next.masterNodeFlushMap = latest.getMasterNodeFlushMap();
// remove any lsn from the map that wont be used anymore
-next.masterNodeFlushMap.values().removeIf(lsn -> lsn <= lowWatermark);
+next.masterNodeFlushMap.values()
+.removeIf((LongPredicate) (lsn -> lsn <= lowWatermark && lsn
!= HAS_NULL_MISSING_VALUES_FIX));
return next;
}
@@ -86,7 +94,7 @@
return lastComponentId;
}
-public Map getMasterNodeFlushMap() {
+public Long2LongMap getMasterNodeFlushMap() {
return masterNodeFlushMap;
}
@@ -94,6 +102,10 @@
return id;
}
+public boolean hasNullMissingValuesFix() {
+return masterNodeFlushMap.containsKey(HAS_NULL_MISSING_VALUES_FIX);
+}
+
public String asJson() throws HyracksDataException {
try {
return OBJECT_MAPPER.writeValueAsString(this);
--
To view, visit https://asterix-gerrit.ics.uci.edu/3327
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I044674f7171b63c24295dd68e1d5de1b82798b50
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Change in asterixdb[stabilization-f69489]: [NO ISSUE][*DB][STO] indicate null/missing value fix in inde...
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3324 to look at the new patch set (#2). Change subject: [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint .. [NO ISSUE][*DB][STO] indicate null/missing value fix in index checkpoint - user model changes: no - storage format changes: yes (backwards-compatible) - interface changes: no Details: - add marker on inintial IndexCheckpoint, propagate on subsequent checkpoints - ignore extra JSON fields when deserializing IndexCheckpoint Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java 3 files changed, 26 insertions(+), 6 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/24/3324/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3324 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[stabilization-f69489]: WIP: indicate null/misisng value fix in index checkpoint
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3324
Change subject: WIP: indicate null/misisng value fix in index checkpoint
..
WIP: indicate null/misisng value fix in index checkpoint
Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646
---
M asterixdb/asterix-common/pom.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
2 files changed, 21 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/24/3324/1
diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml
index 3945756..c9d7ac6 100644
--- a/asterixdb/asterix-common/pom.xml
+++ b/asterixdb/asterix-common/pom.xml
@@ -290,5 +290,9 @@
org.apache.hyracks
hyracks-control-nc
+
+ it.unimi.dsi
+ fastutil
+
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
index cb34600..05056cc 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/IndexCheckpoint.java
@@ -19,27 +19,33 @@
package org.apache.asterix.common.storage;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.function.LongPredicate;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import it.unimi.dsi.fastutil.longs.Long2LongMap;
+import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
public class IndexCheckpoint {
private static final Logger LOGGER = LogManager.getLogger();
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final long INITIAL_CHECKPOINT_ID = 0;
+// TODO(mblow): remove this marker & related logic once we no longer are
able to read indexes prior to the fix
+private static final long HAS_NULL_MISSING_VALUES_FIX = -1;
private long id;
private long validComponentSequence;
private long lowWatermark;
private long lastComponentId;
-private Map masterNodeFlushMap;
+private Long2LongMap masterNodeFlushMap;
public static IndexCheckpoint first(long lastComponentSequence, long
lowWatermark, long validComponentId) {
IndexCheckpoint firstCheckpoint = new IndexCheckpoint();
@@ -47,7 +53,8 @@
firstCheckpoint.lowWatermark = lowWatermark;
firstCheckpoint.validComponentSequence = lastComponentSequence;
firstCheckpoint.lastComponentId = validComponentId;
-firstCheckpoint.masterNodeFlushMap = new HashMap<>();
+firstCheckpoint.masterNodeFlushMap = new Long2LongOpenHashMap();
+firstCheckpoint.masterNodeFlushMap.put(HAS_NULL_MISSING_VALUES_FIX,
HAS_NULL_MISSING_VALUES_FIX);
return firstCheckpoint;
}
@@ -66,7 +73,7 @@
next.validComponentSequence = validComponentSequence;
next.masterNodeFlushMap = latest.getMasterNodeFlushMap();
// remove any lsn from the map that wont be used anymore
-next.masterNodeFlushMap.values().removeIf(lsn -> lsn <= lowWatermark);
+next.masterNodeFlushMap.values().removeIf((LongPredicate)(lsn -> lsn
<= lowWatermark && lsn != HAS_NULL_MISSING_VALUES_FIX));
return next;
}
@@ -86,7 +93,7 @@
return lastComponentId;
}
-public Map getMasterNodeFlushMap() {
+public Long2LongMap getMasterNodeFlushMap() {
return masterNodeFlushMap;
}
@@ -94,6 +101,10 @@
return id;
}
+public boolean hasNullMissingValuesFix() {
+return masterNodeFlushMap.containsKey(HAS_NULL_MISSING_VALUES_FIX);
+}
+
public String asJson() throws HyracksDataException {
try {
return OBJECT_MAPPER.writeValueAsString(this);
--
To view, visit https://asterix-gerrit.ics.uci.edu/3324
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id93ab9d16887b37cf6c0d011950e7c57f1a1d646
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-Owner: Michael Blow
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Michael Blow has posted comments on this change. Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available .. Patch Set 1: Integration-Tests+1 Verified+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3320 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0f4575affd9689f0044bac9959404ad76e133358 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Michael Blow has submitted this change and it was merged.
Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available
..
[NO ISSUE] Use RuntimeMXBean.getPid() when available
(reapplies 7cc982e5 which was inadvertantly reverted)
Change-Id: I0f4575affd9689f0044bac9959404ad76e133358
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3320
Reviewed-by: Ian Maxon
Integration-Tests: Michael Blow
Tested-by: Michael Blow
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java
5 files changed, 20 insertions(+), 10 deletions(-)
Approvals:
Michael Blow: Verified; Verified
Ian Maxon: Looks good to me, approved
Objections:
Anon. E. Moose #1000171: Violations found
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
index c37acab..24a3e57 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
@@ -79,7 +79,7 @@
private final Map systemProperties;
-private final int pid;
+private final long pid;
private final HeartbeatSchema hbSchema;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
index 437b001..474bc0a 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
@@ -75,7 +75,7 @@
private final NetworkAddress messagingPort;
-private final int pid;
+private final long pid;
private final NodeCapacity capacity;
@@ -190,7 +190,7 @@
return messagingPort;
}
-public int getPid() {
+public long getPid() {
return pid;
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
index 5a8edbd..46e77e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
@@ -21,6 +21,7 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Level;
@@ -34,11 +35,20 @@
private PidHelper() {
}
-public static int getPid() {
+public static long getPid() {
return getPid(ManagementFactory.getRuntimeMXBean());
}
-public static int getPid(RuntimeMXBean runtimeMXBean) {
+public static long getPid(RuntimeMXBean runtimeMXBean) {
+// TODO: replace with direct invoke of getPid() once compatibility is
at JDK 10 or higher
+try {
+Method getPidMethod = runtimeMXBean.getClass().getMethod("getPid");
+return (Long) getPidMethod.invoke(runtimeMXBean);
+} catch (NoSuchMethodException e) {
+LOGGER.debug("ignoring exception trying to find getPid() (expected
pre-JDK 10)", e);
+} catch (IllegalAccessException | InvocationTargetException e) {
+LOGGER.debug("ignoring exception trying to execute getPid()", e);
+}
try {
Field jvmField = runtimeMXBean.getClass().getDeclaredField("jvm");
jvmField.setAccessible(true);
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
index b5fe3d3..b744198 100644
---
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3320
Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available
..
[NO ISSUE] Use RuntimeMXBean.getPid() when available
(reapplies 7cc982e5 which was inadvertantly reverted)
Change-Id: I0f4575affd9689f0044bac9959404ad76e133358
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java
5 files changed, 20 insertions(+), 10 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/20/3320/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
index c37acab..24a3e57 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
@@ -79,7 +79,7 @@
private final Map systemProperties;
-private final int pid;
+private final long pid;
private final HeartbeatSchema hbSchema;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
index 437b001..474bc0a 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
@@ -75,7 +75,7 @@
private final NetworkAddress messagingPort;
-private final int pid;
+private final long pid;
private final NodeCapacity capacity;
@@ -190,7 +190,7 @@
return messagingPort;
}
-public int getPid() {
+public long getPid() {
return pid;
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
index 5a8edbd..46e77e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
@@ -21,6 +21,7 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Level;
@@ -34,11 +35,20 @@
private PidHelper() {
}
-public static int getPid() {
+public static long getPid() {
return getPid(ManagementFactory.getRuntimeMXBean());
}
-public static int getPid(RuntimeMXBean runtimeMXBean) {
+public static long getPid(RuntimeMXBean runtimeMXBean) {
+// TODO: replace with direct invoke of getPid() once compatibility is
at JDK 10 or higher
+try {
+Method getPidMethod = runtimeMXBean.getClass().getMethod("getPid");
+return (Long) getPidMethod.invoke(runtimeMXBean);
+} catch (NoSuchMethodException e) {
+LOGGER.debug("ignoring exception trying to find getPid() (expected
pre-JDK 10)", e);
+} catch (IllegalAccessException | InvocationTargetException e) {
+LOGGER.debug("ignoring exception trying to execute getPid()", e);
+}
try {
Field jvmField = runtimeMXBean.getClass().getDeclaredField("jvm");
jvmField.setAccessible(true);
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
index b5fe3d3..b744198 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
+++
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Reviewed-on: https://asterix-gerrit.ics.uci.edu/3311 Tested-by: Jenkins Contrib: Jenkins Integration-Tests: Jenkins Reviewed-by: Ian Maxon --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java 35 files changed, 210 insertions(+), 233 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; ; Verified Ian Maxon: Looks good to me, approved Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java index 976dbc3..8dcfa26 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java @@ -33,13 +33,10 @@ import org.apache.asterix.api.http.server.VersionApiServlet; import org.apache.asterix.common.config.BuildProperties; import org.apache.asterix.runtime.utils.CcApplicationContext; -import org.apache.asterix.test.runtime.SqlppExecutionTest; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.http.api.IServletRequest; import org.apache.hyracks.http.api.IServletResponse; -import org.junit.After; import
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Michael Blow has posted comments on this change. Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. Patch Set 10: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/3311/10/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java File hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java: PS10, Line 29: > space? a cheap way to make the output aligned with the NCs, which are nc: -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 10 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#10). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java 35 files changed, 210 insertions(+), 233 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/10 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 10 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [NO ISSUE] Don't generate trace log on CC
Michael Blow has submitted this change and it was merged.
Change subject: [NO ISSUE] Don't generate trace log on CC
..
[NO ISSUE] Don't generate trace log on CC
Change-Id: Ic6d7e55ef7dd4af16a77167a400b0c6ab4cb23cb
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3318
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Contrib: Jenkins
Reviewed-by: Murtadha Hubail
Reviewed-by: Ian Maxon
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Anon. E. Moose #1000171:
Jenkins: Verified; No violations found; ; Verified
Murtadha Hubail: Looks good to me, approved
Ian Maxon: Looks good to me, approved
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
index 98e0245..22dea9f 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
@@ -68,15 +68,6 @@
builder.add(builder.newLogger("org.apache.hyracks.http.server.CLFLogger",
Level.forName("ACCESS", 550))
.add(builder.newAppenderRef("access")).addAttribute("additivity", false));
-LayoutComponentBuilder traceLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m,%n")
-.addAttribute("header", "[").addAttribute("footer", "]");
-AppenderComponentBuilder traceRoll =
-builder.newAppender("trace",
"RollingFile").addAttribute("fileName", logDir + "trace-cc.log")
-.addAttribute("filePattern", logDir +
"trace-cc-%d{MM-dd-yy-ss}.log.gz").add(traceLayout)
-.addComponent(triggeringPolicy);
-builder.add(traceRoll);
-
builder.add(builder.newLogger("org.apache.hyracks.util.trace.Tracer.Traces",
Level.forName("TRACER", 570))
-
.add(builder.newAppenderRef("trace")).addAttribute("additivity", false));
return builder.build();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/3318
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6d7e55ef7dd4af16a77167a400b0c6ab4cb23cb
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: [NO ISSUE][TEST] Allow asterix-dashboard skip
Michael Blow has posted comments on this change. Change subject: [NO ISSUE][TEST] Allow asterix-dashboard skip .. Patch Set 2: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/3316/2/asterixdb/pom.xml File asterixdb/pom.xml: PS2, Line 441: com.helger.maven : ph-javacc-maven-plugin is this intended to be in this patch? PS2, Line 581: com.helger.maven : ph-javacc-maven-plugin : 4.1.2 is this intended to be in this patch? -- To view, visit https://asterix-gerrit.ics.uci.edu/3316 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie089a8649376caf731f989da3db4e8443981ec63 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Don't generate trace log on CC
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3318
Change subject: [NO ISSUE] Don't generate trace log on CC
..
[NO ISSUE] Don't generate trace log on CC
Change-Id: Ic6d7e55ef7dd4af16a77167a400b0c6ab4cb23cb
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/18/3318/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
index 98e0245..22dea9f 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
@@ -68,15 +68,6 @@
builder.add(builder.newLogger("org.apache.hyracks.http.server.CLFLogger",
Level.forName("ACCESS", 550))
.add(builder.newAppenderRef("access")).addAttribute("additivity", false));
-LayoutComponentBuilder traceLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m,%n")
-.addAttribute("header", "[").addAttribute("footer", "]");
-AppenderComponentBuilder traceRoll =
-builder.newAppender("trace",
"RollingFile").addAttribute("fileName", logDir + "trace-cc.log")
-.addAttribute("filePattern", logDir +
"trace-cc-%d{MM-dd-yy-ss}.log.gz").add(traceLayout)
-.addComponent(triggeringPolicy);
-builder.add(traceRoll);
-
builder.add(builder.newLogger("org.apache.hyracks.util.trace.Tracer.Traces",
Level.forName("TRACER", 570))
-
.add(builder.newAppenderRef("trace")).addAttribute("additivity", false));
return builder.build();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/3318
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6d7e55ef7dd4af16a77167a400b0c6ab4cb23cb
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow
Change in asterixdb[master]: [WIP][NO ISSUE] Make IOManager more configurable
Michael Blow has posted comments on this change. Change subject: [WIP][NO ISSUE] Make IOManager more configurable .. Patch Set 2: (6 comments) https://asterix-gerrit.ics.uci.edu/#/c/3133/2/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java: PS2, Line 92: INTEGER Assuming this must be > 0, POSITIVE_INTEGER PS2, Line 93: INTEGER Assuming this must be > 0, POSITIVE_INTEGER PS2, Line 585: getIOParallelism Consider Io -vs- IO PS2, Line 589: getIOQueueLen Consider Io -vs- IO https://asterix-gerrit.ics.uci.edu/#/c/3133/2/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/IOManager.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/IOManager.java: PS2, Line 70: private final int ioParallelism; : private final int queueLen; do we need these? https://asterix-gerrit.ics.uci.edu/#/c/3133/2/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/src/main/java/org/apache/hyracks/examples/btree/helper/RuntimeContext.java File hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/src/main/java/org/apache/hyracks/examples/btree/helper/RuntimeContext.java: PS2, Line 63: 10 should this be the configured queue capacity? -- To view, visit https://asterix-gerrit.ics.uci.edu/3133 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c8ad11c2b8b983ef4bf7cf78c2f068accddfff4 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello analyt...@couchbase.com, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#9). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf 30 files changed, 204 insertions(+), 216 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/9 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 9 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: analyt...@couchbase.com
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Michael Blow has submitted this change and it was merged.
Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available
..
[NO ISSUE] Use RuntimeMXBean.getPid() when available
Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3312
Integration-Tests: Jenkins
Tested-by: Jenkins
Contrib: Jenkins
Reviewed-by: Till Westmann
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java
A
hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/PidHelperTest.java
6 files changed, 51 insertions(+), 10 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified; ; Verified
Objections:
Jenkins: Violations found
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
index c37acab..24a3e57 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
@@ -79,7 +79,7 @@
private final Map systemProperties;
-private final int pid;
+private final long pid;
private final HeartbeatSchema hbSchema;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
index 437b001..474bc0a 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
@@ -75,7 +75,7 @@
private final NetworkAddress messagingPort;
-private final int pid;
+private final long pid;
private final NodeCapacity capacity;
@@ -190,7 +190,7 @@
return messagingPort;
}
-public int getPid() {
+public long getPid() {
return pid;
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
index 5a8edbd..46e77e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
@@ -21,6 +21,7 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Level;
@@ -34,11 +35,20 @@
private PidHelper() {
}
-public static int getPid() {
+public static long getPid() {
return getPid(ManagementFactory.getRuntimeMXBean());
}
-public static int getPid(RuntimeMXBean runtimeMXBean) {
+public static long getPid(RuntimeMXBean runtimeMXBean) {
+// TODO: replace with direct invoke of getPid() once compatibility is
at JDK 10 or higher
+try {
+Method getPidMethod = runtimeMXBean.getClass().getMethod("getPid");
+return (Long) getPidMethod.invoke(runtimeMXBean);
+} catch (NoSuchMethodException e) {
+LOGGER.debug("ignoring exception trying to find getPid() (expected
pre-JDK 10)", e);
+} catch (IllegalAccessException | InvocationTargetException e) {
+LOGGER.debug("ignoring exception trying to execute getPid()", e);
+}
try {
Field jvmField = runtimeMXBean.getClass().getDeclaredField("jvm");
jvmField.setAccessible(true);
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#8). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/PidHelperTest.java 31 files changed, 235 insertions(+), 216 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/8 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#7). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf 30 files changed, 132 insertions(+), 204 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/7 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 7 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3312 to look at the new patch set (#3). Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available .. [NO ISSUE] Use RuntimeMXBean.getPid() when available Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/PidHelperTest.java 6 files changed, 51 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/3312/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/3312 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#6). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/PidHelperTest.java 31 files changed, 163 insertions(+), 204 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/6 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#5). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf 30 files changed, 148 insertions(+), 220 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/5 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: [NO ISSUE] Fix logging for ncservice-based tests
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3311 to look at the new patch set (#4). Change subject: [NO ISSUE] Fix logging for ncservice-based tests .. [NO ISSUE] Fix logging for ncservice-based tests Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/NcLifecycleIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/ReplicationIT.java M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NcLifecycleIT/ncservice2.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/ReplicationIT/ncservice2.conf M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java M hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java M hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf 31 files changed, 204 insertions(+), 220 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/11/3311/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/3311 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id264aede0f62558ad6e34355047c623a1d594692 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: [NO ISSUE] Use RuntimeMXBean.getPid() when available
Michael Blow has uploaded a new patch set (#2). Change subject: [NO ISSUE] Use RuntimeMXBean.getPid() when available .. [NO ISSUE] Use RuntimeMXBean.getPid() when available Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java 5 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/3312/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3312 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: PLEASE EDIT to provide a meaningful commit message!
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3312
Change subject: PLEASE EDIT to provide a meaningful commit message!
..
PLEASE EDIT to provide a meaningful commit message!
The following commits from your working branch will be included:
commit 4ce0cbbfde42525bf005bfbef7aa5ba5d0a9707c
Author: Michael Blow
Date: Tue Apr 2 21:31:43 2019 -0400
foo
commit fe8f855711a9fe97056b62149151b7739de21a46
Author: Michael Blow
Date: Tue Apr 2 21:27:06 2019 -0400
foo
commit 235b75839da74b32df56075a45c72ae56138b79c
Author: Michael Blow
Date: Tue Apr 2 21:19:15 2019 -0400
foo
commit 28dc2f3ed10a3fbc4b8cb8d2596b621dea465779
Author: Michael Blow
Date: Tue Apr 2 20:46:50 2019 -0400
foo
commit 9b1706a4247f1279f3e19d8c405949cdbb108b0d
Author: Michael Blow
Date: Tue Apr 2 20:39:02 2019 -0400
foo
commit 6324221b21116f8cad61b67559cfd42712a71921
Author: Michael Blow
Date: Tue Apr 2 20:37:47 2019 -0400
foo
commit 0ece97ef487ffe21c560296d59e570a2831577aa
Author: Michael Blow
Date: Tue Apr 2 20:19:25 2019 -0400
foo
Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
R
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java
6 files changed, 20 insertions(+), 10 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/12/3312/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
index c37acab..24a3e57 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java
@@ -79,7 +79,7 @@
private final Map systemProperties;
-private final int pid;
+private final long pid;
private final HeartbeatSchema hbSchema;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
index 437b001..474bc0a 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
@@ -75,7 +75,7 @@
private final NetworkAddress messagingPort;
-private final int pid;
+private final long pid;
private final NodeCapacity capacity;
@@ -190,7 +190,7 @@
return messagingPort;
}
-public int getPid() {
+public long getPid() {
return pid;
}
}
diff --git a/asterixdb/asterix-app/src/main/resources/log4j2.xml
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml
similarity index 100%
rename from asterixdb/asterix-app/src/main/resources/log4j2.xml
rename to
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
index 5a8edbd..46e77e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java
@@ -21,6 +21,7 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Level;
@@ -34,11 +35,20 @@
private PidHelper() {
}
-public static int getPid() {
+public static long getPid() {
