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 2019/02/13 08:48:38 UTC
svn commit: r1853477 - in /jackrabbit/oak/branches/1.8: ./
oak-run/src/main/java/org/apache/jackrabbit/oak/run/
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Wed Feb 13 08:48:38 2019
New Revision: 1853477
URL: http://svn.apache.org/viewvc?rev=1853477&view=rev
Log:
OAK-8043: RDB: expose DDL generation functionality in oak-run (ported to 1.8)
Added:
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RDBDDLDumpCommand.java
- copied unchanged from r1853433, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RDBDDLDumpCommand.java
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 13 08:48:38 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850837,1851533-1851535,1851619,1852451,1852492
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850837,1851533-1851535,1851619,1852451,1852492,1853393,1853433
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java?rev=1853477&r1=1853476&r2=1853477&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java (original)
+++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java Wed Feb 13 08:48:38 2019
@@ -44,6 +44,7 @@ public final class AvailableModes {
.put("history", new HistoryCommand())
.put(JsonIndexCommand.INDEX, new JsonIndexCommand())
.put(PersistentCacheCommand.PERSISTENTCACHE, new PersistentCacheCommand())
+ .put("rdbddldump", new RDBDDLDumpCommand())
.put("revisions", new RevisionsCommand())
.put("recovery", new RecoveryCommand())
.put("repair", new RepairCommand())
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java?rev=1853477&r1=1853476&r2=1853477&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBHelper.java Wed Feb 13 08:48:38 2019
@@ -16,18 +16,21 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import java.util.Arrays;
+
/**
* Convenience class that dumps the table creation statements for various
* database types.
* <p>
* Run with:
+ *
* <pre>
* java -cp oak-run-<i>version</i>.jar org.apache.jackrabbit.oak.plugins.document.rdb.RDBHelper
* </pre>
*/
public class RDBHelper {
- private static String[] databases = { "Apache Derby", "DB2", "H2", "Microsoft SQL Server", "MySQL", "Oracle", "PostgreSQL",
+ private static String[] DATABASES = { "Apache Derby", "DB2", "H2", "Microsoft SQL Server", "MySQL", "Oracle", "PostgreSQL",
"default" };
public static void main(String[] args) {
@@ -37,31 +40,64 @@ public class RDBHelper {
int upgradeTo = defaultOpts.getUpgradeToSchema();
System.out.println("Table Creation Statements for RDBBlobStore and RDBDocumentStore");
System.out.println("RDBDocumentStore initial version: " + initial + ", with modifications up to version: " + upgradeTo);
+ System.out.println(
+ "(use system properties org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions.INITIALSCHEMA and org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions.UPGRADETOSCHEMA to specify initial DB schema, and schema to upgrade to)");
+ System.out.println();
- for (String database : databases) {
- System.out.println(database);
- System.out.println();
+ for (String database : DATABASES) {
+ internalDump(database, initial, upgradeTo);
+ }
+ }
- RDBDocumentStoreDB ddb = RDBDocumentStoreDB.getValue(database);
- RDBBlobStoreDB bdb = RDBBlobStoreDB.getValue(database);
+ public static String getSupportedDatabases() {
+ return Arrays.asList(DATABASES).toString();
+ }
- for (String table : RDBDocumentStore.getTableNames()) {
- System.out.println(" " + ddb.getTableCreationStatement(table, defaultOpts.getInitialSchema()));
- for (String s : ddb.getIndexCreationStatements(table, defaultOpts.getInitialSchema())) {
- System.out.println(" " + s);
- }
- for (int level = initial + 1; level <= upgradeTo; level++) {
- for (String statement : ddb.getTableUpgradeStatements(table, level)) {
- System.out.println(" " + statement);
- }
- }
- }
- System.out.println();
+ public static void dump(String database, Integer initial, Integer upgrade) {
+ RDBOptions defaultOpts = new RDBOptions();
+
+ if (database == null) {
+ internalDump(initial == null ? defaultOpts.getInitialSchema() : initial,
+ upgrade == null ? defaultOpts.getUpgradeToSchema() : upgrade);
+ } else {
+ internalDump(database, initial == null ? defaultOpts.getInitialSchema() : initial,
+ upgrade == null ? defaultOpts.getUpgradeToSchema() : upgrade);
+ }
+ }
- System.out.println(" " + bdb.getMetaTableCreationStatement("DATASTORE_META"));
- System.out.println(" " + bdb.getDataTableCreationStatement("DATASTORE_DATA"));
+ private static void internalDump(int initial, int upgradeTo) {
+ for (String database : DATABASES) {
+ internalDump(database, initial, upgradeTo);
System.out.println();
+ }
+ }
+
+ private static void internalDump(String database, int initial, int upgradeTo) {
+ System.out.println("-- " + database);
+
+ RDBDocumentStoreDB ddb = RDBDocumentStoreDB.getValue(database);
+ RDBBlobStoreDB bdb = RDBBlobStoreDB.getValue(database);
+
+ for (String table : RDBDocumentStore.getTableNames()) {
System.out.println();
+ System.out.println(" -- creating table " + table + " for schema version " + initial);
+ System.out.println(" " + ddb.getTableCreationStatement(table, initial));
+ for (String s : ddb.getIndexCreationStatements(table, initial)) {
+ System.out.println(" " + s);
+ }
+ for (int level = initial + 1; level <= upgradeTo; level++) {
+ System.out.println(" -- upgrading table " + table + " to schema version " + level);
+ for (String statement : ddb.getTableUpgradeStatements(table, level)) {
+ System.out.println(" " + statement);
+ }
+ }
}
+ System.out.println();
+
+ System.out.println(" -- creating blob store tables");
+ System.out.println(" " + bdb.getMetaTableCreationStatement("DATASTORE_META"));
+ System.out.println(" " + bdb.getDataTableCreationStatement("DATASTORE_DATA"));
+ System.out.println();
+ System.out.println();
}
}