changes towards recovery
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@2715 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
index fa2d216..37d5018 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
@@ -78,7 +78,7 @@
resourceID = resourceIdFactory.createId();
ILocalResourceFactory localResourceFactory = opDesc.getLocalResourceFactoryProvider()
.getLocalResourceFactory();
- localResourceRepository.insert(localResourceFactory.createLocalResource(resourceID, file.getFile().getPath()));
+ localResourceRepository.insert(localResourceFactory.createLocalResource(resourceID, file.getFile().getPath(), partition));
} catch (IOException e) {
throw new HyracksDataException(e);
}
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceFactory.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceFactory.java
index 7fed1cf..c443b0b 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceFactory.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceFactory.java
@@ -15,5 +15,5 @@
package edu.uci.ics.hyracks.storage.common.file;
public interface ILocalResourceFactory {
- public LocalResource createLocalResource(long resourceId, String resourceName);
+ public LocalResource createLocalResource(long resourceId, String resourceName, int partition);
}
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LocalResource.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LocalResource.java
index 3ef3ce7..f4575f3 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LocalResource.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LocalResource.java
@@ -20,14 +20,21 @@
private static final long serialVersionUID = 1L;
private final long resourceId;
private final String resourceName;
+ private final int partition;
private final int resourceType;
private final Object object;
- public LocalResource(long resourceId, String resourceName, int resourceType, Object object) {
+ public static final int TransientResource = 0;
+ public static final int LSMBTreeResource = 1;
+ public static final int LSMRTreeResource = 2;
+ public static final int LSMInvertedIndexResource = 3;
+
+ public LocalResource(long resourceId, String resourceName, int partition, int resourceType, Object object) {
this.resourceId = resourceId;
this.resourceName = resourceName;
- this.object = object;
+ this.partition = partition;
this.resourceType = resourceType;
+ this.object = object;
}
public long getResourceId() {
@@ -38,6 +45,10 @@
return resourceName;
}
+ public int getPartition() {
+ return partition;
+ }
+
public int getResourceType() {
return resourceType;
}
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/TransientLocalResourceFactory.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/TransientLocalResourceFactory.java
index 5d4bbbd..ffd3dff 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/TransientLocalResourceFactory.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/TransientLocalResourceFactory.java
@@ -16,10 +16,8 @@
public class TransientLocalResourceFactory implements ILocalResourceFactory {
- public static final int TransientResource = 0;
-
@Override
- public LocalResource createLocalResource(long resourceId, String resourceName) {
- return new LocalResource(resourceId, resourceName, TransientResource, null);
+ public LocalResource createLocalResource(long resourceId, String resourceName, int partition) {
+ return new LocalResource(resourceId, resourceName, partition, LocalResource.TransientResource, null);
}
}