From f0149e8b90f738c0a3846177b7dc00143b4d8d00 Mon Sep 17 00:00:00 2001 From: ?? ? <ulysseskao@ximple.com.tw> Date: Fri, 13 Jun 2008 10:41:27 +0800 Subject: [PATCH] update for EOFM-117 --- xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java | 3 ++- xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java | 5 +++++ xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 5 +++++ xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java | 5 +++++ xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 5 +++++ 5 files changed, 22 insertions(+), 1 deletions(-) diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java index c8cb87c..4835023 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java @@ -326,6 +326,7 @@ jobContext.commitTransaction(); //jobContext.startTransaction(); System.gc(); + System.runFinalization(); } int now = order % step; @@ -342,6 +343,7 @@ logger.info("end convert job:[" + order + "]"); System.gc(); + System.runFinalization(); } protected OrderedMap getBlobStorageList(Connection connection, String schemaSrc, String tableSrc, @@ -635,6 +637,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -768,6 +771,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -945,6 +949,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java index ac5c49d..8b1e3bf 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java @@ -326,6 +326,7 @@ jobContext.commitTransaction(); //jobContext.startTransaction(); System.gc(); + System.runFinalization(); } int now = order % step; @@ -342,6 +343,7 @@ logger.info("end convert job:[" + order + "]"); System.gc(); + System.runFinalization(); } protected OrderedMap getBlobStorageList(Connection connection, String schemaSrc, String tableSrc, @@ -635,6 +637,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -768,6 +771,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -945,6 +949,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java index e73e9f7..49ae703 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java @@ -330,6 +330,7 @@ jobContext.commitTransaction(); //jobContext.startTransaction(); System.gc(); + System.runFinalization(); } int now = order % step; @@ -346,6 +347,7 @@ jobContext.resetFeatureContext(); logger.info("end convert job:[" + order + "]"); System.gc(); + System.runFinalization(); } protected OrderedMap getBlobStorageList(Connection connection, String schemaSrc, String tableSrc, @@ -640,6 +642,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -773,6 +776,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -950,6 +954,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java index 22c9784..35a4de6 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java @@ -228,6 +228,7 @@ jobContext.commitTransaction(); //jobContext.startTransaction(); System.gc(); + System.runFinalization(); } int now = order % step; @@ -244,6 +245,7 @@ logger.info("end convert job:[" + order + "]"); System.gc(); + System.runFinalization(); } protected OrderedMap getBlobStorageList(Connection connection, String schemaSrc, String tableSrc, @@ -536,6 +538,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -667,6 +670,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); @@ -841,6 +845,7 @@ convertContext.commitTransaction(); convertContext.closeFeatureWriter(); System.gc(); + System.runFinalization(); } catch (FileNotFoundException e) { convertContext.rollbackTransaction(); diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java index deaa440..774e7cd 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java @@ -679,7 +679,8 @@ String attrValue; - StringBuffer statementSQL = new StringBuffer("INSERT INTO " + tableName + " ("); + StringBuilder statementSQL = new StringBuilder(512); + statementSQL.append("INSERT INTO ").append(tableName).append(" ("); // encode insertion for attributes, but remember to avoid auto-increment ones, // they may be included in the feature type as well -- Gitblit v0.0.0-SNAPSHOT