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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3774
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3774&view=rev
Author:   thompsonbry
Date:     2010-10-12 17:53:12 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
Added Serializable to several classes to address RMI errors.

Added wrapper to return a proxy to the MetadataServer to address a Serialization error where the MetadataServer was attempting to return a FutureTask rather than its proxy.

Modified the test harness to allow testing of individual tests per BigdataSparqlTest.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/BTreeCostModel.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/DiskCostModel.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/IndexSegmentCostModel.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/ScanCostReport.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/SubqueryCostReport.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/resources/logging/log4j.properties
    branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/service/jini/MetadataServer.java
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/Rule2BOpUtility.java
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/BTreeCostModel.java
===================================================================

--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/BTreeCostModel.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/BTreeCostModel.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -26,6 +26,7 @@
  */
 package com.bigdata.bop.cost;
 
+import java.io.Serializable;
 import java.text.NumberFormat;
 
 import com.bigdata.btree.AbstractBTree;
@@ -54,10 +55,16 @@
  *       focus on one branch of the {@link BTree} could cause nothing but the
  *       root to be in the cache when probing a different branch.
  */
-public class BTreeCostModel {
+public class BTreeCostModel implements Serializable {
 
-    private final DiskCostModel diskCostModel;
+	/**
+	 * @todo should be either Externalizable and explicitly managed versioning
+	 *       or Serializable with a public interface for versioning.
+	 */
+	private static final long serialVersionUID = 1L;
 
+	private final DiskCostModel diskCostModel;
+
     /**
      * 
      * @param diskCostModel

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/DiskCostModel.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/DiskCostModel.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/DiskCostModel.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -26,6 +26,8 @@
  */
 package com.bigdata.bop.cost;
 
+import java.io.Serializable;
+
 /**
  * A cost model of the disk.
  * 
@@ -38,10 +40,16 @@
  *       transfer rate. However, SCSI does much better than SATA when it can
  *       reorder the writes for improved locality.
  */
-public class DiskCostModel {
+public class DiskCostModel implements Serializable {
 
-    public static final DiskCostModel DEFAULT = new DiskCostModel(10d, 41943040);
+	/**
+	 * @todo should be either Externalizable and explicitly managed versioning
+	 *       or Serializable with a public interface for versioning.
+	 */
+	private static final long serialVersionUID = 1L;
 
+	public static final DiskCostModel DEFAULT = new DiskCostModel(10d, 41943040);
+
     /**
      * The average disk seek time (milliseconds).
      */

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/IndexSegmentCostModel.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/IndexSegmentCostModel.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/IndexSegmentCostModel.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -26,6 +26,8 @@
  */
 package com.bigdata.bop.cost;
 
+import java.io.Serializable;
+
 import com.bigdata.btree.IndexSegment;
 
 /**
@@ -38,10 +40,16 @@
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
  * @version $Id$
  */
-public class IndexSegmentCostModel {
+public class IndexSegmentCostModel implements Serializable {
 
-    private final DiskCostModel diskCostModel;
+	/**
+	 * @todo should be either Externalizable and explicitly managed versioning
+	 *       or Serializable with a public interface for versioning.
+	 */
+	private static final long serialVersionUID = 1L;
 
+	private final DiskCostModel diskCostModel;
+
     /**
      * 
      * @param diskCostModel

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/ScanCostReport.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/ScanCostReport.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/ScanCostReport.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -1,6 +1,8 @@
 package com.bigdata.bop.cost;
 
+import java.io.Serializable;
 
+
 /**
  * A report on the expected cost of an index key range scan.
  * 
@@ -8,9 +10,15 @@
  *         Thompson</a>
  * @version $Id$
  */
-public class ScanCostReport {
+public class ScanCostReport implements Serializable {
 
-    /**
+	/**
+	 * @todo should be either Externalizable and explicitly managed versioning
+	 *       or Serializable with a public interface for versioning.
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
      * The fast range count.
      */
     public final long rangeCount;

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/SubqueryCostReport.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/SubqueryCostReport.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/cost/SubqueryCostReport.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -8,7 +8,8 @@
 public class SubqueryCostReport implements Serializable {
 
     /**
-     * 
+	 * @todo should be either Externalizable and explicitly managed versioning
+	 *       or Serializable with a public interface for versioning.
      */
     private static final long serialVersionUID = 1L;
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/resources/logging/log4j.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/resources/logging/log4j.properties	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/resources/logging/log4j.properties	2010-10-12 17:53:12 UTC (rev 3774)
@@ -173,6 +173,7 @@
 #log4j.logger.com.bigdata.relation.accesspath.IAccessPath=DEBUG
 
 #log4j.logger.com.bigdata.rdf.sail.BigdataSail=DEBUG
+log4j.logger.com.bigdata.rdf.sail.Rule2BOpUtility=INFO
 #log4j.logger.com.bigdata.rdf.sail.TestNamedGraphs=DEBUG
 #log4j.logger.com.bigdata.rdf.sail.QuadsTestCase=DEBUG
 #log4j.logger.com.bigdata.relation.rule.eval.NestedSubqueryWithJoinThreadsTask=DEBUG

Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/service/jini/MetadataServer.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/service/jini/MetadataServer.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/service/jini/MetadataServer.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -43,6 +43,7 @@
 
 import org.apache.log4j.MDC;
 
+import com.bigdata.btree.proc.IIndexProcedure;
 import com.bigdata.service.IDataService;
 import com.bigdata.service.IMetadataService;
 import com.bigdata.service.MetadataService;
@@ -300,6 +301,18 @@
         }
 
         /**
+         * Extends the base behavior to return an RMI compatible proxy for the
+         * {@link Future}.
+         */
+        @Override
+        public Future submit(final long tx, final String name,
+                final IIndexProcedure proc) {
+
+            return getFederation().getProxy(super.submit(tx, name, proc));
+
+        }
+        
+        /**
          * Extends the base behavior to return a {@link Name} of the service
          * from the {@link Configuration}. If no name was specified in the
          * {@link Configuration} then the value returned by the base class is

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/Rule2BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/Rule2BOpUtility.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/Rule2BOpUtility.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -485,9 +485,9 @@
 
         }
         
-        if (true||log.isDebugEnabled()) {
+        if (true||log.isInfoEnabled()) {
             // just for now while i'm debugging
-            log.info ("rule=" + rule + "\nquery="
+            log.info("rule=" + rule + ":::query="
                     + BOpUtility.toString(left));
         }
         

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -28,6 +28,7 @@
 import java.util.UUID;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import org.apache.log4j.Logger;
 import org.openrdf.query.Dataset;
@@ -36,22 +37,63 @@
 import org.openrdf.repository.Repository;
 import org.openrdf.repository.dataset.DatasetRepository;
 
+import com.bigdata.btree.keys.KeyBuilder;
 import com.bigdata.journal.ITx;
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.sail.BigdataSailRepository;
+import com.bigdata.rdf.sail.BigdataSail.Options;
 import com.bigdata.rdf.store.ScaleOutTripleStore;
 import com.bigdata.service.jini.JiniClient;
 import com.bigdata.service.jini.JiniFederation;
 
 /**
+ * Runs the SPARQL test suite against a {@link JiniFederation}, which must be
+ * already deployed. Each test in the suite is run against a distinct quad store
+ * in its own bigdata namespace.
+ * 
  * @author <a href="mailto:dm...@us...">David MacMillan</a>
  * @version $Id$
  */
 public class BigdataFederationSparqlTest extends SPARQLQueryTest
 {
-    public static Test suite ()
-        throws Exception
-    {
+
+    /**
+     * Skip the dataset tests for now until we can figure out what is wrong with
+     * them.
+     * 
+     * FIXME Fix the dataset tests. There is some problem in how the data to be
+     * loaded into the fixture is being resolved in these tests.
+     */
+    public static Test suite() throws Exception {
+        
+        return suite(true /*hideDatasetTests*/);
+        
+    }
+    
+    public static Test suite(final boolean hideDatasetTests) throws Exception {
+        
+        TestSuite suite1 = fullSuite();
+
+        // Only run the specified tests?
+        if (!BigdataSparqlTest.testURIs.isEmpty()) {
+            final TestSuite suite = new TestSuite();
+            for (String s : BigdataSparqlTest.testURIs) {
+                suite.addTest(BigdataSparqlTest.getSingleTest(suite1, s));
+            }
+            return suite;
+        }
+        
+        if(hideDatasetTests)
+            suite1 = BigdataSparqlTest.filterOutDataSetTests(suite1);
+        
+        return suite1;
+        
+    }
+
+    /**
+     * Return the entire test suite. 
+     */
+    public static TestSuite fullSuite() throws Exception {
         return ManifestTest.suite
         (
             new Factory ()
@@ -124,32 +166,180 @@
         return "SPARQLTest_" + UUID.randomUUID ().toString () ;
     }
 
-    private Properties getProperties ()
+	/**
+	 * Configuration options for the KB instances used to run the SPARQL
+	 * compliance test suite.
+	 */
+    private Properties getProperties () throws Exception
     {
+//    	Note: This approach does not work because we are using a different namespace for each test.
+//        /*
+//         * Pick up properties configured for the client as defaults.
+//         * 
+//         * You can specify those properties using NV[] for the component.
+//         */
+//        final String component = System.getProperty ( COMPONENT_PROPERTY, DEFAULT_COMPONENT_PROPERTY ) ;
+//        final Properties properties = getFederation().getClient().getProperties(
+//                component);
+//        return properties;
         if ( null == _properties )
         {
-            //
-            // TODO What do we really need here? Don't some of these entail others?
-            //
-            _properties = new Properties () ;
-            _properties.put ( BigdataSail.Options.QUADS_MODE, "true" ) ;
-            _properties.put ( BigdataSail.Options.TRUTH_MAINTENANCE, "false" ) ;
-            _properties.put ( BigdataSail.Options.NATIVE_JOINS, "true" ) ;
-            _properties.put ( BigdataSail.Options.QUERY_TIME_EXPANDER, "true" ) ;
+        	
+//    	    /* Multiplier for the scatter effect.
+//    	     */
+//    	    final int scatterFactor = 1;
+//    	    final int scatterFactor_term2id = 1;
+//    	    final int dataServiceCount = 2;
+//
+//    	    /* The #of index partitions to allocate on a scatter split.  ZERO
+//    	     * (0) means that 2 index partitions will be allocated per
+//    	     * data service which partiticpates in the scatter split.
+//    	     * Non-zero values directly give the #of index partitions to
+//    	     * create.  
+//    	     */
+//    	    final int scatterSplitIndexPartitionCount = ConfigMath.multiply
+//    		( scatterFactor,
+//    		  dataServiceCount
+//    		  );
+//    	    final int scatterSplitIndexPartitionCount_term2id = ConfigMath.multiply
+//    		( scatterFactor_term2id,
+//    		  dataServiceCount
+//    		  );
+//
+//    	    // Use all discovered data services when scattering an index.
+//    	    final int scatterSplitDataServiceCount = 0;
+//
+//    	    /* Scatter split trigger point.  The scatter split will not be
+//    	     * triggered until the initial index partition has reached
+//    	     * this percentage of a nominal index partition in size.
+//    	     */
+//    	    final double scatterSplitPercentOfSplitThreshold = 0.5;//was .5
+//
+//    		/* 
+//    		 * Multipliers that compensate for the consumer/producer ratio for
+//    		 * the asynchronous index write API.  These are empirical factors
+//    		 * based on observing the ratio (chunkWritingTime/chunkWaitingTime).
+//    		 * Assuming a constant chunk writing time, if the chunk size for each
+//    		 * index is adjusted by its multiplier then this ratio would be 1:1.
+//    		 * In practice, the chunk writing time is not a linear function of
+//    		 * the chunk size, which is one reason why we prefer larger chunks
+//    		 * and why the asynchronous write API is a win.
+//    		 *
+//    		 * Note: These factors were set relative to TERM2ID.  However, when
+//    		 * I reduced the scatterFactor for TERM2ID by 1/2, I doubled its
+//    		 * chunk size to keep up the same throughput so it is now at 2.00
+//    		 * rather than 1.00.
+//    		 */
+//    	    final double chunkSizeFactor_id2term =  1.79;
+//    		final double chunkSizeFactor_term2id =  2.00;
+//    		final double chunkSizeFactor_stmts   =  8.00;
+//    		
+//    		/* The nominal sink chunk size.  For each index, this is adjusted
+//    		 * by the factor specified above.
+//    		 */
+////        		static private sinkChunkSize = 10000;
+//    		final int sinkChunkSize = 1000;
+        		 
+    	    /*
+    	     * Specify / override some triple store properties.
+    	     *
+    	     * Note: You must reference this object in the section for the
+    	     * component which will actually create the KB instance, e.g.,
+    	     * either the RDFDataLoadMaster or the LubmGeneratorMaster.
+    	     */
+            _properties = new Properties ();
+            
+            /*
+             * Setup for quads.
+             */
+            _properties.put ( BigdataSail.Options.QUADS_MODE, "true" );
+            _properties.put ( BigdataSail.Options.TRUTH_MAINTENANCE, "false" );
+            _properties.put ( BigdataSail.Options.QUERY_TIME_EXPANDER, "false" );
+            
+            if (BigdataSparqlTest.cannotInlineTests.contains(testURI))
+                _properties.setProperty(Options.INLINE_LITERALS, "false");
+
+			/*
+			 * The Sesame TCK forces statement level connection auto-commit so
+			 * we set a flag to permit that here. However, auto-commit and this
+			 * flag SHOULD NOT be used outside of the test suite as they provide
+			 * an extreme performance penalty.
+			 */
             _properties.put ( BigdataSail.Options.ALLOW_AUTO_COMMIT, "true" ) ;
-            _properties.put ( BigdataSail.Options.ISOLATABLE_INDICES, "false" ) ;
-            _properties.put ( BigdataSail.Options.STAR_JOINS, "false" ) ;
-            _properties.put ( BigdataSail.Options.TEXT_INDEX, "false" ) ;
+
+			/*
+			 * Provide Unicode support for keys with locale-based string
+			 * collation. This is more expensive in key creation during loading,
+			 * but allows key comparison and sorting in the specified locale in
+			 * queries.
+			 * 
+			 * @see com.bigdata.btree.keys.CollatorEnum
+			 */
+    	    _properties.put(KeyBuilder.Options.COLLATOR,"ICU");
+    	    _properties.put(KeyBuilder.Options.USER_LANGUAGE,"en");
+    	    _properties.put(KeyBuilder.Options.USER_COUNTRY,"US");
+    	    _properties.put(KeyBuilder.Options.USER_VARIANT,"");
+
+			/*
+			 * Turn off the full text index (search for literals by keyword).
+			 */
+			_properties.put(BigdataSail.Options.TEXT_INDEX, "false");
+
+			/*
+			 * Turn on bloom filter for the SPO index (good up to ~2M index
+			 * entries for scale-up -or- for any size index for scale-out). This
+			 * is a big win for some queries on scale-out indices since we can
+			 * avoid touching the disk if the bloom filter reports "false" for a
+			 * key.
+			 */
+			_properties.put(BigdataSail.Options.BLOOM_FILTER, "true");
+
+			/*
+			 * The #of low order bits from the TERM2ID index partition local
+			 * counter that will be reversed and written into the high-order
+			 * bits of the term identifier. This has a strong effect on the
+			 * distribution of bulk index read/write operations for the triple
+			 * store. For a given value of N, a bulk write will tend to touch
+			 * 2^N index partitions. Therefore if this is even roughly on the
+			 * order of the number of index partitions, each bulk write will
+			 * tend to be scattered to all index partitions.
+			 * 
+			 * Note: If this value is too large then the writes WITHIN the index
+			 * partitions will become uniformly distributed, which will
+			 * negatively impact index performance.
+			 */
+			_properties.put(BigdataSail.Options.TERMID_BITS_TO_REVERSE,"2");
+        	        
+			/*
+			 * Option may be enabled to store blank nodes such that they are
+			 * stable (they are not stored by default).
+			 */
+			// new NV(BigdataSail.Options.STORE_BLANK_NODES,"true");
+
         }
         return _properties ;
     }
 
-    public static final String CONFIG_PROPERTY = "bigdata.configuration" ;
-
+	/**
+	 * The name of the jini configuration file for the federation.
+	 */
+	public static final String CONFIG_PROPERTY = "bigdata.configuration";
+	
+//	/**
+//	 * The name of the component in that configuration file whose "properties"
+//	 * field will be used to initialize the KB.
+//	 */
+//    public static final String COMPONENT_PROPERTY = "bigdata.component" ;
+//
+//    /**
+//     * The default value for {@link #COMPONENT_PROPERTY}.
+//     */
+//    public static final String DEFAULT_COMPONENT_PROPERTY = "SparqlQuadsTestSuite";
+    
     private static final Logger _logger = Logger.getLogger ( BigdataFederationSparqlTest.class ) ;
 
     private static JiniFederation<Object> _fed = null ;
     private static Properties _properties = null ;
 
     private ScaleOutTripleStore _ts = null ;
-}
\ No newline at end of file
+}

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -70,7 +70,7 @@
      * numeric values and these tests test for syntatic differences, i.e.
      * 01 != 1.
      */
-    protected static Collection<String> cannotInlineTests = Arrays.asList(new String[] {
+    static final Collection<String> cannotInlineTests = Arrays.asList(new String[] {
           "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-01",
           "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-03",
           "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-04",
@@ -131,7 +131,7 @@
      *            
      * @return The test suite without the data set tests.
      */
-    static protected TestSuite filterOutDataSetTests(final TestSuite suite1) {
+    static TestSuite filterOutDataSetTests(final TestSuite suite1) {
         
         final TestSuite suite2 = new TestSuite(suite1.getName());
         
@@ -158,7 +158,7 @@
      * suite is run. When specified, only the tests matching these test URIs are
      * run.
      */
-    static final protected Collection<String> testURIs = Arrays.asList(new String[] {
+    static final Collection<String> testURIs = Arrays.asList(new String[] {
 /*
 //      busted with EvalStrategy1
         "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2",
@@ -200,6 +200,10 @@
 //            "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-07",
 //            "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-11",
 //            "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/distinct/manifest#distinct-star-1"
+    		
+    		/*
+    		 * Problems with JiniFederation.
+    		 */
     });
 
     /**
@@ -216,16 +220,16 @@
      *             if there is no test in the suite which is associated with
      *             that testURI.
      */
-    protected static BigdataSparqlTest getSingleTest(TestSuite suite,
+    static SPARQLQueryTest getSingleTest(TestSuite suite,
             final String testURI) throws RuntimeException {
     
-        BigdataSparqlTest test = null;
+        SPARQLQueryTest test = null;
         final Enumeration e1 = suite.tests();
         while (e1.hasMoreElements()) {
             suite = (TestSuite) e1.nextElement();
             final Enumeration e2 = suite.tests();
             while (e2.hasMoreElements()) {
-                 test = (BigdataSparqlTest) e2.nextElement();
+                 test = (SPARQLQueryTest) e2.nextElement();
                  if (testURI.equals(test.getTestURI())) {
                      return test;
                  }
@@ -275,9 +279,9 @@
         
     }
     
-    public String getTestURI() {
-        return testURI;
-    }
+//    public String getTestURI() {
+//        return testURI;
+//    }
     
     /**
      * Overridden to destroy the backend database and its files on the disk.

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java	2010-10-12 14:59:42 UTC (rev 3773)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java	2010-10-12 17:53:12 UTC (rev 3774)
@@ -631,4 +631,12 @@
 		int secLastSlashIdx = manifestFileURL.lastIndexOf('/', lastSlashIdx - 1);
 		return manifestFileURL.substring(secLastSlashIdx + 1, lastSlashIdx);
 	}
+
+	/**
+	 * Made visible to the test suites so we can filter for specific tests.
+	 */
+	public String getTestURI() {
+        return testURI;
+    }
+    
 }


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




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

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

Fast, scalable, robust graph database platform

bigdata-commit — Commit traffic.