Skip to content

Commit b4bee5b

Browse files
Jan-MJan-M
committed
Fix backendContext for test. Bitmap data source needs to use other constructor
1 parent 7e4c86f commit b4bee5b

File tree

1 file changed

+67
-22
lines changed

1 file changed

+67
-22
lines changed

‎src/test/resources/backendContextTest.xml

Lines changed: 67 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,31 +114,76 @@
114114
</constructor-arg>
115115
</bean>
116116

117+
<bean id="bitmapConfig1" class="com.zaxxer.hikari.HikariConfig">
118+
<property name="poolName" value="springHikariCP" />
119+
<property name="connectionTestQuery" value="SELECT 1" />
120+
<property name="dataSourceClassName" value="org.postgresql.ds.PGSimpleDataSource" />
121+
<property name="maximumPoolSize" value="5" />
122+
<property name="idleTimeout" value="5000" />
123+
<property name="connectionInitSql" value="SET APPLICATION_NAME='bitmap1'; SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('00');" />
124+
125+
<property name="dataSourceProperties">
126+
<props>
127+
<prop key="url">${frontend.sproc.datasource.url1}</prop>
128+
<prop key="user">${frontend.sproc.datasource.username}</prop>
129+
<prop key="password">${frontend.sproc.datasource.password}</prop>
130+
</props>
131+
</property>
132+
</bean>
133+
134+
<bean id="bitmapPool1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
135+
<constructor-arg ref="bitmapConfig1" />
136+
</bean>
137+
138+
<bean id="bitmapConfig2" class="com.zaxxer.hikari.HikariConfig">
139+
<property name="poolName" value="springHikariCP" />
140+
<property name="connectionTestQuery" value="SELECT 1" />
141+
<property name="dataSourceClassName" value="org.postgresql.ds.PGSimpleDataSource" />
142+
<property name="maximumPoolSize" value="5" />
143+
<property name="idleTimeout" value="5000" />
144+
<property name="connectionInitSql" value="SET APPLICATION_NAME='bitmap2'; SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('10');" />
145+
146+
<property name="dataSourceProperties">
147+
<props>
148+
<prop key="url">${frontend.sproc.datasource.url1}</prop>
149+
<prop key="user">${frontend.sproc.datasource.username}</prop>
150+
<prop key="password">${frontend.sproc.datasource.password}</prop>
151+
</props>
152+
</property>
153+
</bean>
154+
155+
<bean id="bitmapPool2" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
156+
<constructor-arg ref="bitmapConfig2" />
157+
</bean>
158+
159+
<bean id="bitmapConfig3" class="com.zaxxer.hikari.HikariConfig">
160+
<property name="poolName" value="springHikariCP" />
161+
<property name="connectionTestQuery" value="SELECT 1" />
162+
<property name="dataSourceClassName" value="org.postgresql.ds.PGSimpleDataSource" />
163+
<property name="maximumPoolSize" value="5" />
164+
<property name="idleTimeout" value="5000" />
165+
<property name="connectionInitSql" value="SET APPLICATION_NAME='bitmap3'; SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('1');" />
166+
167+
<property name="dataSourceProperties">
168+
<props>
169+
<prop key="url">${frontend.sproc.datasource.url2}</prop>
170+
<prop key="user">${frontend.sproc.datasource.username}</prop>
171+
<prop key="password">${frontend.sproc.datasource.password}</prop>
172+
</props>
173+
</property>
174+
</bean>
175+
176+
<bean id="bitmapPool3" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
177+
<constructor-arg ref="bitmapConfig3" />
178+
</bean>
179+
117180
<bean id="testBitmapShardDataSourceProvider" class="de.zalando.sprocwrapper.dsprovider.BitmapShardDataSourceProvider">
118-
<constructor-arg>
119-
<value>com.zaxxer.hikari.HikariDataSource</value>
120-
</constructor-arg>
121-
<constructor-arg>
122-
<map>
123-
<entry><key><value>driverClass</value></key><value>org.postgresql.Driver</value></entry>
124-
<entry><key><value>username</value></key><value>${frontend.sproc.datasource.username}</value></entry>
125-
<entry><key><value>password</value></key><value>${frontend.sproc.datasource.password}</value></entry>
126-
</map>
127-
</constructor-arg>
128181
<constructor-arg>
129182
<map>
130-
<entry>
131-
<key><value>00</value></key>
132-
<value>${frontend.sproc.datasource.url1}|SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('00')</value>
133-
</entry>
134-
<entry>
135-
<key><value>10</value></key>
136-
<value>${frontend.sproc.datasource.url1}|SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('10')</value>
137-
</entry>
138-
<entry>
139-
<key><value>1</value></key>
140-
<value>${frontend.sproc.datasource.url2}|SET search_path to ztest_schema1, public; CREATE TEMPORARY TABLE shard_name (shard_name text); INSERT INTO shard_name (shard_name) VALUES ('1')</value>
141-
</entry>
183+
<entry key="00" value-ref="bitmapPool1" />
184+
<entry key="01" value-ref="bitmapPool3" />
185+
<entry key="10" value-ref="bitmapPool2" />
186+
<entry key="11" value-ref="bitmapPool3" />
142187
</map>
143188
</constructor-arg>
144189
</bean>

0 commit comments

Comments
 (0)