[Bigdata-commit] SF.net SVN: bigdata:[4027] branches/JOURNAL_HA_BRANCH/bigdata

[<tho...@us...>]

Revision: 4027
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4027&view=rev
Author:   thompsonbry
Date:     2010-12-21 15:05:59 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
Bug fix to AbstractJournal where it was using a local FileMetadata object rather than the instance field and thus was not reporting the FileMetadata reference to DumpJournal.

Added a NAMESPACE option to the BigdataSail.

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-12-21 13:55:51 UTC (rev 4026)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-12-21 15:05:59 UTC (rev 4027)
@@ -880,7 +880,7 @@
 
 			} else {
 
-				final FileMetadata fileMetadata = FileMetadata.createInstance(
+				/*final FileMetadata*/ fileMetadata = FileMetadata.createInstance(
 						properties, !(this instanceof Journal), quorumToken);
 
 				final BufferMode bufferMode = fileMetadata.bufferMode;

Modified: branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2010-12-21 13:55:51 UTC (rev 4026)
+++ branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2010-12-21 15:05:59 UTC (rev 4027)
@@ -340,7 +340,6 @@
         
         public static final String DEFAULT_ALLOW_AUTO_COMMIT = "false";
 
-        
         /**
          * Options (default <code>false</code>) creates the SPO relation with
          * isolatable indices to allow read/write transactions.
@@ -360,6 +359,15 @@
         
         public static final String DEFAULT_STAR_JOINS = "false";
         
+		/**
+		 * Option specifies the namespace of the designed KB instance (default
+		 * {@value #DEFAULT_NAMESPACE}).
+		 */
+		public static final String NAMESPACE = BigdataSail.class.getPackage()
+				.getName()+ ".namespace";
+
+		public static final String DEFAULT_NAMESPACE = "kb";
+
     }
 
     /**
@@ -621,8 +629,10 @@
         final ITransactionService txService = 
             journal.getTransactionManager().getTransactionService();
         
-        final String namespace = "kb";
-        
+        final String namespace = properties.getProperty(
+                BigdataSail.Options.NAMESPACE,
+                BigdataSail.Options.DEFAULT_NAMESPACE);
+       
         // throws an exception if there are inconsistent properties
         checkProperties(properties);
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.