Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4607] branches/QUADS_QUERY_BRANCH/bigdata
|
From: <tho...@us...> - 2011-06-02 18:07:09
|
Revision: 4607
http://bigdata.svn.sourceforge.net/bigdata/?rev=4607&view=rev
Author: thompsonbry
Date: 2011-06-02 18:07:02 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Fixed cluster install for the QUADS_QUERY_BRANCH and verified that we can run SPARQL against the federation.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractTask.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ILocalTransactionManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalDelegate.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeEnum.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/DavidsTestBOps.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -2228,11 +2228,11 @@
}
- /**
- * Return the object providing the {@link AbstractLocalTransactionManager}
- * for this journal.
- */
- abstract public AbstractLocalTransactionManager getLocalTransactionManager();
+// /**
+// * Return the object providing the {@link AbstractLocalTransactionManager}
+// * for this journal.
+// */
+// abstract public AbstractLocalTransactionManager getLocalTransactionManager();
public long commit() {
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -25,19 +25,9 @@
/**
* Logger.
*/
- protected static final Logger log = Logger
- .getLogger(AbstractLocalTransactionManager.class);
+ private static final Logger log = Logger
+ .getLogger(AbstractLocalTransactionManager.class);
- /**
- * True iff the {@link #log} level is INFO or less.
- */
- final static protected boolean INFO = log.isInfoEnabled();
-
- /**
- * True iff the {@link #log} level is DEBUG or less.
- */
- final static protected boolean DEBUG = log.isDebugEnabled();
-
public AbstractLocalTransactionManager() {
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractTask.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractTask.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractTask.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -2426,6 +2426,12 @@
}
+ public ILocalTransactionManager getLocalTransactionManager() {
+
+ return delegate.getLocalTransactionManager();
+
+ }
+
public IResourceLockService getResourceLockService() {
return delegate.getResourceLockService();
@@ -2845,6 +2851,12 @@
}
+ public ILocalTransactionManager getLocalTransactionManager() {
+
+ return delegate.getLocalTransactionManager();
+
+ }
+
public IResourceLockService getResourceLockService() {
return delegate.getResourceLockService();
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IJournal.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IJournal.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -25,7 +25,6 @@
import java.util.Properties;
-import com.bigdata.btree.keys.IKeyBuilderFactory;
import com.bigdata.rawstore.IMRMW;
/**
@@ -55,5 +54,11 @@
* Immediate shutdown.
*/
public void shutdownNow();
-
+
+ /**
+ * Return the object providing the local transaction manager for this
+ * journal.
+ */
+ public ILocalTransactionManager getLocalTransactionManager();
+
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ILocalTransactionManager.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ILocalTransactionManager.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ILocalTransactionManager.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -36,8 +36,6 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
- *
- * @todo we don't really need an interface for this as there is only one impl.
*/
public interface ILocalTransactionManager extends
/* ITransactionManager, */IServiceShutdown {
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalDelegate.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalDelegate.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalDelegate.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -43,8 +43,9 @@
import com.bigdata.sparse.SparseRowStore;
public class JournalDelegate implements IJournal {
- protected final AbstractJournal delegate;
+ private final AbstractJournal delegate;
+
public JournalDelegate(final AbstractJournal source) {
this.delegate = source;
}
@@ -221,7 +222,11 @@
return delegate.getResourceLocator();
}
- public IResourceLockService getResourceLockService() {
+ public ILocalTransactionManager getLocalTransactionManager() {
+ return delegate.getLocalTransactionManager();
+ }
+
+ public IResourceLockService getResourceLockService() {
return delegate.getResourceLockService();
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -274,4 +274,15 @@
*/
String MASTER_ELECTION = "masterElection";
+ /**
+ * The name of the znode that is a child of {@link #LOGICAL_SERVICE_PREFIX}
+ * serving as the root of the HA quorum for that logical service. For
+ * example:
+ *
+ * <pre>
+ * zpath=/benchmark/config/com.bigdata.service.jini.TransactionServer/logicalService0000000000/quorum
+ * </pre>
+ */
+ String QUORUM = "quorum";
+
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeEnum.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeEnum.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeEnum.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -42,7 +42,13 @@
/**
* An ephemeral znode representing physical service instance.
*/
- PhysicalService;
+ PhysicalService,
+
+ /**
+ * A persistent znode representing the quorum for a highly available logical
+ * service.
+ */
+ Quorum;
private ServiceConfigurationZNodeEnum(){}
@@ -114,7 +120,7 @@
if (parent.endsWith(BigdataZooDefs.MASTER_ELECTION)) {
/*
- * The child is an EPHEMERAL znode representing a phsical
+ * The child is an EPHEMERAL znode representing a physical
* service instance.
*/
@@ -144,6 +150,17 @@
}
+ if (child.endsWith(BigdataZooDefs.QUORUM)) {
+
+ /*
+ * The child is an PERSISTENT znode representing the quorum for
+ * the logical service.
+ */
+
+ return Quorum;
+
+ }
+
throw new RuntimeException("serviceConfigZPath=" + serviceConfigZPath
+ ", zpath=" + zpath);
Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -612,7 +612,11 @@
case MasterElectionLock:
return NONE;
+
+ case Quorum:
+ return NONE;
+
default:
throw new AssertionError(zpath);
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/DavidsTestBOps.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/DavidsTestBOps.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/DavidsTestBOps.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -52,12 +52,14 @@
import com.bigdata.rdf.vocab.NoVocabulary;
/**
+ * A test suite developed for some bits and pieces of SPARQL 1.0 coverage.
+ *
* @author <a href="mailto:mrp...@us...">Mike Personick</a>
* @version $Id$
*/
public class DavidsTestBOps extends ProxyBigdataSailTestCase {
- protected static final Logger log = Logger.getLogger(DavidsTestBOps.class);
+ private static final Logger log = Logger.getLogger(DavidsTestBOps.class);
@Override
public Properties getProperties() {
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -120,6 +120,8 @@
suite.addTestSuite(TestDescribe.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.DavidsTestBOps.class);
+
// The Sesame TCK, including the SPARQL test suite.
{
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -115,6 +115,8 @@
suite.addTestSuite(com.bigdata.rdf.sail.TestRollbacksTx.class);
suite.addTestSuite(com.bigdata.rdf.sail.TestMillisecondPrecisionForInlineDateTimes.class);
+
+ suite.addTestSuite(com.bigdata.rdf.sail.DavidsTestBOps.class);
// The Sesame TCK, including the SPARQL test suite.
{
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java 2011-06-02 16:59:34 UTC (rev 4606)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java 2011-06-02 18:07:02 UTC (rev 4607)
@@ -60,7 +60,7 @@
* location, then it is convenient (but not necessary) to also specify its path. For
* example:
* <pre>
- * -Dbigdata.configuration=/nas/bigdata/benchmark/config/bigdataStandalone.config
+ * -Dbigdata.configuration=/nas/bigdata/benchmark/config/bigdataCluster.config
* -Dcom.bigdata.counters.linux.sysstat.path=/usr/local/bin
* </pre>
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
