bigdata-commit Mailing List for Blazegraph (powered by bigdata) (Page 216)

Fast, scalable, robust graph database platform

Brought to you by: beebs, hyandell, mrpersonick, thompsonbry

bigdata-commit — Commit traffic.

This list is closed, nobody may subscribe to it.

2010	Jan	Feb	Mar	Apr	May	Jun	Jul (139)	Aug (94)	Sep (232)	Oct (143)	Nov (138)	Dec (55)
2011	Jan (127)	Feb (90)	Mar (101)	Apr (74)	May (148)	Jun (241)	Jul (169)	Aug (121)	Sep (157)	Oct (199)	Nov (281)	Dec (75)
2012	Jan (107)	Feb (122)	Mar (184)	Apr (73)	May (14)	Jun (49)	Jul (26)	Aug (103)	Sep (133)	Oct (61)	Nov (51)	Dec (55)
2013	Jan (59)	Feb (72)	Mar (99)	Apr (62)	May (92)	Jun (19)	Jul (31)	Aug (138)	Sep (47)	Oct (83)	Nov (95)	Dec (111)
2014	Jan (125)	Feb (60)	Mar (119)	Apr (136)	May (270)	Jun (83)	Jul (88)	Aug (30)	Sep (47)	Oct (27)	Nov (23)	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec
2016	Jan	Feb	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 214 215 216 217 218 .. 220 > >> (Page 216 of 220)

[Bigdata-commit] SF.net SVN: bigdata:[3349] branches/BIGDATA_RELEASE_0_83_2/

From: <tho...@us...> - 2010-07-29 16:54:38

Revision: 3349
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3349&view=rev
Author:   thompsonbry
Date:     2010-07-29 16:54:30 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
This branch provides a bug fix for trac issue #118. 

Added Paths:
-----------
    branches/BIGDATA_RELEASE_0_83_2/


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

[Bigdata-commit] SF.net SVN: bigdata:[3348] trunk/build.properties

From: <tho...@us...> - 2010-07-29 16:52:19

Revision: 3348
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3348&view=rev
Author:   thompsonbry
Date:     2010-07-29 16:52:13 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
bumped the build version number.

Modified Paths:
--------------
    trunk/build.properties

Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2010-07-29 16:51:34 UTC (rev 3347)
+++ trunk/build.properties	2010-07-29 16:52:13 UTC (rev 3348)
@@ -36,7 +36,7 @@
 release.dir=ant-release
 
 # The build version (note: 0.82b -> 0.82.0)
-build.ver=0.83.1
+build.ver=0.83.2
 build.ver.osgi=0.83
 
 # Set true to do a snapshot build.  This changes the value of ${version} to


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

[Bigdata-commit] SF.net SVN: bigdata:[3347] trunk/bigdata/src/releases

From: <tho...@us...> - 2010-07-29 16:51:40

Revision: 3347
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3347&view=rev
Author:   thompsonbry
Date:     2010-07-29 16:51:34 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
release notes.

Modified Paths:
--------------
    trunk/bigdata/src/releases/RELEASE_0_83_1.txt

Added Paths:
-----------
    trunk/bigdata/src/releases/RELEASE_0_83_2.txt

Modified: trunk/bigdata/src/releases/RELEASE_0_83_1.txt
===================================================================
--- trunk/bigdata/src/releases/RELEASE_0_83_1.txt	2010-07-29 16:50:28 UTC (rev 3346)
+++ trunk/bigdata/src/releases/RELEASE_0_83_1.txt	2010-07-29 16:51:34 UTC (rev 3347)
@@ -11,13 +11,10 @@
 build the code using the ant script.  The cluster installer requires the use of
 the ant script.  You can checkout this release from the following URL:
 
-	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_2
+	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_1
 
 New features:
 
-- This release provides a bug fix for issue#118.  Upgrade to this release is
-  advised.  See https://sourceforge.net/apps/trac/bigdata/ticket/118 for details.
-
 - Inlining XSD numerics, xsd:boolean, or custom datatype extensions
   into the statement indices.  Inlining provides a smaller footprint
   and faster queries for data using XSD numeric datatypes.  In order

Added: trunk/bigdata/src/releases/RELEASE_0_83_2.txt
===================================================================
--- trunk/bigdata/src/releases/RELEASE_0_83_2.txt	                        (rev 0)
+++ trunk/bigdata/src/releases/RELEASE_0_83_2.txt	2010-07-29 16:51:34 UTC (rev 3347)
@@ -0,0 +1,65 @@
+This is a bigdata (R) snapshot release.  This release is capable of loading 1B
+triples in under one hour on a 15 node cluster and has been used to load up to
+13B triples on the same cluster.  JDK 1.6 is required.
+
+See [1] for instructions on installing bigdata(R), [2] for the javadoc and [3]
+and [4] for news, questions, and the latest developments.  For more information
+about SYSTAP, LLC and bigdata, see [5].
+
+Please note that we recommend checking out the code from SVN using the tag for
+this release.  The code will build automatically under eclipse.  You can also
+build the code using the ant script.  The cluster installer requires the use of
+the ant script.  You can checkout this release from the following URL:
+
+	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_2
+
+New features:
+
+- This release provides a bug fix for issue#118.  Upgrade to this release is
+  advised.  See https://sourceforge.net/apps/trac/bigdata/ticket/118 for details.
+
+- Inlining XSD numerics, xsd:boolean, or custom datatype extensions
+  into the statement indices.  Inlining provides a smaller footprint
+  and faster queries for data using XSD numeric datatypes.  In order
+  to introduce inlining we were forced to make a change in the
+  physical schema for the RDF database which breaks binary
+  compatibility for existing stores.  The recommended migration path
+  is to export the data and import it into a new bigdata instance.
+
+- Refactor of the dynamic sharding mechanism for higher performance.
+
+- The SparseRowStore has been modified to make Unicode primary keys
+  decodable by representing Unicode primary keys using UTF8 rather
+  than Unicode sort keys.  This change also allows the SparseRowStore
+  to work with the JDK collator option which embeds nul bytes into
+  Unicode sort keys.  This change breaks binary compatibility, but
+  there is an option for historical compatibility.
+
+The roadmap for the next releases include:
+
+- Query optimizations;
+
+- Support for high-volume analytic query workloads and SPARQL aggregations;
+
+- High availability for the journal and the cluster;
+
+- Simplified deployment, configuration, and administration for clusters.
+
+For more information, please see the following links:
+
+[1] http://bigdata.wiki.sourceforge.net/GettingStarted
+[2] http://www.bigdata.com/bigdata/docs/api/
+[3] http://sourceforge.net/projects/bigdata/
+[4] http://www.bigdata.com/blog 
+[5] http://www.systap.com/bigdata.htm
+
+About bigdata: 
+
+Bigdata\xAE is a horizontally-scaled, general purpose storage and computing fabric
+for ordered data (B+Trees), designed to operate on either a single server or a
+cluster of commodity hardware. Bigdata\xAE uses dynamically partitioned key-range
+shards in order to remove any realistic scaling limits - in principle, bigdata\xAE
+may be deployed on 10s, 100s, or even thousands of machines and new capacity may
+be added incrementally without requiring the full reload of all data. The bigdata\xAE
+RDF database supports RDFS and OWL Lite reasoning, high-level query (SPARQL),
+and datum level provenance. 


Property changes on: trunk/bigdata/src/releases/RELEASE_0_83_2.txt
___________________________________________________________________
Added: svn:keywords
   + Id Date Revision Author HeadURL


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

[Bigdata-commit] SF.net SVN: bigdata:[3346] trunk/bigdata/src/releases/RELEASE_0_83_1.txt

From: <tho...@us...> - 2010-07-29 16:50:34

Revision: 3346
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3346&view=rev
Author:   thompsonbry
Date:     2010-07-29 16:50:28 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
Bug fix release.

This is a bigdata (R) snapshot release.  This release is capable of loading 1B
triples in under one hour on a 15 node cluster and has been used to load up to
13B triples on the same cluster.  JDK 1.6 is required.

See [1] for instructions on installing bigdata(R), [2] for the javadoc and [3]
and [4] for news, questions, and the latest developments.  For more information
about SYSTAP, LLC and bigdata, see [5].

Please note that we recommend checking out the code from SVN using the tag for
this release.  The code will build automatically under eclipse.  You can also
build the code using the ant script.  The cluster installer requires the use of
the ant script.  You can checkout this release from the following URL:

	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_2

New features:

- This release provides a bug fix for issue#118.  Upgrade to this release is
  advised.  See https://sourceforge.net/apps/trac/bigdata/ticket/118 for details.

- Inlining XSD numerics, xsd:boolean, or custom datatype extensions
  into the statement indices.  Inlining provides a smaller footprint
  and faster queries for data using XSD numeric datatypes.  In order
  to introduce inlining we were forced to make a change in the
  physical schema for the RDF database which breaks binary
  compatibility for existing stores.  The recommended migration path
  is to export the data and import it into a new bigdata instance.

- Refactor of the dynamic sharding mechanism for higher performance.

- The SparseRowStore has been modified to make Unicode primary keys
  decodable by representing Unicode primary keys using UTF8 rather
  than Unicode sort keys.  This change also allows the SparseRowStore
  to work with the JDK collator option which embeds nul bytes into
  Unicode sort keys.  This change breaks binary compatibility, but
  there is an option for historical compatibility.

The roadmap for the next releases include:

- Query optimizations;

- Support for high-volume analytic query workloads and SPARQL aggregations;

- High availability for the journal and the cluster;

- Simplified deployment, configuration, and administration for clusters.

For more information, please see the following links:

[1] http://bigdata.wiki.sourceforge.net/GettingStarted
[2] http://www.bigdata.com/bigdata/docs/api/
[3] http://sourceforge.net/projects/bigdata/
[4] http://www.bigdata.com/blog 
[5] http://www.systap.com/bigdata.htm

About bigdata: 

Bigdata?\194?\174 is a horizontally-scaled, general purpose storage and computing fabric
for ordered data (B+Trees), designed to operate on either a single server or a
cluster of commodity hardware. Bigdata?\194?\174 uses dynamically partitioned key-range
shards in order to remove any realistic scaling limits - in principle, bigdata?\194?\174
may be deployed on 10s, 100s, or even thousands of machines and new capacity may
be added incrementally without requiring the full reload of all data. The bigdata?\194?\174
RDF database supports RDFS and OWL Lite reasoning, high-level query (SPARQL),
and datum level provenance. 

Modified Paths:
--------------
    trunk/bigdata/src/releases/RELEASE_0_83_1.txt

Modified: trunk/bigdata/src/releases/RELEASE_0_83_1.txt
===================================================================
--- trunk/bigdata/src/releases/RELEASE_0_83_1.txt	2010-07-29 15:02:07 UTC (rev 3345)
+++ trunk/bigdata/src/releases/RELEASE_0_83_1.txt	2010-07-29 16:50:28 UTC (rev 3346)
@@ -11,10 +11,13 @@
 build the code using the ant script.  The cluster installer requires the use of
 the ant script.  You can checkout this release from the following URL:
 
-	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_1
+	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_2
 
 New features:
 
+- This release provides a bug fix for issue#118.  Upgrade to this release is
+  advised.  See https://sourceforge.net/apps/trac/bigdata/ticket/118 for details.
+
 - Inlining XSD numerics, xsd:boolean, or custom datatype extensions
   into the statement indices.  Inlining provides a smaller footprint
   and faster queries for data using XSD numeric datatypes.  In order


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

[Bigdata-commit] SF.net SVN: bigdata:[3345] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata/journal/DiskOnlyStrategy.java

From: <mar...@us...> - 2010-07-29 15:02:13

Revision: 3345
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3345&view=rev
Author:   martyncutcher
Date:     2010-07-29 15:02:07 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
Add commit overide to ensure writeCache is flushed on commit prior to calling writeRootBlock

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 14:57:15 UTC (rev 3344)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 15:02:07 UTC (rev 3345)
@@ -470,6 +470,24 @@
     }
     
     /**
+     * Need to overide commit to ensure the writeCache is flushed prior to
+     * writing the rootblock.
+     * 
+     * For the DiskOnlyStrategy flushing the writeCache also ensures the
+     * backing file is created if the file is temporary.
+     * 
+     * Note that the call must be syncronized or concurrent writers to the
+     * cache will cause problems.
+     */
+    public void commit() {
+    	if (writeCache != null) {
+	    	synchronized(this) {
+	    		flushWriteCache();
+	    	}
+    	}
+    }
+    
+    /**
      * Writes the {@link #writeCache} through to the disk and its position is
      * reset to zero.
      * <p>


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

[Bigdata-commit] SF.net SVN: bigdata:[3344] trunk/bigdata/src/java/com/bigdata/journal

From: <tho...@us...> - 2010-07-29 14:57:21

Revision: 3344
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3344&view=rev
Author:   thompsonbry
Date:     2010-07-29 14:57:15 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
javadoc updates.  issue https://sourceforge.net/apps/trac/bigdata/ticket/118 should be resolved at this point (by Martyn's commit).

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
    trunk/bigdata/src/java/com/bigdata/journal/Options.java

Modified: trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 14:55:40 UTC (rev 3343)
+++ trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 14:57:15 UTC (rev 3344)
@@ -470,16 +470,16 @@
         }
         
     }
-    
+
     /**
-     * Need to overide commit to ensure the writeCache is flushed prior to
-     * writing the rootblock.
+     * Need to override commit to ensure the writeCache is flushed prior to
+     * writing the root block.
      * 
-     * For the DiskOnlyStrategy flushing the writeCache also ensures the
-     * backing file is created if the file is temporary.
+     * For the DiskOnlyStrategy flushing the writeCache also ensures the backing
+     * file is created if the file is temporary.
      * 
-     * Note that the call must be syncronized or concurrent writers to the
-     * cache will cause problems.
+     * Note that the internal call to flush the writeCache must be synchronized
+     * or concurrent writers to the cache will cause problems.
      */
     public void commit() {
     	if (writeCache != null) {

Modified: trunk/bigdata/src/java/com/bigdata/journal/Options.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/journal/Options.java	2010-07-29 14:55:40 UTC (rev 3343)
+++ trunk/bigdata/src/java/com/bigdata/journal/Options.java	2010-07-29 14:57:15 UTC (rev 3344)
@@ -402,28 +402,23 @@
     String FORCE_ON_COMMIT = AbstractJournal.class.getName()+".forceOnCommit";
 
     /**
-     * This boolean option causes application data to be forced to stable
-     * storage <em>before</em> we update the root blocks. This option seeks to
-     * guarantee that the application data is stable on the disk before the
-     * atomic commit. Some operating systems and/or file systems may otherwise
-     * choose an ordered write or otherwise process the writes in a different
-     * order. This could have the consequence that the root blocks are laid down
-     * on the disk before the application data. In this situation a hard failure
-     * during the write could result in the loss of application data since the
-     * updated root blocks represent the atomic commit point but not all
-     * application data was successfully made stable on disk.
+     * This boolean option may be used to request that application data are
+     * forced to stable storage <em>before</em> we update the root blocks
+     * (default {@value #DEFAULT_DOUBLE_SYNC}). This is accomplished by invoking
+     * {@link FileChannel#force(boolean)} before root blocks are updated as part
+     * of the atomic commit protocol in an attempt to guard against operating
+     * systems and/or file systems which may otherwise reorders writes with the
+     * consequence that the root blocks are laid down on the disk before the
+     * application data. In this situation a hard failure during the root block
+     * write could result in the loss of application data since the updated root
+     * blocks represent the atomic commit point but not all application data was
+     * successfully made stable on disk. However, note that there are often
+     * multiple cache layers in use by the operating system, the disk
+     * controller, and the disk. Therefore durability is thus best achieved
+     * through a mixture of methods, which can include battery powered hardware
+     * write cache and/or replication.
      * 
-     * @deprecated This option does NOT provide a sufficient guarantee when a
-     *             write cache is in use by the operating system or the disk if
-     *             the layered write caches return before all data is safely on
-     *             disk (or in a battery powered cache). In order to protect
-     *             against this you MUST disable the write cache layers in the
-     *             operating system and the disk drive such that
-     *             {@link FileChannel#force(boolean)} will not return until the
-     *             data are in fact on stable storage. If you disable the OS and
-     *             disk write cache then you do NOT need to specify this option
-     *             since writes will be ordered and all data will be on disk
-     *             before we update the commit blocks.
+     * @see #DEFAULT_DOUBLE_SYNC
      */
     String DOUBLE_SYNC = AbstractJournal.class.getName()+".doubleSync";
 


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

[Bigdata-commit] SF.net SVN: bigdata:[3343] trunk/bigdata

From: <tho...@us...> - 2010-07-29 14:55:47

Revision: 3343
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3343&view=rev
Author:   thompsonbry
Date:     2010-07-29 14:55:40 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
Progress on the TermIdEncoder [https://sourceforge.net/apps/trac/bigdata/ticket/124].

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/btree/BTree.java
    trunk/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
    trunk/bigdata/src/java/com/bigdata/mdi/LocalPartitionMetadata.java
    trunk/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java
    trunk/bigdata/src/java/com/bigdata/resources/CompactingMergeTask.java
    trunk/bigdata/src/java/com/bigdata/resources/IncrementalBuildTask.java
    trunk/bigdata/src/java/com/bigdata/resources/JoinIndexPartitionTask.java
    trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java
    trunk/bigdata/src/java/com/bigdata/resources/OverflowManager.java
    trunk/bigdata/src/java/com/bigdata/resources/SplitIndexPartitionTask.java
    trunk/bigdata/src/java/com/bigdata/resources/SplitUtility.java
    trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java
    trunk/bigdata/src/java/com/bigdata/service/MetadataService.java
    trunk/bigdata/src/test/com/bigdata/btree/TestIndexPartitionFencePosts.java
    trunk/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java
    trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask.java
    trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask2.java
    trunk/bigdata/src/test/com/bigdata/resources/TestMergeTask.java
    trunk/bigdata/src/test/com/bigdata/resources/TestOverflow.java
    trunk/bigdata/src/test/com/bigdata/resources/TestResourceManagerBootstrap.java
    trunk/bigdata/src/test/com/bigdata/resources/TestSegSplitter.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/DumpFederation.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java

Modified: trunk/bigdata/src/java/com/bigdata/btree/BTree.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/BTree.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/btree/BTree.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -1339,8 +1339,8 @@
                     oldPmd.getLeftSeparatorKey(), //
                     oldPmd.getRightSeparatorKey(),//
                     newResources,//
-                    oldPmd.getIndexPartitionCause(),//
-                    "" // history is deprecated.
+                    oldPmd.getIndexPartitionCause()//
+//                    "" // history is deprecated.
             );
 
             // update the local partition metadata on our cloned IndexMetadata.

Modified: trunk/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -1227,9 +1227,9 @@
                                 pmd.getLeftSeparatorKey(),//
                                 pmd.getRightSeparatorKey(),//
                                 null, // No resource metadata for indexSegment.
-                                pmd.getIndexPartitionCause(),
-                                pmd.getHistory()+
-                                "build("+pmd.getPartitionId()+",compactingMerge="+compactingMerge+") "
+                                pmd.getIndexPartitionCause()
+//                                ,pmd.getHistory()+
+//                                "build("+pmd.getPartitionId()+",compactingMerge="+compactingMerge+") "
                         )
                         );
                 

Modified: trunk/bigdata/src/java/com/bigdata/mdi/LocalPartitionMetadata.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/mdi/LocalPartitionMetadata.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/mdi/LocalPartitionMetadata.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -41,7 +41,6 @@
 import com.bigdata.btree.IndexSegmentStore;
 import com.bigdata.journal.Journal;
 import com.bigdata.service.DataService;
-import com.bigdata.service.Event;
 
 /**
  * An immutable object providing metadata about a local index partition,
@@ -80,6 +79,9 @@
     /**
      * 
      * @see #getSourcePartitionId()
+     * 
+     * @deprecated MoveTask manages without this field (it was required by the
+     *             previous MOVE implementation).
      */
     private int sourcePartitionId;
     
@@ -111,53 +113,53 @@
      */
     private IndexPartitionCause cause;
     
-    /**
-     * A history of operations giving rise to the current partition metadata.
-     * E.g., register(timestamp), copyOnOverflow(timestamp), split(timestamp),
-     * join(partitionId,partitionId,timestamp), etc. This is truncated when
-     * serialized to keep it from growing without bound.
-     * 
-     * @deprecated See {@link #getHistory()}
-     */
-    private String history;
+//    /**
+//     * A history of operations giving rise to the current partition metadata.
+//     * E.g., register(timestamp), copyOnOverflow(timestamp), split(timestamp),
+//     * join(partitionId,partitionId,timestamp), etc. This is truncated when
+//     * serialized to keep it from growing without bound.
+//     * 
+//     * @deprecated See {@link #getHistory()}
+//     */
+//    private String history;
+//    
+//    /**
+//     * If the history string exceeds {@link #MAX_HISTORY_LENGTH} characters then
+//     * truncates it to the last {@link #MAX_HISTORY_LENGTH}-3 characters,
+//     * prepends "...", and returns the result. Otherwise returns the entire
+//     * history string.
+//     * 
+//     * @deprecated See {@link #history}
+//     */
+//    protected String getTruncatedHistory() {
+//        
+//        if (MAX_HISTORY_LENGTH == 0)
+//            return "";
+//        
+//        String history = this.history;
+//        
+//        if(history.length() > MAX_HISTORY_LENGTH) {
+//
+//            /*
+//             * Truncate the history.
+//             */
+//
+//            final int len = history.length();
+//            
+//            final int fromIndex = len - (MAX_HISTORY_LENGTH - 3);
+//
+//            assert fromIndex > 0 : "len=" + len + ", fromIndex=" + fromIndex
+//                    + ", maxHistoryLength=" + MAX_HISTORY_LENGTH;
+//            
+//            history = "..." + history.substring(fromIndex, len);
+//            
+//        }
+//
+//        return history;
+//        
+//    }
     
     /**
-     * If the history string exceeds {@link #MAX_HISTORY_LENGTH} characters then
-     * truncates it to the last {@link #MAX_HISTORY_LENGTH}-3 characters,
-     * prepends "...", and returns the result. Otherwise returns the entire
-     * history string.
-     * 
-     * @deprecated See {@link #history}
-     */
-    protected String getTruncatedHistory() {
-        
-        if (MAX_HISTORY_LENGTH == 0)
-            return "";
-        
-        String history = this.history;
-        
-        if(history.length() > MAX_HISTORY_LENGTH) {
-
-            /*
-             * Truncate the history.
-             */
-
-            final int len = history.length();
-            
-            final int fromIndex = len - (MAX_HISTORY_LENGTH - 3);
-
-            assert fromIndex > 0 : "len=" + len + ", fromIndex=" + fromIndex
-                    + ", maxHistoryLength=" + MAX_HISTORY_LENGTH;
-            
-            history = "..." + history.substring(fromIndex, len);
-            
-        }
-
-        return history;
-        
-    }
-    
-    /**
      * De-serialization constructor.
      */
     public LocalPartitionMetadata() {
@@ -199,21 +201,21 @@
      *            the remote {@link DataService} will fill it in on arrival.
      * @param cause
      *            The underlying cause for the creation of the index partition.
-     * @param history
-     *            A human interpretable history of the index partition. The
-     *            history is a series of whitespace delimited records each of
-     *            more or less the form <code>foo(x,y,z)</code>. The history
-     *            gets truncated when the {@link LocalPartitionMetadata} is
-     *            serialized in order to prevent it from growing without bound.
      */
+//    * @param history
+//    *            A human interpretable history of the index partition. The
+//    *            history is a series of whitespace delimited records each of
+//    *            more or less the form <code>foo(x,y,z)</code>. The history
+//    *            gets truncated when the {@link LocalPartitionMetadata} is
+//    *            serialized in order to prevent it from growing without bound.
     public LocalPartitionMetadata(//
             final int partitionId,//
             final int sourcePartitionId,//
             final byte[] leftSeparatorKey,//
             final byte[] rightSeparatorKey,// 
             final IResourceMetadata[] resources,//
-            final IndexPartitionCause cause,
-            final String history
+            final IndexPartitionCause cause
+//            final String history
             ) {
 
         /*
@@ -232,7 +234,7 @@
 
         this.cause = cause;
         
-        this.history = history;
+//        this.history = history;
         
         /*
          * Test arguments.
@@ -440,23 +442,23 @@
         
     }
     
-    /**
-     * A history of the changes to the index partition.
-     * 
-     * @deprecated I've essentially disabled the history (it is always empty
-     *             when it is persisted). I found it nearly impossible to read.
-     *             There are much saner ways to track what is going on in the
-     *             federation. An analysis of the {@link Event} log is much more
-     *             useful. If nothing else, you could examine the index
-     *             partition in the metadata index by scanning the commit points
-     *             and reading its state in each commit and reporting all state
-     *             changes.
-     */
-    final public String getHistory() {
-        
-        return history;
-        
-    }
+//    /**
+//     * A history of the changes to the index partition.
+//     * 
+//     * @deprecated I've essentially disabled the history (it is always empty
+//     *             when it is persisted). I found it nearly impossible to read.
+//     *             There are much saner ways to track what is going on in the
+//     *             federation. An analysis of the {@link Event} log is much more
+//     *             useful. If nothing else, you could examine the index
+//     *             partition in the metadata index by scanning the commit points
+//     *             and reading its state in each commit and reporting all state
+//     *             changes.
+//     */
+//    final public String getHistory() {
+//        
+//        return history;
+//        
+//    }
     
     final public int hashCode() {
 
@@ -466,7 +468,7 @@
     }
     
     // Note: used by assertEquals in the test cases.
-    public boolean equals(Object o) {
+    public boolean equals(final Object o) {
 
         if (this == o)
             return true;
@@ -520,7 +522,7 @@
         ", rightSeparator="+BytesUtil.toString(rightSeparatorKey)+
         ", resourceMetadata="+Arrays.toString(resources)+
         ", cause="+cause+
-        ", history="+history+
+//        ", history="+history+
         "}"
         ;
 
@@ -537,6 +539,17 @@
      * but that field is only serialized for a journal.
      */
     private static final transient short VERSION1 = 0x1;
+
+    /**
+     * This version serializes the {@link #partitionId} as 32-bits clean and
+     * gets rid of the <code>history</code> field.
+     */
+    private static final transient short VERSION2 = 0x2;
+
+    /**
+     * The current version.
+     */
+    private static final transient short VERSION = VERSION2;
     
     public void readExternal(final ObjectInput in) throws IOException,
             ClassNotFoundException {
@@ -546,13 +559,18 @@
         switch (version) {
         case VERSION0:
         case VERSION1:
+        case VERSION2:
             break;
         default:
             throw new IOException("Unknown version: " + version);
         }
-        
-        partitionId = (int) LongPacker.unpackLong(in);
 
+        if (version < VERSION2) {
+            partitionId = (int) LongPacker.unpackLong(in);
+        } else {
+            partitionId = in.readInt();
+        }
+
         sourcePartitionId = in.readInt(); // MAY be -1.
         
         final int nresources = ShortPacker.unpackShort(in);
@@ -579,7 +597,9 @@
 
         cause = (IndexPartitionCause)in.readObject();
         
-        history = in.readUTF();
+        if (version < VERSION2) {
+            /* history = */in.readUTF();
+        }
         
         resources = nresources>0 ? new IResourceMetadata[nresources] : null;
 
@@ -613,9 +633,13 @@
 
     public void writeExternal(final ObjectOutput out) throws IOException {
 
-        ShortPacker.packShort(out, VERSION1);
+        ShortPacker.packShort(out, VERSION);
 
-        LongPacker.packLong(out, partitionId);
+        if (VERSION < VERSION2) {
+            LongPacker.packLong(out, partitionId);
+        } else {
+            out.writeInt(partitionId);
+        }
         
         out.writeInt(sourcePartitionId); // MAY be -1.
         
@@ -640,7 +664,9 @@
 
         out.writeObject(cause);
         
-        out.writeUTF(getTruncatedHistory());
+        if (VERSION < VERSION2) {
+            out.writeUTF("");// getTruncatedHistory()
+        }
                 
         /*
          * Note: we serialize using the IResourceMetadata interface so that we

Modified: trunk/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -224,19 +224,36 @@
 
     }
 
+    /**
+     * The original version.
+     */
     private static final transient short VERSION0 = 0x0;
+
+    /**
+     * The {@link #partitionId} is now 32-bits clean.
+     */
+    private static final transient short VERSION1 = 0x0;
     
+    /**
+     * The current version.
+     */
+    private static final transient short VERSION = VERSION1;
+    
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         
         final short version = ShortPacker.unpackShort(in);
         
-        if (version != VERSION0) {
-            
+        if (version != VERSION0 && version != VERSION1) {
+
             throw new IOException("Unknown version: "+version);
             
         }
 
-        partitionId = (int)LongPacker.unpackLong(in);
+        if (version < VERSION1) {
+            partitionId = (int) LongPacker.unpackLong(in);
+        } else {
+            partitionId = in.readInt();
+        }
         
         dataServiceUUID = new UUID(in.readLong()/*MSB*/,in.readLong()/*LSB*/);
         
@@ -264,9 +281,13 @@
 
     public void writeExternal(ObjectOutput out) throws IOException {
 
-        ShortPacker.packShort(out, VERSION0);
+        ShortPacker.packShort(out, VERSION);
         
-        LongPacker.packLong(out, partitionId);
+        if (VERSION < VERSION1) {
+            LongPacker.packLong(out, partitionId);
+        } else {
+            out.writeInt(partitionId);
+        }
 
         out.writeLong(dataServiceUUID.getMostSignificantBits());
         

Modified: trunk/bigdata/src/java/com/bigdata/resources/CompactingMergeTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/CompactingMergeTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/CompactingMergeTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -1178,21 +1178,22 @@
                         currentpmd.getLeftSeparatorKey(),//
                         currentpmd.getRightSeparatorKey(),//
                         newResources, //
-                        currentpmd.getIndexPartitionCause(),
-                        currentpmd.getHistory()
-                                + OverflowActionEnum.Merge//
-                                + "(lastCommitTime="
-                                + segmentMetadata.getCreateTime()//
-                                + ",btreeEntryCount="
-                                + btree.getEntryCount()//
-                                + ",segmentEntryCount="
-                                + buildResult.builder.getCheckpoint().nentries//
-                                + ",segment="
-                                + segmentMetadata.getUUID()//
-                                + ",counter="
-                                + btree.getCounter().get()//
-                                + ",oldResources="
-                                + Arrays.toString(currentResources) + ") "));
+                        currentpmd.getIndexPartitionCause()
+//                        currentpmd.getHistory()
+//                                + OverflowActionEnum.Merge//
+//                                + "(lastCommitTime="
+//                                + segmentMetadata.getCreateTime()//
+//                                + ",btreeEntryCount="
+//                                + btree.getEntryCount()//
+//                                + ",segmentEntryCount="
+//                                + buildResult.builder.getCheckpoint().nentries//
+//                                + ",segment="
+//                                + segmentMetadata.getUUID()//
+//                                + ",counter="
+//                                + btree.getCounter().get()//
+//                                + ",oldResources="
+//                                + Arrays.toString(currentResources) + ") "
+                ));
 
                 // update the metadata associated with the btree
                 btree.setIndexMetadata(indexMetadata);

Modified: trunk/bigdata/src/java/com/bigdata/resources/IncrementalBuildTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/IncrementalBuildTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/IncrementalBuildTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -552,21 +552,22 @@
                         currentpmd.getLeftSeparatorKey(),//
                         currentpmd.getRightSeparatorKey(),//
                         newResources, //
-                        currentpmd.getIndexPartitionCause(),
-                        currentpmd.getHistory()
-                                + OverflowActionEnum.Build//
-                                + "(lastCommitTime="
-                                + segmentMetadata.getCreateTime()//
-                                + ",segment="
-                                + segmentMetadata.getUUID()//
-                                + ",#buildSources="
-                                + buildResult.sourceCount//
-                                + ",merge="
-                                + buildResult.compactingMerge//
-                                + ",counter="
-                                + btree.getCounter().get()//
-                                + ",oldResources="
-                                + Arrays.toString(currentResources) + ") "));
+                        currentpmd.getIndexPartitionCause()
+//                        , currentpmd.getHistory()
+//                                + OverflowActionEnum.Build//
+//                                + "(lastCommitTime="
+//                                + segmentMetadata.getCreateTime()//
+//                                + ",segment="
+//                                + segmentMetadata.getUUID()//
+//                                + ",#buildSources="
+//                                + buildResult.sourceCount//
+//                                + ",merge="
+//                                + buildResult.compactingMerge//
+//                                + ",counter="
+//                                + btree.getCounter().get()//
+//                                + ",oldResources="
+//                                + Arrays.toString(currentResources) + ") "
+                                ));
 
                 // update the metadata associated with the btree
                 btree.setIndexMetadata(indexMetadata);

Modified: trunk/bigdata/src/java/com/bigdata/resources/JoinIndexPartitionTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/JoinIndexPartitionTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/JoinIndexPartitionTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -289,9 +289,10 @@
                         // Note: the live journal.
                         getJournal().getResourceMetadata() //
                         },//
-                        IndexPartitionCause.join(resourceManager),
-                        // new history line.
-                        summary+" "));
+                        IndexPartitionCause.join(resourceManager)
+//                        // new history line.
+//                        , summary+" "
+                ));
 
                 /*
                  * Set the updated index metadata on the btree (required for it

Modified: trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -1367,9 +1367,10 @@
                             // Historical writes from the source DS.
                             historySegmentMetadata//
                         },
-                        IndexPartitionCause.move(resourceManager),
-                        // history line.
-                        oldpmd.getHistory() + summary + " "));
+                        IndexPartitionCause.move(resourceManager)
+//                        // history line.
+//                        ,oldpmd.getHistory() + summary + " "
+                ));
                         
                 /*
                  * Create the BTree to aborb writes for the target index

Modified: trunk/bigdata/src/java/com/bigdata/resources/OverflowManager.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/OverflowManager.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/OverflowManager.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -2486,16 +2486,18 @@
                                     oldpmd.getLeftSeparatorKey(),//
                                     oldpmd.getRightSeparatorKey(),//
                                     newResources, //
-                                    oldpmd.getIndexPartitionCause(), oldpmd
-                                            .getHistory()
-                                            + OverflowActionEnum.Copy
-                                            + "(lastCommitTime="
-                                            + lastCommitTime
-                                            + ",entryCount="
-                                            + entryCount
-                                            + ",counter="
-                                            + oldBTree.getCounter().get()
-                                            + ") "));
+                                    oldpmd.getIndexPartitionCause()//
+//                                    , oldpmd
+//                                            .getHistory()
+//                                            + OverflowActionEnum.Copy
+//                                            + "(lastCommitTime="
+//                                            + lastCommitTime
+//                                            + ",entryCount="
+//                                            + entryCount
+//                                            + ",counter="
+//                                            + oldBTree.getCounter().get()
+//                                            + ") "
+                                    ));
 
                 } else {
 
@@ -2535,15 +2537,17 @@
                                     oldpmd.getLeftSeparatorKey(),//
                                     oldpmd.getRightSeparatorKey(),//
                                     newResources, //
-                                    oldpmd.getIndexPartitionCause(), oldpmd
-                                            .getHistory()
-                                            + "overflow(lastCommitTime="
-                                            + lastCommitTime
-                                            + ",entryCount="
-                                            + entryCount
-                                            + ",counter="
-                                            + oldBTree.getCounter().get()
-                                            + ") "));
+                                    oldpmd.getIndexPartitionCause()//
+//                                    , oldpmd
+//                                            .getHistory()
+//                                            + "overflow(lastCommitTime="
+//                                            + lastCommitTime
+//                                            + ",entryCount="
+//                                            + entryCount
+//                                            + ",counter="
+//                                            + oldBTree.getCounter().get()
+//                                            + ") "
+                                    ));
 
                 }
 

Modified: trunk/bigdata/src/java/com/bigdata/resources/SplitIndexPartitionTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/SplitIndexPartitionTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/SplitIndexPartitionTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -844,12 +844,12 @@
                                             resourceManager.getLiveJournal()
                                                     .getResourceMetadata(),
                                             splitResult.buildResults[i].segmentMetadata },
-                                    IndexPartitionCause.split(resourceManager),
-                                    /*
-                                     * Note: history is record of the split.
-                                     */
-                                    pmd.getHistory() + summary + " ")//
-                            );
+                                    IndexPartitionCause.split(resourceManager)
+//                                    /*
+//                                     * Note: history is record of the split.
+//                                     */
+//                                    , pmd.getHistory() + summary + " "//
+                            ));
 
                     /*
                      * create new btree.

Modified: trunk/bigdata/src/java/com/bigdata/resources/SplitUtility.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/SplitUtility.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/SplitUtility.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -400,11 +400,12 @@
                     /*
                      * Note: cause will be set by the atomic update task.
                      */
-                    null,//
-                    oldpmd.getHistory()
-                            + "chooseTailSplitPoint(oldPartitionId="
-                            + oldpmd.getPartitionId() + ",nsplits=" + 2
-                            + ",newPartitionId=" + partitionId + ") ");
+                    null//
+//                    , oldpmd.getHistory()
+//                            + "chooseTailSplitPoint(oldPartitionId="
+//                            + oldpmd.getPartitionId() + ",nsplits=" + 2
+//                            + ",newPartitionId=" + partitionId + ") "
+                            );
 
             final int fromIndex = 0;
 
