henning 2003/07/16 02:47:34
Modified: src/generator/src/conf default.properties
src/generator/src/templates/sql/id-table idtable.axion
idtable.cloudscape idtable.db2 idtable.db2400
idtable.hypersonic idtable.interbase idtable.mssql
idtable.mysql idtable.oracle idtable.postgresql
idtable.sapdb idtable.sybase scheduler.props
turbine.props
src/generator/xdocs properties-reference.xml
Log:
Make it possible to control the values inserted in the ID Table by
setting properties for start value and step. Contains even
documentation for the properties!
Revision Changes Path
1.2 +7 -1 db-torque/src/generator/src/conf/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/conf/default.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.properties 14 Feb 2003 08:04:36 -0000 1.1
+++ default.properties 16 Jul 2003 09:47:33 -0000 1.2
@@ -132,7 +132,13 @@
idTableXMLFile =
documentationFormat = html
-initialID = 101
+
+#
+# ID Broker Default Values
+#
+initialID = 101
+initialIDValue = 1000
+initialIDStep = 10
torque.idTableXMLFile = ${idTableXMLFile}
torque.doc.format = ${documentationFormat}
1.2 +1 -1 db-torque/src/generator/src/templates/sql/id-table/idtable.axion
Index: idtable.axion
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.axion,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.axion 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.axion 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.cloudscape
Index: idtable.cloudscape
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.cloudscape,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.cloudscape 16 Jul 2003 09:39:20 -0000 1.2
+++ idtable.cloudscape 16 Jul 2003 09:47:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1 db-torque/src/generator/src/templates/sql/id-table/idtable.db2
Index: idtable.db2
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.db2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.db2 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.db2 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.db2400
Index: idtable.db2400
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.db2400,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.db2400 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.db2400 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,5 +1,5 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.hypersonic
Index: idtable.hypersonic
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.hypersonic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.hypersonic 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.hypersonic 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.interbase
Index: idtable.interbase
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.interbase,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.interbase 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.interbase 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1 db-torque/src/generator/src/templates/sql/id-table/idtable.mssql
Index: idtable.mssql
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.mssql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.mssql 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.mssql 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1 db-torque/src/generator/src/templates/sql/id-table/idtable.mysql
Index: idtable.mysql
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.mysql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.mysql 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.mysql 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.oracle
Index: idtable.oracle
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.oracle,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.oracle 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.oracle 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.postgresql
Index: idtable.postgresql
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.postgresql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.postgresql 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.postgresql 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1 db-torque/src/generator/src/templates/sql/id-table/idtable.sapdb
Index: idtable.sapdb
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.sapdb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.sapdb 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.sapdb 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,5 +1,5 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +1 -1
db-torque/src/generator/src/templates/sql/id-table/idtable.sybase
Index: idtable.sybase
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/idtable.sybase,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.sybase 10 Feb 2003 13:18:46 -0000 1.1
+++ idtable.sybase 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (ID_TABLE_ID, TABLE_NAME, NEXT_ID, QUANTITY) VALUES
($initialID, '$tbl.Name', 1000, 10);
+insert into ID_TABLE (ID_TABLE_ID, TABLE_NAME, NEXT_ID, QUANTITY) VALUES
($initialID, '$tbl.Name', $initialIDValue, $initialIDStep);
#set ( $initialID = $initialID + 1 )
#end
1.2 +7 -1
db-torque/src/generator/src/templates/sql/id-table/scheduler.props
Index: scheduler.props
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/scheduler.props,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scheduler.props 10 Feb 2003 13:18:46 -0000 1.1
+++ scheduler.props 16 Jul 2003 09:47:33 -0000 1.2
@@ -1,6 +1,12 @@
# -------------------------------------------------------------------------
# The values for the ID_TABLE_ID column in the ID_TABLE will have
-# reserved values from 1-100 for turbine tables. The rest will
+# reserved values from 1-100 for scheduler tables. The rest will
# be for tables used for projects.
# -------------------------------------------------------------------------
initialID = 20
+
+#
+# Setting for initial Value and Step
+#
+initialIDValue = 1000
+initialIDStep = 10
1.2 +6 -0 db-torque/src/generator/src/templates/sql/id-table/turbine.props
Index: turbine.props
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/id-table/turbine.props,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- turbine.props 10 Feb 2003 13:18:46 -0000 1.1
+++ turbine.props 16 Jul 2003 09:47:33 -0000 1.2
@@ -4,3 +4,9 @@
# be for tables used for projects.
# -------------------------------------------------------------------------
initialID = 1
+
+#
+# Setting for initial Value and Step
+#
+initialIDValue = 1000
+initialIDStep = 10
1.3 +21 -1 db-torque/src/generator/xdocs/properties-reference.xml
Index: properties-reference.xml
===================================================================
RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- properties-reference.xml 16 Jul 2003 09:30:32 -0000 1.2
+++ properties-reference.xml 16 Jul 2003 09:47:34 -0000 1.3
@@ -345,12 +345,32 @@
</tr>
<tr>
<td><code> torque.initialID </code></td>
- <td><code> 101 </code></td>
+ <td><code> 101</code></td>
<td>
Controls the starting id of table entries when creating SQL for the id-table.
If you
have two projects that use the same id-table in the same database with
different tables,
make sure that they have different initialID settings and the ranges (initialID
is incremented
for every new table) don't overlap.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.initialIDValue</code></td>
+ <td><code> 1000</code></td>
+ <td>
+ The start value of the ID broker for supplying IDs to Torque. This value is
incremented every
+ time Torque requests ID keys from the broker. If you pre-load your table
straight from SQL,
+ make sure that you don't accidentially overlap with this setting, because
Torque doesn't keep
+ record of what IDs are already taken in the database. If you overlap, inserting
new objects
+ will fail because the ID assigned by Torque is already taken.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.initialIDStep</code></td>
+ <td><code> 10</code></td>
+ <td>
+ For performance reasons, the ID Broker does not request a single ID at a time
but fetches a
+ whole range and increments the current next ID Value in the ID Table by this
step. If you have
+ to do lots of inserts straight in a row, increment this value to get slightly
better performance.
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
