search-server/spacewalk-search/build.xml | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ----- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 3 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 2 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 2 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 2 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 2 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 2 +- search-server/spacewalk-search/src/config/rhn-search | 6 +++--- search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 2 ++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 6 ++++-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 4 ++-- 13 files changed, 19 insertions(+), 21 deletions(-)
New commits: commit 1b0da0722612e2cac5be406932fe0a53225ab915 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 14:36:53 2011 +0100
don't duplicate files from spacewalk-search.jar on filesystem
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index c4caadf..8308024 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -76,7 +76,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/indexes install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -d -m 755 $RPM_BUILD_ROOT%{_var}/log/rhn/search @@ -85,9 +84,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/ # using install -m does not preserve the symlinks cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib -install -p -m 644 src/config/log4j.properties $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/classes/log4j.properties install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search -install -p -m 644 src/config/com/redhat/satellite/search/db/* $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir} ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search.conf @@ -111,8 +108,6 @@ fi %defattr(644,root,root,755) %attr(755, root, root) %{_var}/log/rhn/search %{_prefix}/share/rhn/search/lib/* -%{_prefix}/share/rhn/search/classes/log4j.properties -%{_prefix}/share/rhn/search/classes/com/* %attr(755, root, root) %{_prefix}/share/rhn/search/indexes %attr(755, root, root) %{_initrddir}/rhn-search %attr(755, root, root) %{_bindir}/rhnsearchd
commit b36f27ac8067825ea6734411f8b5e9eb2f171743 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 14:07:18 2011 +0100
move config.xml back to jar
Revert "Fixed build.xml to not include config.xml in the build" Revert "Updated rhn-search to include config.xml on the filesystem" This reverts commit c24051b81949ef19013ffb7cdc7604605fddd350. This reverts commit c052fde91e9b6eff1d0bedf9bdbd234a4ec1baa1.
diff --git a/search-server/spacewalk-search/build.xml b/search-server/spacewalk-search/build.xml index 276c8fe..de8e25f 100644 --- a/search-server/spacewalk-search/build.xml +++ b/search-server/spacewalk-search/build.xml @@ -169,7 +169,7 @@ <target name="package" depends="compile"> <jar basedir="${build.dir}" destfile="${dist.dir}/${jar.file.name}" - excludes="**/tests/**, **/db/config.xml" + excludes="**/tests/**" includes="**/**" /> </target>
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index 5ffb659..1429d17 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -77,7 +77,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` - CLASSPATH=/usr/share/rhn/search/classes:${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes + CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes }
# Do not modify anything beyond this point
commit 8d6f33908d5cbf794e65e7de7e3458b59cb3e6db Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 13:34:35 2011 +0100
add @ to db_name only for oracle (PG)
also removed defaultStatementTimeout because postgresql doesn't understand it
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 4038c8b..4fb411b 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 @@ -15,14 +15,13 @@ maxSessions="10" maxTransactions="10" useStatementNamespaces="false" - defaultStatementTimeout="30" /> <!-- 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.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> <property name="JDBC.Username" value="${db_user}"/> <property name="JDBC.Password" value="${db_password}"/> </dataSource> 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 1a8f71d..5ffac00 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 @@ -60,11 +60,13 @@ public class DatabaseManager { } Properties overrides = config.getNamespaceProperties("search");
- String[] options = {"db_name", "db_password", "db_user", - "db_host", "db_port", "db_name"}; + String[] options = {"db_name", "db_password", "db_user"}; for (String option : options) { overrides.setProperty(option, config.getString(option)); } + if (config.getString("db_backend").equals("oracle")) { + overrides.setProperty("db_name", "@" + overrides.getProperty("db_name")); + }
client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides); }
commit 7b545fb2392a6f5116438d2fad4f45e4c8edc7ae Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 11:52:54 2011 +0100
fixed package and errata search in PG
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 377497b..d986810 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 @@ -174,9 +174,9 @@ public class IndexHandler { } return Collections.EMPTY_LIST; } - List<String> ids = new ArrayList<String>(); + List<Long> ids = new ArrayList<Long>(); for (Result pr : hits) { - ids.add(pr.getId()); + ids.add(new Long(pr.getId())); }
Query<String> query = null;
commit c39a4e05ccdd86e7335bfb3facceb94de5e58fa0 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 11:14:22 2011 +0100
made service rhn-search cleanindex queries work on PG
--- Cause: org.postgresql.util.PSQLException: ERROR: syntax error at or near "rhnIndexerWork" Position: 14 at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.executeUpdate(GeneralStatement.java:91) at com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate.update(SqlMapExecutorDelegate.java:505) at com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate.delete(SqlMapExecutorDelegate.java:528) at com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl.delete(SqlMapSessionImpl.java:98) at com.redhat.satellite.search.db.WriteQuery.delete(WriteQuery.java:72) at com.redhat.satellite.search.DeleteIndexes.deleteQuery(DeleteIndexes.java:87) at com.redhat.satellite.search.DeleteIndexes.main(DeleteIndexes.java:118) Caused by: org.postgresql.util.PSQLException: ERROR: syntax error at or near "rhnIndexerWork" Position: 14 at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:2062) at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1795) at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:257) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:479) at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:367) at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:360) at com.ibatis.sqlmap.engine.execution.SqlExecutor.executeUpdate(SqlExecutor.java:81) at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.sqlExecuteUpdate(GeneralStatement.java:200) at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.executeUpdate(GeneralStatement.java:78) ... 6 more
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 13c5985..d9f9d80 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 @@ -29,7 +29,7 @@ ORDER by e.id ASC </select> <delete id="deleteLastErrata"> - DELETE rhnIndexerWork where object_type = 'errata' + DELETE FROM rhnIndexerWork where object_type = 'errata' </delete> <insert id="createLastErrata" parameterClass="java.util.Map"> 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 70d6d8a..de205c5 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 @@ -28,7 +28,7 @@
<delete id="deleteLastHardwareDevice"> - DELETE rhnIndexerWork where object_type = 'hwdevice' + DELETE FROM rhnIndexerWork where object_type = 'hwdevice' </delete> <insert id="createLastHardwareDevice" parameterClass="java.util.Map"> 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 46e84d5..1972292 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 @@ -47,7 +47,7 @@ ORDER by p.id ASC </select> <delete id="deleteLastPackage"> - DELETE rhnIndexerWork where object_type = 'package' + DELETE FROM rhnIndexerWork where object_type = 'package' </delete> <insert id="createLastPackage" parameterClass="java.util.Map"> 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 71814ea..6596e13 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 @@ -69,7 +69,7 @@ </select>
<delete id="deleteLastServer"> - DELETE rhnIndexerWork where object_type = 'server' + DELETE FROM rhnIndexerWork where object_type = 'server' </delete> <insert id="createLastServer" parameterClass="java.util.Map"> 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 c56090c..5e29554 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 @@ -24,7 +24,7 @@ </select>
<delete id="deleteLastServerCustomInfo"> - DELETE rhnIndexerWork where object_type = 'server_custom_info' + DELETE FROM rhnIndexerWork where object_type = 'server_custom_info' </delete> <insert id="createLastServerCustomInfo" parameterClass="java.util.Map"> 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 5d4d67c..6266583 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 @@ -26,7 +26,7 @@
<delete id="deleteLastSnapshotTag"> - DELETE rhnIndexerWork where object_type = 'snapshot_tag' + DELETE FROM rhnIndexerWork where object_type = 'snapshot_tag' </delete> <insert id="createLastSnapshotTag" parameterClass="java.util.Map">
commit bb334cc207abd8be29c2ed22cb54371ae959580f Author: Michael Mraka michael.mraka@redhat.com Date: Mon Feb 7 10:31:04 2011 +0100
added potgresql jdbc to rhn-search path
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index 3384280..5ffb659 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -75,8 +75,8 @@ unlock() { }
removeindex() { - JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib' - SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar` + 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` CLASSPATH=/usr/share/rhn/search/classes:${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes }
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 de49399..966d884 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 @@ -48,6 +48,8 @@ wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64 wrapper.java.library.path.3=/usr/lib/oracle/11.2/client/lib wrapper.java.library.path.4=/usr/lib/oracle/11.2/client64/lib +wrapper.java.library.path.5=/usr/lib/gcj/postgresql-jdbc +wrapper.java.library.path.6=/usr/lib64/gcj/postgresql-jdbc
# Java Additional Parameters #wrapper.java.additional.1=