[Mulgara-svn] r220 - in branches/lostphasetokens: conf src/jar/itql/java/org/mulgara/itql src/jar/resolver/java/org/mulgara/resolver src/jar/resolver-store/java/org/mulgara/resolver/store src/jar/resolver-store/java/org/mulgara/store/statement/xa src/jar/util-xa/java/org/mulgara/store/xa
andrae at mulgara.org
andrae at mulgara.org
Mon Apr 9 15:43:51 UTC 2007
Author: andrae
Date: 2007-04-09 10:43:50 -0500 (Mon, 09 Apr 2007)
New Revision: 220
Modified:
branches/lostphasetokens/conf/log4j-mulgara.xml
branches/lostphasetokens/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterUnitTest.java
branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java
branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/InternalResolver.java
branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
branches/lostphasetokens/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java
Log:
MGR-46 Lost Phase Tokens
I believe this commit catches all known lost-phase tokens. Tests run 100%, and
the log files appear clean. I will give this a day or two and push it into
trunk.
Modified: branches/lostphasetokens/conf/log4j-mulgara.xml
===================================================================
--- branches/lostphasetokens/conf/log4j-mulgara.xml 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/conf/log4j-mulgara.xml 2007-04-09 15:43:50 UTC (rev 220)
@@ -65,6 +65,15 @@
<category name="org.mulgara.resolver.DatabaseSession">
<priority value="info"/>
</category>
+ <category name="org.mulgara.store.xa.FreeList">
+ <priority value="info"/>
+ </category>
+ <category name="org.mulgara.itql.ItqlInterpreterUnitTest">
+ <priority value="info"/>
+ </category>
+ <category name="org.mulgara.resolver.store.StatementStoreXAResource">
+ <priority value="debug"/>
+ </category>
-->
<!-- WARN and above goes to console, all else to logfile appender -->
Modified: branches/lostphasetokens/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterUnitTest.java
===================================================================
--- branches/lostphasetokens/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterUnitTest.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterUnitTest.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -304,7 +304,7 @@
public void testHelp() throws Exception {
// log that we're executing the test
- log.debug("Starting help test");
+ log.info("Starting help test");
// create the statement
String statement = "help ;";
@@ -351,7 +351,7 @@
assertEquals(expected.toString(), results);
// log that we've completed the test
- log.debug("Completed help test");
+ log.info("Completed help test");
}
/**
@@ -365,7 +365,7 @@
public void testInsert1() throws Exception {
// log that we're executing the test
- log.debug("Starting insert test 1");
+ log.info("Starting insert test 1");
String statement;
@@ -391,7 +391,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed insert test 1");
+ log.info("Completed insert test 1");
}
/**
@@ -406,7 +406,7 @@
public void testInsert2() throws Exception {
// log that we're executing the test
- log.debug("Starting insert test 1");
+ log.info("Starting insert test 1");
String statement;
@@ -435,7 +435,7 @@
interpreter.executeCommand(statement);
// log that we've completed the test
- log.debug("Completed insert test 2");
+ log.info("Completed insert test 2");
}
// testHelp()
@@ -453,7 +453,7 @@
public void testQuit() throws Exception {
// log that we're executing the test
- log.debug("Starting quit test");
+ log.info("Starting quit test");
// create the statement
String statement = "quit ;";
@@ -476,7 +476,7 @@
assertEquals(expected, results);
// log that we've completed the test
- log.debug("Completed quit test");
+ log.info("Completed quit test");
}
// testQuit()
@@ -494,7 +494,7 @@
public void testSu1() throws Exception {
// log that we're executing the test
- log.debug("Starting su test 1");
+ log.info("Starting su test 1");
// create the statement
String statement = "su <ldap://bar.org> fred Fo0Bar ;";
@@ -519,7 +519,7 @@
assertEquals(expected, results);
// log that we've completed the test
- log.debug("Completed su test 1");
+ log.info("Completed su test 1");
}
// testSu1()
@@ -537,7 +537,7 @@
public void testAlias1() throws Exception {
// log that we're executing the test
- log.debug("Starting alias test 1");
+ log.info("Starting alias test 1");
// create the statement
String statement = "alias <http://purl.org/dc/elements/1.1> as dc ;";
@@ -560,7 +560,7 @@
assertEquals(expected, results);
// log that we've completed the test
- log.debug("Completed alias test 1");
+ log.info("Completed alias test 1");
}
// testAlias1()
@@ -579,7 +579,7 @@
public void testSelect1() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 1");
+ log.info("Starting select test 1");
// create the statement
String statement =
@@ -614,7 +614,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 1");
+ log.info("Completed select test 1");
}
// testSelect1()
@@ -633,7 +633,7 @@
public void testSelect2() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 2");
+ log.info("Starting select test 2");
// create the statement
String statement =
@@ -666,7 +666,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 2");
+ log.info("Completed select test 2");
}
// testSelect2()
@@ -685,7 +685,7 @@
public void testSelect3() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 3");
+ log.info("Starting select test 3");
// create the statement
String statement =
@@ -721,7 +721,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 3");
+ log.info("Completed select test 3");
}
// testSelect3()
@@ -741,7 +741,7 @@
public void testSelect4() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 4");
+ log.info("Starting select test 4");
// create the statement
String statement =
@@ -777,7 +777,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 4");
+ log.info("Completed select test 4");
}
// testSelect4()
@@ -797,7 +797,7 @@
public void testSelect5() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 5");
+ log.info("Starting select test 5");
// create the statement
String statement =
@@ -838,7 +838,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 5");
+ log.info("Completed select test 5");
}
// testSelect5()
@@ -859,7 +859,7 @@
public void testSelect6() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 6");
+ log.info("Starting select test 6");
// create the statement
String statement =
@@ -898,7 +898,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 6");
+ log.info("Completed select test 6");
}
// testSelect6()
@@ -919,7 +919,7 @@
public void testSelect7() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 7");
+ log.info("Starting select test 7");
// create the statement
String statement =
@@ -980,7 +980,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 7");
+ log.info("Completed select test 7");
}
// testSelect7()
@@ -1004,7 +1004,7 @@
public void testSelect8() throws Exception {
// log that we're executing the test
- log.debug("Starting select test 8");
+ log.info("Starting select test 8");
// create the statement
String statement =
@@ -1047,7 +1047,7 @@
expected.close();
// log that we've completed the test
- log.debug("Completed select test 7");
+ log.info("Completed select test 7");
}
// testSelect8()
@@ -1063,7 +1063,7 @@
public void testDelete1() throws Exception {
// log that we're executing the test
- log.debug("Starting delete test 1");
+ log.info("Starting delete test 1");
String statement;
@@ -1089,7 +1089,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed drop test 1");
+ log.info("Completed drop test 1");
}
/**
@@ -1103,7 +1103,7 @@
public void testDelete2() throws Exception {
// log that we're executing the test
- log.debug("Starting delete test 2");
+ log.info("Starting delete test 2");
String statement;
@@ -1129,7 +1129,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed drop test 2");
+ log.info("Completed drop test 2");
}
/**
@@ -1143,7 +1143,7 @@
public void testDirectory1() throws Exception {
// log that we're executing the test
- log.debug("Starting directory DB test 1");
+ log.info("Starting directory DB test 1");
// create the statement
String statement = "directory <beep://rns.site1.net:7000/models> ;";
@@ -1161,7 +1161,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed directory test 1");
+ log.info("Completed directory test 1");
}
// testDirectory1()
@@ -1177,7 +1177,7 @@
public void testCreate1() throws Exception {
// log that we're executing the test
- log.debug("Starting create test 1");
+ log.info("Starting create test 1");
// create the statement
String statement = "create <mulgara://localhost/database> ;";
@@ -1195,7 +1195,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed create test 1");
+ log.info("Completed create test 1");
}
// testCreate1()
@@ -1211,7 +1211,7 @@
public void testCreate2() throws Exception {
// log that we're executing the test
- log.debug("Starting create test 2");
+ log.info("Starting create test 2");
// create the statement
String statement = "create <mulgara://localhost/database#model> ;";
@@ -1229,7 +1229,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed create test 2");
+ log.info("Completed create test 2");
}
// testCreate2()
@@ -1245,7 +1245,7 @@
public void testDrop1() throws Exception {
// log that we're executing the test
- log.debug("Starting drop test 1");
+ log.info("Starting drop test 1");
// create the statement
String statement = "drop <mulgara://localhost/database> ;";
@@ -1263,7 +1263,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed drop test 1");
+ log.info("Completed drop test 1");
}
// testDrop1()
@@ -1279,7 +1279,7 @@
public void testDrop2() throws Exception {
// log that we're executing the test
- log.debug("Starting drop test 2");
+ log.info("Starting drop test 2");
// create the statement
String statement = "drop <mulgara://localhost/database#model> ;";
@@ -1297,7 +1297,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed drop test 2");
+ log.info("Completed drop test 2");
}
// testDrop2()
@@ -1371,7 +1371,7 @@
public void testLoad1() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 1");
+ log.info("Starting load test 1");
// create the statement
String statement =
@@ -1390,7 +1390,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 1");
+ log.info("Completed load test 1");
}
// testLoad1()
@@ -1407,7 +1407,7 @@
public void testLoad2() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 2");
+ log.info("Starting load test 2");
// create the statement
String statement =
@@ -1426,7 +1426,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 2");
+ log.info("Completed load test 2");
}
// testLoad2()
@@ -1443,7 +1443,7 @@
public void testLoad3() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 3");
+ log.info("Starting load test 3");
// create the statement
String statement = "load <" + dcSchemaURI + "> into <" + testModel + "> ;";
@@ -1461,7 +1461,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 3");
+ log.info("Completed load test 3");
}
// testLoad3()
@@ -1478,7 +1478,7 @@
public void testLoad4() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 4");
+ log.info("Starting load test 4");
// create the statement
String statement =
@@ -1497,7 +1497,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 4");
+ log.info("Completed load test 4");
}
// testLoad4()
@@ -1514,7 +1514,7 @@
public void testLoad5() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 5");
+ log.info("Starting load test 5");
// create the statement
String statement =
@@ -1533,7 +1533,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 5");
+ log.info("Completed load test 5");
}
// testLoad5()
@@ -1550,7 +1550,7 @@
public void testLoad6() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 6");
+ log.info("Starting load test 6");
// create the statement
String statement =
@@ -1569,7 +1569,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 6");
+ log.info("Completed load test 6");
}
// testLoad6()
@@ -1586,7 +1586,7 @@
public void testLoad7() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 7");
+ log.info("Starting load test 7");
// create the statement
String statement =
@@ -1606,7 +1606,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 7");
+ log.info("Completed load test 7");
}
// testLoad7()
@@ -1623,7 +1623,7 @@
public void testLoad8() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 8");
+ log.info("Starting load test 8");
// create the statement
String statement =
@@ -1642,7 +1642,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 8");
+ log.info("Completed load test 8");
}
// testLoad8()
@@ -1659,7 +1659,7 @@
public void testLoad9() throws Exception {
// log that we're executing the test
- log.debug("Starting load test 9");
+ log.info("Starting load test 9");
// create the statement
String statement =
@@ -1678,7 +1678,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed load test 9");
+ log.info("Completed load test 9");
}
// testLoad9()
@@ -1723,7 +1723,7 @@
public void testSet1() throws Exception {
// log that we're executing the test
- log.debug("Starting set test 1");
+ log.info("Starting set test 1");
// create the statement
String statement = "set time on ;";
@@ -1747,7 +1747,7 @@
assertEquals(true, results.startsWith(expected));
// log that we've completed the test
- log.debug("Completed set test 1");
+ log.info("Completed set test 1");
}
// testSet1()
@@ -1765,7 +1765,7 @@
public void testSet2() throws Exception {
// log that we're executing the test
- log.debug("Starting set test 2");
+ log.info("Starting set test 2");
// create the statement
String statement = "set time off ;";
@@ -1788,7 +1788,7 @@
assertEquals(expected, results);
// log that we've completed the test
- log.debug("Completed set test 2");
+ log.info("Completed set test 2");
}
// testSet2()
@@ -1806,7 +1806,7 @@
public void testBackup1() throws Exception {
// log that we're executing the test
- log.debug("Starting backup test 1");
+ log.info("Starting backup test 1");
// create the statement
File backupFile = new File(tmpDirectory, "server1backup.gz");
@@ -1822,7 +1822,7 @@
results = interpreter.getLastMessage();
// log that we've completed the test
- log.debug("Completed backup test 1");
+ log.info("Completed backup test 1");
}
// testBackup1()
@@ -1840,7 +1840,7 @@
public void testRestore1() throws Exception {
// log that we're executing the test
- log.debug("Starting restore test 1");
+ log.info("Starting restore test 1");
// create the statement
File backupFile = new File(tmpDirectory, "server1backup.gz");
@@ -1856,7 +1856,7 @@
results = interpreter.getLastMessage();
// log that we've completed the test
- log.debug("Completed restore test 1");
+ log.info("Completed restore test 1");
}
// testRestore1()
@@ -1870,7 +1870,7 @@
public void testBackupRestore1() throws Exception {
// log that we're executing the test
- log.debug("Starting combined backup-restore test 1");
+ log.info("Starting combined backup-restore test 1");
// TODO - perform the backup
// create the statement
@@ -1887,7 +1887,7 @@
results = interpreter.getLastMessage();
// log that we've completed the test
- log.debug("Completed combined backup-restore test 1");
+ log.info("Completed combined backup-restore test 1");
}
// testBackupRestore1()
@@ -1901,7 +1901,7 @@
public void testBackupRestore2() throws Exception {
// log that we're executing the test
- log.debug("Starting combined backup-restore test 2");
+ log.info("Starting combined backup-restore test 2");
// TODO - perform the backup
// create the statement
@@ -1918,7 +1918,7 @@
results = interpreter.getLastMessage();
// log that we've completed the test
- log.debug("Completed combined backup-restore test 2");
+ log.info("Completed combined backup-restore test 2");
}
/**
@@ -1930,7 +1930,7 @@
public void testBackupRestore3() throws Exception {
// log that we're executing the test
- log.debug("Starting combined backup-restore test 3");
+ log.info("Starting combined backup-restore test 3");
// TODO - perform the backup
// create the statement
@@ -1947,7 +1947,7 @@
results = interpreter.getLastMessage();
// log that we've completed the test
- log.debug("Completed combined backup-restore test 3");
+ log.info("Completed combined backup-restore test 3");
}
@@ -1959,6 +1959,8 @@
*/
public void test1ParseQuery() throws Exception {
+ log.info("Starting parse query 1");
+
// Compose the expected result
Query expected = new Query(
Arrays.asList(new Variable[] {
@@ -1977,6 +1979,8 @@
assertEquals(expected,
interpreter.parseQuery(
"select $x from <x:m> where $x <x:p> 'o';"));
+
+ log.info("Completed parse query 1");
}
/**
@@ -1987,6 +1991,8 @@
*/
public void test2ParseQuery() throws Exception {
+ log.info("Starting parse query 2");
+
try {
String notAQuery = "quit";
@@ -1997,6 +2003,7 @@
// this is the correct response
}
+ log.info("Completed parse query 2");
}
/**
@@ -2007,6 +2014,7 @@
*/
public void test3ParseQuery() throws Exception {
+ log.info("Starting parse query 3");
// Compose the expected result
Query expected = new Query(
Arrays.asList(new Variable[] {
@@ -2025,6 +2033,7 @@
assertEquals(expected,
interpreter.parseQuery(
"select $x from <x:m> where $x <x:p> 'o' limit 10 offset 2;"));
+ log.info("Completed parse query 3");
}
/**
@@ -2035,6 +2044,7 @@
*/
public void test4ParseQuery() throws Exception {
+ log.info("Starting parse query 4");
// Compose the expected result
List varList = Arrays.asList(new Variable[] { new Variable("x") });
@@ -2061,6 +2071,7 @@
"where $x <x:p> 'o' " +
"having $x <http://mulgara.org/mulgara#occurs> " +
"'2.0'^^<http://www.w3.org/2001/XMLSchema#double> limit 10 offset 2;"));
+ log.info("Completed parse query 4");
}
// ItqlInterpreterUnitTest()
@@ -2123,7 +2134,7 @@
public void testCreate3() throws Exception {
// log that we're executing the test
- log.debug("Starting create test 3");
+ log.info("Starting create test 3");
// create the statement
String statement = "create <"+ testModel +"> ;";
@@ -2141,7 +2152,7 @@
log.debug("Received results : " + results);
// log that we've completed the test
- log.debug("Completed create test 3");
+ log.info("Completed create test 3");
}
// testCreate1()
@@ -2155,7 +2166,7 @@
public void testLoadApi1() throws Exception {
// log that we're executing the test
- log.debug("Starting load API test 1");
+ log.info("Starting load API test 1");
URI sourceURI = new URI("http://purl.org/dc/elements/1.1");
URI modelURI = new URI(testModel);
@@ -2164,6 +2175,7 @@
long statements = interpreter.load(null, sourceURI, modelURI);
this.assertEquals("Incorrect number of statements inserted", 146, statements);
+ log.info("Completed test load api 1");
}
// testLoadApi1()
@@ -2176,7 +2188,7 @@
public void testLoadApi2() throws Exception {
// log that we're executing the test
- log.debug("Starting load API test 2");
+ log.info("Starting load API test 2");
URI sourceURI = new URI("http://purl.org/dc/elements/1.1");
URI modelURI = new URI(testModel);
@@ -2198,6 +2210,7 @@
inputStream.close();
+ log.info("Completed test load api 2");
}
// testLoadApi2()
@@ -2210,7 +2223,7 @@
public void testLoadApi3() throws Exception {
// log that we're executing the test
- log.debug("Starting load API test 3");
+ log.info("Starting load API test 3");
URI sourceURI = new URI("http://purl.org/dc/elements/1.1");
URI dummyURI = new URI("http://mydummysite.com/rssfeed.rdf");
@@ -2223,6 +2236,7 @@
this.assertEquals("Incorrect number of statements inserted", 146, statements);
+ log.info("Completed test load api 3");
}
/**
@@ -2233,7 +2247,7 @@
public void testLoadApi4() throws Exception {
// log that we're executing the test
- log.debug("Starting load API test 4");
+ log.info("Starting load API test 4");
URI sourceURI = new URI("http://purl.org/dc/elements/1.1");
URI modelURI = new URI(testModel);
@@ -2244,6 +2258,7 @@
this.assertEquals("Incorrect number of statements inserted", 146, statements);
+ log.info("Completed test load api 4");
}
/**
@@ -2254,7 +2269,7 @@
public void testBackupApi1() throws Exception {
// log that we're executing the test
- log.debug("Starting backup API test 1");
+ log.info("Starting backup API test 1");
File file = new File(tmpDirectory, "backup1.rdf");
file.delete();
@@ -2277,7 +2292,7 @@
public void testBackupApi2() throws Exception {
// log that we're executing the test
- log.debug("Starting backup API test 2");
+ log.info("Starting backup API test 2");
File file = new File(tmpDirectory, "backup2.rdf");
file.delete();
@@ -2301,7 +2316,7 @@
public void testBackupApi3() throws Exception {
// log that we're executing the test
- log.debug("Starting backup API test 3");
+ log.info("Starting backup API test 3");
File file = new File(tmpDirectory, "backup1.gz");
file.delete();
@@ -2323,7 +2338,7 @@
public void testBackupApi4() throws Exception {
// log that we're executing the test
- log.debug("Starting backup API test 3");
+ log.info("Starting backup API test 3");
File file = new File(tmpDirectory, "backup2.gz");
file.delete();
@@ -2345,7 +2360,7 @@
public void testLoadBackupApi1() throws Exception {
// log that we're executing the test
- log.debug("Starting load a backup API test 1");
+ log.info("Starting load a backup API test 1");
File file = new File(tmpDirectory, "backup1.rdf");
@@ -2367,7 +2382,7 @@
public void testRestoreApi1() throws Exception {
// log that we're executing the test
- log.debug("Starting Restore API test 1");
+ log.info("Starting Restore API test 1");
File file = new File(tmpDirectory, "backup1.gz");
@@ -2386,7 +2401,7 @@
public void testRestoreApi2() throws Exception {
// log that we're executing the test
- log.debug("Starting Restore API test 2");
+ log.info("Starting Restore API test 2");
File file = new File(tmpDirectory, "backup1.gz");
@@ -2405,7 +2420,7 @@
public void testRestoreApi3() throws Exception {
// log that we're executing the test
- log.debug("Starting Restore API test 3");
+ log.info("Starting Restore API test 3");
File file = new File(tmpDirectory, "backup2.gz");
Modified: branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/InternalResolver.java
===================================================================
--- branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/InternalResolver.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/InternalResolver.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -226,18 +226,22 @@
assert resolution != null;
// Check the solution and extract the model type (if any) from it
- resolution.beforeFirst();
- if (resolution.next()) {
- long modelType = resolution.getColumnValue(
- resolution.getColumnIndex(modelTypeVariable));
- if (resolution.next()) { throw new ResolverException("Model " + model + " has more than one type!");
+ try {
+ resolution.beforeFirst();
+ if (resolution.next()) {
+ long modelType = resolution.getColumnValue(
+ resolution.getColumnIndex(modelTypeVariable));
+ if (resolution.next()) { throw new ResolverException("Model " + model + " has more than one type!");
+ }
+
+ return modelType;
}
-
- return modelType;
+ else {
+ return NodePool.NONE;
+ }
+ } finally {
+ resolution.close();
}
- else {
- return NodePool.NONE;
- }
}
catch (QueryException e) {
throw new ResolverException("Unable to determine model type of "+model, e);
Modified: branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
===================================================================
--- branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -409,7 +409,7 @@
throw new MulgaraTransactionException(
"Attempt to suspend write transaction without setting AutoCommit Off");
} else {
- logger.error("Suspended transaction: ac=" + autoCommit + " t=" + transaction + "ut=" + userTransaction);
+// logger.error("Suspended transaction: ac=" + autoCommit + " t=" + transaction + "ut=" + userTransaction);
}
Transaction xa = transactionManager.suspend();
Modified: branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
===================================================================
--- branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -283,7 +283,9 @@
public void rollback() throws SimpleXAResourceException
{
- logger.debug("Rollback phase on StringPoolSession " + System.identityHashCode(this));
+ if (logger.isDebugEnabled()) {
+ logger.debug("Rollback phase on StringPoolSession " + System.identityHashCode(this));
+ }
if (state == RELEASE) {
throw new SimpleXAResourceException("Attempting to rollback phase outside transaction");
}
@@ -298,7 +300,9 @@
public void release() throws SimpleXAResourceException
{
- logger.debug("Release phase on StringPoolSession " + System.identityHashCode(this));
+ if (logger.isDebugEnabled()) {
+ logger.debug("Release phase on StringPoolSession " + System.identityHashCode(this));
+ }
if (state == RELEASE) {
return;
} else if (state != COMMIT && state != ROLLBACK) {
Modified: branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java
===================================================================
--- branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -204,7 +204,7 @@
}
try {
if (onePhase) {
- // Check return value is XA_OK.
+ // Currently prepare only returns XA_OK, and throws an exception on failure.
prepare(xid);
}
} catch (Throwable th) {
@@ -223,13 +223,7 @@
throw new XAException(XAException.XAER_RMERR);
}
} finally {
- synchronized(preparing) {
- if (preparing.contains(session)) {
- preparing.remove(session);
- } else {
- logger.debug("Already committed in this transaction");
- }
- }
+ cleanup("commit");
}
}
@@ -247,12 +241,13 @@
logger.debug("Forget xid=" + System.identityHashCode(xid));
}
try {
- if (logger.isDebugEnabled()) {
- logger.debug("Releasing session " + session);
+ synchronized(preparing) {
+ if (preparing.contains(session)) {
+ rollback(xid);
+ }
}
- session.release();
- } catch (SimpleXAResourceException es) {
- logger.debug("Attempt to release store failed", es);
+ } finally {
+ cleanup("forget");
}
}
@@ -301,6 +296,8 @@
// Make sure the exception is logged.
logger.fatal("Failed to rollback resource in transaction " + xid, th);
fatalError = true;
+ } finally {
+ cleanup("rollback");
}
if (fatalError) {
@@ -366,4 +363,27 @@
return buffer.toString();
}
+
+
+ private void cleanup(String operation) {
+ try {
+ synchronized(preparing) {
+ if (preparing.contains(session)) {
+ preparing.remove(session);
+ } else {
+ logger.debug("Already committed/rolledback in this transaction");
+ }
+ }
+ } finally {
+ try {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Releasing session after " + operation + " " + session);
+ }
+ session.release();
+ session = null;
+ } catch (SimpleXAResourceException es) {
+ logger.error("Attempt to release store failed", es);
+ }
+ }
+ }
}
Modified: branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
===================================================================
--- branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -2320,6 +2320,10 @@
logger.debug("----Provenance : " + objectIds);
}
}
+ if (stack != null) {
+ logger.warn("TuplesImpl not closed (" + System.identityHashCode(this) + ")", stack);
+ logger.warn("----Provenance : " + objectIds);
+ }
}
Modified: branches/lostphasetokens/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java
===================================================================
--- branches/lostphasetokens/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java 2007-04-08 12:46:40 UTC (rev 219)
+++ branches/lostphasetokens/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java 2007-04-09 15:43:50 UTC (rev 220)
@@ -1339,7 +1339,8 @@
if ( (token == null) && (refCount > 0)) {
if (logger.isInfoEnabled()) {
- logger.info("Lost phase token.", stack);
+ logger.warn("Lost phase token. " + System.identityHashCode(this) + " refC=" + refCount, stack);
+ logger.info("getToken() called from:", new Throwable());
}
refCount = 0;
}
More information about the Mulgara-svn
mailing list