@@ -437,11 +438,12 @@
                      * Note: Cause will be set by the atomic update for the
                      * split task.
                      */
-                    null,//
-                    oldpmd.getHistory()
-                            + "chooseTailSplitPoint(oldPartitionId="
-                            + oldpmd.getPartitionId() + ",nsplits=" + 2
-                            + ",newPartitionId=" + partitionId + ") ");
+                    null//
+//                    , oldpmd.getHistory()
+//                            + "chooseTailSplitPoint(oldPartitionId="
+//                            + oldpmd.getPartitionId() + ",nsplits=" + 2
+//                            + ",newPartitionId=" + partitionId + ") "
+                    );
 
             /*
              * Note: The index of the last tuple in the btree will be the
@@ -1050,11 +1052,12 @@
                         /*
                          * Note: cause will be set by the atomic update task.
                          */
-                        null,//
-                        oldpmd.getHistory()
-                                + "chooseSplitPoint(oldPartitionId="
-                                + oldpmd.getPartitionId() + ",nsplits=" + N
-                                + ",newPartitionId=" + partitionId + ") ");
+                        null //
+//                        , oldpmd.getHistory()
+//                                + "chooseSplitPoint(oldPartitionId="
+//                                + oldpmd.getPartitionId() + ",nsplits=" + N
+//                                + ",newPartitionId=" + partitionId + ") "
+                        );
 
                 final Split split = new Split(newpmd, fromIndex, toIndex);
 

Modified: trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -2603,14 +2603,15 @@
                                 getResourceMetadata() //
                                 },
                                 // cause
-                                IndexPartitionCause.register(resourceManager),
-                                /*
-                                 * Note: Retains whatever history given by the
-                                 * caller.
-                                 */
-                                pmd.getHistory() + "register(name=" + name
-                                        + ",partitionId="
-                                        + pmd.getPartitionId() + ") "));
+                                IndexPartitionCause.register(resourceManager)
+//                                /*
+//                                 * Note: Retains whatever history given by the
+//                                 * caller.
+//                                 */
+//                                , pmd.getHistory() + "register(name=" + name
+//                                        + ",partitionId="
+//                                        + pmd.getPartitionId() + ") "
+                        ));
 
             } else {
 

Modified: trunk/bigdata/src/java/com/bigdata/service/MetadataService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/MetadataService.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/java/com/bigdata/service/MetadataService.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -1123,11 +1123,11 @@
                          * service.
                          */
                          null, // [resources] Signal to the RegisterIndexTask.
-                         null, // [cause] Signal to RegisterIndexTask
-                         /*
-                          * History.
-                          */
-                         "createScaleOutIndex(name="+scaleOutIndexName+") "
+                         null // [cause] Signal to RegisterIndexTask
+//                         /*
+//                          * History.
+//                          */
+//                         ,"createScaleOutIndex(name="+scaleOutIndexName+") "
                     ));
                 
                 dataServices[i].registerIndex(DataService

Modified: trunk/bigdata/src/test/com/bigdata/btree/TestIndexPartitionFencePosts.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/btree/TestIndexPartitionFencePosts.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/btree/TestIndexPartitionFencePosts.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -78,8 +78,8 @@
                 new byte[]{}, // leftSeparator
                 null, // rightSeparator
                 null, // no resource descriptions.
-                null, // no cause.
-                "" // history
+                null // no cause.
+//                , "" // history
                 ));
         
         BTree ndx = BTree.create(new SimpleMemoryRawStore(),metadata);

Modified: trunk/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -638,8 +638,8 @@
                     new IResourceMetadata[] {//
                             resourceManager.getLiveJournal().getResourceMetadata(), //
                     }, //
-                    IndexPartitionCause.register(resourceManager),
-                    "" // history
+                    IndexPartitionCause.register(resourceManager)
+//                    ,"" // history
                     ));
 
             // submit task to register the index and wait for it to complete.

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -127,8 +127,8 @@
                     new IResourceMetadata[] {//
                             resourceManager.getLiveJournal().getResourceMetadata(), //
                     }, //
-                    IndexPartitionCause.register(resourceManager),
-                    "" // history
+                    IndexPartitionCause.register(resourceManager)
+//                    "" // history
                     ));
 
             // submit task to register the index and wait for it to complete.
@@ -317,8 +317,8 @@
                     new IResourceMetadata[] {//
                             resourceManager.getLiveJournal().getResourceMetadata(), //
                     }, //
-                    IndexPartitionCause.register(resourceManager),
-                    "" // history
+                    IndexPartitionCause.register(resourceManager)
+//                    ,"" // history
                     ));
 
             // submit task to register the index and wait for it to complete.

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask2.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask2.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestBuildTask2.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -193,8 +193,8 @@
                     new IResourceMetadata[] {//
                     resourceManager.getLiveJournal().getResourceMetadata(), //
                     }, //
-                    IndexPartitionCause.register(resourceManager),
-                    "" // history
+                    IndexPartitionCause.register(resourceManager)
+//                    "" // history
             ));
 
             // submit task to register the index and wait for it to complete.

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestMergeTask.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestMergeTask.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestMergeTask.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -115,8 +115,8 @@
                     new IResourceMetadata[] {//
                             resourceManager.getLiveJournal().getResourceMetadata(), //
                     }, //
-                    IndexPartitionCause.register(resourceManager),
-                    "" // history
+                    IndexPartitionCause.register(resourceManager)
+//                    ,"" // history
                     ));
 
             // submit task to register the index and wait for it to complete.

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestOverflow.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestOverflow.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestOverflow.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -121,8 +121,8 @@
                     new IResourceMetadata[]{
                             journal.getResourceMetadata()
                     },//
