Author: reschke
Date: Thu Mar 26 13:18:48 2015
New Revision: 1669338
URL: http://svn.apache.org/r1669338
Log:
OAK-1266 - improve diagnostics; reject invalid table names (ported to 1.0)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 13:18:48 2015
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656394,1656400,1656425,1656427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,165
9578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666177,1666218,1666220,1666351-1666352,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656394,1656400,1656425,1656427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,165
9578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666177,1666218,1666220,1666351-1666352,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669337
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1669338&r1=1669337&r2=1669338&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
Thu Mar 26 13:18:48 2015
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
+import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -127,16 +128,36 @@ public class RDBBlobStore extends Cachin
private RDBConnectionHandler ch;
// from options
- private String dataTable;
- private String metaTable;
+ private String tnData;
+ private String tnMeta;
private Set<String> tablesToBeDropped = new HashSet<String>();
+ private static void versionCheck(DatabaseMetaData md, int xmaj, int xmin,
String description) throws SQLException {
+ int maj = md.getDatabaseMajorVersion();
+ int min = md.getDatabaseMinorVersion();
+ if (maj < xmaj || (maj == xmaj && min < xmin)) {
+ LOG.info("Unsupported " + description + " version: " + maj + "." +
min + ", expected at least " + xmaj + "." + xmin);
+ }
+ }
+
/**
* Defines variation in the capabilities of different RDBs.
*/
protected enum DB {
+ H2("H2") {
+ @Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 1, 4, description);
+ }
+ },
+
DB2("DB2") {
@Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 10, 5, description);
+ }
+
+ @Override
public String getDataTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE
+ ") not null primary key, DATA blob(" + MINBLOB + "))";
}
@@ -144,6 +165,11 @@ public class RDBBlobStore extends Cachin
MSSQL("Microsoft SQL Server") {
@Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 11, 0, description);
+ }
+
+ @Override
public String getDataTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE
+ ") not null primary key, DATA varbinary(max))";
}
@@ -151,6 +177,11 @@ public class RDBBlobStore extends Cachin
MYSQL("MySQL") {
@Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 5, 5, description);
+ }
+
+ @Override
public String getDataTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE
+ ") not null primary key, DATA mediumblob)";
}
@@ -158,6 +189,11 @@ public class RDBBlobStore extends Cachin
ORACLE("Oracle") {
@Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 12, 1, description);
+ }
+
+ @Override
public String getMetaTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE
+ ") not null primary key, LVL number, LASTMOD number)";
}
@@ -165,6 +201,11 @@ public class RDBBlobStore extends Cachin
POSTGRES("PostgreSQL") {
@Override
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ versionCheck(md, 9, 3, description);
+ }
+
+ @Override
public String getDataTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE
+ ") not null primary key, DATA bytea)";
}
@@ -173,6 +214,10 @@ public class RDBBlobStore extends Cachin
DEFAULT("default") {
};
+ public void checkVersion(DatabaseMetaData md) throws SQLException {
+ LOG.info("Unknown database type: " + md.getDatabaseProductName());
+ }
+
public String getDataTableCreationStatement(String tableName) {
return "create table " + tableName + " (ID varchar(" + IDSIZE + ")
not null primary key, DATA blob)";
}
@@ -181,7 +226,7 @@ public class RDBBlobStore extends Cachin
return "create table " + tableName + " (ID varchar(" + IDSIZE + ")
not null primary key, LVL int, LASTMOD bigint)";
}
- private String description;
+ protected String description;
private DB(String description) {
this.description = description;
@@ -210,34 +255,36 @@ public class RDBBlobStore extends Cachin
private void initialize(DataSource ds, RDBOptions options) throws
Exception {
- String tablePrefix = options.getTablePrefix();
- if (tablePrefix.length() > 0 && !tablePrefix.endsWith("_")) {
- tablePrefix += "_";
- }
- this.dataTable = tablePrefix + "DATASTORE_DATA";
- this.metaTable = tablePrefix + "DATASTORE_META";
+ this.tnData = RDBJDBCTools.createTableName(options.getTablePrefix(),
"DATASTORE_DATA");
+ this.tnMeta = RDBJDBCTools.createTableName(options.getTablePrefix(),
"DATASTORE_META");
this.ch = new RDBConnectionHandler(ds);
Connection con = this.ch.getRWConnection();
+ DatabaseMetaData md = con.getMetaData();
+ String dbDesc = md.getDatabaseProductName() + " " +
md.getDatabaseProductVersion();
+ String driverDesc = md.getDriverName() + " " + md.getDriverVersion();
+ String dbUrl = md.getURL();
+
+ List<String> tablesCreated = new ArrayList<String>();
+ List<String> tablesPresent = new ArrayList<String>();
try {
- for (String baseName : new String[] { "DATASTORE_META",
"DATASTORE_DATA" }) {
- String tableName = tablePrefix + baseName;
+ for (String tableName : new String[] { this.tnData, this.tnMeta })
{
try {
PreparedStatement stmt = con.prepareStatement("select ID
from " + tableName + " where ID = ?");
stmt.setString(1, "0");
stmt.executeQuery();
con.commit();
+ tablesPresent.add(tableName);
} catch (SQLException ex) {
// table does not appear to exist
con.rollback();
- DB db =
DB.getValue(con.getMetaData().getDatabaseProductName());
- LOG.info("Attempting to create table " + tableName + " in
" + db);
+ DB db = DB.getValue(md.getDatabaseProductName());
Statement stmt = con.createStatement();
- if (baseName.equals("DATASTORE_META")) {
+ if (this.tnMeta.equals(tableName)) {
String ct =
db.getMetaTableCreationStatement(tableName);
stmt.execute(ct);
} else {
@@ -249,16 +296,28 @@ public class RDBBlobStore extends Cachin
con.commit();
- if (options.isDropTablesOnClose()) {
- tablesToBeDropped.add(tableName);
- }
+ tablesCreated.add(tableName);
}
}
+
+ if (options.isDropTablesOnClose()) {
+ tablesToBeDropped.addAll(tablesCreated);
+ }
+
+ LOG.info("RDBBlobStore instantiated for database " + dbDesc + ",
using driver: " + driverDesc + ", connecting to: "
+ + dbUrl);
+ if (!tablesPresent.isEmpty()) {
+ LOG.info("Tables present upon startup: " + tablesPresent);
+ }
+ if (!tablesCreated.isEmpty()) {
+ LOG.info("Tables created upon startup: " + tablesCreated
+ + (options.isDropTablesOnClose() ? " (will be dropped
on exit)" : ""));
+ }
+
+ this.callStack = LOG.isDebugEnabled() ? new Exception("call stack
of RDBBlobStore creation") : null;
} finally {
this.ch.closeConnection(con);
}
-
- this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of
RDBBlobStore creation") : null;
}
private long minLastModified;
@@ -280,7 +339,7 @@ public class RDBBlobStore extends Cachin
try {
long now = System.currentTimeMillis();
- PreparedStatement prep = con.prepareStatement("update " +
metaTable + " set LASTMOD = ? where ID = ?");
+ PreparedStatement prep = con.prepareStatement("update " +
this.tnMeta + " set LASTMOD = ? where ID = ?");
int count;
try {
prep.setLong(1, now);
@@ -296,7 +355,7 @@ public class RDBBlobStore extends Cachin
}
if (count == 0) {
try {
- prep = con.prepareStatement("insert into " + dataTable +
"(ID, DATA) values(?, ?)");
+ prep = con.prepareStatement("insert into " + this.tnData +
"(ID, DATA) values(?, ?)");
try {
prep.setString(1, id);
prep.setBytes(2, data);
@@ -311,7 +370,7 @@ public class RDBBlobStore extends Cachin
throw new RuntimeException(message, ex);
}
try {
- prep = con.prepareStatement("insert into " + metaTable +
"(ID, LVL, LASTMOD) values(?, ?, ?)");
+ prep = con.prepareStatement("insert into " + this.tnMeta +
"(ID, LVL, LASTMOD) values(?, ?, ?)");
try {
prep.setString(1, id);
prep.setInt(2, level);
@@ -337,7 +396,7 @@ public class RDBBlobStore extends Cachin
byte[] data;
try {
- PreparedStatement prep = con.prepareStatement("select DATA from "
+ dataTable + " where ID = ?");
+ PreparedStatement prep = con.prepareStatement("select DATA from "
+ this.tnData + " where ID = ?");
try {
prep.setString(1, id);
ResultSet rs = prep.executeQuery();
@@ -365,7 +424,7 @@ public class RDBBlobStore extends Cachin
Connection con = this.ch.getROConnection();
try {
- PreparedStatement prep = con.prepareStatement("select DATA
from " + dataTable + " where ID = ?");
+ PreparedStatement prep = con.prepareStatement("select DATA
from " + this.tnData + " where ID = ?");
try {
prep.setString(1, id);
ResultSet rs = prep.executeQuery();
@@ -415,7 +474,7 @@ public class RDBBlobStore extends Cachin
return;
}
String id = StringUtils.convertBytesToHex(blockId.getDigest());
- PreparedStatement prep = con.prepareStatement("update " +
metaTable + " set LASTMOD = ? where ID = ? and LASTMOD < ?");
+ PreparedStatement prep = con.prepareStatement("update " +
this.tnMeta + " set LASTMOD = ? where ID = ? and LASTMOD < ?");
prep.setLong(1, System.currentTimeMillis());
prep.setString(2, id);
prep.setLong(3, minLastModified);
@@ -440,15 +499,15 @@ public class RDBBlobStore extends Cachin
Connection con = this.ch.getRWConnection();
try {
int count = 0;
- PreparedStatement prep = con.prepareStatement("select ID from " +
metaTable + " where LASTMOD < ?");
+ PreparedStatement prep = con.prepareStatement("select ID from " +
this.tnMeta + " where LASTMOD < ?");
prep.setLong(1, minLastModified);
ResultSet rs = prep.executeQuery();
ArrayList<String> ids = new ArrayList<String>();
while (rs.next()) {
ids.add(rs.getString(1));
}
- prep = con.prepareStatement("delete from " + metaTable + " where
ID = ?");
- PreparedStatement prepData = con.prepareStatement("delete from " +
dataTable + " where ID = ?");
+ prep = con.prepareStatement("delete from " + this.tnMeta + " where
ID = ?");
+ PreparedStatement prepData = con.prepareStatement("delete from " +
this.tnData + " where ID = ?");
for (String id : ids) {
prep.setString(1, id);
prep.execute();
@@ -490,16 +549,16 @@ public class RDBBlobStore extends Cachin
}
if (maxLastModifiedTime > 0) {
- prepMeta = con.prepareStatement("delete from " + metaTable + "
where ID in (" + inClause.toString()
+ prepMeta = con.prepareStatement("delete from " + this.tnMeta +
" where ID in (" + inClause.toString()
+ ") and LASTMOD <= ?");
prepMeta.setLong(batch + 1, maxLastModifiedTime);
- prepData = con.prepareStatement("delete from " + dataTable + "
where ID in (" + inClause.toString()
- + ") and not exists(select * from " + metaTable + " m
where ID = m.ID and m.LASTMOD <= ?)");
+ prepData = con.prepareStatement("delete from " + this.tnData +
" where ID in (" + inClause.toString()
+ + ") and not exists(select * from " + this.tnMeta + "
m where ID = m.ID and m.LASTMOD <= ?)");
prepData.setLong(batch + 1, maxLastModifiedTime);
} else {
- prepMeta = con.prepareStatement("delete from " + metaTable + "
where ID in (" + inClause.toString() + ")");
- prepData = con.prepareStatement("delete from " + dataTable + "
where ID in (" + inClause.toString() + ")");
+ prepMeta = con.prepareStatement("delete from " + this.tnMeta +
" where ID in (" + inClause.toString() + ")");
+ prepData = con.prepareStatement("delete from " + this.tnData +
" where ID in (" + inClause.toString() + ")");
}
for (int idx = 0; idx < batch; idx++) {
@@ -521,7 +580,7 @@ public class RDBBlobStore extends Cachin
@Override
public Iterator<String> getAllChunkIds(long maxLastModifiedTime) throws
Exception {
- return new ChunkIdIterator(this.ch, maxLastModifiedTime, metaTable);
+ return new ChunkIdIterator(this.ch, maxLastModifiedTime, this.tnMeta);
}
/**
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1669338&r1=1669337&r2=1669338&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Thu Mar 26 13:18:48 2015
@@ -49,8 +49,6 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.sql.DataSource;
-import com.google.common.collect.ImmutableMap;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -73,6 +71,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Striped;
@@ -616,9 +615,11 @@ public class RDBDocumentStore implements
private RDBConnectionHandler ch;
// from options
- private String tablePrefix = "";
private Set<String> tablesToBeDropped = new HashSet<String>();
+ // table names
+ private String tnNodes, tnClusterNodes, tnSettings;
+
// ratio between Java characters and UTF-8 encoding
// a) single characters will fit into 3 bytes
// b) a surrogate pair (two Java characters) will fit into 4 bytes
@@ -651,10 +652,9 @@ public class RDBDocumentStore implements
private void initialize(DataSource ds, DocumentMK.Builder builder,
RDBOptions options) throws Exception {
- this.tablePrefix = options.getTablePrefix();
- if (tablePrefix.length() > 0 && !tablePrefix.endsWith("_")) {
- tablePrefix += "_";
- }
+ this.tnNodes = RDBJDBCTools.createTableName(options.getTablePrefix(),
"NODES");
+ this.tnClusterNodes =
RDBJDBCTools.createTableName(options.getTablePrefix(), "CLUSTERNODES");
+ this.tnSettings =
RDBJDBCTools.createTableName(options.getTablePrefix(), "SETTINGS");
this.ch = new RDBConnectionHandler(ds);
this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of
RDBDocumentStore creation") : null;
@@ -1079,11 +1079,11 @@ public class RDBDocumentStore implements
private <T extends Document> String getTable(Collection<T> collection) {
if (collection == Collection.CLUSTER_NODES) {
- return this.tablePrefix + "CLUSTERNODES";
+ return this.tnClusterNodes;
} else if (collection == Collection.NODES) {
- return this.tablePrefix + "NODES";
+ return this.tnNodes;
} else if (collection == Collection.SETTINGS) {
- return this.tablePrefix + "SETTINGS";
+ return this.tnSettings;
} else {
throw new IllegalArgumentException("Unknown collection: " +
collection.toString());
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java?rev=1669338&r1=1669337&r2=1669338&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
Thu Mar 26 13:18:48 2015
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Locale;
+import javax.annotation.Nonnull;
+
public class RDBJDBCTools {
protected static String jdbctype(String jdbcurl) {
@@ -56,4 +58,30 @@ public class RDBJDBCTools {
return "";
}
}
+
+ private static @Nonnull String checkLegalTableName(@Nonnull String
tableName) throws IllegalArgumentException {
+ for (int i = 0; i < tableName.length(); i++) {
+ char c = tableName.charAt(i);
+ if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >=
'0' && c <= '9') || (c == '_'))) {
+ throw new IllegalArgumentException("Invalid character '" + c +
"' in table name '" + tableName + "'");
+ }
+ }
+ return tableName;
+ }
+
+ /**
+ * Creates a table name based on an optional prefix and a base name.
+ *
+ * @throws IllegalArgumentException
+ * upon illegal characters in name
+ */
+ protected static @Nonnull String createTableName(@Nonnull String prefix,
@Nonnull String basename)
+ throws IllegalArgumentException {
+ String p = checkLegalTableName(prefix);
+ String b = checkLegalTableName(basename);
+ if (p.length() != 0 && !p.endsWith("_")) {
+ p += "_";
+ }
+ return p + b;
+ }
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java?rev=1669338&r1=1669337&r2=1669338&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
Thu Mar 26 13:18:48 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import javax.annotation.Nonnull;
+
/**
* Options applicable to RDB persistence
*/
@@ -38,12 +40,12 @@ public class RDBOptions {
/**
* Prefix for table names.
*/
- public RDBOptions tablePrefix(String tablePrefix) {
+ public RDBOptions tablePrefix(@Nonnull String tablePrefix) {
this.tablePrefix = tablePrefix;
return this;
}
- public String getTablePrefix() {
+ public @Nonnull String getTablePrefix() {
return this.tablePrefix;
}
