You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2019/09/27 18:03:10 UTC
[asterixdb] branch master updated (2dff04c -> 72e0e31)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from 2dff04c [ASTERIXDB-2647][COMP] Random partitioner shouldn't preserve input's properties
new 0b37be0 [ASTERIXDB-2497][TX] Ensure Log Record Flush LSN is Set
new e8e59d0 [NO ISSUE] Update Guava, Jackson dependencies
new 819c57b Merge commit 'e8e59d0e6e' from 'stabilization-f69489'
new 72e0e31 Merge commit '819c57b440'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../appended-resources/supplemental-models.xml | 30 +++++++++++++++++++---
hyracks-fullstack/pom.xml | 30 +++++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)
[asterixdb] 01/04: [ASTERIXDB-2497][TX] Ensure Log Record Flush LSN
is Set
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0b37be00fca9f79eb306b6fe9965a2c8a5bcc21a
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Thu Dec 13 20:42:46 2018 +0300
[ASTERIXDB-2497][TX] Ensure Log Record Flush LSN is Set
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Set the flush LSN of log records before giving it
to the log flusher to avoid reading invalid value
if the flush is completed before setting the LSN.
- Ensure log record LSN is thread-safe.
- Warn in case of a flush with LSN = 0.
Change-Id: Ifc605c2d794339a3dc5004b462eca50ec103c717
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3087
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Till Westmann <ti...@apache.org>
(cherry picked from commit 440e3a56b6f7d888c07575a898b79fec8848e06a)
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3573
---
.../apache/asterix/common/context/PrimaryIndexOperationTracker.java | 3 +++
.../main/java/org/apache/asterix/common/transactions/LogRecord.java | 2 +-
.../asterix/transaction/management/service/logging/LogManager.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
index a1d31d5..59e19ca 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
@@ -201,6 +201,9 @@ public class PrimaryIndexOperationTracker extends BaseOperationTracker implement
}
idGenerator.refresh();
long flushLsn = logRecord.getLSN();
+ if (flushLsn == 0) {
+ LOGGER.warn("flushing an index with LSN 0. Flush log record: {}", logRecord::getLogRecordForDisplay);
+ }
ILSMComponentId nextComponentId = idGenerator.getId();
Map<String, Object> flushMap = new HashMap<>();
flushMap.put(LSMIOOperationCallback.KEY_FLUSH_LOG_LSN, flushLsn);
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
index 0c3b21d..7a1079d 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
@@ -88,7 +88,7 @@ public class LogRecord implements ILogRecord {
private final ILogMarkerCallback callback; // A callback for log mark operations
private int PKFieldCnt;
private ITransactionContext txnCtx;
- private long LSN;
+ private volatile long LSN;
private final AtomicBoolean isFlushed;
private final PrimaryKeyTupleReference readPKValue;
private final SimpleTupleReference readNewValue;
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
index 0a6dda9..a990379 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
@@ -187,10 +187,10 @@ public class LogManager implements ILogManager, ILifeCycleComponent {
}
final int logSize = logRecord.getLogSize();
ensureSpace(logSize);
- appendPage.append(logRecord, appendLSN.get());
if (logRecord.getLogType() == LogType.FLUSH) {
logRecord.setLSN(appendLSN.get());
}
+ appendPage.append(logRecord, appendLSN.get());
if (logRecord.isMarker()) {
logRecord.logAppended(appendLSN.get());
}
[asterixdb] 04/04: Merge commit '819c57b440'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 72e0e31493e2929909cb6d836da102b3c14ca3e7
Merge: 2dff04c 819c57b
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Sep 27 12:18:06 2019 -0400
Merge commit '819c57b440'
Change-Id: I82594526b6f921af058982f450efbdfdad78b106
.../appended-resources/supplemental-models.xml | 30 +++++++++++++++++++---
hyracks-fullstack/pom.xml | 30 +++++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)
[asterixdb] 02/04: [NO ISSUE] Update Guava, Jackson dependencies
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit e8e59d0e6e72ba3fd96074c021ff7180261dcd59
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Sep 26 19:28:12 2019 -0400
[NO ISSUE] Update Guava, Jackson dependencies
Change-Id: I1a415367b0e403237deab782dd99214b927138db
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3576
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
.../appended-resources/supplemental-models.xml | 30 +++++++++++++++++++---
hyracks-fullstack/pom.xml | 30 +++++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 18ad7ef..fffa65c 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -173,8 +173,32 @@
<properties>
<!-- guava is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- see https://github.com/google/guava/blob/v18.0/COPYING -->
- <license.ignoreMissingEmbeddedNotice>18.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreMissingEmbeddedLicense>18.0</license.ignoreMissingEmbeddedLicense>
+ <!-- see https://github.com/google/guava/tree/v28.0/COPYING -->
+ <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre</license.ignoreMissingEmbeddedLicense>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <properties>
+ <!-- guava is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
+ <!-- see https://github.com/google/guava/tree/v28.0/ -->
+ <license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <!-- see https://github.com/google/error-prone/tree/v2.3.2/ -->
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.3.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.3.2</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -205,7 +229,7 @@
<artifactId>jackson-annotations</artifactId>
<properties>
<!-- jackson-annotation does not provide an embedded NOTICE file -->
- <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7,2.9.10</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 6a4ecac..b9ac716 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -151,22 +151,44 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
+ <version>2.9.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.7</version>
+ <version>2.9.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.7</version>
+ <version>2.9.10</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
[asterixdb] 03/04: Merge commit 'e8e59d0e6e' from
'stabilization-f69489'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 819c57b440b16ceb045f8aa4d406c105b39eb4bb
Merge: 2dff04c e8e59d0
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Sep 27 09:12:23 2019 -0400
Merge commit 'e8e59d0e6e' from 'stabilization-f69489'
Change-Id: I73ad57791bb7264a670bb36f4eb6f50640b4a86f
.../appended-resources/supplemental-models.xml | 30 +++++++++++++++++++---
hyracks-fullstack/pom.xml | 30 +++++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)