You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/06/18 17:08:22 UTC
svn commit: r1686242 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java
Author: reschke
Date: Thu Jun 18 15:08:21 2015
New Revision: 1686242
URL: http://svn.apache.org/r1686242
Log:
OAK-1266 - RDBHelper: un-hardwire set of DocumentStore table names (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 18 15:08:21 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686229,1686234
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1686242&r1=1686241&r2=1686242&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Jun 18 15:08:21 2015
@@ -318,6 +318,24 @@ public class RDBDocumentStore implements
return this.droppedTables;
}
+ // table names
+ private static Map<Object, String> TABLEMAP;
+ private static List<String> TABLENAMES;
+ static {
+ Map<Object, String> tmp = new HashMap<Object, String>();
+ tmp.put(Collection.CLUSTER_NODES, "CLUSTERNODES");
+ tmp.put(Collection.NODES, "NODES");
+ tmp.put(Collection.SETTINGS, "SETTINGS");
+ TABLEMAP = Collections.unmodifiableMap(tmp);
+ List<String> tl = new ArrayList<String>(TABLEMAP.values());
+ Collections.sort(tl);
+ TABLENAMES = Collections.unmodifiableList(tl);
+ }
+
+ public static List<String> getTableNames() {
+ return TABLENAMES;
+ }
+
@Override
public void dispose() {
if (!this.tablesToBeDropped.isEmpty()) {
@@ -810,9 +828,9 @@ public class RDBDocumentStore implements
private void initialize(DataSource ds, DocumentMK.Builder builder, RDBOptions options) throws Exception {
- this.tnNodes = RDBJDBCTools.createTableName(options.getTablePrefix(), "NODES");
- this.tnClusterNodes = RDBJDBCTools.createTableName(options.getTablePrefix(), "CLUSTERNODES");
- this.tnSettings = RDBJDBCTools.createTableName(options.getTablePrefix(), "SETTINGS");
+ this.tnNodes = RDBJDBCTools.createTableName(options.getTablePrefix(), TABLEMAP.get(Collection.NODES));
+ this.tnClusterNodes = RDBJDBCTools.createTableName(options.getTablePrefix(), TABLEMAP.get(Collection.CLUSTER_NODES));
+ this.tnSettings = RDBJDBCTools.createTableName(options.getTablePrefix(), TABLEMAP.get(Collection.SETTINGS));
this.ch = new RDBConnectionHandler(ds);
this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of RDBDocumentStore creation") : null;
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java?rev=1686242&r1=1686241&r2=1686242&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java Thu Jun 18 15:08:21 2015
@@ -17,11 +17,13 @@
package org.apache.jackrabbit.oak.plugins.document.rdb;
/**
- * Convenience class that dumps the table creation statements for various database types.
+ * Convenience class that dumps the table creation statements for various
+ * database types.
*/
public class RDBHelper {
- private static String[] databases = { "Apache Derby", "DB2", "H2", "Microsoft SQL Server", "MySQL", "Oracle", "PostgreSQL", "default" };
+ private static String[] databases = { "Apache Derby", "DB2", "H2", "Microsoft SQL Server", "MySQL", "Oracle", "PostgreSQL",
+ "default" };
public static void main(String[] args) {
for (String database : databases) {
@@ -31,9 +33,11 @@ public class RDBHelper {
RDBDocumentStore.DB ddb = RDBDocumentStore.DB.getValue(database);
RDBBlobStore.DB bdb = RDBBlobStore.DB.getValue(database);
- System.out.println(" " + ddb.getTableCreationStatement("CLUSTERNODES"));
- System.out.println(" " + ddb.getTableCreationStatement("NODES"));
- System.out.println(" " + ddb.getTableCreationStatement("SETTINGS"));
+ for (String table : RDBDocumentStore.getTableNames()) {
+ System.out.println(" " + ddb.getTableCreationStatement(table));
+ }
+ System.out.println();
+
System.out.println(" " + bdb.getMetaTableCreationStatement("DATASTORE_META"));
System.out.println(" " + bdb.getDataTableCreationStatement("DATASTORE_DATA"));
System.out.println();