2martens
/
dis
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixed wrong paths 

Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens 2017-05-31 14:33:41 +02:00
parent 0af13545e4
commit 1837dfa35e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
04/src/PersistenceManager.java
View File

@ -14,6 +14,7 @@ public class PersistenceManager {
private Hashtable<Integer, Integer> _pageLSN; private Hashtable<Integer, Integer> _pageLSN;
private int _nextTransactionNumber; private int _nextTransactionNumber;
private int _nextLogSequenceNumber; private int _nextLogSequenceNumber;
private String _dataPath;
static { static {
try { try {
@ -43,6 +44,7 @@ public class PersistenceManager {
_pageLSN = new Hashtable<>(); _pageLSN = new Hashtable<>();
_nextTransactionNumber = 1; _nextTransactionNumber = 1;
_nextLogSequenceNumber = 1; _nextLogSequenceNumber = 1;
_dataPath = "/home/jim/git-repos/dis/04/data/";
} }
/** /**
@ -107,7 +109,7 @@ public class PersistenceManager {
*/ */
public void recovery() { public void recovery() {
try { try {
BufferedReader reader = new BufferedReader(new FileReader("../data/log.txt")); BufferedReader reader = new BufferedReader(new FileReader(_dataPath + "log.txt"));
String line; String line;
List<Integer> winner_tas = new ArrayList<>(); List<Integer> winner_tas = new ArrayList<>();
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
@ -118,7 +120,7 @@ public class PersistenceManager {
} }
reader.close(); reader.close();
reader = new BufferedReader(new FileReader("../data/log.txt")); reader = new BufferedReader(new FileReader(_dataPath + "log.txt"));
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
String[] cols = line.split(","); String[] cols = line.split(",");
if (!cols[2].equals("WRITE") || !winner_tas.contains(Integer.valueOf(cols[1]))) { if (!cols[2].equals("WRITE") || !winner_tas.contains(Integer.valueOf(cols[1]))) {
@ -129,7 +131,7 @@ public class PersistenceManager {
int pageID = Integer.valueOf(cols[3]); int pageID = Integer.valueOf(cols[3]);
String data = cols[4]; String data = cols[4];
BufferedReader readPage = new BufferedReader(new FileReader("../data/" + pageID + ".txt")); BufferedReader readPage = new BufferedReader(new FileReader(_dataPath + pageID + ".txt"));
String pageLine = readPage.readLine(); String pageLine = readPage.readLine();
readPage.close(); readPage.close();
String[] pageCols = pageLine.split(","); String[] pageCols = pageLine.split(",");
@ -138,7 +140,7 @@ public class PersistenceManager {
continue; continue;
} }
FileWriter writer = new FileWriter("../data/" + pageID + ".txt"); FileWriter writer = new FileWriter(_dataPath + pageID + ".txt");
writer.write("" + pageID + "," + lsn + "," + data + "\n"); writer.write("" + pageID + "," + lsn + "," + data + "\n");
writer.close(); writer.close();
} }
@ -164,7 +166,7 @@ public class PersistenceManager {
*/ */
private synchronized int log(int taid, int pageid, String type, String data) { private synchronized int log(int taid, int pageid, String type, String data) {
try { try {
FileWriter fw = new FileWriter("../data/log.txt", true); FileWriter fw = new FileWriter(_dataPath + "log.txt", true);
fw.write("" + _nextLogSequenceNumber + "," + taid + "," + type + "," + pageid + "," + data); fw.write("" + _nextLogSequenceNumber + "," + taid + "," + type + "," + pageid + "," + data);
fw.write("\n"); fw.write("\n");
fw.close(); fw.close();
@ -198,7 +200,7 @@ public class PersistenceManager {
for (int pageid : pageIDs) { for (int pageid : pageIDs) {
int lsn = _pageLSN.get(pageid); int lsn = _pageLSN.get(pageid);
try { try {
FileWriter fw = new FileWriter("../data/" + pageid + ".txt", false); FileWriter fw = new FileWriter(_dataPath + pageid + ".txt", false);
fw.write(pageid + "," + lsn + "," + _pageBuffer.get(pageid)); fw.write(pageid + "," + lsn + "," + _pageBuffer.get(pageid));
fw.close(); fw.close();
} catch (IOException e) { } catch (IOException e) {