dev/null |binary rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/build.properties | 2 search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar |binary search-server/spacewalk-search/spacewalk-search.spec | 22 ++ search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 76 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 44 +--- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml | 29 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 48 ++-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 69 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml | 31 +-- search-server/spacewalk-search/src/config/rhn-search | 2 search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java | 31 +++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java | 72 +++++++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java | 97 ---------- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 52 ----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java | 19 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java | 31 +-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java | 27 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 9 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java | 5 29 files changed, 359 insertions(+), 446 deletions(-)
New commits: commit 56ae852cf76565d58ca13a6dc441265ea521f013 Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 17:04:32 2013 +0100
Automatic commit of package [spacewalk-search] release [2.1.7-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 57e73af..bd48388 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.6-1 search-server/spacewalk-search/ +2.1.7-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 5cc0ee8..101e000 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.6 +Version: 2.1.7 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -186,6 +186,22 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog +* Fri Dec 06 2013 Tomas Lestach tlestach@redhat.com 2.1.7-1 +- 1023669 - have unique id for SnapshotTag +- 1023669 - remove unused logger +- 1023669 - start using verifyServerVisibility +- 1023669 - start using errata visibility +- 1023669 - fix list iterations as query parameters +- 1023669 - add connection customizer +- 1023669 - introduce C3P0DataSourceFactory +- 1023669 - link cglib-node and objectweb-asm for DelteIndexes +- 1023669 - require and link c3p0 +- 1023669 - require and link cglib-nodep and objectweb-asm +- 1023669 - replace ibatis jar with mybatis +- 1023669 - adapt code for mybatis +- 1023669 - migrate to mybatis +- 1023669 - remove original setSessionTimeZone + * Fri Nov 15 2013 Tomas Lestach tlestach@redhat.com 2.1.6-1 - Fix custom info value index removal in advanced search
commit 9c6c5ec64dffb23dea2d413acc10cd70034787e2 Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 14:50:39 2013 +0100
1023669 - have unique id for SnapshotTag
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java index 732f56a..a59f5bd 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java @@ -20,7 +20,6 @@ package com.redhat.satellite.search.db.models; * @version $Rev$ */ public class SnapshotTag extends GenericRecord { - private long id; private long snapshotId; private long tagNameId; private long serverId; @@ -28,18 +27,19 @@ public class SnapshotTag extends GenericRecord { private String name; private String created; private String modified; - /** - * @return the id - */ - public long getId() { - return id; - } - /** - * @param idIn the id to set - */ - public void setId(long idIn) { - this.id = idIn; - } + + private String makeUniqId(long serverIdIn, long snapshotdIn) { + return serverIdIn + "-" + snapshotdIn; + } + + /** + * + * @return uniqId + */ + public String getUniqId() { + return makeUniqId(serverId, snapshotId); + } + /** * @return the snapshotId */ @@ -124,5 +124,4 @@ public class SnapshotTag extends GenericRecord { public void setModified(String modifiedIn) { this.modified = modifiedIn; } - } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java index 1e31647..78bc0b4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java @@ -36,6 +36,7 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { throws ClassCastException { SnapshotTag sTag = (SnapshotTag)data; Map<String, String> attrs = new HashMap<String, String>(); + attrs.put("uniqId", sTag.getUniqId()); attrs.put("snapshotId", new Long(sTag.getSnapshotId()).toString()); attrs.put("tagNameId", new Long(sTag.getTagNameId()).toString()); attrs.put("serverId", new Long(sTag.getServerId()).toString()); @@ -98,9 +99,9 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { * {@inheritDoc} */ public String getUniqueFieldId() { - return "tagNameId"; + return "uniqId"; } - + /** * {@inheritDoc} */
commit 6e9f2b8e96b9b9b771c2c43068430b5f1af2955f Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 18:04:31 2013 +0100
1023669 - remove unused logger
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java index 60df540..adee517 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java @@ -18,8 +18,6 @@ import com.redhat.satellite.search.db.models.GenericRecord; import com.redhat.satellite.search.db.models.HardwareDevice; import com.redhat.satellite.search.index.builder.BuilderFactory;
-import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map;
@@ -29,8 +27,6 @@ import java.util.Map; */ public class IndexHardwareDevicesTask extends GenericIndexTask {
- private static Logger log = Logger.getLogger(IndexHardwareDevicesTask.class); - /** * {@inheritDoc} */
commit fd0668d0e3782c29ac773ea383774112d0472ec1 Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 17:07:43 2013 +0100
1023669 - start using verifyServerVisibility
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 9f761f5..a6a75ac 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -83,13 +83,14 @@ SELECT last_modified from rhnIndexerWork where object_type='server' </select> <select id="verifyServerVisibility" resultType="string"> - SELECT object_id - FROM rhnVisibleObjects - WHERE pxt_session_id = #{session_id} - AND object_type = #{object_type} - AND object_id IN + SELECT DISTINCT s.id + FROM rhnServer s + INNER JOIN rhnUserServerPerms usp ON s.id = usp.server_id + INNER JOIN pxtsessions ps ON ps.web_user_id = usp.user_id + WHERE ps.id = #{session_id} + AND s.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> <select id="maxServerId" resultType="java.lang.Long"> @@ -99,4 +100,4 @@ <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 2e491a4..3832dff 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,8 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.equals("package") || indexName.equals("errata")) { + if (indexName.equals("package") || indexName.equals("errata") + || indexName.equals("server")) { return screenHits(sessionId, indexName, hits); } return hits; @@ -210,6 +211,9 @@ public class IndexHandler { else if ("errata".equals(indexName)) { query = databaseManager.getQuery("verifyErrataVisibility"); } + else if ("server".equals(indexName)) { + query = databaseManager.getQuery("verifyServerVisibility"); + } else { if (log.isDebugEnabled()) { log.debug("screenHits(" + indexName +
commit 773441bc54f5e503f8095b44c528299ce60f8bc5 Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 11:58:57 2013 +0100
1023669 - start using errata visibility
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 86736e3..8ae20ae 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -46,13 +46,13 @@ from rhnErrata e, rhnChannelErrata ce, rhnAvailableChannels ac, - pxrsessions ps, + pxtsessions ps, web_contact wc where e.id = ce.errata_id and ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #{sessionId} + ps.id = #{session_id} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> #{item} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 26c26f7..2e491a4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,7 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.compareTo("package") == 0) { + if (indexName.equals("package") || indexName.equals("errata")) { return screenHits(sessionId, indexName, hits); } return hits;
commit fca32356713665947a21ec7b02e0ce0aea22c7cd Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 11:58:33 2013 +0100
1023669 - fix list iterations as query parameters
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 3f6b9e7..86736e3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -55,7 +55,7 @@ ps.id = #{sessionId} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 61ecd4b..3643781 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -71,7 +71,7 @@ and ps.id = #{session_id} and p.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper>
commit 8ad305a04ad2c87ffc1691f3749e6c66e1734db7 Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 12:02:43 2013 +0100
1023669 - add connection customizer
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 906d492..bcb2e52 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -19,6 +19,7 @@ <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> <property name="user" value="${db_user}"/> <property name="password" value="${db_password}"/> + <property name="connectionCustomizerClassName" value="com.redhat.satellite.search.config.translator.RhnConnectionCustomizer" /> </dataSource> </environment> </environments> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java new file mode 100644 index 0000000..6baa29d --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ConnectionCustomizer; +import com.redhat.satellite.search.db.DatabaseManager; + +import org.apache.log4j.Logger; + +import java.lang.reflect.Method; +import java.sql.Connection; +import java.util.TimeZone; +/** + * RhnConnectionCustomizer + * @version $Rev$ + */ +public class RhnConnectionCustomizer implements ConnectionCustomizer { + + private static final Logger LOG = Logger.getLogger(RhnConnectionCustomizer.class); + + /** + * {@inheritDoc} + */ + public void onAcquire(Connection c, String pdsIdt) throws Exception { + if (DatabaseManager.isOracle()) { + try { + Method setSessionTimeZoneMethod = Class.forName( + "oracle.jdbc.driver.OracleConnection").getMethod( + "setSessionTimeZone", String.class); + if (setSessionTimeZoneMethod != null) { + setSessionTimeZoneMethod.invoke(c, TimeZone.getDefault().getID()); + } + } + catch (Exception e) { + LOG.warn("Failed to set session time zone."); + } + } + } + + /** + * {@inheritDoc} + */ + public void onCheckIn(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onCheckOut(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onDestroy(Connection c, String pdsIdt) throws Exception { + // empty + } +} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index d62c0c7..01c9ed1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; public class DatabaseManager {
private SqlSessionFactory sessionFactory = null; - private boolean isOracle; + private static boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class);
@@ -117,4 +117,8 @@ public class DatabaseManager { public WriteQuery getWriterQuery(String name) { return new WriteQuery(sessionFactory.openSession(), name); } + + public static boolean isOracle() { + return isOracle; + } }
commit 628312a320a62114a97ce91c14b6e612287fd2c2 Author: Tomas Lestach tlestach@redhat.com Date: Wed Dec 4 17:25:25 2013 +0100
1023669 - introduce C3P0DataSourceFactory
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index a9ebaa8..906d492 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -13,14 +13,12 @@
<environments default="default"> <environment id="default"> - <transactionManager type="JDBC"> - </transactionManager> - - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> + <transactionManager type="JDBC" /> + <dataSource type="com.redhat.satellite.search.config.translator.C3P0DataSourceFactory"> + <property name="driverClass" value="${search.connection.driver_class}"/> + <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> + <property name="user" value="${db_user}"/> + <property name="password" value="${db_password}"/> </dataSource> </environment> </environments> @@ -35,4 +33,4 @@ <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> </mappers> - </configuration> \ No newline at end of file + </configuration> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java new file mode 100644 index 0000000..ddf2f6a --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ComboPooledDataSource; +import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory; + +/** + * DataSourceFactory using c3p0 + * C3P0DataSourceFactory + * @version $Rev$ + */ +public class C3P0DataSourceFactory extends UnpooledDataSourceFactory { + + public C3P0DataSourceFactory() { + this.dataSource = new ComboPooledDataSource(); + } +}
commit d0cfd085c7e09688a914d97b999e13d06505b9f1 Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 16:56:12 2013 +0100
1023669 - link cglib-node and objectweb-asm for DelteIndexes
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index b00b4de..6bff688 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -76,7 +76,7 @@ unlock() {
removeindex() { JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc' - SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar` + SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar` CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes }
commit bee0af607cb413cc6d7a1a3fb3990b4e6932e614 Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 5 15:00:11 2013 +0100
1023669 - require and link c3p0
diff --git a/search-server/spacewalk-search/build.properties b/search-server/spacewalk-search/build.properties index 5fa6842..2cfbe0a 100644 --- a/search-server/spacewalk-search/build.properties +++ b/search-server/spacewalk-search/build.properties @@ -19,4 +19,4 @@ javadoc.method.scope=public javadoc.type.scope=package javadoc.var.scope=package javadoc.lazy=true -jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core" +jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core c3p0" diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 621e8ac..5cc0ee8 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch
#Requires: apache-ibatis-sqlmap +Requires: c3p0 Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli @@ -46,6 +47,7 @@ Requires: simple-core Obsoletes: rhn-search < 5.3.0 BuildRequires: ant #BuildRequires: apache-ibatis-sqlmap +BuildRequires: c3p0 BuildRequires: jakarta-commons-cli BuildRequires: jakarta-commons-codec BuildRequires: jakarta-commons-httpclient diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 86ec44a..5ca090d 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -45,6 +45,7 @@ wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar
wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar +wrapper.java.classpath.26=/usr/share/java/c3p0.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib
commit 1efa3b50930d8d341032266584d90270864a9999 Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 10:37:14 2013 +0100
1023669 - require and link cglib-nodep and objectweb-asm
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ad9e0a3..621e8ac 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch
#Requires: apache-ibatis-sqlmap +Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli Requires: jakarta-commons-codec @@ -35,6 +36,7 @@ Requires: jakarta-oro Requires: oro %endif #Requires: lucene +Requires: objectweb-asm Requires: quartz < 2.0 Conflicts: quartz >= 2.0 Requires: redstone-xmlrpc diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 61e5ef0..86ec44a 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -43,6 +43,9 @@ wrapper.java.classpath.22=/usr/share/java/slf4j/jcl.jar
wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar
+wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar +wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar + # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64
commit c8baa2b0d868f0b027a3a746653b413f4ea2548a Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 10:35:29 2013 +0100
1023669 - replace ibatis jar with mybatis
diff --git a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar b/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar deleted file mode 100644 index 72dbe19..0000000 Binary files a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar and /dev/null differ diff --git a/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar new file mode 100644 index 0000000..1ac3064 Binary files /dev/null and b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar differ
commit 8556f444b08486e6b983a64c50614c3d47b1ccf5 Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 16:51:45 2013 +0100
1023669 - adapt code for mybatis
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index f2e193d..61e5ef0 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -15,7 +15,7 @@ wrapper.java.mainclass=com.redhat.satellite.search.Main wrapper.java.classpath.1=/usr/share/rhn/search/classes/ wrapper.java.classpath.2=/usr/share/rhn/search/lib/commons-lang.jar wrapper.java.classpath.3=/usr/share/rhn/search/lib/commons-logging.jar -wrapper.java.classpath.4=/usr/share/rhn/search/lib/ibatis-2.3.0.677.jar +wrapper.java.classpath.4=/usr/share/rhn/search/lib/mybatis-3.2.3.jar wrapper.java.classpath.5=/usr/share/rhn/search/lib/log4j.jar wrapper.java.classpath.6=/usr/share/rhn/search/lib/lucene-core-2.3.2.jar wrapper.java.classpath.7=/usr/share/java/ojdbc14.jar diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java deleted file mode 100644 index e874623..0000000 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright (c) 2008--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ - -package com.redhat.satellite.search.db; - -import com.ibatis.sqlmap.client.SqlMapSession; - -import org.apache.log4j.Logger; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * Simplified connection class for executing arbitrary SQL - * - * @version $Rev$ - */ -public class Connection { - private static Logger log = Logger.getLogger(Connection.class); - - private SqlMapSession session; - - /** - * Constructor - * @param sess iBatis session to use - */ - public Connection(SqlMapSession sess) { - session = sess; - } - - /** - * Close down all resources - * @throws SQLException something bad happened - */ - public void close() throws SQLException { - session.close(); - } - - /** - * Executes a query - * @param statement string of valid SQL - * @param handler called on each row - * @throws SQLException something bad happened - */ - public void executeQuery(String statement, ResultHandler handler) throws SQLException { - java.sql.Connection cn = null; - Statement stmt = null; - ResultSet rs = null; - try { - log.warn("start transaction"); - session.startTransaction(); - log.warn("get current connection"); - cn = session.getCurrentConnection(); - log.warn("creating statement"); - stmt = cn.createStatement(); - log.warn("execute query"); - rs = stmt.executeQuery(statement); - log.warn("process resultset"); - while (rs.next()) { - handler.handleRow(rs); - } - } - finally { - try { - log.warn("commit transaction"); - session.commitTransaction(); - } - finally { - try { - if (rs != null) { - log.warn("close RS"); - rs.close(); - } - } - finally { - if (stmt != null) { - log.warn("close STMT"); - stmt.close(); - } - } - } - } - } -} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 7991436..d62c0c7 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -22,11 +22,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.Properties; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.client.SqlMapClientBuilder; + import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException;
+import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.log4j.Logger;
/** @@ -35,7 +36,7 @@ import org.apache.log4j.Logger; */ public class DatabaseManager {
- private SqlMapClient client = null; + private SqlSessionFactory sessionFactory = null; private boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class);
@@ -95,7 +96,7 @@ public class DatabaseManager { } }
- client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides); + sessionFactory = new SqlSessionFactoryBuilder(). build(reader, overrides); }
/** @@ -105,7 +106,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(client.openSession(), name); + return new Query<T>(sessionFactory.openSession(), name); }
/** @@ -114,14 +115,6 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - return new WriteQuery(client.openSession(), name); - } - - /** - * Opens a direct DB connection - * @return connection object - */ - public Connection getConnection() { - return new Connection(client.openSession()); + return new WriteQuery(sessionFactory.openSession(), name); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java index d83e744..090aee8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java @@ -15,7 +15,7 @@
package com.redhat.satellite.search.db;
-import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession;
import java.sql.SQLException; import java.util.ArrayList; @@ -29,10 +29,10 @@ import java.util.List; */ public class Query<T> {
- private SqlMapSession session; + private SqlSession session; private String queryName;
- Query(SqlMapSession sessionIn, String queryNameIn) { + Query(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } @@ -43,12 +43,7 @@ public class Query<T> { */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); @@ -63,7 +58,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public List<T> loadList(Object param) throws SQLException { - List r = session.queryForList(queryName, param); + List r = session.selectList(queryName, param); List<Object> results = r; List<T> retval = new ArrayList<T>(results.size()); for (Object item : results) { @@ -80,7 +75,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load(Object param) throws SQLException { - return (T)session.queryForObject(queryName, param); + return (T)session.selectOne(queryName, param); }
/** @@ -90,6 +85,6 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load() throws SQLException { - return (T)session.queryForObject(queryName); + return (T)session.selectOne(queryName); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java index 9cc76a5..acaa483 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java @@ -15,43 +15,38 @@
package com.redhat.satellite.search.db;
-import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession;
import java.sql.SQLException;
/** * Query for writing (insert, update, delete) to a database - * + * * @version $Rev$ */ public class WriteQuery { - - private SqlMapSession session; + + private SqlSession session; private String queryName;
- WriteQuery(SqlMapSession sessionIn, String queryNameIn) { + WriteQuery(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } - + /** * Close query and all associated resources * @throws SQLException something bad happened */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); } - } - + } + /** * Execute update query * @param param query param @@ -61,22 +56,22 @@ public class WriteQuery { public int update(Object param) throws SQLException { return session.update(queryName, param); } - + /** * Execute delete query * @param param query param * @return number of rows updated * @throws SQLException something bad happened - */ + */ public int delete(Object param) throws SQLException { return session.delete(queryName, param); } - + /** * Execute insert query * @param param query param * @throws SQLException something bad happened - */ + */ public void insert(Object param) throws SQLException { session.insert(queryName, param); } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java index 376de7f..c8bd93b 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java @@ -22,8 +22,6 @@ import com.redhat.satellite.search.index.Result; import com.redhat.satellite.search.index.QueryParseException; import com.redhat.satellite.search.scheduler.ScheduleManager;
-import com.ibatis.sqlmap.client.SqlMapException; - import org.apache.log4j.Logger;
import redstone.xmlrpc.XmlRpcFault; @@ -93,11 +91,6 @@ public class DatabaseHandler { log.info("Returned " + hits.size() + " records"); return hits; } - catch (SqlMapException e) { - log.warn("Caught SqlMapException: " + e.getMessage()); - e.printStackTrace(); - throw new XmlRpcFault(IndexHandler.DB_ERROR, e.getMessage()); - } catch (SQLException e) { log.warn("Caught SQLException: " + e.getMessage()); e.printStackTrace(); @@ -161,7 +154,7 @@ public class DatabaseHandler { */ private List<Result> runQuery(Long sessionId, String namespace, String queryName, Map<String, Object> args) - throws SQLException, SqlMapException { + throws SQLException { // Look up Query in DB args.put("sessionId", sessionId); Query<Result> query = databaseManager.getQuery(queryName); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java index 9b575bf..df3bf55 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks;
-import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.WriteQuery; @@ -224,13 +223,6 @@ public abstract class GenericIndexTask implements Job { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close(); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java index a755a06..c9b9ea0 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks;
-import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.models.GenericRecord; @@ -67,13 +66,6 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close();
commit 611fbe71f2d77497679a3969744d44971ac6a7a0 Author: Tomas Lestach tlestach@redhat.com Date: Wed Dec 4 11:30:11 2013 +0100
1023669 - migrate to mybatis
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 655d953..a9ebaa8 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -1,39 +1,38 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMapConfig - PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-config-2.dtd"> -<!-- Always ensure to use the correct XML header as above! --> -<sqlMapConfig> - <!-- These settings control SqlMap configuration details, primarily to do with transaction - management. They are all optional (see the Developer Guide for more). --> - <settings - cacheModelsEnabled="true" - statementCachingEnabled="false" - enhancementEnabled="true" - lazyLoadingEnabled="true" - maxRequests="100" - maxSessions="10" - maxTransactions="10" - useStatementNamespaces="false" - /> - <!-- Configure a datasource to use with this SQL Map using SimpleDataSource. - Notice the use of the properties from the above resource --> - <transactionManager type="JDBC" > - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> - </dataSource> - </transactionManager> - <!-- Identify all SQL Map XML files to be loaded by this SQL map. Notice the paths - are relative to the classpath. For now, we only have one… --> - <sqlMap resource="com/redhat/satellite/search/db/package.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata_handler.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/hwdevice.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/snapshot_tag.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server_custom_info.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/xccdf_ident.xml" /> -</sqlMapConfig> +<?xml version="1.0" encoding="UTF-8"?><!-- Always ensure to use the correct XML header as above! --><!--Converted at: Wed Dec 04 11:26:11 CET 2013--> +<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-config.dtd"> +<configuration><settings> + <setting name="cacheEnabled" value="true"/> + <setting name="lazyLoadingEnabled" value="true"/> + </settings> + <typeAliases> + </typeAliases> + + <typeHandlers> + </typeHandlers> + + <environments default="default"> + <environment id="default"> + <transactionManager type="JDBC"> + </transactionManager> + + <dataSource type="SIMPLE"> + <property name="JDBC.Driver" value="${search.connection.driver_class}"/> + <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> + <property name="JDBC.Username" value="${db_user}"/> + <property name="JDBC.Password" value="${db_password}"/> + </dataSource> + </environment> + </environments> + + <mappers> + <mapper resource="com/redhat/satellite/search/db/package.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata.xml"/> + <mapper resource="com/redhat/satellite/search/db/server.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata_handler.xml"/> + <mapper resource="com/redhat/satellite/search/db/hwdevice.xml"/> + <mapper resource="com/redhat/satellite/search/db/snapshot_tag.xml"/> + <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> + <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> + </mappers> + </configuration> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index d9f9d80..3f6b9e7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errata"> - <select id="listErrataFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.Errata"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:11 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errata"> + <select id="listErrataFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.Errata"> SELECT e.id, e.advisory, @@ -25,29 +22,26 @@ e.modified, e.last_modified as lastModified FROM rhnErrata e - WHERE e.id > #id# + WHERE e.id > #{id} ORDER by e.id ASC </select> <delete id="deleteLastErrata"> DELETE FROM rhnIndexerWork where object_type = 'errata' </delete> - <insert id="createLastErrata" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('errata', #id#, #last_modified#) + <insert id="createLastErrata" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('errata', #{id}, #{last_modified}) </insert> - <update id="updateLastErrata" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'errata' + <update id="updateLastErrata" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'errata' </update> - <select id="getLastErrataId" - resultClass="java.lang.Long"> + <select id="getLastErrataId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='errata' </select> - <select id="maxErrataId" resultClass="java.lang.Long"> + <select id="maxErrataId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnErrata </select> - <select id="verifyErrataVisibility" resultClass="string"> + <select id="verifyErrataVisibility" resultType="string"> select distinct e.id from rhnErrata e, rhnChannelErrata ce, @@ -58,10 +52,10 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# + ps.id = #{sessionId} and e.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml index 4fa590d..850468d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errataHandler"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:11 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errataHandler">
- <select id="listErrataByCVE" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result"> + <select id="listErrataByCVE" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT DISTINCT ecve.errata_id as id from rhnErrataCVE ecve, @@ -22,13 +19,11 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - LOWER(cve.name) like #param0# + ps.id = #{sessionId} and + LOWER(cve.name) like #{param0} </select>
- <select id="listErrataByIssueDateRange" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result" > + <select id="listErrataByIssueDateRange" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT E.id as id FROM rhnErrata E, @@ -41,9 +36,9 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - E.issue_date >= TO_TIMESTAMP(#param0#, 'YYYY-MM-DD HH24:MI:SS') - AND E.issue_date <= TO_TIMESTAMP(#param1#, 'YYYY-MM-DD HH24:MI:SS') + ps.id = #{sessionId} and + E.issue_date >= TO_TIMESTAMP(#{param0}, 'YYYY-MM-DD HH24:MI:SS') + AND E.issue_date <= TO_TIMESTAMP(#{param1}, 'YYYY-MM-DD HH24:MI:SS') ORDER BY E.issue_date ASC </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml index de205c5..d8326d3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:11 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="hwdevice">
-<sqlMap namespace="hwdevice"> - - <select id="getHardwareDeviceById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.HardwareDevice"> + <select id="getHardwareDeviceById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.HardwareDevice"> SELECT rd.id as id, rd.server_id as serverId, @@ -22,7 +19,7 @@ rd.prop4 as subDeviceId, rd.pcitype as pciType FROM rhnDevice rd - WHERE rd.id > #id# + WHERE rd.id > #{id} ORDER by rd.id ASC </select>
@@ -30,24 +27,20 @@ <delete id="deleteLastHardwareDevice"> DELETE FROM rhnIndexerWork where object_type = 'hwdevice' </delete> - <insert id="createLastHardwareDevice" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('hwdevice', #id#, #last_modified#) + <insert id="createLastHardwareDevice" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('hwdevice', #{id}, #{last_modified}) </insert> - <update id="updateLastHardwareDevice" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'hwdevice' + <update id="updateLastHardwareDevice" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'hwdevice' </update> - <select id="getLastHardwareDeviceId" - resultClass="java.lang.Long"> + <select id="getLastHardwareDeviceId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='hwdevice' </select> - <select id="getLastHardwareDeviceIndexRun" - resultClass="java.util.Date"> + <select id="getLastHardwareDeviceIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='hwdevice' </select> - <select id="queryAllHwDeviceIds" resultClass="Long"> + <select id="queryAllHwDeviceIds" resultType="Long"> SELECT id from rhnDevice </select>
-</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 1972292..61ecd4b 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="package"> - <select id="getPackageById" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:12 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="package"> + <select id="getPackageById" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -22,11 +19,9 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id = #id# + and p.id = #{id} </select> - <select id="listPackagesFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> + <select id="listPackagesFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -43,29 +38,26 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id > #id# + and p.id > #{id} ORDER by p.id ASC </select> <delete id="deleteLastPackage"> DELETE FROM rhnIndexerWork where object_type = 'package' </delete> - <insert id="createLastPackage" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('package', #id#, #last_modified#) + <insert id="createLastPackage" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('package', #{id}, #{last_modified}) </insert> - <update id="updateLastPackage" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'package' + <update id="updateLastPackage" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'package' </update> - <select id="getLastPackageId" - resultClass="java.lang.Long"> + <select id="getLastPackageId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='package' </select> - <select id="maxPackageId" resultClass="java.lang.Long"> + <select id="maxPackageId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnPackage </select> - <select id="verifyPackageVisibility" resultClass="string"> + <select id="verifyPackageVisibility" resultType="string"> select distinct p.id from rhnPackage p, rhnAvailableChannels ac, @@ -76,10 +68,10 @@ and ac.channel_id = cp.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id - and ps.id = #session_id# + and ps.id = #{session_id} and p.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 535bcbb..9f761f5 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -1,10 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="server"> - <select id="getServerByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.Server"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:12 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="server"> + <select id="getServerByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.Server"> SELECT s.id as id, s.name as name, @@ -58,51 +56,47 @@ LEFT OUTER JOIN rhnServerDmi dmi ON s.id = dmi.server_id LEFT OUTER JOIN rhnCPU cpu on s.id = cpu.server_id LEFT OUTER JOIN rhnVirtualInstance vi on s.id = vi.virtual_system_id - WHERE s.modified >= #last_modified# - or rsn.modified >= #last_modified# - or si.checkin >= #last_modified# - or rr.modified >= #last_modified# - or sl.modified >= #last_modified# - or dmi.modified >= #last_modified# - or cpu.modified >= #last_modified# - or s.id > #id# + WHERE s.modified >= #{last_modified} + or rsn.modified >= #{last_modified} + or si.checkin >= #{last_modified} + or rr.modified >= #{last_modified} + or sl.modified >= #{last_modified} + or dmi.modified >= #{last_modified} + or cpu.modified >= #{last_modified} + or s.id > #{id} ORDER by s.id ASC </select>
<delete id="deleteLastServer"> DELETE FROM rhnIndexerWork where object_type = 'server' </delete> - <insert id="createLastServer" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server', #id#, #last_modified#) + <insert id="createLastServer" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server', #{id}, #{last_modified}) </insert> - <update id="updateLastServer" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server' + <update id="updateLastServer" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server' </update> - <select id="getLastServerId" - resultClass="java.lang.Long"> + <select id="getLastServerId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server' </select> - <select id="getLastServerIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server' </select> - <select id="verifyServerVisibility" resultClass="string"> + <select id="verifyServerVisibility" resultType="string"> SELECT object_id FROM rhnVisibleObjects - WHERE pxt_session_id = #session_id# - AND object_type = #object_type# + WHERE pxt_session_id = #{session_id} + AND object_type = #{object_type} AND object_id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> - <select id="maxServerId" resultClass="java.lang.Long"> + <select id="maxServerId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnServer </select> - <select id="queryAllServerIds" resultClass="Long"> + <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml index 5e29554..90680d7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:12 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="serverCustomInfo">
-<sqlMap namespace="serverCustomInfo"> - - <select id="getServerCustomInfoByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="getServerCustomInfoByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo">
SELECT rscdv.key_id as keyId, @@ -19,30 +16,26 @@ TO_CHAR(rscdv.modified, 'YYYY-MM-DD HH24-MI-SS') as modified FROM rhnServerCustomDataValue rscdv INNER JOIN rhnCustomDataKey rcdk on rcdk.id = rscdv.key_id - WHERE rscdv.modified > #last_modified# + WHERE rscdv.modified > #{last_modified} ORDER by rscdv.key_id ASC </select>
<delete id="deleteLastServerCustomInfo"> DELETE FROM rhnIndexerWork where object_type = 'server_custom_info' </delete> - <insert id="createLastServerCustomInfo" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server_custom_info', #id#, #last_modified#) + <insert id="createLastServerCustomInfo" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server_custom_info', #{id}, #{last_modified}) </insert> - <update id="updateLastServerCustomInfo" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server_custom_info' + <update id="updateLastServerCustomInfo" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server_custom_info' </update> - <select id="getLastServerCustomInfoId" - resultClass="java.lang.Long"> + <select id="getLastServerCustomInfoId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="getLastServerCustomInfoIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerCustomInfoIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="queryAllServerCustomInfoIds" resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="queryAllServerCustomInfoIds" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo"> SELECT server_id as serverId, key_id as keyId from rhnServerCustomDataValue </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml index 6266583..21c376d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:12 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="snapshotTag">
-<sqlMap namespace="snapshotTag"> - - <select id="getSnapshotTagByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.SnapshotTag"> + <select id="getSnapshotTagByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.SnapshotTag">
SELECT rt.id as id, @@ -20,7 +17,7 @@ FROM rhnSnapshotTag rst INNER JOIN rhnTag rt on rst.tag_id = rt.id INNER JOIN rhnTagName rtn on rt.name_id = rtn.id - WHERE rst.tag_id > #id# OR rst.modified > #last_modified# + WHERE rst.tag_id > #{id} OR rst.modified > #{last_modified} ORDER by rst.snapshot_id ASC </select>
@@ -28,26 +25,22 @@ <delete id="deleteLastSnapshotTag"> DELETE FROM rhnIndexerWork where object_type = 'snapshot_tag' </delete> - <insert id="createLastSnapshotTag" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('snapshot_tag', #id#, #last_modified#) + <insert id="createLastSnapshotTag" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('snapshot_tag', #{id}, #{last_modified}) </insert> - <update id="updateLastSnapshotTag" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'snapshot_tag' + <update id="updateLastSnapshotTag" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'snapshot_tag' </update> - <select id="getLastSnapshotTagId" - resultClass="java.lang.Long"> + <select id="getLastSnapshotTagId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='snapshot_tag' </select> - <select id="getLastSnapshotTagIndexRun" - resultClass="java.util.Date"> + <select id="getLastSnapshotTagIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='snapshot_tag' </select>
- <select id="queryAllSnapshotTagIds" resultClass="Long"> + <select id="queryAllSnapshotTagIds" resultType="Long"> SELECT snapshot_id from rhnSnapshotTag </select>
-</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml index ab060a6..7f111cc 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml @@ -1,42 +1,39 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> - -<sqlMap namespace="xccdfIdent"> - <select id="getXccdfIdentById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.XccdfIdent"> +<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed Dec 04 11:26:12 CET 2013--> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="xccdfIdent"> + <select id="getXccdfIdentById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.XccdfIdent"> SELECT id, identifier FROM rhnXccdfIdent - WHERE id > #id# + WHERE id > #{id} ORDER BY id ASC </select> - <select id="queryAllXccdfIdentIds" resultClass="Long"> + <select id="queryAllXccdfIdentIds" resultType="Long"> SELECT id FROM rhnXccdfIdent </select>
- <insert id="createLastXccdfIdent" parameterClass="java.util.Map"> + <insert id="createLastXccdfIdent" parameterType="java.util.Map"> INSERT INTO rhnIndexerWork - VALUES ('xccdf_ident', #id#, #last_modified#) + VALUES ('xccdf_ident', #{id}, #{last_modified}) </insert> - <select id="getLastXccdfIdentId" resultClass="java.lang.Long"> + <select id="getLastXccdfIdentId" resultType="java.lang.Long"> SELECT last_id FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <select id="getLastXccdfIdentIndexRun" resultClass="java.util.Date"> + <select id="getLastXccdfIdentIndexRun" resultType="java.util.Date"> SELECT last_modified FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <update id="updateLastXccdfIdent" parameterClass="java.util.Map"> + <update id="updateLastXccdfIdent" parameterType="java.util.Map"> UPDATE rhnIndexerWork - SET last_id = #id#, last_modified = #last_modified# + SET last_id = #{id}, last_modified = #{last_modified} WHERE object_type = 'xccdf_ident' </update> <delete id="deleteLastXccdfIdent"> DELETE FROM rhnIndexerWork WHERE object_type = 'xccdf_ident' </delete> -</sqlMap> +</mapper> \ No newline at end of file
commit fa685be37666426aba108a7f2e39759f8ba6459a Author: Tomas Lestach tlestach@redhat.com Date: Fri Dec 6 16:38:24 2013 +0100
1023669 - remove original setSessionTimeZone
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 3cfe695..7991436 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -21,13 +21,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.lang.reflect.Method; import java.util.Properties; -import java.util.TimeZone; - import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; -import com.ibatis.sqlmap.client.SqlMapSession; import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException;
@@ -109,7 +105,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(openSession(), name); + return new Query<T>(client.openSession(), name); }
/** @@ -118,8 +114,7 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - SqlMapSession session = openSession(); - return new WriteQuery(session, name); + return new WriteQuery(client.openSession(), name); }
/** @@ -127,32 +122,6 @@ public class DatabaseManager { * @return connection object */ public Connection getConnection() { - return new Connection(openSession()); - } - - private SqlMapSession openSession() { - SqlMapSession session = client.openSession(); - setSessionTimeZone(); - return session; - } - - public void setSessionTimeZone() { - if (isOracle) { - try { - java.sql.Connection proxyConn = client.getDataSource().getConnection(); - // this is a trick, how to get OracleConnection from the Proxy object - java.sql.Connection oraConn = proxyConn.createStatement().getConnection(); - Method setSessionTimeZoneMethod = Class.forName( - "oracle.jdbc.driver.OracleConnection").getMethod( - "setSessionTimeZone", String.class); - if (setSessionTimeZoneMethod != null) { - setSessionTimeZoneMethod.invoke(oraConn, TimeZone.getDefault().getID()); - } - } - catch (Exception e) { - log.warn("Unable to set session timezone."); - e.printStackTrace(); - } - } + return new Connection(client.openSession()); } }
spacewalk-commits@lists.fedorahosted.org
-
Tomas Lestach