-                    IndexPartitionCause.register(resourceManager),
-                    ""//history
+                    IndexPartitionCause.register(resourceManager)
+//                    ,""//history
                     ));
             
             // create index and register on the journal.

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestResourceManagerBootstrap.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestResourceManagerBootstrap.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestResourceManagerBootstrap.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -652,8 +652,8 @@
                         new IndexPartitionCause(
                                         IndexPartitionCause.CauseEnum.Register,
                                         0/*overflowCounter*/, System
-                                                .currentTimeMillis()/*lastCommitTime*/),
-                        "bootstrap() "// history
+                                                .currentTimeMillis()/*lastCommitTime*/)
+//                        ,"bootstrap() "// history
                         ));
 
                 /*

Modified: trunk/bigdata/src/test/com/bigdata/resources/TestSegSplitter.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/resources/TestSegSplitter.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata/src/test/com/bigdata/resources/TestSegSplitter.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -528,8 +528,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    , null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -664,8 +664,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    , null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -774,8 +774,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -868,8 +868,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -970,8 +970,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -1140,8 +1140,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -1229,8 +1229,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -1316,8 +1316,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -1476,8 +1476,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    ,null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.
@@ -1622,8 +1622,8 @@
                     fromKey, //
                     toKey,//
                     new IResourceMetadata[] { store.getResourceMetadata() }, //
-                    null, // cause
-                    null // history
+                    null // cause
+//                    null // history
             );
 
             // Generates BTree w/ constrained keys and commits to store.

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/DumpFederation.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/DumpFederation.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/DumpFederation.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -513,7 +513,7 @@
                             + "\tRightSeparator"//
                             + "\tView"//
                             + "\tCause"//
-                            + "\tHistory"//
+//                            + "\tHistory"//
                             + "\tIndexMetadata"//
                             ;
 
@@ -610,8 +610,8 @@
                         + rec.detailRec.pmd.getIndexPartitionCause()
                         + "\"");
 
-                // history
-                sb.append("\t\"" + rec.detailRec.pmd.getHistory() + "\"");
+//                // history
+//                sb.append("\t\"" + rec.detailRec.pmd.getHistory() + "\"");
 
                 // indexMetadata
                 sb.append("\t\"" + rec.detailRec.indexMetadata + "\"");
@@ -620,8 +620,8 @@
 
                 sb.append("\tN/A");
                 sb.append("\tN/A");
+//                sb.append("\tN/A");
                 sb.append("\tN/A");
-                sb.append("\tN/A");
 
             }
             

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java	2010-07-29 14:49:19 UTC (rev 3342)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java	2010-07-29 14:55:40 UTC (rev 3343)
@@ -35,13 +35,13 @@
  * available for bit flags in the low two-bits of the resulting long value
  * (they will be ZERO(0) and may be overwritten by the caller).
  * <p>
- * The purpose of this encoding is to cause the N high bits to vary rapily
+ * The purpose of this encoding is to cause the N high bits to vary rapidly
  * as the local counter is driven up by writes on the index partition. This
  * has the effect of scattering writes on dependent indices (those using the
  * resulting long value as the sole or leading component of their key).
  * <p>
  * Given a source RDF/XML document with M "terms" distributed uniformly over
- * K TERM2ID index partitions, each term has a uniform likelyhood of setting
+ * K TERM2ID index partitions, each term has a uniform likelihood of setting
  * any of the low bits of the local counter. After encoding, this means that
  * the N high-bits of encoded term identifier are uniformly distributed.
  * Assuming that the separator keys for the ID2TERM index divide the key
@@ -49,7 +49,7 @@
  * ID2TERM index partitions will be uniformly distributed as well.
  * <p>
  * The next bits in the encoded values are derived from the partition
- * identifer followed by the term identifier and therefore have a strong
+ * identifier followed by the term identifier and therefore have a strong
  * bias for the index partition and the sequential assignment of local
  * counter values within an index partition respectively. This means that
  * read / write access within an index partition tends to have some


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

[Bigdata-commit] SF.net SVN: bigdata:[3342] trunk/bigdata/src/java/com/bigdata/journal/ DiskOnlyStrategy.java

From: <mar...@us...> - 2010-07-29 14:49:26

Revision: 3342
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3342&view=rev
Author:   martyncutcher
Date:     2010-07-29 14:49:19 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
re-instate commit overide, but with protected call to flushWriteCache to guard against concurrency errors!

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java

Modified: trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 14:00:32 UTC (rev 3341)
+++ trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 14:49:19 UTC (rev 3342)
@@ -472,6 +472,24 @@
     }
     
     /**
+     * Need to overide commit to ensure the writeCache is flushed prior to
+     * writing the rootblock.
+     * 
+     * For the DiskOnlyStrategy flushing the writeCache also ensures the
+     * backing file is created if the file is temporary.
+     * 
+     * Note that the call must be syncronized or concurrent writers to the
+     * cache will cause problems.
+     */
+    public void commit() {
+    	if (writeCache != null) {
+	    	synchronized(this) {
+	    		flushWriteCache();
+	    	}
+    	}
+    }
+    
+    /**
      * Writes the {@link #writeCache} through to the disk and its position is
      * reset to zero.
      * <p>


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

[Bigdata-commit] SF.net SVN: bigdata:[3341] branches/bugfix-btm

From: <btm...@us...> - 2010-07-29 14:00:47

Revision: 3341
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3341&view=rev
Author:   btmurphy
Date:     2010-07-29 14:00:32 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
merge -r:3267:HEAD(3339) ~/trunk/bigdata ~/bigdata/branches/bugfix-btm [trunk --> branch bugfix-btm]

Modified Paths:
--------------
    branches/bugfix-btm/.classpath
    branches/bugfix-btm/bigdata/src/architecture/mergePriority.xls
    branches/bugfix-btm/bigdata/src/java/com/bigdata/LRUNexus.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/Checkpoint.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/DefaultTupleSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IndexSegment.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentStore.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/NOPTupleSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/NodeSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/keys/IKeyBuilder.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/keys/KeyBuilder.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/proc/AbstractKeyArrayIndexProcedure.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/view/FusedView.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/io/DirectBufferPool.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/AbstractBufferStrategy.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/BufferMode.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/CommitRecordIndex.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/FileMetadata.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/Name2Addr.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/journal/Options.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/IndexPartitionCause.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/MetadataIndex.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/IRelation.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/accesspath/SameVariableConstraint.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/locator/DefaultResourceLocator.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/IPredicate.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/Rule.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/Var.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/eval/DefaultRuleTaskFactory.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/eval/RuleState.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/JoinTask.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/LocalJoinTask.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/resources/JournalIndex.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/resources/MoveTask.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/resources/StoreManager.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/resources/ViewMetadata.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/AbstractService.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/CommitTimeIndex.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/LoadBalancerService.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/ndx/RawDataServiceTupleIterator.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/proxy/RemoteAsynchronousIteratorImpl.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/proxy/RemoteChunk.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/sparse/AbstractAtomicRowReadOrWrite.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/sparse/SparseRowStore.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/sparse/TPSTupleSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/striterator/IKeyOrder.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
    branches/bugfix-btm/bigdata/src/resources/logging/log4j.properties
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/AbstractBTreeTestCase.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/AbstractIndexSegmentTestCase.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestAll_IndexSegment.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestBigdataMap.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentBuilderWithLargeTrees.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentBuilderWithSmallTree.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestLeafSplitShortestSeparatorKey.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/keys/AbstractUnicodeKeyBuilderTestCase.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/keys/TestKeyBuilder.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/journal/TestAll.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/journal/TestRootBlockView.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/relation/accesspath/TestSameVariableConstraint.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/relation/rule/TestRule.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/search/TestAll.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/search/TestSearchRestartSafe.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/service/TestResourceService.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/sparse/TestAll.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/test/ExperimentDriver.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/util/concurrent/TestAll.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/benchmark/ThroughputMaster.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java
    branches/bugfix-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/axioms/Axioms.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesPIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesPOIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesSPIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesSPOIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/FullyBufferedJustificationIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/Justification.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/OwlSameAsPropertiesExpandingIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/SPOAssertionBuffer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/TruthMaintenance.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataRDFFullTextIndex.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIndexCodes.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermWriteProc.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/KVOTermIdComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteProc.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteTask.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/IMagicTuple.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/IRISUtils.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicAccessPath.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicIndexWriteProc.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicKeyOrder.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicPredicate.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicRelation.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicTuple.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResourceImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueIdComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/StatementEnum.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/TermIdComparator2.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/NQuadsParser.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleDistinctTermScan.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_11_13.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_3_5_6_7_9.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_5_6_7_9.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctMultiTermAdvancer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctSPOIterator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctTermAdvancer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/JustificationRemover.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/JustificationTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/OSPComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/POSComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOAccessPath.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOIndexWriteProc.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOKeyOrder.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOPredicate.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOSortKeyBuilder.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOStarJoin.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/ScaleOutTripleStore.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/axioms/TestAxioms.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestAddTerms.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestComparators.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestCompletionScan.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestFullTextIndex.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestTerm2IdTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestVocabulary.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestIRIS.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestMagicKeyOrderStrategy.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestMagicStore.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/model/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestRDFXMLInterchangeWithStatementIdentifiers.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDistinctTermScan.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestJustifications.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestOptionals.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleExpansion.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestSlice.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestTruthMaintenance.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestDefaultGraphAccessPath.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOAccessPath.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOKeyCoders.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOKeyOrder.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOPredicate.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOStarJoin.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractDistributedTripleStoreTestCase.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractEmbeddedTripleStoreTestCase.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractTestCase.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestBulkFilter.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestRestartSafe.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestStatementIdentifiers.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestTripleStore.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestTripleStoreBasics.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataConstructIterator.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStatistics.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl2.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/FreeTextSearchExpander.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/HitConvertor.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestAll.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestJoinScope.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestProvenanceQuery.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestQuery.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestSetBinding.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest2.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/stress/LoadClosureAndQueryTest.java
    branches/bugfix-btm/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
    branches/bugfix-btm/build.properties
    branches/bugfix-btm/build.xml
    branches/bugfix-btm/src/resources/bin/pstart
    branches/bugfix-btm/src/resources/config/bigdataCluster.config
    branches/bugfix-btm/src/resources/config/bigdataCluster16.config
    branches/bugfix-btm/src/resources/config/jini/reggie.config
    branches/bugfix-btm/src/resources/config/standalone/bigdataStandalone.config
    branches/bugfix-btm/src/resources/scripts/archiveRun.sh
    branches/bugfix-btm/src/resources/scripts/bigdata
    branches/bugfix-btm/src/resources/scripts/extractCounters.sh

Added Paths:
-----------
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentMultiBlockIterator.java
    branches/bugfix-btm/bigdata/src/releases/RELEASE_0_83_0.txt
    branches/bugfix-btm/bigdata/src/releases/RELEASE_0_83_1.txt
    branches/bugfix-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentMultiBlockIterators.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr/ServiceInfo.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/DiscoveryTool.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/disco.config
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/logging.properties
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/Util.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config/ConfigDeployUtil.java
    branches/bugfix-btm/bigdata-perf/bsbm/
    branches/bugfix-btm/bigdata-perf/bsbm/RWStore.properties
    branches/bugfix-btm/bigdata-perf/bsbm/WORMStore.properties
    branches/bugfix-btm/bigdata-perf/bsbm/build.properties
    branches/bugfix-btm/bigdata-perf/bsbm/build.xml
    branches/bugfix-btm/bigdata-perf/bsbm/lib/
    branches/bugfix-btm/bigdata-perf/bsbm/lib/jdom.jar
    branches/bugfix-btm/bigdata-perf/bsbm/lib/log4j-1.2.12.jar
    branches/bugfix-btm/bigdata-perf/bsbm/lib/ssj.jar
    branches/bugfix-btm/bigdata-perf/bsbm/src/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/DateGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/Generator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistRangeGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ParetoDistGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/RandomBucket.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/TextGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ValueGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/BSBMResource.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Offer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Person.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Producer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Product.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductFeature.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductType.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/RatingSite.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Review.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Vendor.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/Qualification.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QualificationDefaultValues.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QueryResult.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/NTriples.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/ObjectBundle.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/SQLSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Serializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/TriG.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Turtle.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/VirtSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/XMLSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/AbstractParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientManager.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientThread.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQuery.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQueryMix.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/LocalSPARQLParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/NetQuery.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/PreCalcParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/Query.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/QueryMix.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SPARQLConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ServerConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriver.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriverDefaultValues.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/tools/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/tools/ResultTransform.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/BSBM.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/DC.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/FOAF.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/ISO3166.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDF.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDFS.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/REV.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/XSD.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/givennames.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/ignoreQueries.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-original.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-rewritten.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9-original.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/querymix.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/titlewords.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/logging/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/logging/log4j.properties
    branches/bugfix-btm/bigdata-perf/bsbm/src/test/
    branches/bugfix-btm/bigdata-perf/bsbm/src/test/benchmark/
    branches/bugfix-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/
    branches/bugfix-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/TestBSBM.java
    branches/bugfix-btm/bigdata-perf/lubm/
    branches/bugfix-btm/bigdata-perf/lubm/LEGAL/
    branches/bugfix-btm/bigdata-perf/lubm/LEGAL/LICENSE.txt
    branches/bugfix-btm/bigdata-perf/lubm/README.txt
    branches/bugfix-btm/bigdata-perf/lubm/RWStore.properties
    branches/bugfix-btm/bigdata-perf/lubm/WORMStore.properties
    branches/bugfix-btm/bigdata-perf/lubm/build.properties
    branches/bugfix-btm/bigdata-perf/lubm/build.xml
    branches/bugfix-btm/bigdata-perf/lubm/lib/
    branches/bugfix-btm/bigdata-perf/lubm/src/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/CompressEnum.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/DamlWriter.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Generator.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/OwlWriter.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/RdfWriter.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Writer.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/readme.txt
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/ConfigParser.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbConfigParser.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbSpecification.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryConfigParser.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QuerySpecification.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryTestResult.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/RepositoryCreator.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Atom.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Query.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/QueryResult.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Repository.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/RepositoryFactory.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepository.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepositoryFactory.java
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.dldb
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.sesame
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.dldb
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.sesame
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/readme.txt
    branches/bugfix-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/univ-bench.owl
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/answers (U1)/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query14.txt
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query6.txt
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query8.txt
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/answers (U1)/reference query answers.url
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.kb.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query1.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query10.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query14.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query2.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query3.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query4.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query6.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query8-9.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query8.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query9.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.queryJDS.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query_fastOnly.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/config.query_slowOnly.sparql
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/config/univ-bench.owl
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/logging/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/logging/log4j.properties
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/scripts/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/scripts/lubmClientGen.sh
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/scripts/lubmGen.sh
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/scripts/lubmMaster.sh
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/scripts/lubmQuery.sh
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractBNodeIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractInlineIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractLiteralIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEFlags.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DummyIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/ExtensionIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/NullIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/NumericBNodeIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/TermId.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/UUIDBNodeIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/UUIDLiteralIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDBooleanIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDByteIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDDecimalIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDDoubleIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDFloatIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDIntIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDIntegerIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDLongIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDShortIV.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/AbstractInlineConstraint.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineEQ.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineGE.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineGT.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineLE.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineLT.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineNE.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/package.html
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/TermIVComparator.java
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/rule/
    branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/rule/BindingSetSortKeyBuilder.java
    branches/bugfix-btm/bigdata-rdf/src/samples/
    branches/bugfix-btm/bigdata-rdf/src/samples/com/
    branches/bugfix-btm/bigdata-rdf/src/samples/com/bigdata/
    branches/bugfix-btm/bigdata-rdf/src/samples/com/bigdata/rdf/
    branches/bugfix-btm/bigdata-rdf/src/samples/com/bigdata/rdf/internal/
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/BlobOverflowHandler.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/ColorsEnumExtension.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/EpochExtension.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/SampleExtensionFactory.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestIVCompare.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestLongLiterals.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestInlineConstraints.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestInlining.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestAll.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/model/TestFactory.java
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/relation/
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/relation/rule/
    branches/bugfix-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreWithoutInlining.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSidsWithoutInlining.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestInlineValues.java
    branches/bugfix-btm/src/resources/bin/disco-tool
    branches/bugfix-btm/src/resources/scripts/broadcast_sighup

Removed Paths:
-------------
    branches/bugfix-btm/bigdata/src/architecture/scale-out-perf.txt
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/AddressSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/ISplitHandler.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/ReadOnlyMetadataIndexView.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/relation/rule/BindingSetSortKeyBuilder.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceClient.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java
    branches/bugfix-btm/bigdata/src/java/com/bigdata/service/ndx/DataServiceIndex.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/service/TestLDS.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/util/concurrent/ParallelismLimitedExecutorService.java
    branches/bugfix-btm/bigdata/src/test/com/bigdata/util/concurrent/TestParallelismLimitedExecutorService.java
    branches/bugfix-btm/bigdata-bsbm/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr/ServiceInfo.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/DiscoveryTool.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/disco.config
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/logging.properties
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config/ConfigDeployUtil.java
    branches/bugfix-btm/bigdata-lubm/
    branches/bugfix-btm/bigdata-perf/bsbm/RWStore.properties
    branches/bugfix-btm/bigdata-perf/bsbm/WORMStore.properties
    branches/bugfix-btm/bigdata-perf/bsbm/build.properties
    branches/bugfix-btm/bigdata-perf/bsbm/build.xml
    branches/bugfix-btm/bigdata-perf/bsbm/lib/
    branches/bugfix-btm/bigdata-perf/bsbm/lib/jdom.jar
    branches/bugfix-btm/bigdata-perf/bsbm/lib/log4j-1.2.12.jar
    branches/bugfix-btm/bigdata-perf/bsbm/lib/ssj.jar
    branches/bugfix-btm/bigdata-perf/bsbm/src/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/DateGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/Generator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistRangeGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ParetoDistGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/RandomBucket.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/TextGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ValueGenerator.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/BSBMResource.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Offer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Person.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Producer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Product.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductFeature.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductType.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/RatingSite.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Review.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/model/Vendor.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/Qualification.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QualificationDefaultValues.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QueryResult.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/NTriples.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/ObjectBundle.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/SQLSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Serializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/TriG.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Turtle.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/VirtSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/XMLSerializer.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/AbstractParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientManager.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientThread.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQuery.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQueryMix.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/LocalSPARQLParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/NetQuery.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/PreCalcParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/Query.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/QueryMix.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SPARQLConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLParameterPool.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ServerConnection.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriver.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriverDefaultValues.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/tools/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/tools/ResultTransform.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/BSBM.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/DC.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/FOAF.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/ISO3166.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDF.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDFS.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/REV.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/XSD.java
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/givennames.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/ignoreQueries.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-original.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-rewritten.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6desc.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6valid.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7.txt
    branches/bugfix-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7des...
 
[truncated message content]

[Bigdata-commit] SF.net SVN: bigdata:[3340] branches/dev-btm

From: <btm...@us...> - 2010-07-29 12:58:08

Revision: 3340
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3340&view=rev
Author:   btmurphy
Date:     2010-07-29 12:57:54 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
merge -r:3267:HEAD(3339) ~/trunk/bigdata ~/bigdata/branches/dev-btm [trunk --> branch dev-btm]

Modified Paths:
--------------
    branches/dev-btm/.classpath
    branches/dev-btm/bigdata/src/architecture/mergePriority.xls
    branches/dev-btm/bigdata/src/java/com/bigdata/LRUNexus.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/Checkpoint.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/DefaultTupleSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IndexSegment.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentStore.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/NOPTupleSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/NodeSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/keys/IKeyBuilder.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/keys/KeyBuilder.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/proc/AbstractKeyArrayIndexProcedure.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/view/FusedView.java
    branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
    branches/dev-btm/bigdata/src/java/com/bigdata/io/DirectBufferPool.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/AbstractBufferStrategy.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/BufferMode.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/CommitRecordIndex.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/FileMetadata.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/Name2Addr.java
    branches/dev-btm/bigdata/src/java/com/bigdata/journal/Options.java
    branches/dev-btm/bigdata/src/java/com/bigdata/mdi/IndexPartitionCause.java
    branches/dev-btm/bigdata/src/java/com/bigdata/mdi/MetadataIndex.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/IRelation.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/accesspath/SameVariableConstraint.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/locator/DefaultResourceLocator.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/IPredicate.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/Rule.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/Var.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/eval/DefaultRuleTaskFactory.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/eval/RuleState.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/JoinTask.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/LocalJoinTask.java
    branches/dev-btm/bigdata/src/java/com/bigdata/resources/JournalIndex.java
    branches/dev-btm/bigdata/src/java/com/bigdata/resources/StoreManager.java
    branches/dev-btm/bigdata/src/java/com/bigdata/resources/ViewMetadata.java
    branches/dev-btm/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractService.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/CommitTimeIndex.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/LoadBalancerService.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/ndx/RawDataServiceTupleIterator.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/proxy/RemoteAsynchronousIteratorImpl.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/proxy/RemoteChunk.java
    branches/dev-btm/bigdata/src/java/com/bigdata/sparse/AbstractAtomicRowReadOrWrite.java
    branches/dev-btm/bigdata/src/java/com/bigdata/sparse/SparseRowStore.java
    branches/dev-btm/bigdata/src/java/com/bigdata/sparse/TPSTupleSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/striterator/IKeyOrder.java
    branches/dev-btm/bigdata/src/resources/logging/log4j.properties
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/AbstractBTreeTestCase.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/AbstractIndexSegmentTestCase.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestAll_IndexSegment.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestBigdataMap.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentBuilderWithLargeTrees.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentBuilderWithSmallTree.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestLeafSplitShortestSeparatorKey.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/keys/AbstractUnicodeKeyBuilderTestCase.java
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/keys/TestKeyBuilder.java
    branches/dev-btm/bigdata/src/test/com/bigdata/journal/TestAll.java
    branches/dev-btm/bigdata/src/test/com/bigdata/journal/TestRootBlockView.java
    branches/dev-btm/bigdata/src/test/com/bigdata/relation/accesspath/TestSameVariableConstraint.java
    branches/dev-btm/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java
    branches/dev-btm/bigdata/src/test/com/bigdata/relation/rule/TestRule.java
    branches/dev-btm/bigdata/src/test/com/bigdata/search/TestAll.java
    branches/dev-btm/bigdata/src/test/com/bigdata/search/TestSearchRestartSafe.java
    branches/dev-btm/bigdata/src/test/com/bigdata/sparse/TestAll.java
    branches/dev-btm/bigdata/src/test/com/bigdata/util/concurrent/TestAll.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/benchmark/ThroughputMaster.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/axioms/Axioms.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesPIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesPOIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesSPIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainOwlSameAsPropertiesSPOIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/FullyBufferedJustificationIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/Justification.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/OwlSameAsPropertiesExpandingIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/SPOAssertionBuffer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/inf/TruthMaintenance.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataRDFFullTextIndex.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIndexCodes.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermWriteProc.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/KVOTermIdComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteProc.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteTask.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/IMagicTuple.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/IRISUtils.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicAccessPath.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicIndexWriteProc.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicKeyOrder.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicPredicate.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicRelation.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicTuple.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/magic/MagicTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResourceImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueIdComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/StatementEnum.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/TermIdComparator2.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/NQuadsParser.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleDistinctTermScan.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_11_13.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_3_5_6_7_9.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_5_6_7_9.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctMultiTermAdvancer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctSPOIterator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctTermAdvancer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/JustificationRemover.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/JustificationTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/OSPComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/POSComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOAccessPath.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOIndexWriteProc.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOKeyOrder.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOPredicate.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOSortKeyBuilder.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOStarJoin.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/ScaleOutTripleStore.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/axioms/TestAxioms.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestAddTerms.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestComparators.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestCompletionScan.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestFullTextIndex.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestTerm2IdTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestVocabulary.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestIRIS.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestMagicKeyOrderStrategy.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestMagicStore.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/model/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestRDFXMLInterchangeWithStatementIdentifiers.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDistinctTermScan.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestJustifications.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestOptionals.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleExpansion.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestSlice.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestTruthMaintenance.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestDefaultGraphAccessPath.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOAccessPath.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOKeyCoders.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOKeyOrder.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOPredicate.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOStarJoin.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractDistributedTripleStoreTestCase.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractEmbeddedTripleStoreTestCase.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractTestCase.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestBulkFilter.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestRestartSafe.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestStatementIdentifiers.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestTripleStore.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestTripleStoreBasics.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataConstructIterator.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStatistics.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl2.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/FreeTextSearchExpander.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/HitConvertor.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestAll.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestJoinScope.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestProvenanceQuery.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestQuery.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestSetBinding.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest2.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/stress/LoadClosureAndQueryTest.java
    branches/dev-btm/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
    branches/dev-btm/build.properties
    branches/dev-btm/src/resources/config/bigdataCluster.config
    branches/dev-btm/src/resources/config/bigdataCluster16.config
    branches/dev-btm/src/resources/config/standalone/bigdataStandalone.config
    branches/dev-btm/src/resources/scripts/archiveRun.sh
    branches/dev-btm/src/resources/scripts/bigdata
    branches/dev-btm/src/resources/scripts/extractCounters.sh

Added Paths:
-----------
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IndexSegmentMultiBlockIterator.java
    branches/dev-btm/bigdata/src/releases/RELEASE_0_83_0.txt
    branches/dev-btm/bigdata/src/releases/RELEASE_0_83_1.txt
    branches/dev-btm/bigdata/src/test/com/bigdata/btree/TestIndexSegmentMultiBlockIterators.java
    branches/dev-btm/bigdata-perf/bsbm/
    branches/dev-btm/bigdata-perf/bsbm/RWStore.properties
    branches/dev-btm/bigdata-perf/bsbm/WORMStore.properties
    branches/dev-btm/bigdata-perf/bsbm/build.properties
    branches/dev-btm/bigdata-perf/bsbm/build.xml
    branches/dev-btm/bigdata-perf/bsbm/lib/
    branches/dev-btm/bigdata-perf/bsbm/lib/jdom.jar
    branches/dev-btm/bigdata-perf/bsbm/lib/log4j-1.2.12.jar
    branches/dev-btm/bigdata-perf/bsbm/lib/ssj.jar
    branches/dev-btm/bigdata-perf/bsbm/src/
    branches/dev-btm/bigdata-perf/bsbm/src/java/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/DateGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/Generator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistRangeGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ParetoDistGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/RandomBucket.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/TextGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ValueGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/BSBMResource.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Offer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Person.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Producer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Product.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductFeature.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductType.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/RatingSite.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Review.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Vendor.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/Qualification.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QualificationDefaultValues.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QueryResult.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/NTriples.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/ObjectBundle.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/SQLSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Serializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/TriG.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Turtle.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/VirtSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/XMLSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/AbstractParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientManager.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientThread.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQuery.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQueryMix.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/LocalSPARQLParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/NetQuery.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/PreCalcParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/Query.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/QueryMix.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SPARQLConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ServerConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriver.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriverDefaultValues.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/tools/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/tools/ResultTransform.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/BSBM.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/DC.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/FOAF.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/ISO3166.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDF.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDFS.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/REV.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/XSD.java
    branches/dev-btm/bigdata-perf/bsbm/src/resources/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/givennames.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/ignoreQueries.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-original.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-rewritten.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9-original.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/querymix.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/titlewords.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/logging/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/logging/log4j.properties
    branches/dev-btm/bigdata-perf/bsbm/src/test/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/TestBSBM.java
    branches/dev-btm/bigdata-perf/lubm/
    branches/dev-btm/bigdata-perf/lubm/LEGAL/
    branches/dev-btm/bigdata-perf/lubm/LEGAL/LICENSE.txt
    branches/dev-btm/bigdata-perf/lubm/README.txt
    branches/dev-btm/bigdata-perf/lubm/RWStore.properties
    branches/dev-btm/bigdata-perf/lubm/WORMStore.properties
    branches/dev-btm/bigdata-perf/lubm/build.properties
    branches/dev-btm/bigdata-perf/lubm/build.xml
    branches/dev-btm/bigdata-perf/lubm/lib/
    branches/dev-btm/bigdata-perf/lubm/src/
    branches/dev-btm/bigdata-perf/lubm/src/java/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/CompressEnum.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/DamlWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Generator.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/OwlWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/RdfWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Writer.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/readme.txt
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/ConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbSpecification.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QuerySpecification.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryTestResult.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/RepositoryCreator.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Atom.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Query.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/QueryResult.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Repository.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/RepositoryFactory.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepository.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepositoryFactory.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.dldb
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.sesame
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.dldb
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.sesame
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/readme.txt
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/univ-bench.owl
    branches/dev-btm/bigdata-perf/lubm/src/resources/
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query14.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query6.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query8.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/reference query answers.url
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.kb.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query1.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query10.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query14.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query2.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query3.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query4.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query6.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query8-9.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query8.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query9.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.queryJDS.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query_fastOnly.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query_slowOnly.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/univ-bench.owl
    branches/dev-btm/bigdata-perf/lubm/src/resources/logging/
    branches/dev-btm/bigdata-perf/lubm/src/resources/logging/log4j.properties
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/lubmClientGen.sh
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/lubmGen.sh
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/lubmMaster.sh
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/lubmQuery.sh
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractBNodeIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractInlineIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/AbstractLiteralIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEFlags.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/DummyIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/ExtensionIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/NullIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/NumericBNodeIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/TermId.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/UUIDBNodeIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/UUIDLiteralIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDBooleanIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDByteIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDDecimalIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDDoubleIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDFloatIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDIntIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDIntegerIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDLongIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDShortIV.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/AbstractInlineConstraint.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineEQ.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineGE.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineGT.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineLE.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineLT.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineNE.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/internal/package.html
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/model/TermIVComparator.java
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/rule/
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/relation/rule/BindingSetSortKeyBuilder.java
    branches/dev-btm/bigdata-rdf/src/samples/
    branches/dev-btm/bigdata-rdf/src/samples/com/
    branches/dev-btm/bigdata-rdf/src/samples/com/bigdata/
    branches/dev-btm/bigdata-rdf/src/samples/com/bigdata/rdf/
    branches/dev-btm/bigdata-rdf/src/samples/com/bigdata/rdf/internal/
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/BlobOverflowHandler.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/ColorsEnumExtension.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/EpochExtension.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/SampleExtensionFactory.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestIVCompare.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestLongLiterals.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestInlineConstraints.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/lexicon/TestInlining.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/magic/TestAll.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/model/TestFactory.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/relation/
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/relation/rule/
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreWithoutInlining.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSidsWithoutInlining.java
    branches/dev-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestInlineValues.java
    branches/dev-btm/src/resources/scripts/broadcast_sighup

Removed Paths:
-------------
    branches/dev-btm/bigdata/src/architecture/scale-out-perf.txt
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/AddressSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/ISplitHandler.java
    branches/dev-btm/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java
    branches/dev-btm/bigdata/src/java/com/bigdata/mdi/ReadOnlyMetadataIndexView.java
    branches/dev-btm/bigdata/src/java/com/bigdata/relation/rule/BindingSetSortKeyBuilder.java
    branches/dev-btm/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceClient.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/ndx/DataServiceIndex.java
    branches/dev-btm/bigdata/src/test/com/bigdata/service/TestLDS.java
    branches/dev-btm/bigdata/src/test/com/bigdata/util/concurrent/ParallelismLimitedExecutorService.java
    branches/dev-btm/bigdata/src/test/com/bigdata/util/concurrent/TestParallelismLimitedExecutorService.java
    branches/dev-btm/bigdata-bsbm/
    branches/dev-btm/bigdata-lubm/
    branches/dev-btm/bigdata-perf/bsbm/RWStore.properties
    branches/dev-btm/bigdata-perf/bsbm/WORMStore.properties
    branches/dev-btm/bigdata-perf/bsbm/build.properties
    branches/dev-btm/bigdata-perf/bsbm/build.xml
    branches/dev-btm/bigdata-perf/bsbm/lib/
    branches/dev-btm/bigdata-perf/bsbm/lib/jdom.jar
    branches/dev-btm/bigdata-perf/bsbm/lib/log4j-1.2.12.jar
    branches/dev-btm/bigdata-perf/bsbm/lib/ssj.jar
    branches/dev-btm/bigdata-perf/bsbm/src/
    branches/dev-btm/bigdata-perf/bsbm/src/java/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/DateGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/Generator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/NormalDistRangeGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ParetoDistGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/RandomBucket.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/TextGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/generator/ValueGenerator.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/BSBMResource.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Offer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Person.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Producer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Product.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductFeature.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/ProductType.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/RatingSite.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Review.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/model/Vendor.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/Qualification.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QualificationDefaultValues.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/qualification/QueryResult.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/NTriples.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/ObjectBundle.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/SQLSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Serializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/TriG.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/Turtle.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/VirtSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/serializer/XMLSerializer.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/AbstractParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientManager.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ClientThread.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQuery.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/CompiledQueryMix.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/LocalSPARQLParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/NetQuery.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/PreCalcParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/Query.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/QueryMix.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SPARQLConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/SQLParameterPool.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/ServerConnection.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriver.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/testdriver/TestDriverDefaultValues.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/tools/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/tools/ResultTransform.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/BSBM.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/DC.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/FOAF.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/ISO3166.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDF.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/RDFS.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/REV.java
    branches/dev-btm/bigdata-perf/bsbm/src/java/benchmark/vocabulary/XSD.java
    branches/dev-btm/bigdata-perf/bsbm/src/resources/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/givennames.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/ignoreQueries.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query10valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query11valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query12valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query1valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query2valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query3valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-original.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4-rewritten.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query4valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query5valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query6valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query7valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query8valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9-original.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9desc.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9valid.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/querymix.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/bsbm-data/titlewords.txt
    branches/dev-btm/bigdata-perf/bsbm/src/resources/logging/
    branches/dev-btm/bigdata-perf/bsbm/src/resources/logging/log4j.properties
    branches/dev-btm/bigdata-perf/bsbm/src/test/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/
    branches/dev-btm/bigdata-perf/bsbm/src/test/benchmark/bigdata/TestBSBM.java
    branches/dev-btm/bigdata-perf/lubm/LEGAL/
    branches/dev-btm/bigdata-perf/lubm/LEGAL/LICENSE.txt
    branches/dev-btm/bigdata-perf/lubm/README.txt
    branches/dev-btm/bigdata-perf/lubm/RWStore.properties
    branches/dev-btm/bigdata-perf/lubm/WORMStore.properties
    branches/dev-btm/bigdata-perf/lubm/build.properties
    branches/dev-btm/bigdata-perf/lubm/build.xml
    branches/dev-btm/bigdata-perf/lubm/lib/
    branches/dev-btm/bigdata-perf/lubm/src/
    branches/dev-btm/bigdata-perf/lubm/src/java/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/CompressEnum.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/DamlWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Generator.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/OwlWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/RdfWriter.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/Writer.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/readme.txt
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/ConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/KbSpecification.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryConfigParser.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QuerySpecification.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/QueryTestResult.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/RepositoryCreator.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Atom.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Query.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/QueryResult.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/Repository.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/RepositoryFactory.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepository.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/SparqlRepositoryFactory.java
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.dldb
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.kb.example.sesame
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.dldb
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/config.query.example.sesame
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/readme.txt
    branches/dev-btm/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/univ-bench.owl
    branches/dev-btm/bigdata-perf/lubm/src/resources/
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query14.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query6.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/answers_query8.txt
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/reference query answers.url
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.kb.sparql
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/config.query.sparql
    branches/dev-btm/bigdata-perf/l...
 
[truncated message content]

[Bigdata-commit] SF.net SVN: bigdata:[3339] trunk/bigdata/src/java/com/bigdata/journal/ DiskOnlyStrategy.java

From: <mar...@us...> - 2010-07-29 12:11:09

Revision: 3339
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3339&view=rev
Author:   martyncutcher
Date:     2010-07-29 12:11:02 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
remove commit overide to flush the write cache.  This has introduced some IO concurrency errors.

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java

Modified: trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-28 21:14:27 UTC (rev 3338)
+++ trunk/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java	2010-07-29 12:11:02 UTC (rev 3339)
@@ -472,15 +472,6 @@
     }
     
     /**
-     * Flushes the write cache (if enabled).
-     */
-    public void commit() {
-
-        flushWriteCache();
-
-    }
-
-    /**
      * Writes the {@link #writeCache} through to the disk and its position is
      * reset to zero.
      * <p>


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

[Bigdata-commit] SF.net SVN: bigdata:[3338] trunk

From: <btm...@us...> - 2010-07-28 21:14:34

Revision: 3338
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3338&view=rev
Author:   btmurphy
Date:     2010-07-28 21:14:27 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
[trunk]: trac #126 - Uses of InetAddress.getLocalAddress should be changed to a mechanism that returns a non-loopback address

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
    trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java
    trunk/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
    trunk/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
    trunk/bigdata/src/test/com/bigdata/service/TestResourceService.java
    trunk/bigdata/src/test/com/bigdata/test/ExperimentDriver.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
    trunk/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java
    trunk/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
    trunk/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java
    trunk/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java
    trunk/build.xml
    trunk/src/resources/bin/pstart

Modified: trunk/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -48,6 +48,7 @@
 import com.bigdata.counters.win.StatisticsCollectorForWindows;
 import com.bigdata.io.DirectBufferPool;
 import com.bigdata.rawstore.Bytes;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.util.httpd.AbstractHTTPD;
 
 /**
@@ -64,7 +65,6 @@
  * and Un*x platforms so as to support the declared counters on all platforms.
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
  */
 abstract public class AbstractStatisticsCollector implements IStatisticsCollector {
 
@@ -83,32 +83,10 @@
     
     	String s;
         try {
-
-//            hostname = InetAddress.getLocalHost().getHostName();
-            
-            s = InetAddress.getLocalHost().getCanonicalHostName();
-            
-        } catch (UnknownHostException e) {
-        
-        	try {
-        	
-        		s = InetAddress.getLocalHost().getHostName();
-        		
-        	} catch(UnknownHostException e2) {
-
-				final String msg = "Could not resolve hostname";
-				try {
-					log.error(msg);
-        		} catch(Throwable t) {
-        			System.err.println(msg);
-        		}
-        		
-        		s = "localhost";
-
-        		//throw new AssertionError(e);
-        		
-        	}
-            
+            s = NicUtil.getIpAddress("default.nic", "default", false);
+        } catch(Throwable t) {//for now, maintain same failure logic as used previously
+            t.printStackTrace();
+            s = NicUtil.getIpAddressByLocalHost();
         }
         
         fullyQualifiedHostName = s;
@@ -520,7 +498,6 @@
      * Options for {@link AbstractStatisticsCollector}
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     public interface Options {
         

Modified: trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -63,6 +63,7 @@
 import com.bigdata.service.IMetadataService;
 import com.bigdata.service.MetadataService;
 import com.bigdata.service.ResourceService;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Task moves an index partition to another {@link IDataService}.
@@ -155,7 +156,6 @@
  * need to do the atomic update phase.  
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
  */
 public class MoveTask extends AbstractPrepareTask<MoveResult> {
     
@@ -421,7 +421,6 @@
      * successful.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      * 
      * @todo optimization to NOT send an empty index segment if there are no
      *       buffered writes on the live journal.
@@ -434,6 +433,7 @@
         private final UUID targetDataServiceUUID;
         private final int targetIndexPartitionId;
         private final Event parentEvent;
+        private final InetAddress thisInetAddr;
         
         /**
          * 
@@ -481,6 +481,11 @@
             this.targetIndexPartitionId = targetIndexPartitionId;
             this.parentEvent = parentEvent;
 
+            try {
+                this.thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", false));
+            } catch(Throwable t) {
+                throw new IllegalArgumentException(t.getMessage(), t);
+            }
         }
 
         /**
@@ -591,7 +596,7 @@
                                                     targetIndexPartitionId,//
                                                     historicalWritesBuildResult.segmentMetadata,//
                                                     bufferedWritesBuildResult.segmentMetadata,//
-                                                    InetAddress.getLocalHost(),//
+                                                    thisInetAddr,
                                                     resourceManager
                                                             .getResourceServicePort()//
                                             )).get();
@@ -856,7 +861,6 @@
      * until the "receive" operation is complete.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     private static class IsIndexRegistered_UsingWriteService implements
             IIndexProcedure {
@@ -896,7 +900,6 @@
      * @see InnerReceiveIndexPartitionTask
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     protected static class ReceiveIndexPartitionTask extends DataServiceCallable<Void> {
 
@@ -1039,7 +1042,6 @@
      * source data service.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     private static class InnerReceiveIndexPartitionTask extends AbstractTask<Void> {
         

Modified: trunk/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -5,6 +5,8 @@
 import java.util.Properties;
 import java.util.UUID;
 
+import com.bigdata.util.config.NicUtil;
+
 /**
  * Embedded {@link LoadBalancerService}.
  * 
@@ -14,7 +16,7 @@
 abstract public class AbstractEmbeddedLoadBalancerService extends LoadBalancerService {
 
 //    final private UUID serviceUUID;
-    final private String hostname;
+    private String hostname = NicUtil.getIpAddressByLocalHost();//for now, maintain the same failure logic as in constructor
     
     public AbstractEmbeddedLoadBalancerService(UUID serviceUUID,
             Properties properties) {
@@ -28,17 +30,11 @@
         
         setServiceUUID(serviceUUID);
         
-        String hostname;
         try {
-            
-            hostname = Inet4Address.getLocalHost().getCanonicalHostName();
-            
-        } catch (UnknownHostException e) {
-            
-            hostname = "localhost";
-            
+            this.hostname = NicUtil.getIpAddress("default.nic", "default", false);
+        } catch(Throwable t) {
+            t.printStackTrace();
         }
-        this.hostname = hostname;
 
     }
 

Modified: trunk/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -39,6 +39,7 @@
 import com.bigdata.counters.Instrument;
 import com.bigdata.counters.OneShotInstrument;
 import com.bigdata.counters.PeriodEnum;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Utility class for testing {@link CounterSetHTTPD} or
@@ -62,12 +63,10 @@
 
             CounterSet cset = root.makePath("localhost");
 
-            cset.addCounter("hostname", new OneShotInstrument<String>(
-                    InetAddress.getLocalHost().getHostName()));
+            String localIpAddr = NicUtil.getIpAddress("default.nic", "default", true);
+            cset.addCounter("hostname", new OneShotInstrument<String>(localIpAddr));
+            cset.addCounter("ipaddr", new OneShotInstrument<String>(localIpAddr));
 
-            cset.addCounter("ipaddr", new OneShotInstrument<String>(InetAddress
-                    .getLocalHost().getHostAddress()));
-
             // 60 minutes of data : @todo replace with CounterSetBTree (no fixed limit).
             final HistoryInstrument<Double> history1 = new HistoryInstrument<Double>(
                     new History<Double>(new Double[60], PeriodEnum.Minutes

Modified: trunk/bigdata/src/test/com/bigdata/service/TestResourceService.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/service/TestResourceService.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/test/com/bigdata/service/TestResourceService.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -43,6 +43,7 @@
 
 import com.bigdata.service.ResourceService.ReadResourceTask;
 import com.bigdata.util.concurrent.DaemonThreadFactory;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Test verifies the ability to transmit a file using the
@@ -103,14 +104,15 @@
 
         };
 
+        InetAddress thisInetAddr;
+        thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", true));
         try {
 
             service.awaitRunning(100, TimeUnit.MILLISECONDS);
 
             assertTrue(service.isOpen());
 
-            assertEquals(tmpFile, new ReadResourceTask(InetAddress
-                    .getLocalHost(), service.port, allowedUUID, tmpFile).call());
+            assertEquals(tmpFile, new ReadResourceTask(thisInetAddr, service.port, allowedUUID, tmpFile).call());
 
             if (log.isInfoEnabled())
                 log.info(service.counters.getCounters());
@@ -182,6 +184,8 @@
 
         final List<File> tempFiles = new LinkedList<File>();
         
+        InetAddress thisInetAddr;
+        thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", true));
         try {
 
             service.awaitRunning(100, TimeUnit.MILLISECONDS);
@@ -197,8 +201,7 @@
 
                 tempFiles.add(tmpFile);
 
-                tasks.add(new ReadResourceTask(InetAddress.getLocalHost(),
-                        service.port, allowedUUID, tmpFile));
+                tasks.add(new ReadResourceTask(thisInetAddr, service.port, allowedUUID, tmpFile));
 
             }
 

Modified: trunk/bigdata/src/test/com/bigdata/test/ExperimentDriver.java
===================================================================
--- trunk/bigdata/src/test/com/bigdata/test/ExperimentDriver.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata/src/test/com/bigdata/test/ExperimentDriver.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -68,6 +68,7 @@
 
 import com.bigdata.journal.ProxyTestCase;
 import com.bigdata.util.NV;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * A harness for running comparison of different configurations.
@@ -1364,13 +1365,9 @@
         props.setProperty("os.arch.cpus", ""+SystemUtil.numProcessors());
         
         try {
-            
-            props.setProperty("host",InetAddress.getLocalHost().getHostName());
-            
-        } catch(UnknownHostException ex) {
-            /*
-             * ignore.
-             */
+            props.setProperty( "host", NicUtil.getIpAddress("default.nic", "default", true) );
+        } catch(Throwable t) {
+            t.printStackTrace();
         }
         
         return props;

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -78,6 +78,7 @@
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.service.jini.JiniClientConfig;
 import com.bigdata.service.jini.JiniFederation;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZNodeCreatedWatcher;
 
 /**
@@ -130,6 +131,8 @@
     public final Properties properties;
     public final String[] jiniOptions;
     
+    private final String serviceIpAddr;
+    
     protected void toString(StringBuilder sb) {
 
         super.toString(sb);
@@ -175,6 +178,12 @@
         } else {
             log.warn("groups = " + Arrays.toString(this.groups));
         }
+
+        try {
+            this.serviceIpAddr = NicUtil.getIpAddress("default.nic", "default", false);
+        } catch(IOException e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
     }
 
     /**
@@ -471,8 +480,7 @@
 
             final ServiceDir serviceDir = new ServiceDir(this.serviceDir);
 
-            final Hostname hostName = new Hostname(InetAddress.getLocalHost()
-                    .getCanonicalHostName().toString());
+            final Hostname hostName = new Hostname(serviceIpAddr);
 
             final ServiceUUID serviceUUID = new ServiceUUID(this.serviceUUID);
 

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -10,6 +10,7 @@
 import com.bigdata.jini.lookup.entry.ServiceItemFilterChain;
 import com.bigdata.service.IClientService;
 import com.bigdata.service.jini.JiniFederation;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Constraint on the #of {@link IClientService}s on the same host.
@@ -51,11 +52,9 @@
 //		 */
 //        filter.add(ClientServiceFilter.INSTANCE);
 
-        final String hostname = InetAddress.getLocalHost().getHostName();
+        final String hostname = NicUtil.getIpAddress("default.nic", "default", false);
+        final String canonicalHostname = hostname;
 
-        final String canonicalHostname = InetAddress.getLocalHost()
-                .getCanonicalHostName();
-
         // filters for _this_ host.
         filter.add(new HostnameFilter(new Hostname[] {//
                 new Hostname(hostname),//

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -11,6 +11,7 @@
 import com.bigdata.service.IDataService;
 import com.bigdata.service.jini.JiniFederation;
 import com.bigdata.service.jini.lookup.DataServiceFilter;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Constraint on the #of {@link IDataService}s on the same host.
@@ -47,11 +48,9 @@
         // only consider data services.
         filter.add(DataServiceFilter.INSTANCE);
 
-        final String hostname = InetAddress.getLocalHost().getHostName();
+        final String hostname = NicUtil.getIpAddress("default.nic", "default", false);
+        final String canonicalHostname = hostname;
 
-        final String canonicalHostname = InetAddress.getLocalHost()
-                .getCanonicalHostName();
-
         // filters for _this_ host.
         filter.add(new HostnameFilter(new Hostname[] {//
                 new Hostname(hostname),//

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -54,6 +54,7 @@
 import com.bigdata.io.FileLockUtility;
 import com.bigdata.jini.start.IServiceListener;
 import com.bigdata.jini.start.process.ZookeeperProcessHelper;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZooHelper;
 
 /**
@@ -213,6 +214,8 @@
      */
     public final Map<String, String> other;
 
+    private final InetAddress thisInetAddr;
+
     /**
      * Adds value to {@link #other} if found in the {@link Configuration}.
      * 
@@ -318,6 +321,14 @@
         putIfDefined(config, Options.FORCE_SYNC, Boolean.TYPE);
         putIfDefined(config, Options.SKIP_ACL, Boolean.TYPE);
 
+        try {
+            thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", false));
+        } catch(IOException e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
+        if (log.isInfoEnabled()) {
+            log.info("zookeeper host="+thisInetAddr.getCanonicalHostName());
+        }
     }
 
     /**
@@ -541,7 +552,7 @@
          */
         public V call() throws Exception {
 
-            if (ZooHelper.isRunning(InetAddress.getLocalHost(), clientPort)) {
+            if (ZooHelper.isRunning(thisInetAddr, clientPort)) {
 
                 /*
                  * Query for an instance already running on local host at that
@@ -552,7 +563,7 @@
                  * instance on the localhost.
                  */
 
-                ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+                ZooHelper.ruok(thisInetAddr, clientPort);
 
                 throw new ZookeeperRunningException(
                         "Zookeeper already running on localhost: clientport="
@@ -625,7 +636,7 @@
                          * Note: We don't test this until we have the file lock.
                          */
 
-                        ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+                        ZooHelper.ruok(thisInetAddr, clientPort);
 
                         throw new ZookeeperRunningException(
                                 "Zookeeper already running on localhost: clientport="
@@ -727,7 +738,7 @@
              * clientPort. That could have already been true.
              */
 
-            ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+            ZooHelper.ruok(thisInetAddr, clientPort);
 
             // adjust for time remaining.
             nanos = (System.nanoTime() - begin);

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -42,6 +42,7 @@
 import com.bigdata.service.jini.JiniClientConfig;
 import com.bigdata.service.jini.util.JiniServicesHelper;
 import com.bigdata.service.jini.util.LookupStarter;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Class for starting the jini services.
@@ -169,7 +170,7 @@
          */
 
         if (log.isInfoEnabled())
-            log.info("Will start instance: " + InetAddress.getLocalHost()
+            log.info("Will start instance: " + NicUtil.getIpAddress("default.nic", "default", false)
                     + ", config=" + config);
 
         final JiniCoreServicesStarter<JiniCoreServicesProcessHelper> serviceStarter = serviceConfig

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -16,6 +16,7 @@
 import com.bigdata.jini.start.config.ZookeeperServerConfiguration;
 import com.bigdata.jini.start.config.ZookeeperServerEntry;
 import com.bigdata.jini.start.config.ZookeeperServerConfiguration.ZookeeperRunningException;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZooHelper;
 
 /**
@@ -40,6 +41,14 @@
 
     protected final int clientPort;
     
+    protected static InetAddress thisInetAddr = null;
+    static {
+	try {
+            thisInetAddr = InetAddress.getByName
+                    (NicUtil.getIpAddress("default.nic", "default", false));
+	} catch (Throwable t) { /* swallow */ }
+    }
+    
     /**
      * @param name
      * @param builder
@@ -144,11 +153,11 @@
         final ZookeeperServerConfiguration serverConfig = new ZookeeperServerConfiguration(
                 config);
 
-        if (ZooHelper.isRunning(InetAddress.getLocalHost(), serverConfig.clientPort)) {
+        if (ZooHelper.isRunning(thisInetAddr, serverConfig.clientPort)) {
 
             if (log.isInfoEnabled())
                 log.info("Zookeeper already running: "
-                        + InetAddress.getLocalHost().getCanonicalHostName()
+                        + thisInetAddr.getCanonicalHostName()
                         + ":" + serverConfig.clientPort);
 
             // will not consider start.

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -31,6 +31,7 @@
 import com.bigdata.service.jini.util.DumpFederation;
 import com.bigdata.service.jini.util.DumpFederation.FormatRecord;
 import com.bigdata.service.jini.util.DumpFederation.FormatTabTable;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.util.httpd.AbstractHTTPD;
 import com.bigdata.util.httpd.NanoHTTPD;
 import com.bigdata.util.httpd.NanoHTTPD.Response;
@@ -547,15 +548,10 @@
                  * This exception gets thrown if the client has made a direct
                  * (vs RMI) call.
                  */
-
                 try {
-
-                    clientAddr = Inet4Address.getLocalHost();
-
-                } catch (UnknownHostException ex) {
-
-                    return "localhost";
-
+                    clientAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", false));
+                } catch(Throwable t) {//for now, maintain the same failure logic as used previously
+                    return NicUtil.getIpAddressByLocalHost();
                 }
 
             }

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -39,6 +39,7 @@
 import com.bigdata.service.ILoadBalancerService;
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.service.jini.JiniFederation;
+import com.bigdata.util.config.NicUtil;
 import java.net.InetAddress;
 import net.jini.config.Configuration;
 import net.jini.core.entry.Entry;
@@ -158,8 +159,8 @@
 
         // Set up the service template and filter used to identify the service.
 
-        final String hostname = InetAddress.getLocalHost()
-                    .getCanonicalHostName().toString();
+        final String hostname = 
+            NicUtil.getIpAddress("default.nic", "default", false);
         ServiceTemplate template = new ServiceTemplate(null,
                 new Class[] { iface }, null);
         ServiceItemFilter thisHostFilter = null;

Modified: trunk/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -42,6 +42,7 @@
 import org.apache.zookeeper.KeeperException.NoNodeException;
 
 import com.bigdata.jini.start.config.AbstractHostConstraint;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Utility class for issuing the four letter commands to a zookeeper service.
@@ -53,6 +54,14 @@
 
     protected static final Logger log = Logger.getLogger(ZooHelper.class);
     
+    private static InetAddress thisInetAddr = null;
+    static {
+	try {
+            thisInetAddr = InetAddress.getByName
+                    (NicUtil.getIpAddress("default.nic", "default", false));
+	} catch (Throwable t) { /* swallow */ }
+    }
+
     /**
      * Inquires whether a zookeeper instance is running in a non-error state and
      * returns iff the service reports "imok".
@@ -129,7 +138,7 @@
         if (log.isInfoEnabled())
             log.info("Killing service: @ port=" + clientPort);
 
-        final Socket socket = new Socket(InetAddress.getLocalHost(), clientPort);
+        final Socket socket = new Socket(thisInetAddr, clientPort);
 
         try {
     
@@ -180,7 +189,7 @@
         if (log.isInfoEnabled())
             log.info("hostname=" + addr + ", port=" + clientPort);
     
-        final Socket socket = new Socket(InetAddress.getLocalHost(), clientPort);
+        final Socket socket = new Socket(thisInetAddr, clientPort);
     
         try {
     
@@ -251,7 +260,7 @@
         if (log.isInfoEnabled())
             log.info("hostname=" + addr + ", port=" + clientPort);
     
-        final Socket socket = new Socket(InetAddress.getLocalHost(), clientPort);
+        final Socket socket = new Socket(thisInetAddr, clientPort);
     
         try {
     

Modified: trunk/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
===================================================================
--- trunk/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -27,6 +27,7 @@
 
 package com.bigdata.jini.start.config;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -34,6 +35,8 @@
 import junit.framework.TestCase2;
 import net.jini.config.ConfigurationException;
 
+import com.bigdata.util.config.NicUtil;
+
 /**
  * Unit tests for the {@link ZookeeperServerEntry}.
  * 
@@ -97,9 +100,9 @@
      * @throws SocketException 
      * @throws UnknownHostException 
      */
-    public void test002() throws ConfigurationException, SocketException, UnknownHostException {
+    public void test002() throws ConfigurationException, SocketException, UnknownHostException, IOException {
 
-        final String server = InetAddress.getLocalHost().getCanonicalHostName();
+        final String server = NicUtil.getIpAddress("default.nic", "default", true);
         
         final String[] hosts = new String[] {
                 "127.0.0.1",

Modified: trunk/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java
===================================================================
--- trunk/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -45,6 +45,8 @@
 import com.bigdata.service.IDataService;
 import com.bigdata.service.MetadataService;
 import com.sun.jini.tool.ClassServer;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Abstract base class for tests of remote services.
@@ -366,8 +368,7 @@
          */
 
         // get the hostname.
-        InetAddress addr = InetAddress.getLocalHost();
-        String hostname = addr.getHostName();
+        String hostname = NicUtil.getIpAddress("default.nic", "default", true);
 
         // Find the service registrar (unicast protocol).
         final int timeout = 4*1000; // seconds.

Modified: trunk/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
===================================================================
--- trunk/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -36,6 +36,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.bigdata.util.concurrent.DaemonThreadFactory;
+import com.bigdata.util.config.NicUtil;
 
 import edu.lehigh.swat.bench.ubt.api.QueryResult;
 import edu.lehigh.swat.bench.ubt.api.Repository;
@@ -81,9 +82,10 @@
          */
         String hostname;
         try {
-            hostname = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException ex) {
-            hostname = "localhost";
+            hostname = NicUtil.getIpAddress("default.nic", "default", false);
+        } catch(Throwable t) {//for now, maintain same failure logic as used previously
+            t.printStackTrace();
+            s = NicUtil.getIpAddressByLocalHost();
         }
         QUERY_TEST_RESULT_FILE = hostname + "-result.txt";
     	} else {

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -48,6 +48,7 @@
 import com.bigdata.rdf.rio.LoadStats;
 import com.bigdata.rdf.store.DataLoader;
 import com.bigdata.rdf.store.DataLoader.ClosureEnum;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Test harness for loading randomly generated files into a repository.
@@ -588,7 +589,7 @@
          * Write out the repositoryClass and all defined properties.
          */
 //        metricsWriter.write("repositoryClass, "+m_repo.getClass().getName()+"\n");
-        metricsWriter.write("host, "+InetAddress.getLocalHost().getHostName()+"\n");
+        metricsWriter.write("host, "+NicUtil.getIpAddress("default.nic", "default", true)+"\n");
         if(true) {
             Map props = new TreeMap(PropertyUtil.flatten(getProperties()));
             Iterator itr = props.entrySet().iterator();

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java	2010-07-28 21:14:27 UTC (rev 3338)
@@ -50,6 +50,7 @@
 import com.bigdata.service.IDataService;
 import com.bigdata.service.MetadataService;
 import com.bigdata.service.jini.AbstractServer;
+import com.bigdata.util.config.NicUtil;
 import com.sun.jini.tool.ClassServer;
 
 /**
@@ -371,8 +372,7 @@
          */
 
         // get the hostname.
-        InetAddress addr = InetAddress.getLocalHost();
-        String hostname = addr.getHostName();
+        String hostname = NicUtil.getIpAddress("default.nic", "default", true);
 
         // Find the service registrar (unicast protocol).
         final int timeout = 4*1000; // seconds.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/build.xml	2010-07-28 21:14:27 UTC (rev 3338)
@@ -1927,6 +1927,8 @@
 </echo>
       <echo>    policy:       ${java.security.policy}
 </echo>
+      <echo>    default.nic:  ${default.nic}
+</echo>
       <echo>    hostname:     ${this.hostname}
 </echo>
       <echo>    preferIPv4:   ${java.net.preferIPv4Stack}
@@ -1989,6 +1991,7 @@
         <sysproperty key="log4j.path" value="${bigdata.test.log4j.abs.path}"/>
 
         <sysproperty key="app.home" value="${app.home}"/>
+        <sysproperty key="default.nic" value="${default.nic}"/>
 
         <sysproperty key="classserver.jar" value="${dist.lib}/classserver.jar" />
         <sysproperty key="colt.jar" value="${dist.lib}/colt.jar" />

Modified: trunk/src/resources/bin/pstart
===================================================================
--- trunk/src/resources/bin/pstart	2010-07-28 20:47:53 UTC (rev 3337)
+++ trunk/src/resources/bin/pstart	2010-07-28 21:14:27 UTC (rev 3338)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import os, sys, socket, getopt, fcntl, struct
+import os, sys, socket, getopt, struct
 from os.path import dirname
 
 
@@ -47,13 +47,17 @@
         The path to the java.util.logging configuration file
 
     exportNic=<interfacename>
-        Specifies the name of the network interface on which the Jini service
-        will be exported. This property takes precedence over exportHost.
-        The default value is "eth0".
+        Specifies the name of the network interface to use by default
+        for service export and remote communication. This property
+        takes precedence over exportHost. The default value for this
+        property is "eth0".
 
     exportHost=<ipaddress|hostname>
-        Specifies the IP address on which the Jini service(s) will be exported.
-        This property is not used unless exportNic is "".
+        Specifies the IP address or host name to use when exporting
+        services for remote communication. This property will be
+        employed only when the value of the exportNic property
+        is set to the empty string ("") or a value that does not
+        correspond to any of the network interfaces on the system.
 
     bigdata.codebase.host=<interfacename|ipaddress|hostname>
         Specifies the network address of the codebase HTTP server. If the
@@ -71,26 +75,6 @@
     print "Services: \n  " + ", ".join(serviceNames)
 
 
-def get_interface_ipaddress(ifname):
-    """Gets the IP address assigned to a network interface.
-
-       Parameters:
-           ifname The name of he interface whose IP address to get
-
-       Returns:
-           A string contain the IP address of the interface
-    """
-    if sys.platform == "linux2":
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        return socket.inet_ntoa(fcntl.ioctl(
-            s.fileno(),
-            0x8915,  # SIOCGIFADDR
-            struct.pack('256s', ifname[:15])
-        )[20:24])
-    else:
-        raise NotImplementedError("Not implemented for " + sys.platform)
-
-
 class Params:
     def __init__(self):
         self.serviceName = None
@@ -109,9 +93,7 @@
         # The name of the service
         self.serviceName = serviceName
 
-        # appHome is the base directory of the Java applications. In the
-        # source tree this is the top-level "java" directory. This will
-        # always be valid.
+        # appHome is the base directory of the application being started.
         self.appHome = params.appHome
 
         # A dictionary containing all of the Java system properties to set
@@ -155,8 +137,8 @@
         self.properties['bigdata.codebase.host'] = "eth0"
         self.properties['bigdata.codebase.port'] = "8081"
 
-        self.properties['log4j.configuration'] = \
-            "src/resources/config/log4j.properties"
+        self.properties['log4j.configuration'] = os.path.join( \
+            self.appHome,  "var", "config", "logging", "log4j.properties")
         self.properties['log4j.primary.configuration'] = os.path.join( \
             self.appHome,  "var", "config", "logging", \
             serviceName + "-logging.properties")
@@ -170,17 +152,41 @@
         """Using the params.groups, params.mGroups, and params.lookupLocators
            lists, create Java system properties appropriate for the service to
            convey it the information."""
-        if len(params.groups) > 0:
-            self.properties['groupsToJoin'] = \
-                "{\"" + "\",\"".join(params.groups) + "\"}"
+        if sys.platform == "win32":
+            if len(params.groups) > 0:
+                self.properties['groupsToJoin'] = \
+                    "\"" + "{" + \
+                    "\\" + \
+                    "\"" + \
+                    "\\\",\\\"".join(params.groups) + \
+                    "\\" + \
+                    "\"" + \
+                    "}" + "\""
+            else:
+                self.properties['groupsToJoin'] = "\"" + "{}" + "\""
+            if len(params.lookupLocators) > 0:
+                self.properties['locsToJoin'] = \
+                    "\"" + "{" + \
+                    "new LookupLocator(\\\"" + \
+                    "\\\"),new LookupLocator(\\\"".join(params.lookupLocators) + \
+                    "\\" + \
+                    "\"" + \
+                    ")" + \
+                    "}" + "\""
+            else:
+                self.properties['locsToJoin'] = "\"" + "{}" + "\""
         else:
-            self.properties['groupsToJoin'] = "{}"
-        if len(params.lookupLocators) > 0:
-            self.properties['locsToJoin'] = "{new LookupLocator(\"" + \
-                "\"),new LookupLocator(\"".join(params.lookupLocators) + \
-                "\")}"
-        else:
-            self.properties['locsToJoin'] = "{}"
+            if len(params.groups) > 0:
+                self.properties['groupsToJoin'] = \
+                    "{\"" + "\",\"".join(params.groups) + "\"}"
+            else:
+                self.properties['groupsToJoin'] = "{}"
+            if len(params.lookupLocators) > 0:
+                self.properties['locsToJoin'] = "{new LookupLocator(\"" + \
+                    "\"),new LookupLocator(\"".join(params.lookupLocators) + \
+                    "\")}"
+            else:
+                self.properties['locsToJoin'] = "{}"
 
     def setProperties(self, propList):
         for k, v in propList:
@@ -222,7 +228,7 @@
         self.migrateProperties()
 
         # Build the list of command line arguments
-        argList = [ "java", "-cp", ":".join(starterClasspath) ]
+        argList = [ "java", "-cp", os.pathsep.join(starterClasspath) ]
         propNames = self.properties.keys()
         propNames.sort()
         for p in propNames:
@@ -281,22 +287,50 @@
 
         # Construct the ServiceStarter Service Descriptor list
         if params.startCodebaseHttpd and serviceName != "httpd":
-            self.serviceStarterArgs = [
-                "com.sun.jini.start.serviceDescriptors = " + \
-                "new ServiceDescriptor[] { httpdDescriptor, " + \
-                serviceName + "Descriptor }" ]
+            if sys.platform == "win32":
+                self.serviceStarterArgs = [
+                    "\"" + \
+                    "com.sun.jini.start.serviceDescriptors = " + \
+                    "new ServiceDescriptor[] { httpdDescriptor, " + \
+                    serviceName + "Descriptor }" + \
+                    "\"" ]
+            else:
+                self.serviceStarterArgs = [
+                    "com.sun.jini.start.serviceDescriptors = " + \
+                    "new ServiceDescriptor[] { httpdDescriptor, " + \
+                    serviceName + "Descriptor }" ]
         else:
-            self.serviceStarterArgs = [
-                "com.sun.jini.start.serviceDescriptors = " + \
-                "new ServiceDescriptor[] { " + serviceName + "Descriptor }" ]
+            if sys.platform == "win32":
+                self.serviceStarterArgs = [
+                    "\"" + \
+                    "com.sun.jini.start.serviceDescriptors = " + \
+                    "new ServiceDescriptor[] { " + serviceName + "Descriptor }" + \
+                    "\"" ]
+            else:
+                self.serviceStarterArgs = [
+                    "com.sun.jini.start.serviceDescriptors = " + \
+                    "new ServiceDescriptor[] { " + serviceName + "Descriptor }" ]
 
     def setGroupProperties(self):
         BigdataServiceBase.setGroupProperties(self)
-        if len(params.mGroups) > 0:
-            self.properties['memberGroups'] = \
-                "{\"" + "\",\"".join(params.mGroups) + "\"}"
+        if sys.platform == "win32":
+            if len(params.mGroups) > 0:
+                self.properties['memberGroups'] = \
+                    "\"" + "{" + \
+                    "\\" + \
+                    "\"" + \
+                    "\\\",\\\"".join(params.mGroups) + \
+                    "\\" + \
+                    "\"" + \
+                    "}" + "\""
+            else:
+                self.properties['memberGroups'] = "\"" + "{}" + "\""
         else:
-            self.properties['memberGroups'] = "{}"
+            if len(params.mGroups) > 0:
+                self.properties['memberGroups'] = \
+                    "{\"" + "\",\"".join(params.mGroups) + "\"}"
+            else:
+                self.properties['memberGroups'] = "{}"
 
 
 class BigdataMetaservice(BigdataService):
@@ -328,10 +362,18 @@
                     break
 
         # Construct the ServiceStarter Service Descriptor list
-        self.serviceStarterArgs = [
-            "com.sun.jini.start.serviceDescriptors = " + \
-            "new ServiceDescriptor[] {" + \
-            "Descriptor, ".join(services) + "Descriptor}" ]
+        if sys.platform == "win32":
+            self.serviceStarterArgs = [
+                "\"" +
+                "com.sun.jini.start.serviceDescriptors = " + \
+                "new ServiceDescriptor[] {" + \
+                "Descriptor, ".join(services) + "Descriptor}" + \
+                "\"" ]
+        else:
+            self.serviceStarterArgs = [
+                "com.sun.jini.start.serviceDescriptors = " + \
+                "new ServiceDescriptor[] {" + \
+                "Descriptor, ".join(services) + "Descriptor}" ]
 
 
 class BigdataServiceOldLog(BigdataService):
@@ -420,7 +462,7 @@
 
     # BTM - params.appHome = dirname(dirname( os.path.abspath(sys.argv[0])) )
 
-    print "appHome=" + params.appHome
+    # print "appHome=" + params.appHome
 
     # Instiantate the object for the service
     serviceName = args[0]


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

[Bigdata-commit] SF.net SVN: bigdata:[3337] branches/dev-btm

From: <btm...@us...> - 2010-07-28 20:48:02

Revision: 3337
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3337&view=rev
Author:   btmurphy
Date:     2010-07-28 20:47:53 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
[branch dev-btm]: trac #126 - Uses of InetAddress.getLocalAddress should be changed to a mechanism that returns a non-loopback address

Modified Paths:
--------------
    branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
    branches/dev-btm/bigdata/src/java/com/bigdata/resources/MoveTask.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
    branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
    branches/dev-btm/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
    branches/dev-btm/bigdata/src/test/com/bigdata/service/TestResourceService.java
    branches/dev-btm/bigdata/src/test/com/bigdata/test/ExperimentDriver.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/config/executor.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/config/process.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/shard/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/shard/config/shard.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/transaction.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config/ConfigDeployUtil.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config/default-deploy.properties
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java
    branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/service/jini/AbstractServerTestCase.java
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config
    branches/dev-btm/bigdata-lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java
    branches/dev-btm/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractServerTestCase.java
    branches/dev-btm/build.properties
    branches/dev-btm/build.xml
    branches/dev-btm/src/resources/bin/config/browser.config
    branches/dev-btm/src/resources/bin/pstart
    branches/dev-btm/src/resources/config/bigdataCluster.config
    branches/dev-btm/src/resources/config/jini/reggie.config
    branches/dev-btm/src/resources/scripts/bigdataup

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -48,6 +48,8 @@
 import com.bigdata.counters.win.StatisticsCollectorForWindows;
 import com.bigdata.io.DirectBufferPool;
 import com.bigdata.rawstore.Bytes;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.util.httpd.AbstractHTTPD;
 
 /**
@@ -64,7 +66,6 @@
  * and Un*x platforms so as to support the declared counters on all platforms.
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
  */
 abstract public class AbstractStatisticsCollector implements IStatisticsCollector {
 
@@ -83,32 +84,10 @@
     
     	String s;
         try {
-
-//            hostname = InetAddress.getLocalHost().getHostName();
-            
-            s = InetAddress.getLocalHost().getCanonicalHostName();
-            
-        } catch (UnknownHostException e) {
-        
-        	try {
-        	
-        		s = InetAddress.getLocalHost().getHostName();
-        		
-        	} catch(UnknownHostException e2) {
-
-				final String msg = "Could not resolve hostname";
-				try {
-					log.error(msg);
-        		} catch(Throwable t) {
-        			System.err.println(msg);
-        		}
-        		
-        		s = "localhost";
-
-        		//throw new AssertionError(e);
-        		
-        	}
-            
+            s = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        } catch(Throwable t) {//for now, maintain same failure logic as used previously
+            t.printStackTrace();
+            s = NicUtil.getIpAddressByLocalHost();
         }
         
         fullyQualifiedHostName = s;
@@ -520,7 +499,6 @@
      * Options for {@link AbstractStatisticsCollector}
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     public interface Options {
         

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/resources/MoveTask.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/resources/MoveTask.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -63,6 +63,8 @@
 import com.bigdata.service.IMetadataService;
 import com.bigdata.service.MetadataService;
 import com.bigdata.service.ResourceService;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Task moves an index partition to another {@link IDataService}.
@@ -155,7 +157,6 @@
  * need to do the atomic update phase.  
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
  */
 public class MoveTask extends AbstractPrepareTask<MoveResult> {
     
@@ -421,7 +422,6 @@
      * successful.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      * 
      * @todo optimization to NOT send an empty index segment if there are no
      *       buffered writes on the live journal.
@@ -434,6 +434,7 @@
         private final UUID targetDataServiceUUID;
         private final int targetIndexPartitionId;
         private final Event parentEvent;
+        private final InetAddress thisInetAddr;
         
         /**
          * 
@@ -481,6 +482,11 @@
             this.targetIndexPartitionId = targetIndexPartitionId;
             this.parentEvent = parentEvent;
 
+            try {
+                this.thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.dataNetwork"), false));
+            } catch(Throwable t) {
+                throw new IllegalArgumentException(t.getMessage(), t);
+            }
         }
 
         /**
@@ -591,7 +597,7 @@
                                                     targetIndexPartitionId,//
                                                     historicalWritesBuildResult.segmentMetadata,//
                                                     bufferedWritesBuildResult.segmentMetadata,//
-                                                    InetAddress.getLocalHost(),//
+                                                    thisInetAddr,
                                                     resourceManager
                                                             .getResourceServicePort()//
                                             )).get();
@@ -856,7 +862,6 @@
      * until the "receive" operation is complete.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     private static class IsIndexRegistered_UsingWriteService implements
             IIndexProcedure {
@@ -896,7 +901,6 @@
      * @see InnerReceiveIndexPartitionTask
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     protected static class ReceiveIndexPartitionTask extends DataServiceCallable<Void> {
 
@@ -1039,7 +1043,6 @@
      * source data service.
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
      */
     private static class InnerReceiveIndexPartitionTask extends AbstractTask<Void> {
         

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -5,6 +5,9 @@
 import java.util.Properties;
 import java.util.UUID;
 
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
+
 /**
  * Embedded {@link LoadBalancerService}.
  * 
@@ -14,7 +17,7 @@
 abstract public class AbstractEmbeddedLoadBalancerService extends LoadBalancerService {
 
 //    final private UUID serviceUUID;
-    final private String hostname;
+    private String hostname = NicUtil.getIpAddressByLocalHost();//for now, maintain the same failure logic as in constructor
     
     public AbstractEmbeddedLoadBalancerService(UUID serviceUUID,
             Properties properties) {
@@ -28,17 +31,11 @@
         
         setServiceUUID(serviceUUID);
         
-        String hostname;
         try {
-            
-            hostname = Inet4Address.getLocalHost().getCanonicalHostName();
-            
-        } catch (UnknownHostException e) {
-            
-            hostname = "localhost";
-            
+            this.hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        } catch(Throwable t) {
+            t.printStackTrace();
         }
-        this.hostname = hostname;
 
     }
 

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -507,54 +507,42 @@
     /**
      * Special-purpose convenience method that returns a
      * <code>String</code> value representing the ip address of 
-     * the current node; where the value that is returned is 
-     * determined according to following criteria:
+     * the current node.
      * <p>
-     * <ul>
-     *  <li> If a non-<code>null</code> value is input for the
-     *       <code>systemPropertyName</code> parameter, then
-     *       this is viewed as a declaration by the caller that
-     *       that the system property with that given value
-     *       should take precedence over all other means of
-     *       determining the desired ip address. As such, this
-     *       method determines if a system property having the
-     *       given has indeed been set and, if it has, returns
-     *       the ip address of the nic having that name; or 
-     *       <code>null</code> if there is no nic with the 
-     *       desired name installed on the node.
-     *  <li> If a non-<code>null</code> value is input for the
-     *       <code>systemPropertyName</code> parameter, but
-     *       no system property with that name has been set, 
-     *       and <code>true</code> has been passed in for
-     *       the <code>fallbackOk</code> parameter, then this
-     *       method will return the IPV4 based address of the
-     *       first reachable nic that is found on the node.
-     *       Upon failing to find such an address, if the
-     *       <code>loopbackOk</code> parameter is also 
-     *       <code>true</code>, then this method will return
-     *       the <i>loop back</i> address of the node; otherwise
-     *       <code>null</code> is returned.
-     *  <li> If <code>null</code> is input for the 
-     *       <code>systemPropertyName</code> parameter, but
-     *       a non-<code>null</code> value is input for the
-     *       <code>defaultNic</code> parameter, then this
-     *       method returns the ip address of the nic having
-     *       that name; or <code>null</code> if there is no
-     *       nic with the desired default name installed on the
-     *       node.
-     *  <li> If <code>null</code> is input for both the 
-     *       <code>systemPropertyName</code> parameter and the
-     *       <code>defaultNic</code> parameter, and if the
-     *       <code>fallbackOk</code> parameter is <code>true</code>,
-     *       then this method will return the IPV4 based address
-     *       of the first reachable nic that is found on the node.
-     *       Upon failing to find such an address, if the
-     *       <code>loopbackOk</code> parameter is also 
-     *       <code>true</code>, then this method will return
-     *       the <i>loop back</i> address of the node; otherwise
-     *       <code>null</code> is returned.
-     * </ul>
+     * If a non-<code>null</code> value is input for the
+     * <code>systemPropertyName</code> parameter, then this
+     * method first determines if a system property with
+     * name equivalent to the given value has been set and,
+     * if it has, returns the ip address of the nic whose name
+     * is equivalent to that system property value; or
+     * <code>null</code> if there is no nic with the desired
+     * name installed on the node.
      * <p>
+     * If there is no system property whose name is the value
+     * of the <code>systemPropertyName</code> parameter, and
+     * if the value "default" is input for the 
+     * <code>defaultNic</code> parameter, then this method
+     * will return the IPV4 based address of the first reachable
+     * nic that can be found on the node; otherwise, if a
+     * non-<code>null</code> value not equal to "default" is
+     * input for the the <code>defaultNic</code> parameter, 
+     * then this method returns the ip address of the nic 
+     * corresponding to that given name; or <code>null</code>
+     * if there is no such nic name installed on the node.
+     * <p>
+     * If, on the other hand, <code>null</code> is input for
+     * the <code>systemPropertyName</code> parameter, then 
+     * this method will attempt to find the desired ip address
+     * using only the value of the <code>defaultNic</code>,
+     * and applying the same search criteria as described
+     * above.
+     * <p>
+     * Note that in all cases, if <code>true</code> is input
+     * for the <code>loopOk</code> parameter, then upon failing
+     * to find a valid ip address using the specified search
+     * mechanism, this method will return the <i>loop back</i>
+     * address; otherwise, <code>null</code> is returned.
+     * <p>
      * This method can be called from within a configuration
      * as well as from within program control.
      *
@@ -568,33 +556,24 @@
      *                           the name of the network interface
      *                           whose ip address should be returned
      *                           if <code>null</code> is input for the
+     *                           <code>systemPropertyName</code> parameter,
+     *                           or if there is no system property with
+     *                           name equivalent the value of the
      *                           <code>systemPropertyName</code> parameter.
      *
-     * @param fallbackOk         if <code>true</code>, then if either
-     *                           no system property is set having the
-     *                           name referenced by the 
-     *                           <code>systemPropertyName</code> parameter,
-     *                           or if <code>null</code> is input for both
-     *                           the <code>systemPropertyName</code>
-     *                           parameter and the <code>defaultNic</code>
-     *                           parameter, return the IPV4 based address
-     *                           of the first reachable network interface
-     *                           that can be found on the node.
+     * @param loopbackOk         if <code>true</code>, then return the
+     *                           <i>loop back</i> address upon failure
+     *                           to find a valid ip address using the 
+     *                           search criteria specified through the
+     *                           <code>systemPropertyName</code> and
+     *                           <code>defaultNic</code> parameters.
      *
-     * @param loopbackOk         if <code>true</code>, and if <code>true</code>
-     *                           is also input for the <code>fallbackOk</code>
-     *                           parameter, then if this method attempts,
-     *                           but fails, to find a valid IPV4 fallback
-     *                           address, then the node's <i>loop back</i>
-     *                           address is returned.
-     *
      * @return a <code>String</code> representing an ip address associated
      *         with the current node; where the value that is returned is
      *         determined according to the criteria described above.
      */
     public static String getIpAddress(String  systemPropertyName,
                                       String  defaultNic,
-                                      boolean fallbackOk,
                                       boolean loopbackOk)
                              throws SocketException, IOException
     {
@@ -613,32 +592,30 @@
             }
             if(propSet) {
                 return getIpAddress(nicName, 0, loopbackOk);
-            } else {//desired system property not set, try fallback
-                if(fallbackOk) {
-                    return getDefaultIpv4Address(loopbackOk);
+            } else {//system property not set, try default and/or fallback
+                if(defaultNic != null) {
+                    if( defaultNic.equals("default") ) {
+                        return getDefaultIpv4Address(loopbackOk);
+                    } else {
+                        return getIpAddress(defaultNic, 0, loopbackOk);
+                    }
                 } else {
                     return null;
                 }
             }
-        } else {//no system property name provided, try default nic
+        } else {//no system property name provided, try default
             if(defaultNic != null) {
-                return getIpAddress(defaultNic, 0, loopbackOk);
-            } else {//no default nic provided, try fallback
-                if(fallbackOk) {
+                if( defaultNic.equals("default") ) {
                     return getDefaultIpv4Address(loopbackOk);
                 } else {
-                    return null;
+                    return getIpAddress(defaultNic, 0, loopbackOk);
                 }
+            } else {
+                return getIpAddress(null, loopbackOk);
             }
         }
     }
 
-    public static String getIpAddress()
-                             throws SocketException, IOException
-    {
-        return getIpAddress(null, null, true, true);
-    }
-
     /**
      * Examines each address associated with each network interface
      * card (nic) installed on the current node, and returns the

Modified: branches/dev-btm/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
===================================================================
--- branches/dev-btm/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/test/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -39,6 +39,7 @@
 import com.bigdata.counters.Instrument;
 import com.bigdata.counters.OneShotInstrument;
 import com.bigdata.counters.PeriodEnum;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Utility class for testing {@link CounterSetHTTPD} or
@@ -62,12 +63,10 @@
 
             CounterSet cset = root.makePath("localhost");
 
-            cset.addCounter("hostname", new OneShotInstrument<String>(
-                    InetAddress.getLocalHost().getHostName()));
+            String localIpAddr = NicUtil.getIpAddress("default.nic", "default", true);
+            cset.addCounter("hostname", new OneShotInstrument<String>(localIpAddr));
+            cset.addCounter("ipaddr", new OneShotInstrument<String>(localIpAddr));
 
-            cset.addCounter("ipaddr", new OneShotInstrument<String>(InetAddress
-                    .getLocalHost().getHostAddress()));
-
             // 60 minutes of data : @todo replace with CounterSetBTree (no fixed limit).
             final HistoryInstrument<Double> history1 = new HistoryInstrument<Double>(
                     new History<Double>(new Double[60], PeriodEnum.Minutes

Modified: branches/dev-btm/bigdata/src/test/com/bigdata/service/TestResourceService.java
===================================================================
--- branches/dev-btm/bigdata/src/test/com/bigdata/service/TestResourceService.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/test/com/bigdata/service/TestResourceService.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -43,6 +43,7 @@
 
 import com.bigdata.service.ResourceService.ReadResourceTask;
 import com.bigdata.util.concurrent.DaemonThreadFactory;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Test verifies the ability to transmit a file using the
@@ -103,14 +104,15 @@
 
         };
 
+        InetAddress thisInetAddr;
+        thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", true));
         try {
 
             service.awaitRunning(100, TimeUnit.MILLISECONDS);
 
             assertTrue(service.isOpen());
 
-            assertEquals(tmpFile, new ReadResourceTask(InetAddress
-                    .getLocalHost(), service.port, allowedUUID, tmpFile).call());
+            assertEquals(tmpFile, new ReadResourceTask(thisInetAddr, service.port, allowedUUID, tmpFile).call());
 
             if (log.isInfoEnabled())
                 log.info(service.counters.getCounters());
@@ -182,6 +184,8 @@
 
         final List<File> tempFiles = new LinkedList<File>();
         
+        InetAddress thisInetAddr;
+        thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", "default", true));
         try {
 
             service.awaitRunning(100, TimeUnit.MILLISECONDS);
@@ -197,8 +201,7 @@
 
                 tempFiles.add(tmpFile);
 
-                tasks.add(new ReadResourceTask(InetAddress.getLocalHost(),
-                        service.port, allowedUUID, tmpFile));
+                tasks.add(new ReadResourceTask(thisInetAddr, service.port, allowedUUID, tmpFile));
 
             }
 

Modified: branches/dev-btm/bigdata/src/test/com/bigdata/test/ExperimentDriver.java
===================================================================
--- branches/dev-btm/bigdata/src/test/com/bigdata/test/ExperimentDriver.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata/src/test/com/bigdata/test/ExperimentDriver.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -68,6 +68,7 @@
 
 import com.bigdata.journal.ProxyTestCase;
 import com.bigdata.util.NV;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * A harness for running comparison of different configurations.
@@ -1364,13 +1365,9 @@
         props.setProperty("os.arch.cpus", ""+SystemUtil.numProcessors());
         
         try {
-            
-            props.setProperty("host",InetAddress.getLocalHost().getHostName());
-            
-        } catch(UnknownHostException ex) {
-            /*
-             * ignore.
-             */
+            props.setProperty( "host", NicUtil.getIpAddress("default.nic", "default", true) );
+        } catch(Throwable t) {
+            t.printStackTrace();
         }
         
         return props;

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -244,13 +244,9 @@
         }
 
         innerProxy = (PrivateInterface)serverExporter.export(this);
+        String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
         outerProxy = ServiceProxy.createProxy
-                         (innerProxy, proxyId, 
-                          NicUtil.getIpAddress(
-                              System.getProperty(
-                                  "exportNic", 
-                                  ConfigDeployUtil.getString(
-                                      "node.serviceNetwork"))) );
+                         (innerProxy, proxyId, hostname);
         adminProxy = AdminProxy.createProxy(innerProxy, proxyId);
 
         //Setup lookup discovery

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/config/executor.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/config/executor.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/config/executor.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -16,10 +16,8 @@
 
 com.bigdata.executor {
 
-    private static exportNic = 
-        System.getProperty("exportNic", 
-                           ConfigDeployUtil.getString("node.serviceNetwork"));
-    private static exportIpAddr = NicUtil.getIpAddress(exportNic);
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
     private static exportPort = 
         Integer.parseInt( System.getProperty("exportPort", "0") );
 
@@ -59,7 +57,7 @@
 net.jini.discovery.LookupDiscovery {
     multicastRequestHost = com.bigdata.executor.exportIpAddr;
     multicastInterfaces = new NetworkInterface[] {
-        NicUtil.getNetworkInterface(com.bigdata.executor.exportNic)
+        NicUtil.getNetworkInterface(com.bigdata.executor.exportIpAddr)
     };
 }
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -78,6 +78,8 @@
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.service.jini.JiniClientConfig;
 import com.bigdata.service.jini.JiniFederation;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZNodeCreatedWatcher;
 
 /**
@@ -130,6 +132,8 @@
     public final Properties properties;
     public final String[] jiniOptions;
     
+    private final String serviceIpAddr;
+    
     protected void toString(StringBuilder sb) {
 
         super.toString(sb);
@@ -155,6 +159,7 @@
             final Configuration config) throws ConfigurationException {
 
         super(className, config);
+//BTM
 System.out.println("*** JiniServiceConfiguration: constructor");
 
         final JiniClientConfig tmp = new JiniClientConfig(className, config);
@@ -176,6 +181,12 @@
         } else {
             log.warn("groups = " + Arrays.toString(this.groups));
         }
+
+        try {
+            this.serviceIpAddr = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        } catch(IOException e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
     }
 
     /**
@@ -472,8 +483,7 @@
 
             final ServiceDir serviceDir = new ServiceDir(this.serviceDir);
 
-            final Hostname hostName = new Hostname(InetAddress.getLocalHost()
-                    .getCanonicalHostName().toString());
+            final Hostname hostName = new Hostname(serviceIpAddr);
 
             final ServiceUUID serviceUUID = new ServiceUUID(this.serviceUUID);
 
@@ -854,7 +864,8 @@
                     log.info("Discovered service: elapsed=" + elapsed
                             + ", name=" + processHelper.name + ", item="
                             + items[0]);
-System.out.println("\n**** JiniServiceConfiguration: DISCOVERED SERVICE ---> "+items[0].service+" ****\n");
+//BTM
+System.out.println("\n**** JiniServiceConfiguration.awaitServiceDiscoveryOrDeath: DISCOVERED ---> "+items[0].service+" ****");
                 return items[0];
                 
             } finally {

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -10,6 +10,8 @@
 import com.bigdata.jini.lookup.entry.ServiceItemFilterChain;
 import com.bigdata.service.IClientService;
 import com.bigdata.service.jini.JiniFederation;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Constraint on the #of {@link IClientService}s on the same host.
@@ -51,11 +53,9 @@
 //		 */
 //        filter.add(ClientServiceFilter.INSTANCE);
 
-        final String hostname = InetAddress.getLocalHost().getHostName();
+        final String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        final String canonicalHostname = hostname;
 
-        final String canonicalHostname = InetAddress.getLocalHost()
-                .getCanonicalHostName();
-
         // filters for _this_ host.
         filter.add(new HostnameFilter(new Hostname[] {//
                 new Hostname(hostname),//

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -11,6 +11,8 @@
 import com.bigdata.service.IDataService;
 import com.bigdata.service.jini.JiniFederation;
 import com.bigdata.service.jini.lookup.DataServiceFilter;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Constraint on the #of {@link IDataService}s on the same host.
@@ -47,11 +49,9 @@
         // only consider data services.
         filter.add(DataServiceFilter.INSTANCE);
 
-        final String hostname = InetAddress.getLocalHost().getHostName();
+        final String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        final String canonicalHostname = hostname;
 
-        final String canonicalHostname = InetAddress.getLocalHost()
-                .getCanonicalHostName();
-
         // filters for _this_ host.
         filter.add(new HostnameFilter(new Hostname[] {//
                 new Hostname(hostname),//

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -54,6 +54,8 @@
 import com.bigdata.io.FileLockUtility;
 import com.bigdata.jini.start.IServiceListener;
 import com.bigdata.jini.start.process.ZookeeperProcessHelper;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZooHelper;
 
 /**
@@ -213,6 +215,8 @@
      */
     public final Map<String, String> other;
 
+    private final InetAddress thisInetAddr;
+
     /**
      * Adds value to {@link #other} if found in the {@link Configuration}.
      * 
@@ -318,6 +322,14 @@
         putIfDefined(config, Options.FORCE_SYNC, Boolean.TYPE);
         putIfDefined(config, Options.SKIP_ACL, Boolean.TYPE);
 
+        try {
+            thisInetAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false));
+        } catch(IOException e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
+        if (log.isInfoEnabled()) {
+            log.info("zookeeper host="+thisInetAddr.getCanonicalHostName());
+        }
     }
 
     /**
@@ -541,7 +553,7 @@
          */
         public V call() throws Exception {
 
-            if (ZooHelper.isRunning(InetAddress.getLocalHost(), clientPort)) {
+            if (ZooHelper.isRunning(thisInetAddr, clientPort)) {
 
                 /*
                  * Query for an instance already running on local host at that
@@ -552,7 +564,7 @@
                  * instance on the localhost.
                  */
 
-                ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+                ZooHelper.ruok(thisInetAddr, clientPort);
 
                 throw new ZookeeperRunningException(
                         "Zookeeper already running on localhost: clientport="
@@ -625,7 +637,7 @@
                          * Note: We don't test this until we have the file lock.
                          */
 
-                        ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+                        ZooHelper.ruok(thisInetAddr, clientPort);
 
                         throw new ZookeeperRunningException(
                                 "Zookeeper already running on localhost: clientport="
@@ -727,7 +739,7 @@
              * clientPort. That could have already been true.
              */
 
-            ZooHelper.ruok(InetAddress.getLocalHost(), clientPort);
+            ZooHelper.ruok(thisInetAddr, clientPort);
 
             // adjust for time remaining.
             nanos = (System.nanoTime() - begin);

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -42,6 +42,8 @@
 import com.bigdata.service.jini.JiniClientConfig;
 import com.bigdata.service.jini.util.JiniServicesHelper;
 import com.bigdata.service.jini.util.LookupStarter;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 
 /**
  * Class for starting the jini services.
@@ -83,12 +85,14 @@
     public static boolean startCoreServices(final Configuration config,
             final IServiceListener listener) throws Exception {
 
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: new JiniCoreServicesConfiguration() ...");
         final JiniCoreServicesConfiguration serviceConfig = new JiniCoreServicesConfiguration(
                 config);
 
         // Note: will throw NPE or IAE if constraint relies on fed!
         if (!serviceConfig.canStartService(null/* fed */)) {
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: Constraints do NOT permit start --> "+serviceConfig);
 
             // refuse to start.
@@ -97,11 +101,13 @@
 
         }
 
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: new JiniClientConfig() ...");
         final JiniClientConfig clientConfig = new JiniClientConfig(
                 null/* class */, config);
 
         final LookupLocator[] locators = clientConfig.locators;
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: locators.length = "+locators.length);
         
         if (locators.length > 0) {
@@ -120,6 +126,7 @@
             
             int i = 0;
             for (LookupLocator locator : locators) {
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: locator["+i+"] = "+locator);
 
                 allowed[i++] = locator.getHost();
@@ -130,6 +137,7 @@
 
                 if (log.isInfoEnabled())
                     log.info("Host not selected by locator(s).");
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: locator NOT ALLOWED");
                 
                 return false;
@@ -144,6 +152,7 @@
 
             if (log.isInfoEnabled())
                 log.info("Constraint(s) do not allow service start: " + config);
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: CONSTRAINTS do not allow start ["+config+"]");
 
             return false;
@@ -153,6 +162,7 @@
         /*
          * The #of registrars that we can locate within a timeout.
          */
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: JiniServicesHelper.getServiceRegistrars() ...");
         final ServiceRegistrar[] registrars = JiniServicesHelper
                 .getServiceRegistrars(Integer.MAX_VALUE/* maxCount */,
@@ -162,13 +172,13 @@
         if (log.isInfoEnabled())
             log.info("registrars: #found=" + registrars.length + ", #desired="
                     + serviceConfig.serviceCount);
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: JiniServicesHelper.getServiceRegistrars() - #found=" + registrars.length + ", #desired=" + serviceConfig.serviceCount);
 
         if (registrars.length >= serviceConfig.serviceCount) {
 
             if (log.isInfoEnabled())
                 log.info("Enough instances - will not start another.");
-System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: Enough instances - will not start another.");
 
             return false;
 
@@ -179,17 +189,20 @@
          */
 
         if (log.isInfoEnabled())
-            log.info("Will start instance: " + InetAddress.getLocalHost()
+            log.info("Will start instance: " + NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false)
                     + ", config=" + config);
 
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: serviceConfig.newServiceStarter() ...");
         final JiniCoreServicesStarter<JiniCoreServicesProcessHelper> serviceStarter = serviceConfig
                 .newServiceStarter(listener, clientConfig);
 
         // start jini.
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: serviceStarter.call() ...");
         final JiniCoreServicesProcessHelper processHelper = serviceStarter
                 .call();
+//BTM
 System.out.println("*** JiniCoreServicesProcessHelper.startCoreServices: serviceStarter.call() ... RETURNED!!!");
 
         return true;

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -16,6 +16,8 @@
 import com.bigdata.jini.start.config.ZookeeperServerConfiguration;
 import com.bigdata.jini.start.config.ZookeeperServerEntry;
 import com.bigdata.jini.start.config.ZookeeperServerConfiguration.ZookeeperRunningException;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.zookeeper.ZooHelper;
 
 /**
@@ -40,6 +42,14 @@
 
     protected final int clientPort;
     
+    protected static InetAddress thisInetAddr = null;
+    static {
+	try {
+            thisInetAddr = InetAddress.getByName
+                    (NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false));
+	} catch (Throwable t) { /* swallow */ }
+    }
+    
     /**
      * @param name
      * @param builder
@@ -144,14 +154,16 @@
         final ZookeeperServerConfiguration serverConfig = new ZookeeperServerConfiguration(
                 config);
 
-System.out.println("---- ZookeeperProcessHelper.startZookeeper: [localhost="+InetAddress.getLocalHost()+", clientPort="+serverConfig.clientPort+"] ----");
-        if (ZooHelper.isRunning(InetAddress.getLocalHost(), serverConfig.clientPort)) {
+//BTM
+System.out.println("---- ZookeeperProcessHelper.startZookeeper: [localhost="+thisInetAddr.getCanonicalHostName()+", clientPort="+serverConfig.clientPort+"] ----");
+        if (ZooHelper.isRunning(thisInetAddr, serverConfig.clientPort)) {
 
             if (log.isInfoEnabled())
                 log.info("Zookeeper already running: "
-                        + InetAddress.getLocalHost().getCanonicalHostName()
+                        + thisInetAddr.getCanonicalHostName()
                         + ":" + serverConfig.clientPort);
-System.out.println("---- ZookeeperProcessHelper.startZookeeper: Zookeeper ALREADY RUNNING ----");
+//BTM
+System.out.println("---- ZookeeperProcessHelper.startZookeeper: Zookeeper ALREADY RUNNING on "+thisInetAddr.getCanonicalHostName()+" ----");
 
             // will not consider start.
             return 0;
@@ -179,7 +191,6 @@
         for (ZookeeperServerEntry entry : entries) {
 
             if (entry.isLocalHost()) {
-System.out.println("---- ZookeeperProcessHelper.startZookeeper: IS LOCAL HOST ----");
 
                 if (log.isInfoEnabled())
                     log.info("Zookeeper instance is local: " + entry);
@@ -203,8 +214,6 @@
                     log.error("Could not start: entry=" + entry, ex);
 
                 }
-}else{
-System.out.println("---- ZookeeperProcessHelper.startZookeeper: is NOT local host ----");
             }
 
         } // next entry

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -123,12 +123,12 @@
 
 //To start service using the old bigdata ServicesManagerService mechanism or from the command line or tests without the Jini ServiceStarter
 public static void main(String[] args) {
-String str1 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/61e99f71-a6f7-4a61-a330-ce7a04e6a0fb/Thread Pool/Service Time";
-String str2 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/61e99f71-a6f7-4a61-a330-ce7a04e6a0fb";
-String str3 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/";
-System.out.println("\n\n SSSSS >>>>> "+str1+ "str1.contains(//) >>>> "+str1.contains("//"));
-System.out.println("\n\n SSSSS >>>>> "+str2+ "str1.contains(//) >>>> "+str2.contains("//"));
-System.out.println("\n\n SSSSS >>>>> "+str3+ "str1.contains(//) >>>> "+str3.contains("//"));
+//String str1 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/61e99f71-a6f7-4a61-a330-ce7a04e6a0fb/Thread Pool/Service Time";
+//String str2 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/61e99f71-a6f7-4a61-a330-ce7a04e6a0fb";
+//String str3 = "/raglan/service/com.bigdata.jini.start.IServicesManagerService/";
+//System.out.println("\n\n SSSSS >>>>> "+str1+ "str1.contains(//) >>>> "+str1.contains("//"));
+//System.out.println("\n\n SSSSS >>>>> "+str2+ "str1.contains(//) >>>> "+str2.contains("//"));
+//System.out.println("\n\n SSSSS >>>>> "+str3+ "str1.contains(//) >>>> "+str3.contains("//"));
     try {
         ArrayList<String> argsList = new ArrayList<String>();
 
@@ -416,17 +416,17 @@
                                        ( args,
                                          (this.getClass()).getClassLoader() );
 if(smsProxyId == null) {//service assigns its own proxyId
-System.out.println("XXXXX LOAD BALANCER ServiceImpl: smsProxyId = null ---> service-assigned id");
+logger.warn("XXXXX LOAD BALANCER ServiceImpl: smsProxyId = null ---> service-assigned id");
         BootStateUtil bootStateUtil = 
            new BootStateUtil(config, COMPONENT_NAME, this.getClass(), logger);
         proxyId   = bootStateUtil.getProxyId();
         serviceId = bootStateUtil.getServiceId();
 } else {//ServicesManagerService assigned the proxyId
-System.out.println("XXXXX LOAD BALANCER ServiceImpl: smsProxyId NOT null ---> SMS-assigned id");
+logger.warn("XXXXX LOAD BALANCER ServiceImpl: smsProxyId NOT null ---> SMS-assigned id");
     proxyId = smsProxyId;
     serviceId = com.bigdata.jini.util.JiniUtil.uuid2ServiceID(proxyId);
 }
-System.out.println("XXXXX LOAD BALANCER ServiceImpl: proxyId = "+proxyId+"\n");
+logger.warn("XXXXX LOAD BALANCER ServiceImpl: proxyId = "+proxyId+"\n");
 
         //Service export and proxy creation
         ServerEndpoint endpoint = TcpServerEndpoint.getInstance(0);
@@ -445,11 +445,7 @@
         }
 
         innerProxy = (PrivateInterface)serverExporter.export(this);
-        String hostname = NicUtil.getIpAddress(
-                              System.getProperty(
-                                  "exportNic", 
-                                  ConfigDeployUtil.getString(
-                                      "node.serviceNetwork")));
+        String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
         outerProxy = ServiceProxy.createProxy
                          (innerProxy, proxyId, hostname);
         adminProxy = AdminProxy.createProxy(innerProxy, proxyId);

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -16,10 +16,8 @@
 
 com.bigdata.loadbalancer {
 
-    private static exportNic = 
-        System.getProperty("exportNic", 
-                           ConfigDeployUtil.getString("node.serviceNetwork"));
-    private static exportIpAddr = NicUtil.getIpAddress(exportNic);
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
     private static exportPort = 
         Integer.parseInt( System.getProperty("exportPort", "0") );
 
@@ -59,7 +57,7 @@
 net.jini.discovery.LookupDiscovery {
     multicastRequestHost = com.bigdata.loadbalancer.exportIpAddr;
     multicastInterfaces = new NetworkInterface[] {
-        NicUtil.getNetworkInterface(com.bigdata.loadbalancer.exportNic)
+        NicUtil.getNetworkInterface(com.bigdata.loadbalancer.exportIpAddr)
     };
 }
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -296,13 +296,9 @@
         }
 
         innerProxy = (PrivateInterface)serverExporter.export(this);
+        String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
         outerProxy = ServiceProxy.createProxy
-                         (innerProxy, proxyId, 
-                          NicUtil.getIpAddress(
-                              System.getProperty(
-                                  "exportNic", 
-                                  ConfigDeployUtil.getString(
-                                      "node.serviceNetwork"))) );
+                         (innerProxy, proxyId, hostname);
         adminProxy = AdminProxy.createProxy(innerProxy, proxyId);
 
         //Setup lookup discovery

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -16,10 +16,8 @@
 
 com.bigdata.metadata {
 
-    private static exportNic = 
-        System.getProperty("exportNic", 
-                           ConfigDeployUtil.getString("node.serviceNetwork"));
-    private static exportIpAddr = NicUtil.getIpAddress(exportNic);
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
     private static exportPort = 
         Integer.parseInt( System.getProperty("exportPort", "0") );
 
@@ -59,7 +57,7 @@
 net.jini.discovery.LookupDiscovery {
     multicastRequestHost = com.bigdata.metadata.exportIpAddr;
     multicastInterfaces = new NetworkInterface[] {
-        NicUtil.getNetworkInterface(com.bigdata.metadata.exportNic)
+        NicUtil.getNetworkInterface(com.bigdata.metadata.exportIpAddr)
     };
 }
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -362,13 +362,9 @@
         }
 
         innerProxy = (PrivateInterface)serverExporter.export(this);
+        String hostname = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
         outerProxy = ServiceProxy.createProxy
-                         (innerProxy, proxyId, 
-                          NicUtil.getIpAddress(
-                              System.getProperty(
-                                  "exportNic", 
-                                  ConfigDeployUtil.getString(
-                                      "node.serviceNetwork"))) );
+                         (innerProxy, proxyId, hostname);
         adminProxy = AdminProxy.createProxy(innerProxy, proxyId);
 
         // Setup lookup discovery

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/config/process.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/config/process.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/process/config/process.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -16,10 +16,8 @@
 
 com.bigdata.process {
 
-    private static exportNic = 
-        System.getProperty("exportNic", 
-                           ConfigDeployUtil.getString("node.serviceNetwork"));
-    private static exportIpAddr = NicUtil.getIpAddress(exportNic);
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
     private static exportPort = 
         Integer.parseInt( System.getProperty("exportPort", "0") );
 
@@ -59,7 +57,7 @@
 net.jini.discovery.LookupDiscovery {
     multicastRequestHost = com.bigdata.process.exportIpAddr;
     multicastInterfaces = new NetworkInterface[] {
-      NicUtil.getNetworkInterface(com.bigdata.process.exportNic)
+      NicUtil.getNetworkInterface(com.bigdata.process.exportIpAddr)
     };
 }
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -1092,12 +1092,7 @@
                     // servers are discovered and a leader is elected.
 
                     //zookeeperNetwork (peerAddress)
-                    String zookeeperNetwork =
-                        NicUtil.getIpAddress(
-                              System.getProperty(
-                                  "exportNic", 
-                                  ConfigDeployUtil.getString(
-                                      "node.serviceNetwork")));
+                    String zookeeperNetwork = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
 
                     if(zookeeperNetwork == null) {
                         throw new ConfigurationException

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -21,10 +21,8 @@
 
 com.bigdata.quorum {
 
-    private static exportNic = 
-        System.getProperty("exportNic", 
-                           ConfigDeployUtil.getString("node.serviceNetwork"));
-    private static exportIpAddr = NicUtil.getIpAddress(exportNic);
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
     private static exportPort = 
         Integer.parseInt( System.getProperty("exportPort", "0") );
 
@@ -78,7 +76,7 @@
 net.jini.discovery.LookupDiscovery {
     multicastRequestHost = com.bigdata.quorum.exportIpAddr;
     multicastInterfaces = new NetworkInterface[] {
-        NicUtil.getNetworkInterface(com.bigdata.quorum.exportNic)
+        NicUtil.getNetworkInterface(com.bigdata.quorum.exportIpAddr)
     };
 }
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -36,6 +36,8 @@
 import com.bigdata.service.jini.util.DumpFederation;
 import com.bigdata.service.jini.util.DumpFederation.FormatRecord;
 import com.bigdata.service.jini.util.DumpFederation.FormatTabTable;
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import com.bigdata.util.httpd.AbstractHTTPD;
 import com.bigdata.util.httpd.NanoHTTPD;
 import com.bigdata.util.httpd.NanoHTTPD.Response;
@@ -43,6 +45,7 @@
 import com.sun.jini.start.ServiceDescriptor;
 import com.sun.jini.start.ServiceStarter;
 
+
 /**
  * The load balancer server.
  * <p>
@@ -634,15 +637,10 @@
                  * This exception gets thrown if the client has made a direct
                  * (vs RMI) call.
                  */
-
                 try {
-
-                    clientAddr = Inet4Address.getLocalHost();
-
-                } catch (UnknownHostException ex) {
-
-                    return "localhost";
-
+                    clientAddr = InetAddress.getByName(NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.dataNetwork"), false));
+                } catch(Throwable t) {//for now, maintain the same failure logic as used previously
+                    return NicUtil.getIpAddressByLocalHost();
                 }
 
             }

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java	2010-07-28 20:47:53 UTC (rev 3337)
@@ -74,8 +74,7 @@
     private static String defaultGroup = null;
     static {
 	try {
-            thisHost = NicUtil.getIpAddress
-                           ("default.nic", null, true, true);
+            thisHost = NicUtil.getIpAddress("default.nic", "default", true);
             defaultGroup = 
                 System.getProperty("federation.name",
                                    "bigdata.test.group-"+thisHost);

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config	2010-07-28 18:31:51 UTC (rev 3336)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config	2010-07-28 20:47:53 UTC (rev 3337)
@@ -10,7 +10,7 @@
 com.sun.jini.reggie {
     private static exportPort = 0;//randomly chosen port
     private static exportIpAddr = 
-        NicUtil.getIpAddress("default.nic", null, true, true);
+        NicUtil.getIpAddress("default.nic", "default", true);
     private static codebasePort = 23333;//value used if not set by system prop
 
     // Public configuration entries

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/shard/ServiceImpl.java
==============================================...
 
[truncated message content]

[Bigdata-commit] SF.net SVN: bigdata:[3336] trunk

From: <fko...@us...> - 2010-07-28 18:31:58

Revision: 3336
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3336&view=rev
Author:   fkoliver
Date:     2010-07-28 18:31:51 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
[trunk] Ticket #119: Replaced the signal handlers in the load balancer and
the services manager with remote methods. Extended the BroadcastSighup class 
to call the new sighup methods on discovered services. Add broadcast_sighup
command as a wrapper around the class: arguments specify which type of service,
and whether all or only local services are affected. Update other scripts 
to replace kill commands with the new script.

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/service/AbstractService.java
    trunk/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java
    trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
    trunk/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
    trunk/src/resources/scripts/archiveRun.sh
    trunk/src/resources/scripts/bigdata
    trunk/src/resources/scripts/extractCounters.sh

Added Paths:
-----------
    trunk/src/resources/scripts/broadcast_sighup

Modified: trunk/bigdata/src/java/com/bigdata/service/AbstractService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/AbstractService.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata/src/java/com/bigdata/service/AbstractService.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -46,7 +46,7 @@
  */
 abstract public class AbstractService implements IService {
 
-    protected static final Logger log = Logger.getLogger(AbstractService.class);
+    private static final Logger log = Logger.getLogger(AbstractService.class);
     
     private String serviceName;
     private UUID serviceUUID;

Modified: trunk/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -173,6 +173,11 @@
      */
     public boolean isUnderUtilizedDataService(UUID serviceUUID) throws IOException;
 
+    /**
+     * Logs counters to a temp file. Replacement for sighup mechanism.
+     */
+    public void sighup() throws IOException;
+
 //    /**
 //     * Return the identifier(s) of under-utilized service(s).
 //     * 

Modified: trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -676,6 +676,7 @@
         
     }
     
+    @Override
     synchronized public void shutdown() {
 
         if(!isOpen()) return;
@@ -692,7 +693,7 @@
          * Obtain the exclusive write lock for the event BTree before flushing
          * writes.
          */
-        final Lock lock = eventReceiver.getWriteLock();
+        final Lock tmpLock = eventReceiver.getWriteLock();
         try {
 
             // Flush any buffered writes to the event store.
@@ -707,7 +708,7 @@
             
         } finally {
             
-            lock.unlock();
+            tmpLock.unlock();
             
         }
         
@@ -718,6 +719,7 @@
 
     }
 
+    @Override
     synchronized public void shutdownNow() {
 
         if(!isOpen()) return;
@@ -740,6 +742,7 @@
 
     }
 
+    @Override
     synchronized public void destroy() {
         
         super.destroy();
@@ -2017,8 +2020,38 @@
         }
         
     }
-    
+
     /**
+     * Logs the counters on a file created using
+     * {@link File#createTempFile(String, String, File)} in the log
+     * directory.
+     *
+     * @throws IOException
+     *
+     * @todo this method is not exposed to RMI (it is not on any
+     *       {@link Remote} interface) but it could be.
+     */
+    public void logCounters() throws IOException {
+
+        if (isTransient) {
+
+            log.warn("LBS is transient - request ignored.");
+
+            return;
+
+        }
+
+        final File file = File.createTempFile("counters-hup", ".xml", logDir);
+
+        logCounters(file);
+
+    }
+
+    public void sighup() throws IOException {
+        logCounters();
+    }
+
+    /**
      * Notify the {@link LoadBalancerService} that a new service is available.
      * <p>
      * Note: Embedded services must invoke this method <em>directly</em> when

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -13,6 +13,7 @@
 import com.bigdata.service.IServiceShutdown;
 import com.bigdata.service.jini.JiniFederation;
 import com.bigdata.service.jini.RemoteDestroyAdmin;
+import org.apache.log4j.Logger;
 
 /**
  * Core impl.
@@ -23,6 +24,7 @@
 public abstract class AbstractServicesManagerService extends AbstractService
         implements IServicesManagerService, IServiceListener, IServiceShutdown {
 
+    private static final Logger log = Logger.getLogger(AbstractServicesManagerService.class);
     private final Properties properties;
 
     /**

Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -45,9 +45,6 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
-
 import com.bigdata.btree.IndexSegment;
 import com.bigdata.jini.start.config.IServiceConstraint;
 import com.bigdata.jini.start.config.JiniCoreServicesConfiguration;
@@ -357,101 +354,9 @@
         super(args, lifeCycle);
     
         this.args = args;
-        
-        try {
-
-            /*
-             * Note: This signal is not supported under Windows. You can use the
-             * sighup() method to accomplish the same ends via RMI.
-             */
-            new SigHUPHandler("HUP");
-
-        } catch (IllegalArgumentException ex) {
-
-            log.warn("Signal handler not installed: " + ex);
-            
-        }
-
     }
 
     /**
-     * SIGHUP Handler.
-     * 
-     * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
-     */
-    private class SigHUPHandler implements SignalHandler {
-
-        private final SignalHandler oldHandler;
-
-        /**
-         * Install handler.
-         * 
-         * @param signalName
-         *            The signal name.
-         * @param args
-         *            The command line arguments (these identify the
-         *            configuration and any overrides).
-         * 
-         * @see http://www-128.ibm.com/developerworks/java/library/i-signalhandling/
-         * 
-         * @see http://forum.java.sun.com/thread.jspa?threadID=514860&messageID=2451429
-         *      for the use of {@link Runtime#addShutdownHook(Thread)}.
-         * 
-         * @see http://twit88.com/blog/2008/02/06/java-signal-handling/
-         */
-        @SuppressWarnings("all") // Signal is in the sun namespace
-        protected SigHUPHandler(final String signalName) {
-
-            final Signal signal = new Signal(signalName);
-
-            this.oldHandler = Signal.handle(signal, this);
-            
-            if (log.isInfoEnabled())
-                log.info("Installed handler: " + signal + ", oldHandler="
-                        + this.oldHandler);
-
-        }
-
-        @SuppressWarnings("all") // Signal is in the sun namespace
-        public void handle(final Signal sig) {
-
-            log.warn("Processing signal: " + sig);
-
-            try {
-                
-                final AbstractServicesManagerService service = (AbstractServicesManagerService) impl;
-
-                if (service != null) {
-
-                    service
-                            .sighup(true/* pushConfig */, true/*restartServices*/);
-                    
-                }
-
-                /*
-                 * This appears willing to halt the server so I am not chaining
-                 * back to the previous handler!
-                 */
-                
-//                // Chain back to previous handler, if one exists
-//                if (oldHandler != SIG_DFL && oldHandler != SIG_IGN) {
-//
-//                    oldHandler.handle(sig);
-//
-//                }
-
-            } catch (Throwable t) {
-
-                log.error("Signal handler failed : " + t, t);
-
-            }
-
-        }
-
-    }
-
-    /**
      * Starts and maintains services based on the specified configuration file
      * and/or an existing zookeeper ensemble.
      * 

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -158,7 +158,7 @@
 abstract public class AbstractServer implements Runnable, LeaseListener,
         ServiceIDListener {
     
-    final static protected Logger log = Logger.getLogger(AbstractServer.class);
+    final static private Logger log = Logger.getLogger(AbstractServer.class);
 
 //    /**
 //     * True iff the {@link #log} level is log.isInfoEnabled() or less.
@@ -475,6 +475,13 @@
 
         setSecurityManager();
 
+        Thread.setDefaultUncaughtExceptionHandler(
+                new Thread.UncaughtExceptionHandler() {
+                    public void uncaughtException(Thread t, Throwable e) {
+                        log.warn("Uncaught exception in thread", e);
+                    }
+                });
+
         /*
          * Read jini configuration & service properties 
          */
@@ -1757,7 +1764,7 @@
 
             try {
 
-                ((IService) tmp).destroy();
+                tmp.destroy();
 
             } catch (Throwable ex) {
 

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -1,12 +1,10 @@
 package com.bigdata.service.jini;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.rmi.server.ServerNotActiveException;
 import java.util.Collection;
@@ -23,9 +21,6 @@
 
 import org.apache.log4j.MDC;
 
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
-
 import com.bigdata.counters.CounterSet;
 import com.bigdata.counters.httpd.CounterSetHTTPD;
 import com.bigdata.journal.ITx;
@@ -84,19 +79,6 @@
     public LoadBalancerServer(final String[] args, final LifeCycle lifeCycle) {
 
         super(args, lifeCycle);
-        
-        try {
-
-            /*
-             * Note: This signal is not supported under Windows.
-             */
-            new SigHUPHandler("HUP");
-
-        } catch (IllegalArgumentException ex) {
-
-            log.warn("Signal handler not installed: " + ex);
-            
-        }
     }
 
     /**
@@ -153,80 +135,7 @@
         return service;
         
     }
-    
-    /**
-     * SIGHUP Handler.
-     * 
-     * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
-     */
-    private class SigHUPHandler implements SignalHandler {
 
-        private final SignalHandler oldHandler;
-
-        /**
-         * Install handler.
-         * 
-         * @param signalName
-         *            The signal name.
-         * 
-         * @see http://www-128.ibm.com/developerworks/java/library/i-signalhandling/
-         * 
-         * @see http://forum.java.sun.com/thread.jspa?threadID=514860&messageID=2451429
-         *      for the use of {@link Runtime#addShutdownHook(Thread)}.
-         * 
-         * @see http://twit88.com/blog/2008/02/06/java-signal-handling/
-         */
-        @SuppressWarnings("all") // Signal is in the sun namespace
-        protected SigHUPHandler(final String signalName) {
-
-            final Signal signal = new Signal(signalName);
-
-            this.oldHandler = Signal.handle(signal, this);
-            
-            if (log.isInfoEnabled())
-                log.info("Installed handler: " + signal + ", oldHandler="
-                        + this.oldHandler);
-
-        }
-
-        @SuppressWarnings("all") // Signal is in the sun namespace
-        public void handle(final Signal sig) {
-
-            log.warn("Processing signal: " + sig);
-
-            try {
-                
-                final AdministrableLoadBalancer service = (AdministrableLoadBalancer) impl;
-
-                if (service != null) {
-
-                    service.logCounters();
-                    
-                }
-
-                /*
-                 * This appears willing to halt the server so I am not chaining
-                 * back to the previous handler!
-                 */
-                
-//                // Chain back to previous handler, if one exists
-//                if (oldHandler != SIG_DFL && oldHandler != SIG_IGN) {
-//
-//                    oldHandler.handle(sig);
-//
-//                }
-
-            } catch (Throwable t) {
-
-                log.error("Signal handler failed : " + t, t);
-
-            }
-
-        }
-
-    }
-
     /**
      * Overrides the {@link IFederationDelegate} leave/join behavior to notify
      * the {@link LoadBalancerService}.
@@ -250,6 +159,7 @@
         /**
          * Notifies the {@link LoadBalancerService}.
          */
+        @Override
         public void serviceJoin(IService service, UUID serviceUUID) {
 
             try {
@@ -279,6 +189,7 @@
         /**
          * Notifies the {@link LoadBalancerService}.
          */
+        @Override
         public void serviceLeave(UUID serviceUUID) {
 
             if (log.isInfoEnabled())
@@ -334,6 +245,7 @@
          * root path), dump of the indices in the federation (/indices), and
          * events (/events).
          */
+        @Override
         public AbstractHTTPD newHttpd(final int httpdPort,
                 final CounterSet counterSet) throws IOException {
             
@@ -451,6 +363,7 @@
 
                 final IndicesHandler indicesHandler = new IndicesHandler();
                 
+                @Override
                 public Response doGet(String uri, String method, Properties header,
                         LinkedHashMap<String, Vector<String>> parms)
                         throws Exception {
@@ -668,33 +581,5 @@
             return s;
 
         }
-
-        /**
-         * Logs the counters on a file created using
-         * {@link File#createTempFile(String, String, File)} in the log
-         * directory.
-         * 
-         * @throws IOException
-         * 
-         * @todo this method is not exposed to RMI (it is not on any
-         *       {@link Remote} interface) but it could be.
-         */
-        public void logCounters() throws IOException {
-
-            if (isTransient) {
-
-                log.warn("LBS is transient - request ignored.");
-                
-                return;
-                
-            }
-            
-            final File file = File.createTempFile("counters-hup", ".xml", logDir);
-
-            super.logCounters(file);
-
-        }
-
     }
-
 }

Modified: trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java	2010-07-28 18:31:51 UTC (rev 3336)
@@ -27,21 +27,35 @@
 
 package com.bigdata.service.jini.util;
 
+import com.bigdata.jini.lookup.entry.Hostname;
+import java.io.IOException;
+import java.net.UnknownHostException;
 import org.apache.log4j.Logger;
 
 import net.jini.config.ConfigurationException;
 import net.jini.core.lookup.ServiceItem;
 
 import com.bigdata.jini.start.IServicesManagerService;
+import com.bigdata.service.ILoadBalancerService;
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.service.jini.JiniFederation;
+import java.net.InetAddress;
+import net.jini.config.Configuration;
+import net.jini.core.entry.Entry;
+import net.jini.core.lookup.ServiceTemplate;
+import net.jini.lookup.ServiceItemFilter;
 
 /**
- * Utility will broadcast the {@link IServicesManagerService#sighup()} method to
- * all discovered {@link IServicesManagerService}s in federation to which it
+ * Utility will broadcast the 
+ * {@link IServicesManagerService#sighup(boolean,boolean)} method or
+ * {@link ILoadBalancerService#sighup()} method to either local or
+ * all discovered {@link IServicesManagerService}s 
+ * or {@link ILoadBalancerService}s in federation to which it
  * connects. Each discovered {@link IServicesManagerService} will push the
  * service configuration to zookeeper and then restart any processes for which
  * it has responsibility which are not currently running.
+ * Each discovered {@link ILoadBalancerService} will log current counters to
+ * files.
  * <p>
  * Note: If you are running a federation on a cluster, you can achieve the same
  * effect by changing the federation run state to <code>hup</code> and then
@@ -64,6 +78,16 @@
      * following options are defined:
      * <dl>
      * 
+     * <dt>localOrRemote</dt>
+     * <dd>If "local", then consider only services running on the local host
+     * (similar to what linux "kill -hup" signal used to do). If
+     * "all" then call sighup() on all services found. </dd>
+     * 
+     * <dt>signalTarget</dt>
+     * <dd>If "servicesManager", then send signals only to instances of 
+     * IServicesManagerService. If "loadBalancer", then send signals only to 
+     * instances of ILoadBalancerService. </dd>
+     * 
      * <dt>discoveryDelay</dt>
      * <dd>The time in milliseconds to wait for service discovery before
      * proceeding.</dd>
@@ -84,57 +108,111 @@
      * @throws InterruptedException
      * @throws ConfigurationException
      */
-    public static void main(final String[] args) throws InterruptedException,
-            ConfigurationException {
+    public static void main(final String[] args) {
+        try {
+            main2(args);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.warn("Unexpected exception", e);
+        }
+    }
 
-        final JiniFederation fed = JiniClient.newInstance(args).connect();
+    private static void main2(final String[] args) throws InterruptedException,
+            ConfigurationException, UnknownHostException, IOException {
 
-        final long discoveryDelay = (Long) fed
-                .getClient()
-                .getConfiguration()
+        // Get the configuration and set up the federation.
+
+        final JiniClient client = JiniClient.newInstance(args);
+        final JiniFederation fed = client.connect();
+        final Configuration config = client.getConfiguration();
+
+        final long discoveryDelay = (Long) config
                 .getEntry(COMPONENT, "discoveryDelay", Long.TYPE, 5000L/* default */);
 
-        final boolean pushConfig = (Boolean) fed
-                .getClient()
-                .getConfiguration()
+        final boolean pushConfig = (Boolean) config
                 .getEntry(COMPONENT, "pushConfig", Boolean.TYPE, true/* default */);
 
-        final boolean restartServices = (Boolean) fed.getClient()
-                .getConfiguration().getEntry(COMPONENT, "restartServices",
+        final String localOrAll = (String) config
+                .getEntry(COMPONENT, "localOrAll", String.class, "all");
+
+        final String signalTarget = (String) config
+                .getEntry(COMPONENT, "signalTarget", String.class,
+                          "servicesManager");
+
+        final boolean restartServices = (Boolean) config
+                .getEntry(COMPONENT, "restartServices",
                         Boolean.TYPE, true/* default */);
 
+        // Identify the bigdata interface associated with the service
+        // to which the signal will be delivered.
+
+        Class iface = null;
+        if (signalTarget.equals("servicesManager")) {
+            iface = IServicesManagerService.class;
+        } else if (signalTarget.equals("loadBalancer")) {
+            iface = ILoadBalancerService.class;
+        } else {
+            log.warn("Unexpected target for signal: " + signalTarget);
+            System.exit(1);
+        }
+
+        // Set up the service template and filter used to identify the service.
+
+        final String hostname = InetAddress.getLocalHost()
+                    .getCanonicalHostName().toString();
+        ServiceTemplate template = new ServiceTemplate(null,
+                new Class[] { iface }, null);
+        ServiceItemFilter thisHostFilter = null;
+        if (localOrAll.equals("local")) {
+            thisHostFilter = new ServiceItemFilter() {
+                    public boolean check(ServiceItem item) {
+                        for (Entry entry : item.attributeSets) {
+                            if (entry instanceof Hostname &&
+                                ((Hostname)entry).hostname.equals(hostname)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }
+                };
+        } else if (!localOrAll.equals("all")) {
+            log.warn("Unexpected option for signal: " + localOrAll);
+            System.exit(1);
+        }
+
+        // Use the federation's discovery manager to lookup bigdata
+        // services of interest.
+
         System.out.println("Waiting " + discoveryDelay
                 + "ms for service discovery.");
+        ServiceItem[] items =
+                fed.getServiceDiscoveryManager()
+                .lookup(template, Integer.MAX_VALUE, Integer.MAX_VALUE,
+                thisHostFilter, discoveryDelay);
 
-        Thread.sleep(discoveryDelay/* ms */);
+        // Call the service's appropriate interface method.
 
-        final ServiceItem[] a = fed.getServicesManagerClient()
-                .getServiceCache()
-                .getServiceItems(0/* maxCount */, null/* filter */);
-
         int n = 0;
-        for (ServiceItem item : a) {
-            
+        for (ServiceItem item : items) {
             try {
-                
-                ((IServicesManagerService) item.service).sighup(pushConfig,
-                        restartServices);
-                
-                n++;
-                
-            } catch(Throwable t) {
-                
-                log.warn(item, t);
+                if (signalTarget.equals("servicesManager")) {
+                    ((IServicesManagerService) item.service)
+                        .sighup(pushConfig, restartServices);
+                    ++n;
 
+                } else if (signalTarget.equals("loadBalancer")) {
+                    ((ILoadBalancerService) item.service).sighup();
+                    ++n;
+
+                } else {
+                    log.warn("Unexpected target for signal: " + signalTarget);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.warn("Unexpected target for signal: " + signalTarget);
             }
-
         }
-        
-        System.out.println("Signal sent to " + n + " of " + a.length
-                + " services managers.");
-
-        System.exit(0);
-
+        System.out.println("Signal sent to " + n + " of " + items.length
+                + " instances of " + signalTarget + ".");
     }
-
 }

Modified: trunk/src/resources/scripts/archiveRun.sh
===================================================================
--- trunk/src/resources/scripts/archiveRun.sh	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/src/resources/scripts/archiveRun.sh	2010-07-28 18:31:51 UTC (rev 3336)
@@ -19,7 +19,8 @@
 	exit 1
 fi
 
-source `dirname $0`/bigdataenv
+BINDIR=`dirname $0`
+source $BINDIR/bigdataenv
 
 targetDir=$1
 
@@ -29,21 +30,13 @@
 mkdir -p $targetDir/counters
 mkdir -p $targetDir/indexDumps
 
-# Look for the load balancer service directory on the local host. If
-# we find it, then we read the pid for the LBS and send it a HUP signal
-# so it will write a snapshot of its performance counters.
+# Broadcast a HUP request to the load balancer in the federation so 
+# that it will write a snapshot of its performance counters.
 waitDur=60
-if [ -f "$lockFile" ]; then
-    read pid < `find $LAS -name pid | grep LoadBalancerServer`
-    if [ -z "$pid" ]; then
-        echo "Could not find LoadBalancer process: `hostname` LAS=$LAS."
-    else
-        echo "Sending HUP to the LoadBalancer: $pid"
-        kill -hup $pid
-        echo "Waiting $waitDur seconds for the performance counter dump."
-        sleep $waitDur
-    fi
-fi
+echo "Sending HUP to the LoadBalancer: $pid"
+$BINDIR/broadcast_sighup local loadBalancer
+echo "Waiting $waitDur seconds for the performance counter dump."
+sleep $waitDur
 
 # Copy the configuration file and the various log files.
 cp -v $BIGDATA_CONFIG \

Modified: trunk/src/resources/scripts/bigdata
===================================================================
--- trunk/src/resources/scripts/bigdata	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/src/resources/scripts/bigdata	2010-07-28 18:31:51 UTC (rev 3336)
@@ -266,7 +266,7 @@
 		if [ -z "$pidno" ]; then
 		    echo $"`date` : `hostname` : process died? pid=$pid."
 		else
-		    kill -s hup $pid
+		    ./broadcast_sighup local servicesManager
 		    echo $"`date` : `hostname` : sent SIGHUP pid=$pid."
 		fi
 	    else

Added: trunk/src/resources/scripts/broadcast_sighup
===================================================================
--- trunk/src/resources/scripts/broadcast_sighup	                        (rev 0)
+++ trunk/src/resources/scripts/broadcast_sighup	2010-07-28 18:31:51 UTC (rev 3336)
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+##
+# Script sends equivalent of sighup to a services manager or load balancer.
+#
+
+usage() {
+    echo "Usage: $0  ( local | all )  ( servicesManager | loadBalancer )" 1>&2
+    exit 1
+}
+
+if [ $# -ne 2 ] ; then
+    usage
+fi
+if [ X"$1" != "Xlocal" -a X"$1" != "Xall" ] ; then
+    usage
+fi
+local_or_all=$1
+if [ X"$2" != "XservicesManager" -a X"$2" != "XloadBalancer" ] ; then
+    usage
+fi
+target=$2
+
+# Setup the environment.
+cd `dirname $0`
+source ./bigdataenv
+
+# Verify critical environment variables.
+if [ -z "$JAVA_OPTS" ]; then
+    echo $"`date` : hostname : environment not setup."
+    exit 1;
+fi
+if [ -z "$CLASSPATH" ]; then
+    echo $"`date` : hostname : environment not setup."
+    exit 1;
+fi
+if [ -z "$BIGDATA_CONFIG" ]; then
+    echo $"`date` : hostname : environment not setup."
+    exit 1;
+fi
+
+# Start the services manager on this host.
+#
+# Note: This explicitly specifies a small heap for the services manager since
+# it uses very little heap space and we can avoid problems with contention for
+# virtual memory by not permitting JVM defaults to grant this a large maximum
+# heap on machines with lots of RAM.
+#
+# Allow JVM to be available for debugger to attach.
+#NIC="lo"
+#IP_ADDR=`ifconfig ${NIC} | sed -n -e s'/.*inet addr:\([0-9.]*\).*/\1/p'`
+#JDWP_OPTS="transport=dt_socket,server=y,address=${IP_ADDR}:33340,suspend=y"
+#JAVA_OPTS="-ea -Xdebug -Xrunjdwp:${JDWP_OPTS} ${JAVA_OPTS}"
+java ${JAVA_OPTS} \
+     -cp ${CLASSPATH} \
+     com.bigdata.service.jini.util.BroadcastSighup \
+     ${BIGDATA_CONFIG} \
+     "com.bigdata.service.jini.util.BroadcastSighup.signalTarget=\"$target\"" \
+     "com.bigdata.service.jini.util.BroadcastSighup.localOrAll=\"$local_or_all\"" \
+     "com.bigdata.service.jini.util.BroadcastSighup.pushConfig=true" \
+     "com.bigdata.service.jini.util.BroadcastSighup.restartServices=true" \
+     ${BIGDATA_CONFIG_OVERRIDES}
+exit 0

Modified: trunk/src/resources/scripts/extractCounters.sh
===================================================================
--- trunk/src/resources/scripts/extractCounters.sh	2010-07-28 16:46:24 UTC (rev 3335)
+++ trunk/src/resources/scripts/extractCounters.sh	2010-07-28 18:31:51 UTC (rev 3336)
@@ -18,7 +18,8 @@
     exit 1
 fi
 
-source `dirname $0`/bigdataenv
+BINDIR=`dirname $0`
+source $BINDIR/bigdataenv
 
 targetDir=$1
 
@@ -41,11 +42,8 @@
     exit 1
 fi
 
-#
-# Look for the load balancer service directory on the local host. If
-# we find it, then we read the pid for the LBS and send it a HUP signal
-# so it will write a snapshot of its performance counters.
-#
+# Broadcast a HUP request to the load balancer in the federation so 
+# that it will write a snapshot of its performance counters.
 
 # How long to wait for the LBS to dump a current snapshot.
 waitDur=60
@@ -54,13 +52,8 @@
 tarball=$targetDir-output.tgz
 
 if [ -f "$lockFile" ]; then
-    read pid < "$lbsDir/pid"
-    if [ -z "$pid" ]; then
-        echo "Could not find LoadBalancer process: `hostname` lbsDir=$lbsDir"
-        exit 1
-    fi
     echo "Sending HUP to the LoadBalancer: $pid"
-    kill -hup $pid
+    $BINDIR/broadcast_sighup local loadBalancer
     echo "Waiting $waitDur seconds for the performance counter dump."
     sleep $waitDur
     ant "-Danalysis.counters.dir=$lbsDir"\


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

[Bigdata-commit] SF.net SVN: bigdata:[3335] trunk/bigdata/src/java/com/bigdata/service/ LoadBalancerService.java

From: <tho...@us...> - 2010-07-28 16:46:31

Revision: 3335
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3335&view=rev
Author:   thompsonbry
Date:     2010-07-28 16:46:24 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
spelling errors

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java

Modified: trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java	2010-07-28 15:57:11 UTC (rev 3334)
+++ trunk/bigdata/src/java/com/bigdata/service/LoadBalancerService.java	2010-07-28 16:46:24 UTC (rev 3335)
@@ -1271,7 +1271,7 @@
          * Note: If we are not getting critical counters for some host then we
          * are assuming a reasonable values for the missing data and computing
          * the utilization based on those assumptions. Note that a value of zero
-         * (0) may be interepreted as either critically high utilization or no
+         * (0) may be interpreted as either critically high utilization or no
          * utilization depending on the performance counter involved and that
          * the impact of the different counters can vary depending on the
          * formula used to compute the utilization score.
@@ -1341,7 +1341,7 @@
              * Note: This reflects the disk IO utilization primarily through
              * IOWAIT.
              * 
-             * @todo Play around with other forumulas too.
+             * @todo Play around with other formulas too.
              */
             double adjustedRawScore;
             final double baseRawScore = adjustedRawScore = (1d + percentIOWait * 100d)
@@ -1537,7 +1537,7 @@
             /*
              * dataDir
              * 
-             * Note: If you set these threasholds to GT the default value
+             * Note: If you set these thresholds to GT the default value
              * reported when the counters are not yet available then you will
              * see false 'short on disk' claims. They will go away once the
              * performance counters arrive with real disk space measurements.
@@ -1566,7 +1566,7 @@
             /*
              * tmpDir
              * 
-             * Note: If you set these threasholds to GT the default value
+             * Note: If you set these thresholds to GT the default value
              * reported when the counters are not yet available then you will
              * see false 'short on disk' claims. They will go away once the
              * performance counters arrive with real disk space measurements.


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

[Bigdata-commit] SF.net SVN: bigdata:[3334] trunk

From: <tho...@us...> - 2010-07-28 15:57:18

Revision: 3334
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3334&view=rev
Author:   thompsonbry
Date:     2010-07-28 15:57:11 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
Modified the NanoSparqlServer to support URLs containing a non-default namespace such as http://localhost:80/namespace/LUBM_U50.  This was done so we can start the NanoSparqlServer regardless of whether a KB exists at the default namespace.  I might make a few more changes along these lines to further clean things up.

This change moves the resolution of the AbstractTripleStore, the BigdataSail, etc. inside of the query execution.  I have not yet determined whether this imposes any significant overhead when benchmarking.

NanoSparqlServer now obtains a read-only transaction when it starts as of the lastCommitTime on the bigdata instance.  This is not really ideal because there is little point to starting it first if we are going to be reading from an empty commit point so I may revisit this point later (perhaps always reading from the lastCommitTime unless the URL includes "/namespace/timestamp", in which case we read from that timestamp using a full transaction).  Also, it is possible that abrupt termination of the JVM process (kill -9) could fail to release the read-only transaction and thus keep history from being released. 

Modified Paths:
--------------
    trunk/bigdata-perf/lubm/build.properties
    trunk/bigdata-perf/lubm/src/resources/config/config.kb.sparql
    trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java
    trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java
    trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java
    trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java

Property Changed:
----------------
    trunk/bigdata-perf/lubm/


Property changes on: trunk/bigdata-perf/lubm
___________________________________________________________________
Modified: svn:ignore
   - ant-build
*result.txt

   + ant-build
*result.txt
sample.query.sparql


Modified: trunk/bigdata-perf/lubm/build.properties
===================================================================
--- trunk/bigdata-perf/lubm/build.properties	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-perf/lubm/build.properties	2010-07-28 15:57:11 UTC (rev 3334)
@@ -46,7 +46,7 @@
 lubm.namespace=LUBM_U${lubm.univ}
 
 # Laptop benchmark data directory.
-#lubm.baseDir=d:/bigdata-perf-analysis/lubm/lubm_${lubm.univ}
+#lubm.baseDir=d:/bigdata-perf-analysis/lubm/U${lubm.univ}
 # Server benchmark directory.
 #lubm.baseDir=/nas/data/lubm/U${lubm.univ}
 # Windows Server 2008 benchmark data directory.
@@ -78,7 +78,7 @@
 lubm.journalPropertyFile=${journalMode}Store.properties
 
 # The name of the file used for the journal.
-#lubm.journalFile=${lubm.baseDir}/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
+#lubm.journalFile=${lubm.baseDir}/bigdata-lubm.${journalMode}.jnl
 # Note: This is on the large volume.
 #lubm.journalFile=/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
 # SSD.

Modified: trunk/bigdata-perf/lubm/src/resources/config/config.kb.sparql
===================================================================
--- trunk/bigdata-perf/lubm/src/resources/config/config.kb.sparql	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-perf/lubm/src/resources/config/config.kb.sparql	2010-07-28 15:57:11 UTC (rev 3334)
@@ -8,4 +8,7 @@
 class=edu.lehigh.swat.bench.ubt.bigdata.SparqlRepositoryFactory
 ontology=ignored
 data=ignored
+# Use the default namespace specified to NanoSparqlServer
 database=http://localhost:80
+# Use a specific namespace regardless of the default specified to NanoSparqlServer
+#database=http://localhost:80/namespace/LUBM_U50

Modified: trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java
===================================================================
--- trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java	2010-07-28 15:57:11 UTC (rev 3334)
@@ -21,12 +21,17 @@
         return ((BigdataSail) getSail()).getDatabase();
         
     }
+
+    @Override
+    public BigdataSail getSail() {
+        return (BigdataSail)super.getSail();
+    }
     
-    private BigdataSail getBigdataSail() {
-        
-        return (BigdataSail) getSail();
-        
-    }
+//    private BigdataSail getBigdataSail() {
+//        
+//        return (BigdataSail) getSail();
+//        
+//    }
 
     @Override
     public SailRepositoryConnection getConnection() throws RepositoryException {
@@ -55,7 +60,7 @@
         throws RepositoryException {
         
         return new BigdataSailRepositoryConnection(this, 
-            getBigdataSail().getReadOnlyConnection());
+            getSail().getReadOnlyConnection());
     }
     
     /**
@@ -69,7 +74,7 @@
         throws RepositoryException {
         
         return new BigdataSailRepositoryConnection(this, 
-            getBigdataSail().getReadOnlyConnection(timestamp));
+            getSail().getReadOnlyConnection(timestamp));
         
     }
     
@@ -79,7 +84,7 @@
         try {
             
             return new BigdataSailRepositoryConnection(this, 
-                getBigdataSail().getReadWriteConnection());
+                getSail().getReadWriteConnection());
             
         } catch (IOException e) {
             
@@ -95,7 +100,7 @@
         try {
             
             return new BigdataSailRepositoryConnection(this, 
-                getBigdataSail().getUnisolatedConnection());
+                getSail().getUnisolatedConnection());
             
         } catch (InterruptedException e) {
             

Modified: trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java
===================================================================
--- trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java	2010-07-28 15:57:11 UTC (rev 3334)
@@ -42,8 +42,15 @@
         
     }
     
+    @Override
+    public BigdataSailRepository getRepository() {
+        return (BigdataSailRepository)super.getRepository();
+    }
+    
     /**
-     * Overriden to capture query hints from SPARQL queries. Query hints are
+     * {@inheritDoc}
+     * <p>
+     * Overridden to capture query hints from SPARQL queries. Query hints are
      * embedded in query strings as namespaces.  
      * See {@link BD#QUERY_HINTS_NAMESPACE} for more information.
      */
@@ -61,7 +68,9 @@
     }
 
     /**
-     * Overriden to capture query hints from SPARQL queries. Query hints are
+     * {@inheritDoc}
+     * <p>
+     * Overridden to capture query hints from SPARQL queries. Query hints are
      * embedded in query strings as namespaces.  
      * See {@link BD#QUERY_HINTS_NAMESPACE} for more information.
      */
@@ -76,9 +85,11 @@
     }
 
     /**
-     * Overriden to capture query hints from SPARQL queries. Query hints are
-     * embedded in query strings as namespaces.  
-     * See {@link BD#QUERY_HINTS_NAMESPACE} for more information.
+     * {@inheritDoc}
+     * <p>
+     * Overridden to capture query hints from SPARQL queries. Query hints are
+     * embedded in query strings as namespaces. See
+     * {@link BD#QUERY_HINTS_NAMESPACE} for more information.
      */
     @Override
     public SailBooleanQuery prepareBooleanQuery(final QueryLanguage ql,
@@ -91,7 +102,9 @@
     }
 
     /**
-     * Overriden to capture query hints from SPARQL queries. Query hints are
+     * {@inheritDoc}
+     * <p>
+     * Overridden to capture query hints from SPARQL queries. Query hints are
      * embedded in query strings as namespaces.  
      * See {@link BD#QUERY_HINTS_NAMESPACE} for more information.
      */
@@ -121,6 +134,8 @@
     }
 
     /**
+     * {@inheritDoc}
+     * <p>
      * Note: auto-commit is an EXTREMELY bad idea. Performance will be terrible.
      * The database will swell to an outrageous size. TURN OFF AUTO COMMIT.
      * 

Modified: trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java
===================================================================
--- trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java	2010-07-28 15:57:11 UTC (rev 3334)
@@ -275,7 +275,8 @@
 
 				final int rc = conn.getResponseCode();
 					if(rc < 200 || rc >= 300) {
-					throw new IOException(conn.getResponseMessage());
+                    throw new IOException(rc + " : "
+                            + conn.getResponseMessage()+" : "+url);
 				}
 
 				if (log.isDebugEnabled()) {

Modified: trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
===================================================================
--- trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java	2010-07-28 13:07:06 UTC (rev 3333)
+++ trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java	2010-07-28 15:57:11 UTC (rev 3334)
@@ -73,15 +73,18 @@
 import com.bigdata.journal.AbstractJournal;
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.journal.IJournal;
+import com.bigdata.journal.ITransactionService;
 import com.bigdata.journal.ITx;
 import com.bigdata.journal.Journal;
 import com.bigdata.journal.TimestampUtility;
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.sail.BigdataSailGraphQuery;
 import com.bigdata.rdf.sail.BigdataSailRepository;
+import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
 import com.bigdata.rdf.sail.bench.NanoSparqlClient.QueryType;
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.relation.AbstractResource;
+import com.bigdata.service.IBigdataFederation;
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.util.concurrent.DaemonThreadFactory;
 import com.bigdata.util.httpd.AbstractHTTPD;
@@ -95,9 +98,7 @@
  * @todo Allow configuration options for the sparql endpoint either as URI
  *       parameters, in the property file, as request headers, or as query hints
  *       using the PREFIX mechanism.
- * 
- * @todo Make each namespace available at <code>/namespace?query=...</code>?
- * 
+
  * @todo Allow timestamp for server reads as protocol parameter (URL query
  *       parameter or header).
  * 
@@ -107,8 +108,6 @@
  *       as well).
  * 
  * @todo Add command to kill a running query.
- * 
- * @todo Add command to drop the LRUNexus cache.
  */
 public class NanoSparqlServer extends AbstractHTTPD {
 
@@ -133,16 +132,26 @@
 	 */
     static private final String charset = "UTF-8";
     
+//    /**
+//     * The target Sail.
+//     */
+//    private final BigdataSail sail;
+//
+//    /**
+//	 * The target repository.
+//	 */
+//	private final BigdataSailRepository repo;
+
     /**
-     * The target Sail.
+     * The configuration object.
      */
-    private final BigdataSail sail;
-
+    private final Config config;
+    
     /**
-	 * The target repository.
-	 */
-	private final BigdataSailRepository repo;
-
+     * Provides access to the bigdata database.
+     */
+    private final IIndexManager indexManager;
+    
 	/**
 	 * @todo use to decide ASK, DESCRIBE, CONSTRUCT, SELECT, EXPLAIN, etc.
 	 */
@@ -163,7 +172,7 @@
     	final String query;
     	/** The timestamp when the query was accepted (ns). */
     	final long begin;
-    	public RunningQuery(long queryId,String query,long begin) {
+        public RunningQuery(long queryId, String query, long begin) {
     		this.queryId = queryId;
     		this.query = query;
     		this.begin = begin;
@@ -188,22 +197,16 @@
 
 		super(config.port);
 
-		// resolve the kb instance of interest.
-		final AbstractTripleStore tripleStore = (AbstractTripleStore) indexManager
-				.getResourceLocator().locate(config.namespace, ITx.UNISOLATED);
-
-		if (tripleStore == null) {
-
-			throw new RuntimeException("No such kb: " + config.namespace);
-
-		}
+        if (config.namespace == null)
+            throw new IllegalArgumentException();
 		
-		// since the kb exists, wrap it as a sail.
-		sail = new BigdataSail(tripleStore);
-
-		repo = new BigdataSailRepository(sail);
-		repo.initialize();
-
+		if(indexManager == null)
+		    throw new IllegalArgumentException();
+		
+		this.config = config;
+		
+		this.indexManager = indexManager;
+		
 		// used to parse qeries.
         engine = new SPARQLParserFactory().getParser();
 
@@ -230,13 +233,18 @@
      *       loaded since they must query each shard for the primary statement
      *       index and the TERM2ID index.
      */
-	protected StringBuilder getKBInfo() {
+    protected StringBuilder getKBInfo(final String namespace,
+            final long timestamp) {
 
 		final StringBuilder sb = new StringBuilder();
 
+        BigdataSailRepositoryConnection conn = null;
+
 		try {
 
-			final AbstractTripleStore tripleStore = sail.getDatabase();
+            conn = getQueryConnection(namespace, timestamp);
+		    
+			final AbstractTripleStore tripleStore = conn.getTripleStore();
 
 			sb.append("class\t = " + tripleStore.getClass().getName() + "\n");
 
@@ -282,35 +290,29 @@
 							.getIndexMetadata()
 							.getWriteRetentionQueueCapacity() + "\n");
 
-			sb.append(BigdataSail.Options.STAR_JOINS + "=" + sail.isStarJoins()
-					+ "\n");
+            sb.append(BigdataSail.Options.STAR_JOINS + "="
+                    + conn.getRepository().getSail().isStarJoins() + "\n");
 
 			sb.append(AbstractResource.Options.MAX_PARALLEL_SUBQUERIES + "="
 					+ tripleStore.getMaxParallelSubqueries() + "\n");
 
-			/*
-			 * Stuff which is specific to a local/embedded database.
-			 */
-			if (tripleStore.getIndexManager() instanceof IJournal) {
-
-				final AbstractJournal jnl = (AbstractJournal) sail.getDatabase()
-						.getIndexManager();
-
-				sb.append("file\t= " + jnl.getFile()+"\n");
-
-				sb.append("BufferMode\t= " + jnl.getBufferStrategy().getBufferMode()+"\n");
-
-				sb.append("nextOffset\t= "
-						+ jnl.getRootBlockView().getNextOffset() + "\n");
-
-			}
-
 			// sb.append(tripleStore.predicateUsage());
 
 		} catch (Throwable t) {
 
 			log.warn(t.getMessage(), t);
 
+		} finally {
+		    
+		    if(conn != null) {
+                try {
+                    conn.close();
+                } catch (RepositoryException e) {
+                    log.error(e, e);
+                }
+		        
+		    }
+		    
 		}
 
 		return sb;
@@ -333,6 +335,9 @@
 		}
     }
 
+    /**
+     * FIXME Must abort any open transactions.
+     */
     synchronized public void shutdownNow() {
         System.err.println("Immediate shutdown");
         // interrupt all running queries.
@@ -460,14 +465,76 @@
 		
 		if("/status".equals(uri)) {
 			
+            // @todo Could list the known namespaces.
 			return doStatus(uri, method, header, params);
-			
-		}
-		
+
+        }
+
+        if (uri.startsWith("/namespace/")) {
+
+            // @todo allow status query against any namespace.
+            return doQuery(uri, method, header, params);
+            
+        }
+
 		return new Response(HTTP_NOTFOUND, MIME_TEXT_PLAIN, uri);
 		
 	}
 
+    /**
+     * Return the namespace which will be used to execute the query. The
+     * namespace is represented by the first component of the URI. If there is
+     * no namespace, then return the configured default namespace.
+     * 
+     * @param uri
+     *            The URI path string.
+     * 
+     * @return The namespace.
+     */
+    private String getNamespace(final String uri) {
+
+//        // locate the "//" after the protocol.
+//        final int index = uri.indexOf("//");
+
+        if(!uri.startsWith("/namespace/")) {
+            // use the default namespace.
+            return config.namespace;
+        }
+
+        // locate the next "/" in the URI path.
+        final int beginIndex = uri.indexOf('/', 1/* fromIndex */);
+
+        // locate the next "/" in the URI path.
+        int endIndex = uri.indexOf('/', beginIndex + 1/* fromIndex */);
+
+        if (endIndex == -1) {
+            // use the rest of the URI.
+            endIndex = uri.length();
+        }
+
+        // return the namespace.
+        return uri.substring(beginIndex + 1, endIndex);
+
+	}
+
+    /**
+     * Return the timestamp which will be used to execute the query.
+     * 
+     * @todo the configured timestamp should only be used for the default
+     *       namespace (or it should be configured for each graph explicitly, or
+     *       we should bundle the (namespace,timestamp) together as a single
+     *       object).
+     * 
+     * @todo use path for the timestamp or acquire read lock when the server
+     *       starts against a specific namespace?
+     */
+    private long getTimestamp(final String uri,
+            final LinkedHashMap<String, Vector<String>> params) {
+
+        return config.timestamp;
+        
+    }
+	
 	/**
 	 * Respond to a status request.
 	 * 
@@ -495,19 +562,26 @@
         if (showKBInfo) {
 
             // General information on the connected kb.
-            sb.append(getKBInfo());
+            sb.append(getKBInfo(getNamespace(uri), getTimestamp(uri, params)));
 
         }
 		
-		if (repo.getDatabase().getIndexManager() instanceof IJournal) {
+		if (indexManager instanceof IJournal) {
 
 	        /*
 	         * Stuff which is specific to a local/embedded database.
 	         */
 
-			final AbstractJournal jnl = (AbstractJournal) repo.getDatabase()
-					.getIndexManager();
+			final AbstractJournal jnl = (AbstractJournal) indexManager;
 
+            sb.append("file\t= " + jnl.getFile() + "\n");
+
+            sb.append("BufferMode\t= "
+                    + jnl.getBufferStrategy().getBufferMode() + "\n");
+
+            sb.append("nextOffset\t= " + jnl.getRootBlockView().getNextOffset()
+                    + "\n");
+
 			if (LRUNexus.INSTANCE != null) {
 
 				sb.append(LRUNexus.Options.CLASS + "="
@@ -522,7 +596,6 @@
 			}
 
 			// show the disk access details.
-
 			sb.append(jnl.getBufferStrategy().getCounters().toString()+"\n\n");
 
 		}
@@ -592,6 +665,10 @@
 			final Properties header,
 			final LinkedHashMap<String, Vector<String>> params) throws Exception {
 
+        final String namespace = getNamespace(uri);
+
+        final long timestamp = getTimestamp(uri, params);
+	    
 		final String queryStr = params.get("query").get(0);
 
 		if (queryStr == null) {
@@ -615,8 +692,8 @@
 		 */
 		final PipedOutputStream os = new PipedOutputStream();
 		final InputStream is = new PipedInputStream(os);//Bytes.kilobyte32*8/*pipeSize*/);
-		final FutureTask<Void> ft = new FutureTask<Void>(getQueryTask(queryStr,
-				os));
+        final FutureTask<Void> ft = new FutureTask<Void>(getQueryTask(
+                namespace, timestamp, queryStr, os));
 		try {
 
 			// Choose an appropriate MIME type.
@@ -711,8 +788,9 @@
 	 * 
 	 * @throws MalformedQueryException 
 	 */
-	private Callable<Void> getQueryTask(final String queryStr,
-			final PipedOutputStream os) throws MalformedQueryException {
+    private Callable<Void> getQueryTask(final String namespace,
+            final long timestamp, final String queryStr,
+            final PipedOutputStream os) throws MalformedQueryException {
 
 		/*
 		 * Parse the query so we can figure out how it will need to be executed.
@@ -736,142 +814,283 @@
 			break;
 		case DESCRIBE:
 		case CONSTRUCT:
-			return new GraphQueryTask(queryStr, os);
+			return new GraphQueryTask(namespace, timestamp, queryStr, os);
 		case SELECT:
-			return new TupleQueryTask(queryStr, os);
+			return new TupleQueryTask(namespace, timestamp, queryStr, os);
 		}
 
 		throw new RuntimeException("Unknown query type: " + queryType);
 
 	}
 
-	/**
-	 * Note: A read-only connection from the lastCommitTime
-	 * 
-	 * @throws RepositoryException
-	 */
-	protected SailRepositoryConnection getQueryConnection()
-			throws RepositoryException {
+    /**
+     * Note: A read-only connection.
+     * 
+     * @param namespace
+     * @param timestamp
+     * 
+     * @throws RepositoryException
+     * 
+     * @todo enforce historical query by making sure timestamps conform (we do
+     *       not want to allow read/write tx queries unless update semantics are
+     *       introduced ala SPARQL 1.1).
+     * 
+     * @todo Use a distributed read-only tx for queries (it would be nice if a
+     *       tx used 2PL to specify which namespaces it could touch).
+     */
+    protected BigdataSailRepositoryConnection getQueryConnection(
+            final String namespace, final long timestamp)
+            throws RepositoryException {
+        
+        // resolve the default namespace.
+        final AbstractTripleStore tripleStore = (AbstractTripleStore) indexManager
+                .getResourceLocator().locate(namespace, timestamp);
 
-		return repo.getReadOnlyConnection();
+        if (tripleStore == null) {
 
+            throw new RuntimeException("Not found: namespace=" + namespace
+                    + ", timestamp=" + TimestampUtility.toString(timestamp));
+
+        }
+
+        /*
+         * Since the kb exists, wrap it as a sail.
+         * 
+         * @todo cache? close when not in use any more?
+         */
+        final BigdataSail sail = new BigdataSail(tripleStore);
+
+        final BigdataSailRepository repo = new BigdataSailRepository(sail);
+
+        repo.initialize();
+
+        return (BigdataSailRepositoryConnection) repo
+                .getReadOnlyConnection(timestamp);
+
     }
 
     /**
-     * Executes a tuple query.
+     * Abstract base class for running queries handles the timing, pipe,
+     * reporting, obtains the connection, and provides the finally {} semantics
+     * for each type of query task.
      * 
-     * @todo Extract a base class which handles the timing, pipe, reporting,
-     *       obtains the connection, and provides the finally {} semantics for
-     *       each type of query task.
+     * @author <a href="mailto:tho...@us...">Bryan
+     *         Thompson</a>
+     * @version $Id$
      */
-	private class TupleQueryTask implements Callable<Void> {
+    abstract private class AbstractQueryTask implements Callable<Void> {
+        
+        /** The namespace against which the query will be run. */
+        private final String namespace;
 
-		private final String queryStr;
-		private final PipedOutputStream os;
+        /**
+         * The timestamp of the view for that namespace against which the query
+         * will be run.
+         */
+        private final long timestamp;
 
-		public TupleQueryTask(final String queryStr, final PipedOutputStream os) {
+        /** The SPARQL query string. */
+        protected final String queryStr;
 
-			this.queryStr = queryStr;
-			this.os = os;
+        /** A pipe used to incrementally deliver the results to the client. */
+        private final PipedOutputStream os;
 
-		}
+        /**
+         * 
+         * @param namespace
+         *            The namespace against which the query will be run.
+         * @param timestamp
+         *            The timestamp of the view for that namespace against which
+         *            the query will be run.
+         * @param queryStr
+         *            The SPARQL query string.
+         * @param os
+         *            A pipe used to incrementally deliver the results to the
+         *            client.
+         */
+        protected AbstractQueryTask(final String namespace,
+                final long timestamp, final String queryStr,
+                final PipedOutputStream os) {
 
-		public Void call() throws Exception {
-			final Long queryId = Long.valueOf(queryIdFactory.incrementAndGet());
-			final SailRepositoryConnection cxn = getQueryConnection();
-			try {
-				final long begin = System.nanoTime();
-				queries.put(queryId, new RunningQuery(queryId.longValue(), queryStr, begin));
-				final TupleQuery query = cxn.prepareTupleQuery(
-						QueryLanguage.SPARQL, queryStr);
-				query.evaluate(new SPARQLResultsXMLWriter(new XMLWriter(os)));
-				os.close();
-				return null;
-			} catch (Throwable t) {
-				// launder and rethrow the exception.
-				throw launderThrowable(t,os);
-			} finally {
-				try {
-					cxn.close();
-				} finally {
-					queries.remove(queryId);
-				}
-			}
+            this.namespace = namespace;
+            this.timestamp = timestamp;
+            this.queryStr = queryStr;
+            this.os = os;
+
+        }
+
+        /**
+         * Execute the query.
+         * 
+         * @param cxn
+         *            The connection.
+         * @param os
+         *            Where the write the query results.
+         * 
+         * @throws Exception
+         */
+        abstract protected void doQuery(SailRepositoryConnection cxn,
+                OutputStream os) throws Exception;
+
+        final public Void call() throws Exception {
+            final Long queryId = Long.valueOf(queryIdFactory.incrementAndGet());
+            final SailRepositoryConnection cxn = getQueryConnection(namespace,
+                    timestamp);
+            final long begin = System.nanoTime();
+            try {
+                queries.put(queryId, new RunningQuery(queryId.longValue(),
+                        queryStr, begin));
+                doQuery(cxn, os);
+                os.flush();
+                return null;
+            } catch (Throwable t) {
+                // launder and rethrow the exception.
+                throw launderThrowable(t, os);
+            } finally {
+                queries.remove(queryId);
+                try {
+                    os.close();
+                } catch (Throwable t) {
+                    log.error(t, t);
+                }
+                try {
+                    cxn.close();
+                } catch (Throwable t) {
+                    log.error(t, t);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Executes a tuple query.
+     */
+	private class TupleQueryTask extends AbstractQueryTask {
+
+        public TupleQueryTask(final String namespace, final long timestamp,
+                final String queryStr, final PipedOutputStream os) {
+
+            super(namespace, timestamp, queryStr, os);
+
 		}
 
+        protected void doQuery(final SailRepositoryConnection cxn,
+                final OutputStream os) throws Exception {
+
+            final TupleQuery query = cxn.prepareTupleQuery(
+                    QueryLanguage.SPARQL, queryStr);
+            
+            query.evaluate(new SPARQLResultsXMLWriter(new XMLWriter(os)));
+            
+        }
+        
+//		public Void call() throws Exception {
+//			final Long queryId = Long.valueOf(queryIdFactory.incrementAndGet());
+//			final SailRepositoryConnection cxn = getQueryConnection();
+//			try {
+//				final long begin = System.nanoTime();
+//				queries.put(queryId, new RunningQuery(queryId.longValue(), queryStr, begin));
+//				final TupleQuery query = cxn.prepareTupleQuery(
+//						QueryLanguage.SPARQL, queryStr);
+//				query.evaluate(new SPARQLResultsXMLWriter(new XMLWriter(os)));
+//				os.close();
+//				return null;
+//			} catch (Throwable t) {
+//				// launder and rethrow the exception.
+//				throw launderThrowable(t,os);
+//			} finally {
+//				try {
+//					cxn.close();
+//				} finally {
+//					queries.remove(queryId);
+//				}
+//			}
+//		}
+
 	}
 
 	/**
 	 * Executes a graph query.
 	 */
-	private class GraphQueryTask implements Callable<Void> {
+	private class GraphQueryTask extends AbstractQueryTask {
 
-		private final String queryStr;
-		private final PipedOutputStream os;
+        public GraphQueryTask(final String namespace, final long timestamp,
+                final String queryStr, final PipedOutputStream os) {
 
-		public GraphQueryTask(final String queryStr, final PipedOutputStream os) {
+            super(namespace,timestamp,queryStr,os);
 
-			this.queryStr = queryStr;
-			this.os = os;
-
 		}
 
-		public Void call() throws Exception {
-			final Long queryId = Long.valueOf(queryIdFactory.incrementAndGet());
-			final SailRepositoryConnection cxn = getQueryConnection();
-			try {
-				final long begin = System.nanoTime();
-				queries.put(queryId, new RunningQuery(queryId.longValue(), queryStr, begin));
-				final BigdataSailGraphQuery query = (BigdataSailGraphQuery) cxn
-						.prepareGraphQuery(QueryLanguage.SPARQL, queryStr);
-				query.evaluate(new RDFXMLWriter(os));
-				os.close();
-				return null;
-			} catch (Throwable t) {
-				throw launderThrowable(t, os);
-			} finally {
-				try {
-					cxn.close();
-				} finally {
-					queries.remove(queryId);
-				}
-			}
-		}
-	
+//		public Void call() throws Exception {
+//			final Long queryId = Long.valueOf(queryIdFactory.incrementAndGet());
+//			final SailRepositoryConnection cxn = getQueryConnection();
+//			try {
+//				final long begin = System.nanoTime();
+//				queries.put(queryId, new RunningQuery(queryId.longValue(), queryStr, begin));
+//				final BigdataSailGraphQuery query = (BigdataSailGraphQuery) cxn
+//						.prepareGraphQuery(QueryLanguage.SPARQL, queryStr);
+//				query.evaluate(new RDFXMLWriter(os));
+//				os.close();
+//				return null;
+//			} catch (Throwable t) {
+//				throw launderThrowable(t, os);
+//			} finally {
+//				try {
+//					cxn.close();
+//				} finally {
+//					queries.remove(queryId);
+//				}
+//			}
+//		}
+
+        @Override
+        protected void doQuery(final SailRepositoryConnection cxn,
+                final OutputStream os) throws Exception {
+
+            final BigdataSailGraphQuery query = (BigdataSailGraphQuery) cxn
+                    .prepareGraphQuery(QueryLanguage.SPARQL, queryStr);
+
+            query.evaluate(new RDFXMLWriter(os));
+
+        }
+
 	}
 
-	/**
-	 * Send a STOP message to the service
-	 *
-	 * @param port The port for that service.
-	 * 
-	 * @throws IOException 
-	 * 
-	 * @todo This winds up warning <pre> java.net.SocketTimeoutException: Read timed out</pre>
-	 * even though the shutdown request was accepted and processed by the server.  I'm not
-	 * sure why. 
-	 */
-	public static void sendStop(final int port) throws IOException {
-		
-		final URL url = new URL("http://localhost:" + port+"/stop");
-		HttpURLConnection conn = null;
-		try {
+    /**
+     * Send a STOP message to the service
+     * 
+     * @param port
+     *            The port for that service.
+     * 
+     * @throws IOException
+     * 
+     * @todo This winds up warning <code>
+     * java.net.SocketTimeoutException: Read timed out
+     * </code> even though the shutdown request was
+     *       accepted and processed by the server. I'm not sure why.
+     */
+    public static void sendStop(final int port) throws IOException {
 
-			conn = (HttpURLConnection) url.openConnection();
-			conn.setRequestMethod("POST");
-			conn.setDoInput(true); // true to read from the server.
-			conn.setDoOutput(true); // true to write to the server.
-			conn.setUseCaches(false);
-			conn.setReadTimeout(2000/* ms */);
-			conn.setRequestProperty("Content-Type",
-					"application/x-www-form-urlencoded");
-			conn.setRequestProperty("Content-Length", "" + Integer.toString(0));
-			conn.setRequestProperty("Content-Language", "en-US");
+        final URL url = new URL("http://localhost:" + port + "/stop");
+        HttpURLConnection conn = null;
+        try {
 
-			// Send request
-			conn.getOutputStream().close();
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setDoInput(true); // true to read from the server.
+            conn.setDoOutput(true); // true to write to the server.
+            conn.setUseCaches(false);
+            conn.setReadTimeout(2000/* ms */);
+            conn.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded");
+            conn.setRequestProperty("Content-Length", "" + Integer.toString(0));
+            conn.setRequestProperty("Content-Language", "en-US");
 
-			// connect.
+            // Send request
+            conn.getOutputStream().close();
+
+            // connect.
 			try {
 
 				conn.connect();
@@ -913,16 +1132,21 @@
 		public int port;
 		
 		/**
-		 * The namespace of the KB instance.
+		 * The default namespace.
 		 */
 		public String namespace;
     	
+		/**
+		 * The default timestamp used to query the default namespace.
+		 */
+		public long timestamp;
+		
     	/**
 		 * The #of threads to use to handle SPARQL queries -or- ZERO (0) for an
 		 * unbounded pool.
 		 */
     	public int queryThreadPoolSize = 8;
-
+    	
     	public Config() {
     	}
     	
@@ -934,47 +1158,51 @@
 		
 	}
 
-	/**
-	 * Run an httpd service exposing a SPARQL endpoint. The service will respond
-	 * at the root path for the specified port.
-	 * 
-	 * @param args
-	 *            USAGE: <code>port -stop</code> to stop the server; OR<br/>
-	 *            <code>(options) <i>namespace</i> (propertyFile|configFile) )</code>
-	 *            where
-	 *            <dl>
-	 *            <dt>port</dt>
-	 *            <dd>The port on which the service will respond.</dd>
-	 *            <dt>namespace</dt>
-	 *            <dd>The namespace of the target KB instance ("kb" is the
-	 *            default namespace).</dd>
-	 *            <dt>propertyFile</dt>
-	 *            <dd>A java properties file for a standalone {@link Journal}.</dd>
-	 *            <dt>configFile</dt>
-	 *            <dd>A jini configuration file for a bigdata federation.</dd>
-	 *            </dl>
-	 *            and <i>options</i> are any of:
-	 *            <dl>
-	 *            <dt>-nthreads</dt>
-	 *            <dd>The #of threads which will be used to answer SPARQL queries.</dd>
-	 *            <dt></dt>
-	 *            <dd></dd>
-	 *            <dt></dt>
-	 *            <dd></dd>
-	 *            <dt></dt>
-	 *            <dd></dd>
-	 *            <dt></dt>
-	 *            <dd></dd>
-	 *            <dt></dt>
-	 *            <dd></dd>
-	 *            </dl>
-	 */
+    /**
+     * Run an httpd service exposing a SPARQL endpoint. The service will respond
+     * to the following URL paths:
+     * <dl>
+     * <dt>http://localhost:port/</dt>
+     * <dd>The SPARQL end point for the default namespace as specified by the
+     * <code>namespace</code> command line argument.</dd>
+     * <dt>http://localhost:port/namespace/NAMESPACE</dt>
+     * <dd>where <code>NAMESPACE</code> is the namespace of some triple store or
+     * quad store, may be used to address ANY triple or quads store in the
+     * bigdata instance.</dd>
+     * <dt>http://localhost:port/status</dt>
+     * <dd>A status page.</dd>
+     * </dl>
+     * 
+     * @param args
+     *            USAGE: <code>port -stop</code> to stop the server; OR<br/>
+     *            <code>(options) <i>namespace</i> (propertyFile|configFile) )</code>
+     *            where
+     *            <dl>
+     *            <dt>port</dt>
+     *            <dd>The port on which the service will respond.</dd>
+     *            <dt>namespace</dt>
+     *            <dd>The namespace of the default SPARQL endpoint (the
+     *            namespace will be <code>kb</code> if none was specified when
+     *            the triple/quad store was created).</dd>
+     *            <dt>propertyFile</dt>
+     *            <dd>A java properties file for a standalone {@link Journal}.</dd>
+     *            <dt>configFile</dt>
+     *            <dd>A jini configuration file for a bigdata federation.</dd>
+     *            </dl>
+     *            and <i>options</i> are any of:
+     *            <dl>
+     *            <dt>-nthreads</dt>
+     *            <dd>The #of threads which will be used to answer SPARQL
+     *            queries.</dd>
+     *            </dl>
+     */
 	public static void main(final String[] args) {
 		final Config config = new Config();
 		config.port = 80;
 		Journal jnl = null;
 		JiniClient<?> jiniClient = null;
 		NanoSparqlServer server = null;
+		ITransactionService txs = null;
 		try {
 			/*
 			 * `
@@ -1073,6 +1301,14 @@
 
 			}
 
+            txs = (indexManager instanceof Journal ? ((Journal) indexManager)
+                    .getTransactionManager().getTransactionService()
+                    : ((IBigdataFederation<?>) indexManager)
+                            .getTransactionService());
+
+            config.timestamp = txs.newTx(ITx.READ_COMMITTED);
+            System.out.println("tx: " + config.timestamp);
+
 			// start the server.
 			server = new NanoSparqlServer(config, indexManager);
 
@@ -1104,9 +1340,10 @@
 
             if (true) { // @todo if(!quiet) or if(verbose)
                 /*
-                 * Log some information about the kb (#of statements, etc).
+                 * Log some information about the default kb (#of statements, etc).
                  */
-                System.out.println(server.getKBInfo());
+                System.out.println(server.getKBInfo(config.namespace,
+                        config.timestamp));
             }
 
 			/*
@@ -1126,7 +1363,15 @@
 
 		} catch (Throwable ex) {
 			ex.printStackTrace();
-		} finally {
+        } finally {
+            if (txs != null) {
+                try {
+                    txs.abort(config.timestamp);
+                } catch (IOException e) {
+                    log.error("Could not release transaction: tx="
+                            + config.timestamp, e);
+                }
+		    }
 			if (server != null)
 				server.shutdownNow();
 			if (jnl != null) {


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

[Bigdata-commit] SF.net SVN: bigdata:[3333] trunk/src/resources/config

From: <tho...@us...> - 2010-07-28 13:07:12

Revision: 3333
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3333&view=rev
Author:   thompsonbry
Date:     2010-07-28 13:07:06 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
cleaned up the comments concerning the journalExtent parameter.  the 200MB value is advised.  The 1000MB value has not been tested in quite some time and I have no reason to believe that it would perform better with the changes to the dynamic sharding logic this year.

Modified Paths:
--------------
    trunk/src/resources/config/bigdataCluster.config
    trunk/src/resources/config/bigdataCluster16.config
    trunk/src/resources/config/standalone/bigdataStandalone.config

Modified: trunk/src/resources/config/bigdataCluster.config
===================================================================
--- trunk/src/resources/config/bigdataCluster.config	2010-07-27 21:33:26 UTC (rev 3332)
+++ trunk/src/resources/config/bigdataCluster.config	2010-07-28 13:07:06 UTC (rev 3333)
@@ -184,11 +184,7 @@
 
     // @todo also specify k (replicationCount)
 
-    /* Sets the initial and maximum journal extents.
-     * 
-     * Note: 200M is good for 32bit machines.  Higher end server machines with
-     * more on-disk cache work well with 1000M (1GB).
-     */
+    // Sets the initial and maximum journal extents.
     static private journalExtent = ConfigMath.multiply(200, Bytes.megabyte);
 
     /**

Modified: trunk/src/resources/config/bigdataCluster16.config
===================================================================
--- trunk/src/resources/config/bigdataCluster16.config	2010-07-27 21:33:26 UTC (rev 3332)
+++ trunk/src/resources/config/bigdataCluster16.config	2010-07-28 13:07:06 UTC (rev 3333)
@@ -193,16 +193,8 @@
     static private maxDataServicesPerHost = 2;
     static private dataServiceCount = 22; // was 24; was 20; was 18; was 20;//28;//14;//28
 
-    /* Sets the initial and maximum journal extents.
-     * 
-     * Note: 200M is good for 32bit machines.  Higher end server machines with
-     * more on-disk cache work well with 1000M (1GB).
-     *
-     * Note: I have seen modestly significant IOWait associated with overflow
-     * of a 1G journal at 8B+ triples, so I am reducing the journal size to
-     * compensate.
-     */
-    static private journalExtent = ConfigMath.multiply(200/*was 512*/, Bytes.megabyte);
+    // Sets the initial and maximum journal extents.
+    static private journalExtent = ConfigMath.multiply(200, Bytes.megabyte);
 
     /**
      * zookeeper configuration properties.

Modified: trunk/src/resources/config/standalone/bigdataStandalone.config
===================================================================
--- trunk/src/resources/config/standalone/bigdataStandalone.config	2010-07-27 21:33:26 UTC (rev 3332)
+++ trunk/src/resources/config/standalone/bigdataStandalone.config	2010-07-28 13:07:06 UTC (rev 3333)
@@ -138,8 +138,7 @@
      */
     static private dataServiceCount = 1;
     
-    /* Sets the initial and maximum journal extents.
-     */
+    // Sets the initial and maximum journal extents.
     static private journalExtent = ConfigMath.multiply(200, Bytes.megabyte);
 
     /**


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

[Bigdata-commit] SF.net SVN: bigdata:[3332] branches/BIGDATA_RELEASE_0_83_1/

From: <tho...@us...> - 2010-07-27 21:33:32

Revision: 3332
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3332&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:33:26 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
This fixes two import statements which references a type which had been removed from the source tree.

Added Paths:
-----------
    branches/BIGDATA_RELEASE_0_83_1/


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

[Bigdata-commit] SF.net SVN: bigdata:[3331] trunk

From: <tho...@us...> - 2010-07-27 21:30:54

Revision: 3331
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3331&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:30:48 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
This is a bigdata (R) snapshot release.  This release is capable of loading 1B
triples in under one hour on a 15 node cluster and has been used to load up to
13B triples on the same cluster.  JDK 1.6 is required.

See [1] for instructions on installing bigdata(R), [2] for the javadoc and [3]
and [4] for news, questions, and the latest developments.  For more information
about SYSTAP, LLC and bigdata, see [5].

Please note that we recommend checking out the code from SVN using the tag for
this release.  The code will build automatically under eclipse.  You can also
build the code using the ant script.  The cluster installer requires the use of
the ant script.  You can checkout this release from the following URL:

	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_1

New features:

- Inlining XSD numerics, xsd:boolean, or custom datatype extensions
  into the statement indices.  Inlining provides a smaller footprint
  and faster queries for data using XSD numeric datatypes.  In order
  to introduce inlining we were forced to make a change in the
  physical schema for the RDF database which breaks binary
  compatibility for existing stores.  The recommended migration path
  is to export the data and import it into a new bigdata instance.

- Refactor of the dynamic sharding mechanism for higher performance.

- The SparseRowStore has been modified to make Unicode primary keys
  decodable by representing Unicode primary keys using UTF8 rather
  than Unicode sort keys.  This change also allows the SparseRowStore
  to work with the JDK collator option which embeds nul bytes into
  Unicode sort keys.  This change breaks binary compatibility, but
  there is an option for historical compatibility.

The roadmap for the next releases include:

- Query optimizations;

- Support for high-volume analytic query workloads and SPARQL aggregations;

- High availability for the journal and the cluster;

- Simplified deployment, configuration, and administration for clusters.

For more information, please see the following links:

[1] http://bigdata.wiki.sourceforge.net/GettingStarted
[2] http://www.bigdata.com/bigdata/docs/api/
[3] http://sourceforge.net/projects/bigdata/
[4] http://www.bigdata.com/blog 
[5] http://www.systap.com/bigdata.htm

About bigdata: 

Bigdata?\194?\174 is a horizontally-scaled, general purpose storage and computing fabric
for ordered data (B+Trees), designed to operate on either a single server or a
cluster of commodity hardware. Bigdata?\194?\174 uses dynamically partitioned key-range
shards in order to remove any realistic scaling limits - in principle, bigdata?\194?\174
may be deployed on 10s, 100s, or even thousands of machines and new capacity may
be added incrementally without requiring the full reload of all data. The bigdata?\194?\174
RDF database supports RDFS and OWL Lite reasoning, high-level query (SPARQL),
and datum level provenance. 

Modified Paths:
--------------
    trunk/build.properties

Added Paths:
-----------
    trunk/bigdata/src/releases/RELEASE_0_83_1.txt

Added: trunk/bigdata/src/releases/RELEASE_0_83_1.txt
===================================================================
--- trunk/bigdata/src/releases/RELEASE_0_83_1.txt	                        (rev 0)
+++ trunk/bigdata/src/releases/RELEASE_0_83_1.txt	2010-07-27 21:30:48 UTC (rev 3331)
@@ -0,0 +1,62 @@
+This is a bigdata (R) snapshot release.  This release is capable of loading 1B
+triples in under one hour on a 15 node cluster and has been used to load up to
+13B triples on the same cluster.  JDK 1.6 is required.
+
+See [1] for instructions on installing bigdata(R), [2] for the javadoc and [3]
+and [4] for news, questions, and the latest developments.  For more information
+about SYSTAP, LLC and bigdata, see [5].
+
+Please note that we recommend checking out the code from SVN using the tag for
+this release.  The code will build automatically under eclipse.  You can also
+build the code using the ant script.  The cluster installer requires the use of
+the ant script.  You can checkout this release from the following URL:
+
+	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_1
+
+New features:
+
+- Inlining XSD numerics, xsd:boolean, or custom datatype extensions
+  into the statement indices.  Inlining provides a smaller footprint
+  and faster queries for data using XSD numeric datatypes.  In order
+  to introduce inlining we were forced to make a change in the
+  physical schema for the RDF database which breaks binary
+  compatibility for existing stores.  The recommended migration path
+  is to export the data and import it into a new bigdata instance.
+
+- Refactor of the dynamic sharding mechanism for higher performance.
+
+- The SparseRowStore has been modified to make Unicode primary keys
+  decodable by representing Unicode primary keys using UTF8 rather
+  than Unicode sort keys.  This change also allows the SparseRowStore
+  to work with the JDK collator option which embeds nul bytes into
+  Unicode sort keys.  This change breaks binary compatibility, but
+  there is an option for historical compatibility.
+
+The roadmap for the next releases include:
+
+- Query optimizations;
+
+- Support for high-volume analytic query workloads and SPARQL aggregations;
+
+- High availability for the journal and the cluster;
+
+- Simplified deployment, configuration, and administration for clusters.
+
+For more information, please see the following links:
+
+[1] http://bigdata.wiki.sourceforge.net/GettingStarted
+[2] http://www.bigdata.com/bigdata/docs/api/
+[3] http://sourceforge.net/projects/bigdata/
+[4] http://www.bigdata.com/blog 
+[5] http://www.systap.com/bigdata.htm
+
+About bigdata: 
+
+Bigdata\xAE is a horizontally-scaled, general purpose storage and computing fabric
+for ordered data (B+Trees), designed to operate on either a single server or a
+cluster of commodity hardware. Bigdata\xAE uses dynamically partitioned key-range
+shards in order to remove any realistic scaling limits - in principle, bigdata\xAE
+may be deployed on 10s, 100s, or even thousands of machines and new capacity may
+be added incrementally without requiring the full reload of all data. The bigdata\xAE
+RDF database supports RDFS and OWL Lite reasoning, high-level query (SPARQL),
+and datum level provenance. 


Property changes on: trunk/bigdata/src/releases/RELEASE_0_83_1.txt
___________________________________________________________________
Added: svn:keywords
   + Id Date Revision Author HeadURL

Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2010-07-27 21:28:28 UTC (rev 3330)
+++ trunk/build.properties	2010-07-27 21:30:48 UTC (rev 3331)
@@ -36,7 +36,7 @@
 release.dir=ant-release
 
 # The build version (note: 0.82b -> 0.82.0)
-build.ver=0.83.0
+build.ver=0.83.1
 build.ver.osgi=0.83
 
 # Set true to do a snapshot build.  This changes the value of ${version} to


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

[Bigdata-commit] SF.net SVN: bigdata:[3330] trunk/bigdata-rdf/src/java/com/bigdata/rdf/store

From: <tho...@us...> - 2010-07-27 21:28:34

Revision: 3330
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3330&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:28:28 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
Removed references to the ITermIdCodes interface, which was removed from the main code base.

Modified Paths:
--------------
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java	2010-07-27 21:25:14 UTC (rev 3329)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java	2010-07-27 21:28:28 UTC (rev 3330)
@@ -44,6 +44,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.log4j.Logger;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
@@ -55,6 +56,7 @@
 import org.openrdf.model.vocabulary.RDFS;
 import org.openrdf.model.vocabulary.XMLSchema;
 import org.openrdf.rio.rdfxml.RDFXMLParser;
+
 import com.bigdata.btree.AbstractBTree;
 import com.bigdata.btree.BTree;
 import com.bigdata.btree.BytesUtil;
@@ -80,7 +82,6 @@
 import com.bigdata.rdf.internal.IDatatypeURIResolver;
 import com.bigdata.rdf.internal.IExtension;
 import com.bigdata.rdf.internal.IExtensionFactory;
-import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.lexicon.BigdataRDFFullTextIndex;
 import com.bigdata.rdf.lexicon.ITermIndexCodes;

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java	2010-07-27 21:25:14 UTC (rev 3329)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java	2010-07-27 21:28:28 UTC (rev 3330)
@@ -29,7 +29,6 @@
 
 import org.openrdf.model.Value;
 
-import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.lexicon.LexiconRelation;
 import com.bigdata.rdf.model.BigdataValue;


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

[Bigdata-commit] SF.net SVN: bigdata:[3329] trunk/build.properties

From: <tho...@us...> - 2010-07-27 21:25:20

Revision: 3329
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3329&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:25:14 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
bumped the revision number....

Modified Paths:
--------------
    trunk/build.properties

Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2010-07-27 21:21:32 UTC (rev 3328)
+++ trunk/build.properties	2010-07-27 21:25:14 UTC (rev 3329)
@@ -36,8 +36,8 @@
 release.dir=ant-release
 
 # The build version (note: 0.82b -> 0.82.0)
-build.ver=0.82.0
-build.ver.osgi=0.82
+build.ver=0.83.0
+build.ver.osgi=0.83
 
 # Set true to do a snapshot build.  This changes the value of ${version} to
 # include the date.


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

[Bigdata-commit] SF.net SVN: bigdata:[3328] branches/BIGDATA_RELEASE_0_83_0/

From: <tho...@us...> - 2010-07-27 21:21:39

Revision: 3328
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3328&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:21:32 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
This is a bigdata (R) snapshot release.  This release is capable of loading 1B
triples in under one hour on a 15 node cluster and has been used to load up to
13B triples on the same cluster.  JDK 1.6 is required.

See [1] for instructions on installing bigdata(R), [2] for the javadoc and [3]
and [4] for news, questions, and the latest developments.  For more information
about SYSTAP, LLC and bigdata, see [5].

Please note that we recommend checking out the code from SVN using the tag for
this release.  The code will build automatically under eclipse.  You can also
build the code using the ant script.  The cluster installer requires the use of
the ant script.  You can checkout this release from the following URL:

	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_0

This corresponds to revision 3326.

New features:

- Inlining XSD numerics, xsd:boolean, or custom datatype extensions
  into the statement indices.  Inlining provides a smaller footprint
  and faster queries for data using XSD numeric datatypes.  In order
  to introduce inlining we were forced to make a change in the
  physical schema for the RDF database which breaks binary
  compatibility for existing stores.  The recommended migration path
  is to export the data and import it into a new bigdata instance.

- Refactor of the dynamic sharding mechanism for higher performance.

- The SparseRowStore has been modified to make Unicode primary keys
  decodable by representing Unicode primary keys using UTF8 rather
  than Unicode sort keys.  This change also allows the SparseRowStore
  to work with the JDK collator option which embeds nul bytes into
  Unicode sort keys.  This change breaks binary compatibility, but
  there is an option for historical compatibility.

The roadmap for the next releases include:

- Query optimizations;

- Support for high-volume analytic query workloads and SPARQL aggregations;

- High availability for the journal and the cluster;

- Simplified deployment, configuration, and administration for clusters.

For more information, please see the following links:

[1] http://bigdata.wiki.sourceforge.net/GettingStarted
[2] http://www.bigdata.com/bigdata/docs/api/
[3] http://sourceforge.net/projects/bigdata/
[4] http://www.bigdata.com/blog 
[5] http://www.systap.com/bigdata.htm

About bigdata: 

Bigdata?\194?\174 is a horizontally-scaled, general purpose storage and computing fabric
for ordered data (B+Trees), designed to operate on either a single server or a
cluster of commodity hardware. Bigdata?\194?\174 uses dynamically partitioned key-range
shards in order to remove any realistic scaling limits - in principle, bigdata?\194?\174
may be deployed on 10s, 100s, or even thousands of machines and new capacity may
be added incrementally without requiring the full reload of all data. The bigdata?\194?\174
RDF database supports RDFS and OWL Lite reasoning, high-level query (SPARQL),
and datum level provenance. 

Revision Links:
--------------
    http://bigdata.svn.sourceforge.net/bigdata/?rev=3326&view=rev

Added Paths:
-----------
    branches/BIGDATA_RELEASE_0_83_0/


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

[Bigdata-commit] SF.net SVN: bigdata:[3327] trunk/bigdata/src/releases/RELEASE_0_83_0.txt

From: <tho...@us...> - 2010-07-27 21:20:26

Revision: 3327
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3327&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:20:21 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
Added the release notes.

Modified Paths:
--------------
    trunk/bigdata/src/releases/RELEASE_0_83_0.txt

Modified: trunk/bigdata/src/releases/RELEASE_0_83_0.txt
===================================================================
--- trunk/bigdata/src/releases/RELEASE_0_83_0.txt	2010-07-27 21:15:49 UTC (rev 3326)
+++ trunk/bigdata/src/releases/RELEASE_0_83_0.txt	2010-07-27 21:20:21 UTC (rev 3327)
@@ -11,9 +11,9 @@
 build the code using the ant script.  The cluster installer requires the use of
 the ant script.  You can checkout this release from the following URL:
 
-	https://bigdata.svn.sourceforge.net/svnroot/bigdata/tags/RELEASE_0.83.0
+	https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_0_83_0
 
-This tag corresponds to revision XXXX.
+This corresponds to revision 3326.
 
 New features:
 


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

[Bigdata-commit] SF.net SVN: bigdata:[3326] trunk/bigdata

From: <tho...@us...> - 2010-07-27 21:15:56

Revision: 3326
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3326&view=rev
Author:   thompsonbry
Date:     2010-07-27 21:15:49 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
Cleaned up IndexMetadata to remove support for IAddressSerializer and ISplitHandler.  Those interfaces and their implementations are now gone.

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java
    trunk/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
    trunk/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java
    trunk/bigdata/src/java/com/bigdata/btree/view/FusedView.java
    trunk/bigdata/src/java/com/bigdata/resources/ViewMetadata.java
    trunk/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
    trunk/bigdata-jini/src/java/com/bigdata/service/jini/benchmark/ThroughputMaster.java

Removed Paths:
-------------
    trunk/bigdata/src/java/com/bigdata/btree/AddressSerializer.java
    trunk/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java
    trunk/bigdata/src/java/com/bigdata/btree/ISplitHandler.java
    trunk/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java
    trunk/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java

Deleted: trunk/bigdata/src/java/com/bigdata/btree/AddressSerializer.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/AddressSerializer.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/AddressSerializer.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -1,121 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2007.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/*
- * Created on Dec 26, 2006
- */
-
-package com.bigdata.btree;
-
-import java.io.DataInput;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.bigdata.io.DataOutputBuffer;
-import com.bigdata.rawstore.IAddressManager;
-
-/**
- * Serializes each address as a long integer and does not attempt to pack or
- * compress the addresses.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- * 
- * @deprecated This class is no longer used. The implementation exists solely to
- *             facilitate de-serialization of older {@link IndexMetadata} record
- *             versions.
- */
-public class AddressSerializer implements IAddressSerializer, Externalizable {
-
-    private static final long serialVersionUID = -1434032311796654357L;
-
-//    public static final IAddressSerializer INSTANCE = new AddressSerializer();
-
-    /**
-     * De-serialization ctor.
-     */
-    public AddressSerializer() {
-    }
-
-    public void putChildAddresses(IAddressManager addressManager, DataOutputBuffer os, long[] childAddr,
-            int nchildren) throws IOException {
-
-        throw new UnsupportedOperationException();
-
-//        for (int i = 0; i < nchildren; i++) {
-//
-//            final long addr = childAddr[i];
-//
-//            /*
-//             * Children MUST have assigned persistent identity.
-//             */
-//            if (addr == 0L) {
-//
-//                throw new RuntimeException("Child is not persistent: index="
-//                        + i);
-//
-//            }
-//
-//            os.writeLong(addr);
-//
-//        }
-
-    }
-
-    public void getChildAddresses(IAddressManager addressManager,DataInput is, long[] childAddr,
-            int nchildren) throws IOException {
-
-        throw new UnsupportedOperationException();
-
-//        for (int i = 0; i < nchildren; i++) {
-//
-//            final long addr = is.readLong();
-//
-//            if (addr == 0L) {
-//
-//                throw new RuntimeException(
-//                        "Child does not have persistent address: index=" + i);
-//
-//            }
-//
-//            childAddr[i] = addr;
-//
-//        }
-
-    }
-
-    public void readExternal(ObjectInput arg0) throws IOException, ClassNotFoundException {
-
-        // NOP (no state)
-        
-    }
-
-    public void writeExternal(ObjectOutput arg0) throws IOException {
-
-        // NOP (no state)
-
-    }
-
-}

Modified: trunk/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/BloomFilterFactory.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -31,7 +31,6 @@
 import java.io.Serializable;
 
 import com.bigdata.relation.accesspath.IAccessPath;
-import com.bigdata.resources.DefaultSplitHandler;
 
 /**
  * An interface that is used to generate a bloom filter for an
@@ -145,16 +144,12 @@
      * scale-out indices DO NOT share the same limitation. Each time a scale-out
      * index is partitioned, it is broken into a mutable {@link BTree} for
      * absorbing writes for an index partition and zero or more
-     * {@link IndexSegment}s. The default configuration of the
-     * {@link DefaultSplitHandler} for a scale-out index caps the #of entries in
-     * an index partition at ~ 1.5M. However, many of those index entries are
-     * going to migrate to the {@link IndexSegment}s, so the #of index entries
-     * in the {@link BTree} is never that large. Finally, #of index entries in
-     * an {@link IndexSegment} is always known when the {@link IndexSegment} is
+     * {@link IndexSegment}s. Each time an overflow occurs, index entries are
+     * migrated to the {@link IndexSegment}s, so the #of index entries in the
+     * {@link BTree} is never that large. Finally, #of index entries in an
+     * {@link IndexSegment} is always known when the {@link IndexSegment} is
      * built, so the {@link BloomFilter} for an {@link IndexSegment} is always a
      * perfect fit.
-     * 
-     * @see DefaultSplitHandler
      */
     public static final transient BloomFilterFactory DEFAULT = new BloomFilterFactory(
             DEFAULT_N, DEFAULT_ERROR_RATE, DEFAULT_MAX_ERROR_RATE); 
@@ -234,15 +229,15 @@
      * Create and return a new (empty) bloom filter for a {@link BTree} or
      * {@link IndexSegment}.
      * <p>
-     * The bloom filter can be provisioned with reference to
-     * {@link src/architecture/bloomfilter.xls}. Let <code>p</code> be the
-     * probability of a false positive (aka the error rate) and <code>n</code>
-     * be the #of index entries. The values p=.02 and n=1M result in a space
-     * requirement of 8656171 bits or approximately 1mb and uses ~ 8.6 bits per
-     * element. In order to achieve the same error rate with n=10M, the size
-     * requirements of the bloom filter will be approximately 10mb since the
-     * filter will still use ~ 8.6 bits per element for that error rate, or
-     * roughly one byte per index entry.
+     * The bloom filter can be provisioned with reference to {@link src
+     * /architecture/bloomfilter.xls}. Let <code>p</code> be the probability of
+     * a false positive (aka the error rate) and <code>n</code> be the #of index
+     * entries. The values p=.02 and n=1M result in a space requirement of
+     * 8656171 bits or approximately 1mb and uses ~ 8.6 bits per element. In
+     * order to achieve the same error rate with n=10M, the size requirements of
+     * the bloom filter will be approximately 10mb since the filter will still
+     * use ~ 8.6 bits per element for that error rate, or roughly one byte per
+     * index entry.
      * <p>
      * The maximum record length for the backing store can easily be exceeded by
      * a large bloom filter, large bloom filters will require significant time
@@ -252,12 +247,12 @@
      * While the scale-out architecture uses group commits and hence can be
      * expected to perform more commits during a bulk data load, it also uses
      * one bloom filter per {@link AbstractBTree} so the #of index entries is
-     * bounded by the configured {@link ISplitHandler}. On the other hand, the
-     * bloom filter performance will degrade as a scale-up index grows in size
-     * since the bloom filter can not be made very large for a scale-up store
-     * (the maximum record size is reduced in order to permit more records) and
-     * large indices will therefore experience increasing false positive rates
-     * as they grow.
+     * bounded by the configured {@link ISimpleSplitHandler} in an application
+     * dependent manner. On the other hand, the bloom filter performance will
+     * degrade as a scale-up index grows in size since the bloom filter can not
+     * be made very large for a scale-up store (the maximum record size is
+     * reduced in order to permit more records) and large indices will therefore
+     * experience increasing false positive rates as they grow.
      * <p>
      * Whether or not a bloom filter is useful depends on the application. The
      * bloom filter will ONLY be used for point tests such as contains(),

Deleted: trunk/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/IAddressSerializer.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -1,79 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2007.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/*
- * Created on Dec 26, 2006
- */
-
-package com.bigdata.btree;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.Serializable;
-
-import com.bigdata.io.DataOutputBuffer;
-import com.bigdata.rawstore.IAddressManager;
-
-/**
- * Interface for (de-)serialization of addresses of child nodes and leaves as
- * recorded on a {@link Node}.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- * 
- * @deprecated This interface is no longer used. It exists solely to facilitate
- *             de-serialization of older {@link IndexMetadata} record versions.
- */
-public interface IAddressSerializer extends Serializable {
-
-    /**
-     * De-serialize the child addresses for a node.
-     * 
-     * @param is
-     *            The input stream.
-     * @param childAddr
-     *            The array into which the addresses must be written.
-     * @param nchildren
-     *            The #of valid values in the array. The values in indices
-     *            [0:n-1] are defined and must be read from the buffer and
-     *            written on the array.
-     */
-    public void getChildAddresses(IAddressManager addressManager, DataInput is,
-            long[] childAddr, int nchildren) throws IOException;
-
-    /**
-     * Serialize the child addresses for a node.
-     * 
-     * @param os
-     *            The output stream.
-     * @param childAddr
-     *            The array of child addresses to be written.
-     * @param nchildren
-     *            The #of valid values in the array. The values in indices
-     *            [0:n-1] are defined and must be written.
-     */
-    public void putChildAddresses(IAddressManager addressManager,
-            DataOutputBuffer os, long[] childAddr, int nchildren)
-            throws IOException;
-
-}

Deleted: trunk/bigdata/src/java/com/bigdata/btree/ISplitHandler.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/ISplitHandler.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/ISplitHandler.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -1,119 +0,0 @@
-/*
-
-Copyright (C) SYSTAP, LLC 2006-2008.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-/*
- * Created on Feb 12, 2008
- */
-
-package com.bigdata.btree;
-
-import java.io.Serializable;
-
-import com.bigdata.sparse.SparseRowStore;
-
-/**
- * An interface used to decide when and index partition is overcapacity and
- * should be split, including the split point(s), and when an index partition is
- * undercapacity and should be joined with its right sibling.
- * <p>
- * Note: applications frequency must constrain the allowable separator keys when
- * splitting an index partition into two or more index partitions. For example,
- * the {@link SparseRowStore} must to maintain an guarantee of atomic operations
- * for a logical row, which is in turn defined as the ordered set of index
- * entries sharing the same primary key. You can use this interface to impose
- * application specific constraints such that the index partition boundaries
- * only fall on acceptable separator keys.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- * 
- * @deprecated by {@link ISimpleSplitHandler}. This is only kept around to
- *             deserialize existing instances.
- */
-public interface ISplitHandler extends Serializable {
-
-//    /**
-//     * Return <code>true</code> if a cursory examination of an index partition
-//     * suggests that it SHOULD be split into 2 or more index partitions.
-//     * 
-//     * @param rangeCount
-//     *            A fast range count (may overestimate).
-//     * 
-//     * @return <code>true</code> if the index partition should be split.
-//     */
-//    public boolean shouldSplit(long rangeCount);
-//
-//    /**
-//     * Return the percentage of a single nominal split that would be satisified
-//     * by an index partition based on the specified range count. If the index
-//     * partition has exactly the desired number of tuples, then return ONE
-//     * (1.0). If the index partition has 50% of the desired #of tuples, then
-//     * return <code>.5</code>. If the index partition could be used to build
-//     * two splits, then return TWO (2.0), etc.
-//     * 
-//     * @param rangeCount
-//     *            A fast range count (may overestimate).
-//     * 
-//     * @return The percentage of a split per above.
-//     */
-//    public double percentOfSplit(long rangeCount);
-//    
-//    /**
-//     * Return <code>true</code> if a cursory examination of an index partition
-//     * suggests that it SHOULD be joined with either its left or right sibling.
-//     * The basic determination is that the index partition is "undercapacity".
-//     * Normally this is decided in terms of the range count of the index
-//     * partition.
-//     * 
-//     * @param rangeCount
-//     *            A fast range count (may overestimate).
-//     * 
-//     * @return <code>true</code> if the index partition should be joined.
-//     */
-//    public boolean shouldJoin(long rangeCount);
-//
-//    /**
-//     * Choose a set of splits that completely span the key range of the index
-//     * view. The first split MUST use the leftSeparator of the index view as its
-//     * leftSeparator. The last split MUST use the rightSeparator of the index
-//     * view as its rightSeparator. The #of splits SHOULD be chosen such that the
-//     * resulting index partitions are each at least 50% full.
-//     * 
-//     * @param partitionIdFactory
-//     * 
-//     * @param ndx
-//     *            The source index partition.
-//     * 
-//     * @return A {@link Split}[] array contains everything that we need to
-//     *         define the new index partitions -or- <code>null</code> if a more
-//     *         detailed examination reveals that the index SHOULD NOT be split
-//     *         at this time.
-//     */
-////    * @param btreeCounters
-////    *            Performance counters for the index partition view collected
-////    *            since the last overflow.
-//    public Split[] getSplits(IPartitionIdFactory partitionIdFactory,
-//            ILocalBTreeView ndx);//, BTreeCounters btreeCounters);
-
-}

Modified: trunk/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/IndexMetadata.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/IndexMetadata.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -2377,86 +2377,87 @@
      */
     private static transient final int VERSION0 = 0x0;
 
-    /**
-     * This version introduced the {@link #asynchronousIndexWriteConfiguration}.
-     * Reads of an earlier version create a instance of that field based on a
-     * default configuration.
-     */
-    private static transient final int VERSION1 = 0x1;
-    
-    /**
-     * This version introduced the {@link #scatterSplitConfiguration}. Reads of
-     * an earlier version create a instance of that field based on a default
-     * configuration.
-     */
-    private static transient final int VERSION2 = 0x2;
+//    /**
+//     * This version introduced the {@link #asynchronousIndexWriteConfiguration}.
+//     * Reads of an earlier version create a instance of that field based on a
+//     * default configuration.
+//     */
+//    private static transient final int VERSION1 = 0x1;
+//    
+//    /**
+//     * This version introduced the {@link #scatterSplitConfiguration}. Reads of
+//     * an earlier version create a instance of that field based on a default
+//     * configuration.
+//     */
+//    private static transient final int VERSION2 = 0x2;
+//
+//    /**
+//     * This version introduced {@link #indexSegmentLeafCacheTimeout}. Reads of
+//     * an earlier version use the
+//     * {@link Options#DEFAULT_INDEX_SEGMENT_LEAF_CACHE_TIMEOUT} for this field.
+//     */
+//    private static transient final int VERSION3 = 0x3;
+//
+//    /**
+//     * This version introduced {@link #btreeRecordCompressorFactory} and
+//     * {@link #indexSegmentRecordCompressorFactory}. Both of these fields are
+//     * optional, which implies no compression provider. Reads of prior versions
+//     * set these fields to <code>null</code>.
+//     * 
+//     * @see Options#BTREE_RECORD_COMPRESSOR_FACTORY
+//     * @see Options#INDEX_SEGMENT_RECORD_COMPRESSOR_FACTORY
+//     */
+//    private static transient final int VERSION4 = 0x04;
+//
+//    /**
+//     * This version introduced {@link #childLocks}. Reads of prior versions set
+//     * this field to <code>true</code>.
+//     * 
+//     * @see Options#CHILD_LOCKS
+//     */
+//    private static transient final int VERSION5 = 0x05;
+//    
+//    /**
+//     * This version introduced {@link #versionTimestampFilters}.  Reads of prior
+//     * versions set this field to <code>false</code>.
+//     */
+//    private static transient final int VERSION6 = 0x06;
+//
+//    /**
+//     * This version gets rid of the read-retention queue capacity and nscan
+//     * properties and the index segment leaf cache capacity and timeout
+//     * properties.
+//     */
+//    private static transient final int VERSION7 = 0x07;
+//    
+//    /**
+//     * This version gets rid of the IAddressSerializer interface used by the
+//     * older {@link NodeSerializer} class to (de-)serialize the child addresses
+//     * for a {@link Node}.
+//     */
+//    private static transient final int VERSION8 = 0x08;
+//    
+//    /**
+//     * The childLocks feature was dropped in this version.
+//     */
+//    private static transient final int VERSION9 = 0x09;
+//
+//    /**
+//     * The split handler was changed from an implementation based on the #of
+//     * tuples to one based on the size on disk of an index segment after a
+//     * compacting merge. The old split handlers are replaced by a
+//     * <code>null</code> reference when they are de-serialized.
+//     * 
+//     * @see ISplitHandler
+//     * @see ISimpleSplitHandler
+//     */
+//    private static transient final int VERSION10 = 0x10;
 
     /**
-     * This version introduced {@link #indexSegmentLeafCacheTimeout}. Reads of
-     * an earlier version use the
-     * {@link Options#DEFAULT_INDEX_SEGMENT_LEAF_CACHE_TIMEOUT} for this field.
-     */
-    private static transient final int VERSION3 = 0x3;
-
-    /**
-     * This version introduced {@link #btreeRecordCompressorFactory} and
-     * {@link #indexSegmentRecordCompressorFactory}. Both of these fields are
-     * optional, which implies no compression provider. Reads of prior versions
-     * set these fields to <code>null</code>.
-     * 
-     * @see Options#BTREE_RECORD_COMPRESSOR_FACTORY
-     * @see Options#INDEX_SEGMENT_RECORD_COMPRESSOR_FACTORY
-     */
-    private static transient final int VERSION4 = 0x04;
-
-    /**
-     * This version introduced {@link #childLocks}. Reads of prior versions set
-     * this field to <code>true</code>.
-     * 
-     * @see Options#CHILD_LOCKS
-     */
-    private static transient final int VERSION5 = 0x05;
-    
-    /**
-     * This version introduced {@link #versionTimestampFilters}.  Reads of prior
-     * versions set this field to <code>false</code>.
-     */
-    private static transient final int VERSION6 = 0x06;
-
-    /**
-     * This version gets rid of the read-retention queue capacity and nscan
-     * properties and the index segment leaf cache capacity and timeout
-     * properties.
-     */
-    private static transient final int VERSION7 = 0x07;
-    
-    /**
-     * This version gets rid of the IAddressSerializer interface used by the
-     * older {@link NodeSerializer} class to (de-)serialize the child addresses
-     * for a {@link Node}.
-     */
-    private static transient final int VERSION8 = 0x08;
-    
-    /**
-     * The childLocks feature was dropped in this version.
-     */
-    private static transient final int VERSION9 = 0x09;
-
-    /**
-     * The split handler was changed from an implementation based on the #of
-     * tuples to one based on the size on disk of an index segment after a
-     * compacting merge. The old split handlers are replaced by a
-     * <code>null</code> reference when they are de-serialized.
-     * 
-     * @see ISplitHandler
-     * @see ISimpleSplitHandler
-     */
-    private static transient final int VERSION10 = 0x10;
-
-    /**
      * The version that will be serialized by this class.
      */
-    private static transient final int CURRENT_VERSION = VERSION10;
+    private static transient final int CURRENT_VERSION = VERSION0;
+//    private static transient final int CURRENT_VERSION = VERSION10;
     
     /**
      * @todo review generated record for compactness.
@@ -2468,16 +2469,16 @@
 
         switch (version) {
         case VERSION0:
-        case VERSION1:
-        case VERSION2:
-        case VERSION3:
-        case VERSION4:
-        case VERSION5:
-        case VERSION6:
-        case VERSION7:
-        case VERSION8:
-        case VERSION9:
-        case VERSION10:
+//        case VERSION1:
+//        case VERSION2:
+//        case VERSION3:
+//        case VERSION4:
+//        case VERSION5:
+//        case VERSION6:
+//        case VERSION7:
+//        case VERSION8:
+//        case VERSION9:
+//        case VERSION10:
             break;
         default:
             throw new IOException("Unknown version: version=" + version);
@@ -2499,94 +2500,94 @@
         
         writeRetentionQueueScan = (int)LongPacker.unpackLong(in);
         
-        if (version < VERSION7) {
-        
-            /* btreeReadRetentionQueueCapacity = (int) */LongPacker
-                    .unpackLong(in);
+//        if (version < VERSION7) {
+//        
+//            /* btreeReadRetentionQueueCapacity = (int) */LongPacker
+//                    .unpackLong(in);
+//
+//            /* btreeReadRetentionQueueScan = (int) */LongPacker.unpackLong(in);
+//
+//        }
 
-            /* btreeReadRetentionQueueScan = (int) */LongPacker.unpackLong(in);
-
-        }
-
         pmd = (LocalPartitionMetadata)in.readObject();
         
         btreeClassName = in.readUTF();
         
         checkpointClassName = in.readUTF();
 
-        if (version < VERSION8) {
+//        if (version < VERSION8) {
+//
+//            // Read and discard the IAddressSerializer object.
+//            in.readObject();
+//            
+//        }
 
-            // Read and discard the IAddressSerializer object.
-            in.readObject();
-            
-        }
-
         nodeKeysCoder = (IRabaCoder) in.readObject();
 
         tupleSer = (ITupleSerializer) in.readObject();
         
-        if (version < VERSION4) {
+//        if (version < VERSION4) {
+//
+//            btreeRecordCompressorFactory = null;
+//
+//        } else {
 
-            btreeRecordCompressorFactory = null;
-
-        } else {
-
             btreeRecordCompressorFactory = (IRecordCompressorFactory) in
                     .readObject();
 
-        }
+//        }
         
         conflictResolver = (IConflictResolver)in.readObject();
 
-        if (version < VERSION5 || version >= VERSION9) {
-
-//            childLocks = true;
-            
-        } else {
-            
-//            childLocks = 
-                in.readBoolean();
-            
-        }
+//        if (version < VERSION5 || version >= VERSION9) {
+//
+////            childLocks = true;
+//            
+//        } else {
+//            
+////            childLocks = 
+//                in.readBoolean();
+//            
+//        }
         
         deleteMarkers = in.readBoolean();
         
         versionTimestamps = in.readBoolean();
 
-        if (version < VERSION6) {
+//        if (version < VERSION6) {
+//
+//            versionTimestampFilters = false;
+//
+//        } else {
 
-            versionTimestampFilters = false;
-
-        } else {
-
             versionTimestampFilters = in.readBoolean();
-            
-        }
+//            
+//        }
 
         bloomFilterFactory = (BloomFilterFactory) in.readObject();
 
         overflowHandler = (IOverflowHandler)in.readObject();
 
-        if (version < VERSION10) {
+//        if (version < VERSION10) {
+//
+//            /*
+//             * The old style of split handler is discarded. The default behavior
+//             * for the new style of split handler covers all known uses of the
+//             * old style split handler. While some indices (the sparse row store
+//             * for example) will have to register a new split handler for
+//             * safety, those indices were not safe for splits historically.
+//             */
+//
+//            // read and discard the old split handler.
+//            in.readObject();
+//
+//            splitHandler2 = null;
+//            
+//        } else {
 
-            /*
-             * The old style of split handler is discarded. The default behavior
-             * for the new style of split handler covers all known uses of the
-             * old style split handler. While some indices (the sparse row store
-             * for example) will have to register a new split handler for
-             * safety, those indices were not safe for splits historically.
-             */
-
-            // read and discard the old split handler.
-            in.readObject();
-
-            splitHandler2 = null;
-            
-        } else {
-
             splitHandler2 = (ISimpleSplitHandler) in.readObject();
             
-        }
+//        }
 
         /*
          * IndexSegment.
@@ -2594,118 +2595,118 @@
 
         indexSegmentBranchingFactor = (int) LongPacker.unpackLong(in);
 
-        if (version < VERSION7) {
+//        if (version < VERSION7) {
+//
+//            /* indexSegmentLeafCacheCapacity = (int) */LongPacker
+//                    .unpackLong(in);
+//
+//            if (version < VERSION3) {
+//
+//                /*
+//                 * indexSegmentLeafCacheTimeout = Long
+//                 * .parseLong(Options.DEFAULT_INDEX_SEGMENT_LEAF_CACHE_TIMEOUT);
+//                 */
+//
+//            } else {
+//
+//                /* indexSegmentLeafCacheTimeout = (long) */LongPacker
+//                        .unpackLong(in);
+//
+//            }
+//
+//        }
 
-            /* indexSegmentLeafCacheCapacity = (int) */LongPacker
-                    .unpackLong(in);
-
-            if (version < VERSION3) {
-
-                /*
-                 * indexSegmentLeafCacheTimeout = Long
-                 * .parseLong(Options.DEFAULT_INDEX_SEGMENT_LEAF_CACHE_TIMEOUT);
-                 */
-
-            } else {
-
-                /* indexSegmentLeafCacheTimeout = (long) */LongPacker
-                        .unpackLong(in);
-
-            }
-
-        }
-
         indexSegmentBufferNodes = in.readBoolean();
 
-        if (version < VERSION4) {
+//        if (version < VERSION4) {
+//
+//            indexSegmentRecordCompressorFactory = null;
+//
+//        } else {
 
-            indexSegmentRecordCompressorFactory = null;
-
-        } else {
-
             indexSegmentRecordCompressorFactory = (IRecordCompressorFactory) in
                     .readObject();
 
-        }
+//        }
         
-        if (version < VERSION1) {
-
-            /*
-             * Use the default configuration since not present in the serialized
-             * form before VERSION1.
-             */
-
-            final int masterQueueCapacity = Integer
-                    .parseInt(Options.DEFAULT_MASTER_QUEUE_CAPACITY);
-
-            final int masterChunkSize = Integer
-                    .parseInt(Options.DEFAULT_MASTER_CHUNK_SIZE);
-
-            final long masterChunkTimeoutNanos = Long
-                    .parseLong(Options.DEFAULT_MASTER_CHUNK_TIMEOUT_NANOS);
-
-            final long sinkIdleTimeoutNanos = Long
-                    .parseLong(Options.DEFAULT_SINK_IDLE_TIMEOUT_NANOS);
-
-            final long sinkPollTimeoutNanos = Long
-                    .parseLong(Options.DEFAULT_SINK_POLL_TIMEOUT_NANOS);
-
-            final int sinkQueueCapacity = Integer
-                    .parseInt(Options.DEFAULT_SINK_QUEUE_CAPACITY);
-
-            final int sinkChunkSize = Integer
-                    .parseInt(Options.DEFAULT_SINK_CHUNK_SIZE);
-
-            final long sinkChunkTimeoutNanos = Long
-                    .parseLong(Options.DEFAULT_SINK_CHUNK_TIMEOUT_NANOS);
-
-            asynchronousIndexWriteConfiguration = new AsynchronousIndexWriteConfiguration(
-                    masterQueueCapacity,//
-                    masterChunkSize,//
-                    masterChunkTimeoutNanos,//
-                    sinkIdleTimeoutNanos,//
-                    sinkPollTimeoutNanos,//
-                    sinkQueueCapacity,//
-                    sinkChunkSize,//
-                    sinkChunkTimeoutNanos//
-                    );
-            
-        } else {
+//        if (version < VERSION1) {
+//
+//            /*
+//             * Use the default configuration since not present in the serialized
+//             * form before VERSION1.
+//             */
+//
+//            final int masterQueueCapacity = Integer
+//                    .parseInt(Options.DEFAULT_MASTER_QUEUE_CAPACITY);
+//
+//            final int masterChunkSize = Integer
+//                    .parseInt(Options.DEFAULT_MASTER_CHUNK_SIZE);
+//
+//            final long masterChunkTimeoutNanos = Long
+//                    .parseLong(Options.DEFAULT_MASTER_CHUNK_TIMEOUT_NANOS);
+//
+//            final long sinkIdleTimeoutNanos = Long
+//                    .parseLong(Options.DEFAULT_SINK_IDLE_TIMEOUT_NANOS);
+//
+//            final long sinkPollTimeoutNanos = Long
+//                    .parseLong(Options.DEFAULT_SINK_POLL_TIMEOUT_NANOS);
+//
+//            final int sinkQueueCapacity = Integer
+//                    .parseInt(Options.DEFAULT_SINK_QUEUE_CAPACITY);
+//
+//            final int sinkChunkSize = Integer
+//                    .parseInt(Options.DEFAULT_SINK_CHUNK_SIZE);
+//
+//            final long sinkChunkTimeoutNanos = Long
+//                    .parseLong(Options.DEFAULT_SINK_CHUNK_TIMEOUT_NANOS);
+//
+//            asynchronousIndexWriteConfiguration = new AsynchronousIndexWriteConfiguration(
+//                    masterQueueCapacity,//
+//                    masterChunkSize,//
+//                    masterChunkTimeoutNanos,//
+//                    sinkIdleTimeoutNanos,//
+//                    sinkPollTimeoutNanos,//
+//                    sinkQueueCapacity,//
+//                    sinkChunkSize,//
+//                    sinkChunkTimeoutNanos//
+//                    );
+//            
+//        } else {
         
             asynchronousIndexWriteConfiguration = (AsynchronousIndexWriteConfiguration) in
                     .readObject();
             
-        }
+//        }
 
-        if (version < VERSION2) {
+//        if (version < VERSION2) {
+//
+//            /*
+//             * Use the default configuration since not present in the serialized
+//             * form before VERSION2.
+//             */
+//
+//            final boolean scatterSplitEnabled = Boolean
+//                    .parseBoolean(Options.DEFAULT_SCATTER_SPLIT_ENABLED);
+//
+//            final double scatterSplitPercentOfSplitThreshold = Double
+//                    .parseDouble(Options.DEFAULT_SCATTER_SPLIT_PERCENT_OF_SPLIT_THRESHOLD);
+//
+//            final int scatterSplitDataServicesCount = Integer
+//                    .parseInt(Options.DEFAULT_SCATTER_SPLIT_DATA_SERVICE_COUNT);
+//
+//            final int scatterSplitIndexPartitionsCount = Integer
+//                    .parseInt(Options.DEFAULT_SCATTER_SPLIT_INDEX_PARTITION_COUNT);
+//
+//            this.scatterSplitConfiguration = new ScatterSplitConfiguration(
+//                    scatterSplitEnabled, scatterSplitPercentOfSplitThreshold,
+//                    scatterSplitDataServicesCount,
+//                    scatterSplitIndexPartitionsCount);
+//
+//        } else {
 
-            /*
-             * Use the default configuration since not present in the serialized
-             * form before VERSION2.
-             */
-
-            final boolean scatterSplitEnabled = Boolean
-                    .parseBoolean(Options.DEFAULT_SCATTER_SPLIT_ENABLED);
-
-            final double scatterSplitPercentOfSplitThreshold = Double
-                    .parseDouble(Options.DEFAULT_SCATTER_SPLIT_PERCENT_OF_SPLIT_THRESHOLD);
-
-            final int scatterSplitDataServicesCount = Integer
-                    .parseInt(Options.DEFAULT_SCATTER_SPLIT_DATA_SERVICE_COUNT);
-
-            final int scatterSplitIndexPartitionsCount = Integer
-                    .parseInt(Options.DEFAULT_SCATTER_SPLIT_INDEX_PARTITION_COUNT);
-
-            this.scatterSplitConfiguration = new ScatterSplitConfiguration(
-                    scatterSplitEnabled, scatterSplitPercentOfSplitThreshold,
-                    scatterSplitDataServicesCount,
-                    scatterSplitIndexPartitionsCount);
-
-        } else {
-
             scatterSplitConfiguration = (ScatterSplitConfiguration) in.readObject();
             
-        }
+//        }
         
     }
 
@@ -2752,30 +2753,30 @@
         
         out.writeObject(tupleSer);
         
-        if (version >= VERSION4) {
+//        if (version >= VERSION4) {
             
             out.writeObject(btreeRecordCompressorFactory);
             
-        }
+//        }
 
         out.writeObject(conflictResolver);
 
-        if (version >= VERSION5 && version < VERSION9 ) {
+//        if (version >= VERSION5 && version < VERSION9 ) {
+//
+////            out.writeBoolean(childLocks);
+//            out.writeBoolean(false/* childLocks */);
+//            
+//        }
 
-//            out.writeBoolean(childLocks);
-            out.writeBoolean(false/* childLocks */);
-            
-        }
-
         out.writeBoolean(deleteMarkers);
         
         out.writeBoolean(versionTimestamps);
         
-        if (version >= VERSION6) {
+//        if (version >= VERSION6) {
 
             out.writeBoolean(versionTimestampFilters);
             
-        }
+//        }
 
         out.writeObject(bloomFilterFactory);
         
@@ -2800,25 +2801,25 @@
 
         out.writeBoolean(indexSegmentBufferNodes);
 
-        if (version >= VERSION4) {
+//        if (version >= VERSION4) {
             
             out.writeObject(btreeRecordCompressorFactory);
             
-        }
+//        }
+//
+//        if (version >= VERSION1) {
 
-        if (version >= VERSION1) {
-
             // introduced in VERSION1
             out.writeObject(asynchronousIndexWriteConfiguration);
 
-        }
+//        }
+//
+//        if (version >= VERSION2) {
 
-        if (version >= VERSION2) {
-
             // introduced in VERSION2
             out.writeObject(scatterSplitConfiguration);
 
-        }
+//        }
 
     }
 

Deleted: trunk/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/PackedAddressSerializer.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -1,124 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2007.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/*
- * Created on Dec 26, 2006
- */
-
-package com.bigdata.btree;
-
-import java.io.DataInput;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.bigdata.io.DataOutputBuffer;
-import com.bigdata.rawstore.IAddressManager;
-import com.bigdata.rawstore.IRawStore;
-
-/**
- * Packs the addresses using the {@link IAddressManager} for the backing
- * {@link IRawStore}.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- * 
- * @deprecated This class is no longer used. The implementation exists solely to
- *             facilitate de-serialization of older {@link IndexMetadata} record
- *             versions.
- */
-public class PackedAddressSerializer implements IAddressSerializer, Externalizable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 7533128830948670801L;
-    
-//    public static final IAddressSerializer INSTANCE = new PackedAddressSerializer();
-
-    public PackedAddressSerializer() {
-        
-    }
-    
-    public void putChildAddresses(IAddressManager addressManager, DataOutputBuffer os,
-            long[] childAddr, int nchildren) throws IOException {
-
-        throw new UnsupportedOperationException();
-        
-//        for (int i = 0; i < nchildren; i++) {
-//
-//            final long addr = childAddr[i];
-//
-//            /*
-//             * Children MUST have assigned persistent identity.
-//             */
-//            if (addr == 0L) {
-//
-//                throw new RuntimeException("Child is not persistent: index="
-//                        + i);
-//
-//            }
-//
-//            addressManager.packAddr(os, addr);
-//
-//        }
-
-    }
-
-    public void getChildAddresses(IAddressManager addressManager, DataInput is,
-            long[] childAddr, int nchildren) throws IOException {
-
-        throw new UnsupportedOperationException();
-        
-//        for (int i = 0; i < nchildren; i++) {
-//
-//            final long addr = addressManager.unpackAddr(is);
-//
-//            if (addr == 0L) {
-//
-//                throw new RuntimeException(
-//                        "Child does not have persistent address: index=" + i);
-//
-//            }
-//
-//            childAddr[i] = addr;
-//
-//        }
-
-    }
-
-
-    public void readExternal(ObjectInput arg0) throws IOException, ClassNotFoundException {
-
-        // NOP (no state)
-        
-    }
-
-    public void writeExternal(ObjectOutput arg0) throws IOException {
-
-        // NOP (no state)
-
-    }
-
-}

Modified: trunk/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/isolation/IsolatedFusedView.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -137,7 +137,7 @@
      * <p>
      * Reads will read through the <i>writeSet</i> and then the resource(s) in
      * the <i>groundState</i> in the order in which they are given. A read is
-     * satisified by the first resource containing an index entry for the search
+     * satisfied by the first resource containing an index entry for the search
      * key.
      * <p>
      * Writes will first read through looking for a @todo javadoc

Modified: trunk/bigdata/src/java/com/bigdata/btree/view/FusedView.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/btree/view/FusedView.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/btree/view/FusedView.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -65,7 +65,6 @@
 import com.bigdata.mdi.IResourceMetadata;
 import com.bigdata.mdi.LocalPartitionMetadata;
 import com.bigdata.relation.accesspath.AbstractAccessPath;
-import com.bigdata.resources.DefaultSplitHandler;
 import com.bigdata.service.MetadataService;
 import com.bigdata.service.Split;
 
@@ -86,10 +85,9 @@
  *       {@link ILocalBTreeView} and {@link IAutoboxBTree}.
  * 
  * @todo Can I implement {@link ILinearList} here? That would make it possible
- *       to use keyAt() and indexOf() and might pave the way for a faster
- *       {@link DefaultSplitHandler} and also for a {@link MetadataService} that
- *       supports overflow since the index segments could be transparent at that
- *       point.
+ *       to use keyAt() and indexOf() and might pave the way for a
+ *       {@link MetadataService} that supports overflow since the index segments
+ *       could be transparent at that point.
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
  * @version $Id$

Deleted: trunk/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java	2010-07-27 21:09:15 UTC (rev 3325)
+++ trunk/bigdata/src/java/com/bigdata/resources/DefaultSplitHandler.java	2010-07-27 21:15:49 UTC (rev 3326)
@@ -1,922 +0,0 @@
-package com.bigdata.resources;
-
-import com.bigdata.bfs.BigdataFileSystem;
-import com.bigdata.btree.ISimpleSplitHandler;
-import com.bigdata.btree.ISplitHandler;
-
-/**
- * A configurable default policy for deciding when and where to split an index
- * partition into 2 or more index partitions.
- * <p>
- * Note: There is probably no single value for {@link #getEntryCountPerSplit()}
- * that is going to be "right" across applications. The space requirements for
- * keys is very difficult to estimate since leading key compression will often
- * provide a good win. Likewise, indices are free to use compression on their
- * values as well so the size of the byte[] values is not a good estimate of
- * their size in the index.
- * <p>
- * Note: The #of index entries is a good proxy for the space requirements of
- * most indices. The {@link BigdataFileSystem} is one case where the space
- * requirements could be quite different since 64M blocks may be stored along
- * with the index entries, however in that case you can also test for the size
- * of the index segment that is part of the view and decide that it's time to
- * split the view.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id: DefaultSplitHandler.java 2265 2009-10-26 12:51:06Z thompsonbry
- *          $
- * 
- * @deprecated by {@link ISimpleSplitHandler}. This is only kept around to
- *             deserialize existing instances.
- */
-public class DefaultSplitHandler implements ISplitHandler {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1675517991163473445L;
-
-//    /**
-//     * Logger.
-//     */
-//    protected static final Logger log = Logger
-//            .getLogger(DefaultSplitHandler.class);
-//
-//    /**
-//     * True iff the {@link #log} level is DEBUG or less.
-//     */
-//    final protected static boolean DEBUG = log.isDebugEnabled();
-//
-//    /**
-//     * True iff the {@link #log} level is INFO or less.
-//     */
-//    final protected static boolean INFO = log.isInfoEnabled();
-
-    private int minimumEntryCount;
-    
-    private int entryCountPerSplit;
-
-    private int sampleRate;
-
-    private double overCapacityMultiplier;
-
-    private double underCapacityMultiplier;
-
-//    public String toString() {
-//    
-//        final StringBuilder sb = new StringBuilder();
-//        
-//        sb.append(getClass().getName());
-//        
-//        sb.append("{ minimumEntryCount=" + minimumEntryCount);
-//
-//        sb.append(", entryCountPerSplit=" + entryCountPerSplit);
-//
-//        sb.append(", sampleRate=" + sampleRate);
-//        
-//        sb.append(", overCapacityMultiplier=" + overCapacityMultiplier);
-//        
-//        sb.append(", underCapacityMultiplier=" + underCapacityMultiplier);
-//        
-//        sb.append(", targetCountPerSplit=" + getTargetEntryCountPerSplit());
-//        
-//        sb.append("}");
-//        
-//        return sb.toString();
-//        
-//    }
-    
-    /**
-     * De-serialization ctor.
-     */
-    public DefaultSplitHandler() {
-
-    }
-
-//    /**
-//     * Setup a split handler.
-//     * 
-//     * @param minimumEntryCount
-//     *            An index partition which has no more than this many tuples
-//     *            should be joined with its rightSibling (if any).
-//     * @param entryCountPerSplit
-//     *            The target #of tuples for an index partition.
-//     * @param overCapacityMultiplier
-//     *            The index partition will be split when its actual entry count
-//     *            is GTE to
-//     *            <code>overCapacityMultiplier * entryCountPerSplit</code>
-//     * @param underCapacityMultiplier
-//     *            When an index partition will be split, the #of new index
-//     *            partitions will be chosen such that each index partition is
-//     *            approximately <i>underCapacityMultiplier</i> full.
-//     * @param sampleRate
-//     *            The #of samples to take per estimated split (non-negative, and
-//     *            generally on the order of 10s of samples). The purpose of the
-//     *            samples is to accommodate the actual distribution of the keys
-//     *            in the index.
-//     * 
-//     * @throws IllegalArgumentException
-//     *             if any argument, or combination or arguments, is out of
-//     *             range.
-//     */
-//    public DefaultSplitHandler(final int minimumEntryCount,
-//            final int entryCountPerSplit, final double overCapacityMultiplier,
-//            final double underCapacityMultiplier, final int sampleRate) {
-//
-//        /*
-//         * Bootstap parameter settings. 
-//         * 
-//         * First, verify combination of parameters is legal.
-//         */
-//        assertSplitJoinStable(minimumEntryCount, entryCountPerSplit,
-//                underCapacityMultiplier);
-//
-//        /*
-//         * Now that we know the combination is legal, set individual parameters
-//         * that have dependencies in their legal range. This will let us set the
-//         * individual parameters with their settor methods below.
-//         */
-//        this.minimumEntryCount = minimumEntryCount;
-//        this.entryCountPerSplit = entryCountPerSplit;
-//        this.underCapacityMultiplier = underCapacityMultiplier;
-//        
-//        /*
-//         * Use individual set methods to validate each parameter by itself.
-//         */
-//
-//        setMinimumEntryCount(minimumEntryCount);
-//
-//        setEntryCountPerSplit(entryCountPerSplit);
-//
-//        setOverCapacityMultiplier(overCapacityMultiplier);
-//
-//        setUnderCapacityMultiplier(underCapacityMultiplier);
-//
-//        setSampleRate(sampleRate);
-//        
-//    }
-
-//    /**
-//     * Return <code>true</code> iff the range count of the index is less than
-//     * the {@link #getMinimumEntryCount()}.
-//     * <p>
-//     * Note: This relies on the fast range count, which is the upper bound on
-//     * the #of index entries. For this reason an index partition which has
-//     * undergone a lot of deletes will not underflow until it has gone through a
-//     * build to purge the deleted index entries. This is true even when all
-//     * index entries in the index partition have been deleted!
-//     */
-//    public boolean shouldJoin(final long rangeCount) {
-//
-//        final boolean shouldJoin = rangeCount <= getMinimumEntryCount();
-//        
-//        if (INFO)
-//            log.info("shouldJoin=" + shouldJoin + " : rangeCount=" + rangeCount
-//                    + ", minimumEntryCount=" + getMinimumEntryCount());
-//        
-//        return shouldJoin;
-//        
-//    }
-//    
-//    /**
-//     * Verify that a split will not result in index partitions whose range
-//     * counts are such that they would be immediately eligible for a join.
-//     * 
-//     * @throws IllegalArgumentException
-//     *             if split / join is not stable for the specified values.
-//     * 
-//     * @todo it might be worth while to convert this to a warning since actions
-//     *       such as a scatter split are designed with the expectation that the
-//     *       splits may be undercapacity but will fill up before the next
-//     *       overflow (or that joins will simply not be triggered for N
-//     *       overflows after a split).
-//     */
-//    static void assertSplitJoinStable(final int minimumEntryCount,
-//            final int entryCountPerSplit, final double underCapacityMultiplier) {
-//
-//        final int targetEntryCount = (int) Math.round(underCapacityMultiplier
-//                * entryCountPerSplit);
-//        
-//        if (minimumEntryCount > targetEntryCount) {
-//            
-//            throw new IllegalArgumentException("minimumEntryCount("
-//                    + minimumEntryCount + ") exceeds underCapacityMultiplier("
-//                    + underCapacityMultiplier + ") * entryCountPerSplit("
-//                    + entryCountPerSplit + ")");
-//            
-//        }
-//
-//    }
-//
-//    /**
-//     * The minimum #of index entries before the index partition becomes eligible
-//     * to be joined.
-//     */
-//    public int getMinimumEntryCount() {
-//
-//        return minimumEntryCount;
-//        
-//    }
-//
-//    public void setMinimumEntryCount(final int minimumEntryCount) {
-//
-//        if (minimumEntryCount < 0)
-//            throw new IllegalArgumentException("minimumEntryCount="
-//                    + minimumEntryCount);
-//        
-//        assertSplitJoinStable(minimumEntryCount, getEntryCountPerSplit(),
-//                getUnderCapacityMultiplier());
-//
-//        this.minimumEntryCount = minimumEntryCount;
-//        
-//    }
-//
-//    /**
-//     * The target maximum #of index entries in an index partition.
-//     */
-//    public int getEntryCountPerSplit() {
-//
-//        return entryCountPerSplit;
-//
-//    }
-//
-//    public void setEntryCountPerSplit(final int entryCountPerSplit) {
-//
-////        if (entryCountPerSplit < Options.MIN_BRANCHING_FACTOR) {
-////
-////            throw new IllegalArgumentException(
-////                    "entryCountPerSplit must be GTE the minimum branching factor: entryCountPerSplit="
-////                            + entryCountPerSplit
-////                            + ", minBranchingFactor="
-////                            + Options.MIN_BRANCHING_FACTOR);
-////
-////        }
-//        if (entryCountPerSplit < 1) {
-//
-//            throw new IllegalArgumentException(
-//                    "entryCountPerSplit must be GTE ONE(1): entryCountPerSplit="
-//                            + entryCountPerSplit);
-//
-//        }
-//
-//        assertSplitJoinStable(getMinimumEntryCount(), entryCountPerSplit,
-//                getUnderCapacityMultiplier());
-//        
-//        this.entryCountPerSplit = entryCountPerSplit;
-//        
-//    }
-//
-//    /**
-//     * The #of samples per estimated #of splits.
-//     */
-//    public int getSampleRate() {
-//
-//        return sampleRate;
-//
-//    }
-//
-//    public void setSampleRate(final int sampleRate) {
-//        
-//        if (sampleRate <= 0)
-//            throw new IllegalArgumentException();
-//
-//        this.sampleRate = sampleRate;
-//
-//    }
-//
-//    /**
-//     * The threshold for splitting an index is the
-//     * {@link #getOverCapacityMultiplier()} times
-//     * {@link #getEntryCountPerSplit()}. If there are fewer than this many
-//     * entries in the index then it will not be split.
-//     */
-//    public double getOverCapacityMultiplier() {
-//
-//        return overCapacityMultiplier;
-//
-//    }
-//
-//    /**
-//     * 
-//     * @param overCapacityMultiplier
-//     *            A value in [1.0:2.0].
-//     */
-//    public void setOverCapacityMultiplier(final double overCapacityMultiplier) {
-//
-//        final double min = 1.0;
-//        final double max = 2.0;
-//
-//        if (overCapacityMultiplier < min || overCapacityMultiplier > max) {
-//
-//            throw new IllegalArgumentException("Must be in [" + min + ":" + max
-//                    + "], but was " + overCapacityMultiplier);
-//
-//        }
-//
-//        this.overCapacityMultiplier = overCapacityMultiplier;
-//
-//    }
-//
-//    /**
-//     * This is the target under capacity rate for a new index partition. For
-//     * example, if the {@link #getEntryCountPerSplit()} is 5M and this
-//     * property is <code>.75</code> then an attempt will be made to divide
-//     * the index partition into N splits such that each split is at 75% of
-//     * the {@link #getEntryCountPerSplit()} capacity.
-//     */
-//    public double getUnderCapacityMultiplier() {
-//
-//        return underCapacityMultiplier;
-//
-//    }
-//
-//    /**
-//     * 
-//     * @param underCapacityMultiplier
-//     *            A value in [0.5,1.0).
-//     */
-//    public void setUnderCapacityMultiplier(final double underCapacityMultiplier) {
-//
-//        final double min = 0.5;
-//        final double max = 1.0;
-//
-//        if (underCapacityMultiplier < min || underCapacityMultiplier >= max) {
-//
-//            throw new IllegalArgumentException("Must be in [" + min + ":" + max
-//                    + "), but was " + underCapacityMultiplier);
-//
-//        }
-//
-//        assertSplitJoinStable(getMinimumEntryCount(), getEntryCountPerSplit(),
-//                underCapacityMultiplier);
-//        
-//        this.underCapacityMultiplier = underCapacityMultiplier;
-//
-//    }
-//
-//    /**
-//     * The target #of tuples per split, which is given by:
-//     * 
-//     * <pre>
-//     * targetEntryCountPerSplit := underCapacityMultiplier * entryCountPerSplit
-//     * </pre>
-//     * 
-//     */
-//    public int getTargetEntryCountPerSplit() {
-//
-//        return (int) Math.round(getUnderCapacityMultiplier()
-//                * getEntryCountPerSplit());
-//        
-//    }
-//    
-//    public boolean shouldSplit(final long rangeCount) {
-//
-//        /*
-//         * Recommend split if the range count equals or exceeds the overcapacity
-//         * multiplier.
-//         */
-//
-//        if (rangeCount >= (getOverCapacityMultiplier() * entryCountPerSplit)) {
-//
-//            if(INFO)
-//            log.info("Recommending split: rangeCount(" + rangeCount
-//                    + ") >= (entryCountPerSplit(" + entryCountPerSplit
-//                    + ") * overCapacityMultiplier("
-//                    + getOverCapacityMultiplier() + "))");
-//
-//            return true;
-//
-//        }
-//
-//        return false;
-//
-//    }
-//
-//    public double percentOfSplit(final long rangeCount) {
-//
-//        final double percentOfSplit = (double) rangeCount
-//                / (double) entryCountPerSplit;
-//
-//        if (INFO)
-//            log.info("percentOfSplit=" + percentOfSplit + " = rangeCount("
-//                    + rangeCount + ") / entryCountPerSplit("
-//                    + entryCountPerSplit + ")");
-//
-//        return percentOfSplit;
-//        
-//    }
-//    
-//    /**
-//     * A sample collected from a key-range scan.
-//     * 
-//     * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-//     * @version $Id$
-//     */
-//    static public class Sample {
-//
-//        /**
-//         * A key from the index.
-//         */
-//        final byte[] key;
-//
-//        /**
-//         * The origin zero (0) offset at which that key was found
-//         * (interpretation is that the key was visited by the Nth
-//         * {@link ITuple}).
-//         */
-//        final int offset;
-//
-//        public Sample(byte[] key, int offset) {
-//
-//            assert key != null;
-//
-//            assert offset >= 0;
-//
-//            this.key = key;
-//
-//            this.offset = offset;
-//
-//        }
-//
-//        public String toString() {
-//
-//            return super.toString() + "{offset=" + offset + ", key="
-//                    + Arrays.toString(key) + "}";
-//
-//        }
-//
-//    }
-//
-//    /**
-//     * Sample index using a range scan choosing ({@link #getSampleRate()} x N)
-//     * {@link Sample}s. The key range scan will filter out both duplicates and
-//     * deleted i...
 
[truncated message content]

[Bigdata-commit] SF.net SVN: bigdata:[3325] trunk/bigdata-rdf/src

From: <mrp...@us...> - 2010-07-27 21:09:22

Revision: 3325
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3325&view=rev
Author:   mrpersonick
Date:     2010-07-27 21:09:15 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
getting rid of ITermIdCodes

Modified Paths:
--------------
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java

Added Paths:
-----------
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java
    trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java

Removed Paths:
-------------
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdCodes.java
    trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdFilter.java

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -35,7 +35,7 @@
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.TermId;
-import com.bigdata.rdf.lexicon.ITermIdFilter;
+import com.bigdata.rdf.lexicon.ITermIVFilter;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rules.InferenceEngine;
 import com.bigdata.rdf.spo.ExplicitSPOFilter;
@@ -212,7 +212,7 @@
             resourceIds = new PushbackIterator<IV>(new MergedOrderedIterator(//
                     db.getSPORelation().distinctTermScan(SPOKeyOrder.SPO), //
                     db.getSPORelation().distinctTermScan(SPOKeyOrder.OSP,
-                            new ITermIdFilter() {
+                            new ITermIVFilter() {
                                 private static final long serialVersionUID = 1L;
                                 public boolean isValid(IV iv) {
                                     // filter out literals from the OSP scan.

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -27,7 +27,6 @@
 
 package com.bigdata.rdf.internal;
 
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.lexicon.TermIdEncoder;
 
 /**
@@ -35,15 +34,13 @@
  * setting the bit flags used to identify the type of an RDF Value (URI, 
  * Literal, Blank Node, SID, etc).
  * 
- * @todo This replaces {@link ITermIdCodes}.
- * 
  * @todo update {@link TermIdEncoder}. This encodes term identifiers for
  *       scale-out but moving some bits around. It will be simpler now that the
  *       term identifier is all bits in the long integer with an additional byte
  *       prefix to differentiate URI vs Literal vs BNode vs SID and to indicate
  *       the inline value type (termId vs everything else).
  */
-public enum VTE implements ITermIdCodes {
+public enum VTE {
 
     /** A URI. */
     URI((byte) 0x00),

Copied: trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java (from rev 3324, trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdFilter.java)
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java	                        (rev 0)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIVFilter.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -0,0 +1,22 @@
+package com.bigdata.rdf.lexicon;
+
+import java.io.Serializable;
+import com.bigdata.rdf.internal.IV;
+
+/**
+ * Interface for filtering internal values.
+ * 
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public interface ITermIVFilter extends Serializable {
+    
+    /**
+     * Return <code>true</code> iff the term {@link IV} should be visited.
+     * 
+     * @param iv
+     *            The internal value
+     */
+    public boolean isValid(IV iv);
+    
+}
\ No newline at end of file

Deleted: trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdCodes.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdCodes.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdCodes.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -1,87 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2007.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/*
- * Created on Jan 6, 2008
- */
-
-package com.bigdata.rdf.lexicon;
-
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-
-/**
- * An interface that defines bit masks that are applied to the low bits of the
- * assigned term identifiers and which indicate directly (without consulting the
- * term index) whether a term is a URI, Literal, BNode, or Statement. This is
- * used to quickly test the type of a term identifier without requiring the term
- * value to be materialized from the {@link LexiconKeyOrder#ID2TERM} index.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public interface ITermIdCodes {
-
-    /**
-     * The bit mask that is bit-wise ANDed with a term identifier in order to
-     * reveal the term code (the low two bits of the mask are set).
-     * 
-     * @see #TERMID_CODE_URI
-     * @see #TERMID_CODE_BNODE
-     * @see #TERMID_CODE_LITERAL
-     * @see #TERMID_CODE_STATEMENT
-     */
-    static final public long TERMID_CODE_MASK = 0x03L;
-    
-    /**
-     * The #of bits in the {@link #TERMID_CODE_MASK} (
-     * {@value #TERMID_CODE_MASK_BITS}).
-     */
-    static final public long TERMID_CODE_MASK_BITS = 2L;
-    
-    /**
-     * The bit value used to indicate that a term identifier stands for a
-     * {@link URI}.
-     */
-    static final public long TERMID_CODE_URI = 0x00L;
-
-    /**
-     * The bit value used to indicate that a term identifier stands for a
-     * {@link BNode}.
-     */
-    static final public long TERMID_CODE_BNODE = 0x01L;
-
-    /**
-     * The bit value used to indicate that a term identifier stands for a
-     * {@link Literal}.
-     */
-    static final public long TERMID_CODE_LITERAL = 0x02L;
-
-    /**
-     * The bit value used to indicate that a term identifier stands for a
-     * statement (when support for statement identifiers is enabled).
-     */
-    static final public long TERMID_CODE_STATEMENT = 0x03L;
-    
-}

Deleted: trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdFilter.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdFilter.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdFilter.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -1,31 +0,0 @@
-package com.bigdata.rdf.lexicon;
-
-import java.io.Serializable;
-
-import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.internal.TermId;
-import com.bigdata.rdf.store.AbstractTripleStore;
-
-/**
- * Interface for filtering base term identifiers, typically based on the bit
- * flags defined {@link ITermIdCodes}.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public interface ITermIdFilter extends Serializable {
-    
-    /**
-     * Return <code>true</code> iff the term identifier should be visited.
-     * 
-     * @param termId
-     *            The term identifier.
-     * 
-     * @see AbstractTripleStore#isURI(long)
-     * @see AbstractTripleStore#isBNode(long)
-     * @see AbstractTripleStore#isLiteral(long)
-     * @see AbstractTripleStore#isStatement(IV)
-     */
-    public boolean isValid(IV iv);
-    
-}
\ No newline at end of file

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/TermIdEncoder.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -287,58 +287,58 @@
 
     }
 
-    /**
-     * Set the bit flags for the Value type on the 2 low order bits.
-     * 
-     * @param id
-     *            The encoded term identifier.
-     * @param code
-     *            The term code, which is one of the values defined by
-     *            {@link ITermIndexCodes}.
-     * 
-     * @return The term identifier with the 2 low order bits set to reflect
-     *         the term code using the bit flags defined by
-     *         {@link ITermIdCodes} which correspond to the specified term
-     *         code.
-     */
-    public static long setFlags(long id, final byte code) {
+//    /**
+//     * Set the bit flags for the Value type on the 2 low order bits.
+//     * 
+//     * @param id
+//     *            The encoded term identifier.
+//     * @param code
+//     *            The term code, which is one of the values defined by
+//     *            {@link ITermIndexCodes}.
+//     * 
+//     * @return The term identifier with the 2 low order bits set to reflect
+//     *         the term code using the bit flags defined by
+//     *         {@link ITermIdCodes} which correspond to the specified term
+//     *         code.
+//     */
+//    public static long setFlags(long id, final byte code) {
+//
+//        switch (code) {
+//
+//        case ITermIndexCodes.TERM_CODE_URI:
+//
+//            id |= ITermIdCodes.TERMID_CODE_URI;
+//
+//            break;
+//
+//        case ITermIndexCodes.TERM_CODE_LIT:
+//        case ITermIndexCodes.TERM_CODE_DTL:
+//        case ITermIndexCodes.TERM_CODE_LCL:
+//
+//            id |= ITermIdCodes.TERMID_CODE_LITERAL;
+//
+//            break;
+//
+//        case ITermIndexCodes.TERM_CODE_BND:
+//
+//            id |= ITermIdCodes.TERMID_CODE_BNODE;
+//
+//            break;
+//
+//        case ITermIndexCodes.TERM_CODE_STMT:
+//
+//            id |= ITermIdCodes.TERMID_CODE_STATEMENT;
+//
+//            break;
+//
+//        default:
+//
+//            throw new AssertionError("Unknown term type: code=" + code);
+//
+//        }
+//
+//        return id;
+//
+//    }
 
-        switch (code) {
-
-        case ITermIndexCodes.TERM_CODE_URI:
-
-            id |= ITermIdCodes.TERMID_CODE_URI;
-
-            break;
-
-        case ITermIndexCodes.TERM_CODE_LIT:
-        case ITermIndexCodes.TERM_CODE_DTL:
-        case ITermIndexCodes.TERM_CODE_LCL:
-
-            id |= ITermIdCodes.TERMID_CODE_LITERAL;
-
-            break;
-
-        case ITermIndexCodes.TERM_CODE_BND:
-
-            id |= ITermIdCodes.TERMID_CODE_BNODE;
-
-            break;
-
-        case ITermIndexCodes.TERM_CODE_STMT:
-
-            id |= ITermIdCodes.TERMID_CODE_STATEMENT;
-
-            break;
-
-        default:
-
-            throw new AssertionError("Unknown term type: code=" + code);
-
-        }
-
-        return id;
-
-    }
-
 }

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -71,7 +71,7 @@
 import com.bigdata.rdf.inf.Justification;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.IVUtility;
-import com.bigdata.rdf.lexicon.ITermIdFilter;
+import com.bigdata.rdf.lexicon.ITermIVFilter;
 import com.bigdata.rdf.lexicon.LexiconRelation;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.spo.JustIndexWriteProc.WriteJustificationsProcConstructor;
@@ -1297,7 +1297,7 @@
      *       fast scans across multiple shards when chunk-wise order is Ok.
      */
     public IChunkedIterator<IV> distinctTermScan(
-            final IKeyOrder<ISPO> keyOrder, final ITermIdFilter termIdFilter) {
+            final IKeyOrder<ISPO> keyOrder, final ITermIVFilter termIdFilter) {
 
         final FilterConstructor<SPO> filter = new FilterConstructor<SPO>();
         
@@ -1398,7 +1398,7 @@
      */
     public IChunkedIterator<IV> distinctMultiTermScan(
             final IKeyOrder<ISPO> keyOrder, final IV[] knownTerms,
-            final ITermIdFilter termIdFilter) {
+            final ITermIVFilter termIdFilter) {
 
         final FilterConstructor<SPO> filter = new FilterConstructor<SPO>();
         final int nterms = knownTerms.length;

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -80,9 +80,9 @@
 import com.bigdata.rdf.internal.IDatatypeURIResolver;
 import com.bigdata.rdf.internal.IExtension;
 import com.bigdata.rdf.internal.IExtensionFactory;
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.lexicon.BigdataRDFFullTextIndex;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.lexicon.ITermIndexCodes;
 import com.bigdata.rdf.lexicon.ITextIndexer;
 import com.bigdata.rdf.lexicon.LexiconRelation;
@@ -192,7 +192,7 @@
  */
 abstract public class AbstractTripleStore extends
         AbstractResource<IDatabase<AbstractTripleStore>> implements ITripleStore,
-        IRawTripleStore, IMutableDatabase<AbstractTripleStore>, ITermIdCodes {
+        IRawTripleStore, IMutableDatabase<AbstractTripleStore> {
 
     final static protected Logger log = Logger.getLogger(ITripleStore.class);
 

Modified: trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java
===================================================================
--- trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -29,8 +29,8 @@
 
 import org.openrdf.model.Value;
 
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.lexicon.LexiconRelation;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.StatementEnum;

Copied: trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java (from rev 3324, trunk/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITermIdCodes.java)
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java	                        (rev 0)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/ITermIdCodes.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -0,0 +1,89 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2007.  All rights reserved.
+
+Contact:
+     SYSTAP, LLC
+     4501 Tower Road
+     Greensboro, NC 27410
+     lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/*
+ * Created on Jan 6, 2008
+ */
+
+package com.bigdata.rdf.internal;
+
+import org.openrdf.model.BNode;
+import org.openrdf.model.Literal;
+import org.openrdf.model.URI;
+import com.bigdata.rdf.lexicon.LexiconKeyOrder;
+
+/**
+ * An interface that defines bit masks that are applied to the low bits of the
+ * assigned term identifiers and which indicate directly (without consulting the
+ * term index) whether a term is a URI, Literal, BNode, or Statement. This is
+ * used to quickly test the type of a term identifier without requiring the term
+ * value to be materialized from the {@link LexiconKeyOrder#ID2TERM} index.
+ * 
+ * @deprecated completely superseded by the new {@link IV} lexicon refactor
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public interface ITermIdCodes {
+
+    /**
+     * The bit mask that is bit-wise ANDed with a term identifier in order to
+     * reveal the term code (the low two bits of the mask are set).
+     * 
+     * @see #TERMID_CODE_URI
+     * @see #TERMID_CODE_BNODE
+     * @see #TERMID_CODE_LITERAL
+     * @see #TERMID_CODE_STATEMENT
+     */
+    static final public long TERMID_CODE_MASK = 0x03L;
+    
+    /**
+     * The #of bits in the {@link #TERMID_CODE_MASK} (
+     * {@value #TERMID_CODE_MASK_BITS}).
+     */
+    static final public long TERMID_CODE_MASK_BITS = 2L;
+    
+    /**
+     * The bit value used to indicate that a term identifier stands for a
+     * {@link URI}.
+     */
+    static final public long TERMID_CODE_URI = 0x00L;
+
+    /**
+     * The bit value used to indicate that a term identifier stands for a
+     * {@link BNode}.
+     */
+    static final public long TERMID_CODE_BNODE = 0x01L;
+
+    /**
+     * The bit value used to indicate that a term identifier stands for a
+     * {@link Literal}.
+     */
+    static final public long TERMID_CODE_LITERAL = 0x02L;
+
+    /**
+     * The bit value used to indicate that a term identifier stands for a
+     * statement (when support for statement identifiers is enabled).
+     */
+    static final public long TERMID_CODE_STATEMENT = 0x03L;
+    
+}

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/internal/LegacyTermIdUtility.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -33,7 +33,6 @@
 import com.bigdata.btree.keys.IKeyBuilder;
 import com.bigdata.btree.keys.KeyBuilder;
 import com.bigdata.rawstore.Bytes;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.store.AbstractTripleStore.Options;
 
 class LegacyTermIdUtility implements ITermIdCodes {

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -29,10 +29,10 @@
 
 import junit.framework.TestCase2;
 import com.bigdata.io.ByteArrayBuffer;
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.TermId;
 import com.bigdata.rdf.internal.VTE;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.store.IRawTripleStore;
 

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -30,10 +30,10 @@
 
 import java.util.Properties;
 import com.bigdata.rdf.axioms.NoAxioms;
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.TermId;
 import com.bigdata.rdf.internal.VTE;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rules.RuleContextEnum;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -96,8 +96,7 @@
      * test the term id bits.
      */
     private static TermId uriId(long in) {
-        return new TermId(VTE.URI, in << ITermIdCodes.TERMID_CODE_MASK_BITS
-                | ITermIdCodes.TERMID_CODE_URI);
+        return new TermId(VTE.URI, in);
     }
 
 //    private static long literalId(long in) {

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -52,9 +52,9 @@
 import com.bigdata.btree.BytesUtil;
 import com.bigdata.btree.IRangeQuery;
 import com.bigdata.btree.ITupleSerializer;
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.TermId;
 import com.bigdata.rdf.internal.VTE;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.model.StatementEnum;
 
 /**
@@ -123,7 +123,7 @@
          * 
          * Note: Only explicit statements may have statement identifiers.
          */
-        final TermId sid = new TermId(VTE.STATEMENT, 1 << 2 | ITermIdCodes.TERMID_CODE_STATEMENT);
+        final TermId sid = new TermId(VTE.STATEMENT, 1);
 
         {
 

Modified: trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java
===================================================================
--- trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java	2010-07-27 20:24:50 UTC (rev 3324)
+++ trunk/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java	2010-07-27 21:09:15 UTC (rev 3325)
@@ -42,9 +42,9 @@
 import com.bigdata.io.AbstractFixedByteArrayBuffer;
 import com.bigdata.io.DataOutputBuffer;
 import com.bigdata.io.FixedByteArrayBuffer;
+import com.bigdata.rdf.internal.ITermIdCodes;
 import com.bigdata.rdf.internal.TermId;
 import com.bigdata.rdf.internal.VTE;
-import com.bigdata.rdf.lexicon.ITermIdCodes;
 import com.bigdata.rdf.lexicon.LexiconRelation;
 import com.bigdata.rdf.model.StatementEnum;
 
@@ -99,8 +99,7 @@
 
     protected TermId getSID() {
         
-        return new TermId(VTE.STATEMENT, (r.nextInt(Integer.MAX_VALUE - 1) + 1) << 2
-                | ITermIdCodes.TERMID_CODE_STATEMENT);
+        return new TermId(VTE.STATEMENT, (r.nextInt(Integer.MAX_VALUE - 1) + 1));
 
     }
     


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

4 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 214 215 216 217 218 .. 220 > >> (Page 216 of 220)