You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/10 10:22:56 UTC
svn commit: r1200235 - in /incubator/jena/Jena2/SDB/trunk: Store/
src/com/hp/hpl/jena/sdb/ src/com/hp/hpl/jena/sdb/assembler/
src/com/hp/hpl/jena/sdb/graph/ src/com/hp/hpl/jena/sdb/layout1/
src/com/hp/hpl/jena/sdb/sql/ src/com/hp/hpl/jena/sdb/store/ sr...
Author: andy
Date: Thu Nov 10 09:22:55 2011
New Revision: 1200235
URL: http://svn.apache.org/viewvc?rev=1200235&view=rev
Log:
Remove RDB adapter version of layout1.
Removed:
incubator/jena/Jena2/SDB/trunk/Store/sdb-mysql-rdb.ttl
incubator/jena/Jena2/SDB/trunk/Store/sdb-pgsql-rdb.ttl
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/CodecRDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/StoreRDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/TableDescRDB.java
Modified:
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/StoreDesc.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/AssemblerVocab.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/SDBConnectionDescAssembler.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/StoreDescAssembler.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/PrefixMappingSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/SDBConnectionDesc.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java
incubator/jena/Jena2/SDB/trunk/src/sdb/sdbprint.java
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/StoreDesc.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/StoreDesc.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/StoreDesc.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/StoreDesc.java Thu Nov 10 09:22:55 2011
@@ -45,10 +45,6 @@ public class StoreDesc
private LayoutType layout = null ;
private FeatureSet featureSet = null ;
- /** ModelRDB spefic */
- public String rdbModelName = null ;
- public String rdbModelType = null ;
-
/** MySQL specific */
public MySQLEngineType engineType = null ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/AssemblerVocab.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/AssemblerVocab.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/AssemblerVocab.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/AssemblerVocab.java Thu Nov 10 09:22:55 2011
@@ -74,8 +74,6 @@ public class AssemblerVocab
public static final Property pSDBhost = Vocab.property(NS, "sdbHost") ;
public static final Property pSDBname = Vocab.property(NS, "sdbName") ;
//public static final Property pSDBschema = Vocab.property(NS, "sdbSchema") ;
- // ModeRDB graph name - on the connection
- public static final Property pRDBtype = Vocab.property(NS, "rdbType") ;
// The JDBC URL written out long form. Overrides the above.
public static final Property pJDBC = Vocab.property(NS, "jdbcURL") ;
@@ -94,8 +92,6 @@ public class AssemblerVocab
// MySQL engine type
public static final Property pMySQLEngine = Vocab.property(NS, "engine") ;
- // ModeRDB graph name - on the layout
- public static final Property pModelRDBname = Vocab.property(NS, "rdbModelName") ;
private static boolean initialized = false ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/SDBConnectionDescAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/SDBConnectionDescAssembler.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/SDBConnectionDescAssembler.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/SDBConnectionDescAssembler.java Thu Nov 10 09:22:55 2011
@@ -47,7 +47,6 @@ public class SDBConnectionDescAssembler
sDesc.setDriver( GraphUtils.getStringValue(root, AssemblerVocab.pDriver) ) ;
sDesc.setJdbcURL( GraphUtils.getStringValue(root, AssemblerVocab.pJDBC) ) ;
sDesc.setPoolSize( GraphUtils.getStringValue(root, AssemblerVocab.pPoolSize) ) ;
- sDesc.setRdbType( GraphUtils.getStringValue(root, AssemblerVocab.pRDBtype) ) ;
sDesc.setLabel( GraphUtils.getStringValue(root, RDFS.label) ) ;
if ( sDesc.getUser() == null )
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/StoreDescAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/StoreDescAssembler.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/StoreDescAssembler.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/assembler/StoreDescAssembler.java Thu Nov 10 09:22:55 2011
@@ -77,8 +77,6 @@ public class StoreDescAssembler extends
try { storeDesc.engineType= MySQLEngineType.convert(engineName) ; }
catch (SDBException ex) {}
- // ModelRDB special
- storeDesc.rdbModelName = GraphUtils.getStringValue(root, AssemblerVocab.pModelRDBname) ;
return storeDesc ;
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/PrefixMappingSDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/PrefixMappingSDB.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/PrefixMappingSDB.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/PrefixMappingSDB.java Thu Nov 10 09:22:55 2011
@@ -76,9 +76,7 @@ public class PrefixMappingSDB extends Pr
super() ;
graphName = graphURI ;
connection = sdb ;
- // ModelRDB does not support prefixes in the same way as models/graphs over SDB stores.
- try { readPrefixMapping() ; }
- catch (Throwable th) { }
+ readPrefixMapping() ;
}
@Override
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/SDBConnectionDesc.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/SDBConnectionDesc.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/SDBConnectionDesc.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/SDBConnectionDesc.java Thu Nov 10 09:22:55 2011
@@ -41,8 +41,6 @@ public class SDBConnectionDesc
private String label = null ;
private int poolSize = 0 ; // Less then 1 means no pool.
- public String rdbType = null ; // ModelRDB specific
-
public static SDBConnectionDesc blank()
{ return new SDBConnectionDesc() ; }
@@ -148,12 +146,6 @@ public class SDBConnectionDesc
public void setPassword(String password)
{ this.password = password ; }
- public String getRdbType()
- { return rdbType ; }
-
- public void setRdbType(String rdbType)
- { this.rdbType = rdbType ; }
-
public String getType()
{ return type ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java Thu Nov 10 09:22:55 2011
@@ -104,8 +104,6 @@ public class Feature extends PrintableBa
//
// // Some placeholders
//
-// // The Jena2 database layout
-// LayoutRDB { public String getName() { return "RDB" ; } } ,
// // A database layout that uses a single triple table, with entries being SPARQL-syntax RDF-terms
// LayoutSimple { public String getName() { return "Layout1" ; } } ,
// // The Triple table/Node table layout
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java Thu Nov 10 09:22:55 2011
@@ -32,7 +32,6 @@ public class LayoutType extends Symbol i
public static final LayoutType LayoutTripleNodesHash = new LayoutType("layout2/hash") ;
public static final LayoutType LayoutTripleNodesIndex = new LayoutType("layout2/index") ;
public static final LayoutType LayoutSimple = new LayoutType("layout1") ;
- public static final LayoutType LayoutRDB = new LayoutType("layoutRDB") ;
static SymbolRegistry<LayoutType> registry = new SymbolRegistry<LayoutType>() ;
static { init() ; }
@@ -57,7 +56,6 @@ public class LayoutType extends Symbol i
register(LayoutTripleNodesIndex) ;
register(LayoutSimple) ;
- register(LayoutRDB) ;
}
static public List<String> allNames() { return registry.allNames() ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/sdb/sdbprint.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/sdb/sdbprint.java?rev=1200235&r1=1200234&r2=1200235&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/sdb/sdbprint.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/sdb/sdbprint.java Thu Nov 10 09:22:55 2011
@@ -78,13 +78,8 @@ public class sdbprint extends CmdArgsDB
// Force the connection to be a null one.
// Known to be called after arg module initialization.
StoreDesc storeDesc = getModStore().getStoreDesc() ;
- if ( storeDesc.getLayout() != LayoutType.LayoutRDB )
- {
- // Only fake the connection if not ModelRDB
- // else we need a live conenction (currently)
- storeDesc.connDesc.setJdbcURL(JDBC.jdbcNone) ;
- //storeDesc.connDesc.setType("none") ;
- }
+ storeDesc.connDesc.setJdbcURL(JDBC.jdbcNone) ;
+
if ( storeDesc.getLayout() == null )
storeDesc.setLayout(layoutDefault) ;