>From Wail Alkowaileet <[email protected]>:
Wail Alkowaileet has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17941 )
Change subject: Merge branch 'trinity' into 'master'
......................................................................
Merge branch 'trinity' into 'master'
Change-Id: Ief24403066b4e9dbd1d1e72a5cdba6eab1338fdd
---
M
asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
2 files changed, 15 insertions(+), 9 deletions(-)
Approvals:
Jenkins: Verified; Verified
Wail Alkowaileet: Looks good to me, approved
diff --git
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
index 9fe09d1..39a8841 100644
---
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
+++
b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
@@ -107,11 +107,8 @@
private final List<FileReference> storageRoots;
private final IIndexCheckpointManagerProvider
indexCheckpointManagerProvider;
private final IPersistedResourceRegistry persistedResourceRegistry;
-<<<<<<< HEAD (e2fbcc Merge branch 'trinity' into 'master')
private final ReentrantReadWriteLock resourcesAccessLock = new
ReentrantReadWriteLock(true);
-=======
private IDatasetLifecycleManager datasetLifecycleManager;
->>>>>>> BRANCH (5b5c7d Merge branch 'neo' into 'trinity')
public PersistentLocalResourceRepository(IIOManager ioManager,
IIndexCheckpointManagerProvider indexCheckpointManagerProvider,
@@ -561,15 +558,10 @@
}
}
-<<<<<<< HEAD (e2fbcc Merge branch 'trinity' into 'master')
public void cleanup(int partition) throws HyracksDataException {
beforeReadAccess();
-=======
- public synchronized void cleanup(int partition) throws
HyracksDataException {
-
datasetLifecycleManager.waitForIO(AllDatasetsReplicationStrategy.INSTANCE,
partition);
- final Set<File> partitionIndexes = getPartitionIndexes(partition);
->>>>>>> BRANCH (5b5c7d Merge branch 'neo' into 'trinity')
try {
+
datasetLifecycleManager.waitForIO(AllDatasetsReplicationStrategy.INSTANCE,
partition);
final Set<FileReference> partitionIndexes =
getPartitionIndexes(partition);
try {
for (FileReference index : partitionIndexes) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17941
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Ief24403066b4e9dbd1d1e72a5cdba6eab1338fdd
Gerrit-Change-Number: 17941
Gerrit-PatchSet: 1
Gerrit-Owner: Wail Alkowaileet <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Wail Alkowaileet <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-MessageType: merged
