[Registry-dev] svn commit r14833 -
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/dao
svn at wso2.org
svn at wso2.org
Fri Mar 14 23:12:37 PDT 2008
Author: tyrell
Date: Fri Mar 14 23:12:32 2008
New Revision: 14833
Log:
Modifying SELECT * type statements to fetch only the needed fields.
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
Modified: branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
==============================================================================
--- branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java (original)
+++ branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java Fri Mar 14 23:12:32 2008
@@ -57,7 +57,8 @@
// get the resource data from the resource table
- String sql = "SELECT * FROM ARTIFACTS A WHERE A.PATH=?";
+ String sql =
+ "SELECT AID, MEDIA_TYPE, DIRECTORY, STATE, AUTHOR, CREATED_TIME, DESCRIPTION FROM ARTIFACTS A WHERE A.PATH=?";
PreparedStatement statement = conn.prepareStatement(sql);
statement.setString(1, path);
@@ -81,7 +82,7 @@
return null;
}
- String sqlVersionedFields = "SELECT * FROM VERSIONS WHERE AID=? AND VN=?";
+ String sqlVersionedFields = "SELECT CONTENT, AUTHOR, UPDATED_TIME FROM VERSIONS WHERE AID=? AND VN=?";
PreparedStatement versionQuery = conn.prepareStatement(sqlVersionedFields);
versionQuery.setLong(1, resource.getId());
versionQuery.setLong(2, versionNumber);
@@ -118,7 +119,7 @@
// get the resource data from the resource table
- String sql = "SELECT * FROM ARTIFACTS A WHERE A.AID=?";
+ String sql = "SELECT AID, PATH, MEDIA_TYPE, DIRECTORY, STATE, AUTHOR, CREATED_TIME, DESCRIPTION FROM ARTIFACTS A WHERE A.AID=?";
PreparedStatement statement = conn.prepareStatement(sql);
statement.setLong(1, artifactID);
@@ -144,7 +145,7 @@
if (versionNumber == -1) {
versionNumber = getLatestVersionNumber(artifactID, conn);
}
- String sqlVersionedFields = "SELECT * FROM VERSIONS WHERE AID=? AND VN=?";
+ String sqlVersionedFields = "SELECT CONTENT, AUTHOR, UPDATED_TIME FROM VERSIONS WHERE AID=? AND VN=?";
PreparedStatement versionQuery = conn.prepareStatement(sqlVersionedFields);
versionQuery.setLong(1, resource.getId());
versionQuery.setLong(2, versionNumber);
@@ -213,7 +214,7 @@
// get the resource data from the resource table
- String sql = "SELECT * FROM ARTIFACTS A WHERE A.PATH=?";
+ String sql = "SELECT AID, PATH, MEDIA_TYPE, DIRECTORY, STATE, AUTHOR, CREATED_TIME, DESCRIPTION FROM ARTIFACTS A WHERE A.PATH=?";
PreparedStatement statement = conn.prepareStatement(sql);
statement.setString(1, path);
@@ -241,7 +242,7 @@
long latestVersionNumber = getCurrentVersionNumber(resource.getPath(), conn);
- String sqlVersionedFields = "SELECT * FROM VERSIONS WHERE AID=? AND VN=?";
+ String sqlVersionedFields = "SELECT CONTENT, AUTHOR, UPDATED_TIME FROM VERSIONS WHERE AID=? AND VN=?";
PreparedStatement versionQuery = conn.prepareStatement(sqlVersionedFields);
versionQuery.setLong(1, resource.getId());
versionQuery.setLong(2, latestVersionNumber);
@@ -329,7 +330,7 @@
// }
} catch (SQLException e) {
log.info("Something went wrong while calculating the current " +
- "version for the path : " + path + " and the error us " + e);
+ "version for the path : " + path + " and the error us " + e);
return -1;
}
}
@@ -376,7 +377,7 @@
dependencyPathList.add(path);
}
}
- return (String[])(dependencyPathList.toArray(new String[dependencyPathList.size()]));
+ return (String[]) (dependencyPathList.toArray(new String[dependencyPathList.size()]));
}
public String getParentPath(long resourceID, long versionNumber,
@@ -435,7 +436,7 @@
dependencyPathList.add(path);
}
}
- return (String[])(dependencyPathList.toArray(new String[dependencyPathList.size()]));
+ return (String[]) (dependencyPathList.toArray(new String[dependencyPathList.size()]));
}
public List getChildren(long resourceID, long versionNumber,
@@ -486,7 +487,7 @@
String sql =
"INSERT INTO ARTIFACTS (PATH, MEDIA_TYPE, DIRECTORY, STATE, CREATED_TIME, AUTHOR, " +
- "DESCRIPTION) VALUES (?,?,?,?,?,?,?)";
+ "DESCRIPTION) VALUES (?,?,?,?,?,?,?)";
long now = System.currentTimeMillis();
@@ -565,8 +566,8 @@
Iterator i = props.keySet().iterator();
while (i.hasNext()) {
- String key = (String)i.next();
- String value = (String)props.get(key);
+ String key = (String) i.next();
+ String value = (String) props.get(key);
s2.setLong(1, resourceID);
s2.setString(2, key);
@@ -736,7 +737,7 @@
statement.setBytes(3, bytes);
String userName = resource.getLastUpdaterUserName();
- if(userName == null){
+ if (userName == null) {
userName = User.getCurrentUser();
}
statement.setString(4, userName);
@@ -748,19 +749,19 @@
public static byte[] convertToBytes(Object object) {
if (object instanceof byte[])
- return (byte[])object;
+ return (byte[]) object;
if (object instanceof String)
- return ((String)object).getBytes();
+ return ((String) object).getBytes();
if (object instanceof DataHandler) {
try {
- object = ((DataHandler)object).getInputStream();
+ object = ((DataHandler) object).getInputStream();
} catch (IOException e) {
return null;
}
}
if (object instanceof InputStream) {
// TODO - fix this to really work.
- InputStream is = (InputStream)object;
+ InputStream is = (InputStream) object;
byte[] bytes;
try {
int avail = is.available();
@@ -903,7 +904,7 @@
}
for (Object aDependeyMap : dependeyMap) {
- PreparedStatement preparedStatement = (PreparedStatement)aDependeyMap;
+ PreparedStatement preparedStatement = (PreparedStatement) aDependeyMap;
preparedStatement.executeUpdate();
}
@@ -942,7 +943,7 @@
while (result.next()) {
versionNumbers.add("" + result.getLong("VN"));
}
- return (String[])versionNumbers.toArray(new String[versionNumbers.size()]);
+ return (String[]) versionNumbers.toArray(new String[versionNumbers.size()]);
}
public void restore(long resourceId, long toVersion, Connection connection)
@@ -981,7 +982,7 @@
}
for (Object aDependencyList : dependencyList) {
- PreparedStatement preparedStatement = (PreparedStatement)aDependencyList;
+ PreparedStatement preparedStatement = (PreparedStatement) aDependencyList;
preparedStatement.executeUpdate();
}
}
@@ -1016,8 +1017,8 @@
Resource resource = new Resource();
resource.setId(resourceID);
- if(lastUpdaterUserName == null){
- lastUpdaterUserName = User.getCurrentUser();
+ if (lastUpdaterUserName == null) {
+ lastUpdaterUserName = User.getCurrentUser();
}
resource.setLastUpdaterUserName(lastUpdaterUserName);
resource.setLastModified(new Date(lastModifiedTime));
@@ -1089,7 +1090,7 @@
}
} catch (SQLException e) {
log.debug("Inside getResourceStatus trying to access the path: " + resourcePath +
- " error message" + e.getMessage());
+ " error message" + e.getMessage());
}
return false;
}
@@ -1167,7 +1168,7 @@
List childList = getChildren(collection.getId(), -1, conn);
Iterator i = childList.iterator();
while (i.hasNext()) {
- Resource child = (Resource)i.next();
+ Resource child = (Resource) i.next();
if (child.isDirectory()) {
activateDirectory(child, conn);
} else {
More information about the Registry-dev
mailing list