From 36741f563da97dcc6b945e964a39b788d515662c Mon Sep 17 00:00:00 2001 From: Austin Brougher Date: Thu, 16 May 2013 14:34:21 +0000 Subject: [PATCH] 0001226: Table sym_node_group_channel_window exceeds the max table name length for Sybase ASE 12. 0001225: Table sym_node_group_channel_window exceeds the max table name length for Sybase ASE 12. --- .../src/docbook/configuration.xml | 36 +++++++++---------- .../symmetric/common/TableConstants.java | 28 +++++++-------- .../impl/ConfigurationServiceSqlMap.java | 26 +++++++------- .../src/main/resources/symmetric-schema.xml | 30 ++++++++-------- .../src/test/resources/test-data-drop-all.sql | 2 +- .../test-data-drop-interbase-pre.sql | 2 +- .../jumpmind/symmetric/test/WildcardTest.csv | 4 +-- 7 files changed, 64 insertions(+), 64 deletions(-) diff --git a/symmetric-assemble/src/docbook/configuration.xml b/symmetric-assemble/src/docbook/configuration.xml index dcbfa2ad77..935e07c351 100644 --- a/symmetric-assemble/src/docbook/configuration.xml +++ b/symmetric-assemble/src/docbook/configuration.xml @@ -1518,11 +1518,11 @@ insert into sym_trigger_router (TRIGGER_ID,ROUTER_ID,INITIAL_LOAD_ORDER, Copy Column Transform ('copy'): This transformation type copies the source column value to the target column. This is the default behavior. - + Remove Column Transform ('remove'): This transformation type removes the source column. This transform type is only valid for a table transformation type of 'IMPLIED' where all the columns from the source - are automatically copied to the target. + are automatically copied to the target. Constant Transform ('const'): This transformation type allows you to map a constant value to the given target column. The @@ -1752,7 +1752,7 @@ values ('TABLE_TO_RELOAD','BSH','Client','Server',NULL,NULL, - +
Jobs @@ -1790,8 +1790,8 @@ means every 15 seconds, not every 15 minutes. See documentation for more details. -Some jobs cannot be run in parallel against a single node. When running on a cluster these jobs use the - table to get an exclusive semaphore to run the job. In order to use this table the +Some jobs cannot be run in parallel against a single node. When running on a cluster these jobs use the + table to get an exclusive semaphore to run the job. In order to use this table the cluster.lock.enabled must be set to true. The three main jobs in SymmetricDS are the route, push and @@ -1848,14 +1848,14 @@ are updated to a status of New "NE". The route job will respect the max_batch_size on . If the max -batch size is reached before the end of a database tranaction and the batch algorithm is set to something other than -nontransactional the batch may exceed the specified max size. +batch size is reached before the end of a database tranaction and the batch algorithm is set to something other than +nontransactional the batch may exceed the specified max size. -The route job delegates to a router defined by the router_type and configured by the router_expression in the - table. Each router that has a source_node_group_id +The route job delegates to a router defined by the router_type and configured by the router_expression in the + table. Each router that has a source_node_group_id that matches the current node's source node group id and is linked to the that captured the data gets an -opportunity to choose a list of nodes the data should be sent to. Data can only be routed to nodes that belong to the +opportunity to choose a list of nodes the data should be sent to. Data can only be routed to nodes that belong to the router's target_node_group_id.
@@ -1932,7 +1932,7 @@ SymmetricDS property is set to true , the frequency that data is pushed is controlled by the job.push.period.time.ms -. +. Data is extracted by channel from the source database's @@ -1952,15 +1952,15 @@ the channel will be skipped for this run. If the is set to zero, data extraction will happen every time the jobs run. -The maximum number of batches to extract per synchronization is controlled by -max_batch_to_send on the table. There is also +The maximum number of batches to extract per synchronization is controlled by +max_batch_to_send on the table. There is also a setting that controls the max number of bytes to send in one synchronization. If SymmetricDS has extracted the more than the -number of bytes configured by the transport.max.bytes.to.sync parameter, then it will finish extracting the +number of bytes configured by the transport.max.bytes.to.sync parameter, then it will finish extracting the current batch and finish synchronization so the client has a chance to process and acknowlege the "big" batch. This may happen before -the configured max number of batches has been reached. +the configured max number of batches has been reached. -Both the push and pull jobs can be configured to push and pull +Both the push and pull jobs can be configured to push and pull multiple nodes in parallel. In order to take advantage of this the pull.thread.per.server.count or @@ -1975,7 +1975,7 @@ multiple servers in a cluster. SymmetricDS also provides the ability to configure windows of time when synchronization is allowed. This is done using the - + table. A list of allowed time windows can be specified for a node group and a channel. If one or more windows exist, then data will only be extracted and transported if the time of day falls within the window of @@ -2142,5 +2142,5 @@ requires a lock before running. [ Default: false ]
- + diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/TableConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/TableConstants.java index aa9e8347a3..0b26a9fa72 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/TableConstants.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/TableConstants.java @@ -1,22 +1,22 @@ /* - * Licensed to JumpMind Inc under one or more contributor + * Licensed to JumpMind Inc under one or more contributor * license agreements. See the NOTICE file distributed - * with this work for additional information regarding + * with this work for additional information regarding * copyright ownership. JumpMind Inc licenses this file * to you under the GNU Lesser General Public License (the * "License"); you may not use this file except in compliance - * with the License. - * + * with the License. + * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see + * License along with this library; if not, see * . - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ package org.jumpmind.symmetric.common; @@ -46,7 +46,7 @@ public class TableConstants { public static final String SYM_DATA_EVENT = "data_event"; public static final String SYM_TRANSFORM_TABLE = "transform_table"; public static final String SYM_LOAD_FILTER = "load_filter"; - public static final String SYM_TRANSFORM_COLUMN = "transform_column"; + public static final String SYM_TRANSFORM_COLUMN = "transform_column"; public static final String SYM_TRIGGER_ROUTER = "trigger_router"; public static final String SYM_CHANNEL = "channel"; public static final String SYM_NODE_SECURITY = "node_security"; @@ -59,7 +59,7 @@ public class TableConstants { public static final String SYM_REGISTRATION_REDIRECT = "registration_redirect"; public static final String SYM_NODE_CHANNEL_CTL = "node_channel_ctl"; public static final String SYM_CONFLICT = "conflict"; - public static final String SYM_NODE_GROUP_CHANNEL_WINDOW = "node_group_channel_window"; + public static final String SYM_NODE_GROUP_CHANNEL_WND = "node_group_channel_wnd"; public static final String SYM_NODE_HOST_CHANNEL_STATS = "node_host_channel_stats"; public static final String SYM_INCOMING_ERROR = "incoming_error"; public static final String SYM_SEQUENCE = "sequence"; @@ -70,7 +70,7 @@ public class TableConstants { public static final String SYM_FILE_TRIGGER = "file_trigger"; public static final String SYM_FILE_TRIGGER_ROUTER = "file_trigger_router"; public static final String SYM_FILE_SNAPSHOT = "file_snapshot"; - + private static List tablesWithPrefix; @@ -110,7 +110,7 @@ protected static List populateConfigTables(String tablePrefix) { configTables.add(getTableName(tablePrefix, TableConstants.SYM_NODE_SECURITY)); configTables.add(getTableName(tablePrefix, TableConstants.SYM_PARAMETER)); configTables.add(getTableName(tablePrefix, TableConstants.SYM_CHANNEL)); - configTables.add(getTableName(tablePrefix, TableConstants.SYM_NODE_GROUP_CHANNEL_WINDOW)); + configTables.add(getTableName(tablePrefix, TableConstants.SYM_NODE_GROUP_CHANNEL_WND)); configTables.add(getTableName(tablePrefix, TableConstants.SYM_TRIGGER)); configTables.add(getTableName(tablePrefix, TableConstants.SYM_ROUTER)); configTables.add(getTableName(tablePrefix, TableConstants.SYM_TRIGGER_ROUTER)); @@ -147,7 +147,7 @@ protected static List populateAllTables(String tablePrefix) { tables.add(getTableName(tablePrefix, SYM_NODE_IDENTITY)); tables.add(getTableName(tablePrefix, SYM_NODE_SECURITY)); tables.add(getTableName(tablePrefix, SYM_NODE_CHANNEL_CTL)); - tables.add(getTableName(tablePrefix, SYM_NODE_GROUP_CHANNEL_WINDOW)); + tables.add(getTableName(tablePrefix, SYM_NODE_GROUP_CHANNEL_WND)); tables.add(getTableName(tablePrefix, SYM_PARAMETER)); tables.add(getTableName(tablePrefix, SYM_NODE_HOST_CHANNEL_STATS)); tables.add(getTableName(tablePrefix, SYM_NODE_HOST_STATS)); @@ -170,10 +170,10 @@ protected static List populateAllTables(String tablePrefix) { tables.add(getTableName(tablePrefix, SYM_TRIGGER_ROUTER_GROUPLET)); tables.add(getTableName(tablePrefix, TableConstants.SYM_FILE_TRIGGER)); tables.add(getTableName(tablePrefix, TableConstants.SYM_FILE_TRIGGER_ROUTER)); - tables.add(getTableName(tablePrefix, TableConstants.SYM_FILE_SNAPSHOT)); + tables.add(getTableName(tablePrefix, TableConstants.SYM_FILE_SNAPSHOT)); return tables; } - + public static final List getTablesThatSync(String tablePrefix) { List tables = new ArrayList(getConfigTables(tablePrefix)); tables.removeAll(getTablesThatDoNotSync(tablePrefix)); diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java index 853d5bd632..bbe5c157ef 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java @@ -11,7 +11,7 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, super(platform, replacementTokens); // @formatter:off - + putSql("selectDataEventActionsByIdSql", " select data_event_action from $(node_group_link) where " + " source_node_group_id = ? and target_node_group_id = ? "); @@ -20,11 +20,11 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, + "select source_node_group_id, target_node_group_id, data_event_action, last_update_time, last_update_by, create_time from " + " $(node_group_link) order by source_node_group_id "); - putSql("updateNodeGroupSql", + putSql("updateNodeGroupSql", " update $(node_group) set description=?, last_update_time=?, last_update_by=? where " + " node_group_id=? "); - putSql("insertNodeGroupSql", + putSql("insertNodeGroupSql", "insert into $(node_group) " + " (description, node_group_id, last_update_time, last_update_by, create_time) values(?,?,?,?,?) "); @@ -44,7 +44,7 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, + " $(node_group_link) where source_node_group_id = ? "); putSql("isChannelInUseSql", "select count(*) from $(trigger) where channel_id = ? "); - + putSql("selectChannelsSql", "select c.channel_id, c.processing_order, c.max_batch_size, c.enabled, " + " c.max_batch_to_send, c.max_data_to_route, c.use_old_data_to_route, " + @@ -55,8 +55,8 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, putSql("selectNodeChannelsSql", "select c.channel_id, nc.node_id, nc.ignore_enabled, nc.suspend_enabled, c.processing_order, " - + " c.max_batch_size, c.enabled, c.max_batch_to_send, c.max_data_to_route, c.use_old_data_to_route, " - + " c.use_row_data_to_route, c.use_pk_data_to_route, c.contains_big_lob, c.batch_algorithm, " + + " c.max_batch_size, c.enabled, c.max_batch_to_send, c.max_data_to_route, c.use_old_data_to_route, " + + " c.use_row_data_to_route, c.use_pk_data_to_route, c.contains_big_lob, c.batch_algorithm, " + " nc.last_extract_time, c.extract_period_millis, c.data_loader_type," + " last_update_time, last_update_by, create_time " + " from $(channel) c left outer join " @@ -70,16 +70,16 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, putSql("insertChannelSql", "insert into $(channel) (channel_id, processing_order, max_batch_size, " - + " max_batch_to_send, max_data_to_route, use_old_data_to_route, use_row_data_to_route, " - + " use_pk_data_to_route, contains_big_lob, enabled, batch_algorithm, description, " + + " max_batch_to_send, max_data_to_route, use_old_data_to_route, use_row_data_to_route, " + + " use_pk_data_to_route, contains_big_lob, enabled, batch_algorithm, description, " + " extract_period_millis, data_loader_type, last_update_time, last_update_by, create_time) " + " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, null, ?, ?, ?, ?, ?) "); putSql("updateChannelSql", "update $(channel) set processing_order=?, max_batch_size=?, " + " max_batch_to_send=?, max_data_to_route=?, use_old_data_to_route=?, use_row_data_to_route=?, " - + " use_pk_data_to_route=?, contains_big_lob=?, enabled=?, batch_algorithm=?, extract_period_millis=?, " - + " data_loader_type=?, last_update_time=?, last_update_by=?" + + " use_pk_data_to_route=?, contains_big_lob=?, enabled=?, batch_algorithm=?, extract_period_millis=?, " + + " data_loader_type=?, last_update_time=?, last_update_by=?" + " where channel_id=? "); putSql("deleteNodeGroupLinkSql", @@ -93,7 +93,7 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, putSql("selectNodeGroupChannelWindowSql", "select node_group_id, channel_id, start_time, end_time, enabled " - + " from $(node_group_channel_window) where node_group_id=? and channel_id=? "); + + " from $(node_group_channel_wnd) where node_group_id=? and channel_id=? "); putSql("insertNodeChannelControlSql", "" + "insert into $(node_channel_ctl) (node_id, channel_id, " @@ -105,8 +105,8 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, putSql("getRegistrationRedirectSql", "select registrant_external_id, registration_node_id from $(registration_redirect)"); - - putSql("selectMaxChannelLastUpdateTime" ,"select max(last_update_time) from $(channel) where last_update_time is not null" ); + + putSql("selectMaxChannelLastUpdateTime" ,"select max(last_update_time) from $(channel) where last_update_time is not null" ); putSql("selectMaxNodeGroupLastUpdateTime" ,"select max(last_update_time) from $(node_group) where last_update_time is not null" ); putSql("selectMaxNodeGroupLinkLastUpdateTime" ,"select max(last_update_time) from $(node_group_link) where last_update_time is not null" ); diff --git a/symmetric-core/src/main/resources/symmetric-schema.xml b/symmetric-core/src/main/resources/symmetric-schema.xml index 2dccf584a9..26b5dab64c 100644 --- a/symmetric-core/src/main/resources/symmetric-schema.xml +++ b/symmetric-core/src/main/resources/symmetric-schema.xml @@ -33,7 +33,7 @@ - + @@ -209,7 +209,7 @@ - +
@@ -393,7 +393,7 @@ - + @@ -645,31 +645,31 @@
- + - + - + - +
- + - - + + @@ -680,18 +680,18 @@
- + - + - + - + - +
diff --git a/symmetric-core/src/test/resources/test-data-drop-all.sql b/symmetric-core/src/test/resources/test-data-drop-all.sql index a1b16405f7..ddd8929247 100644 --- a/symmetric-core/src/test/resources/test-data-drop-all.sql +++ b/symmetric-core/src/test/resources/test-data-drop-all.sql @@ -2,7 +2,7 @@ drop table sym_transform_column; drop table sym_transform_table; drop table sym_data_gap; drop table sym_node_channel_ctl; -drop table sym_node_group_channel_window; +drop table sym_node_group_channel_wnd; drop table sym_data_event; drop table sym_trigger_hist; drop table sym_trigger_router; diff --git a/symmetric-core/src/test/resources/test-data-drop-interbase-pre.sql b/symmetric-core/src/test/resources/test-data-drop-interbase-pre.sql index d998329195..65baff5028 100644 --- a/symmetric-core/src/test/resources/test-data-drop-interbase-pre.sql +++ b/symmetric-core/src/test/resources/test-data-drop-interbase-pre.sql @@ -4,7 +4,7 @@ DROP TRIGGER TRG_SYM_TRIGGER_TRIGGER_HIST_ID; DROP GENERATOR GEN_SYM_TRIGGER_TRIGGER_HIST_ID; DROP TABLE SYM_DATA_GAP; DROP TABLE SYM_NODE_CHANNEL_CTL; -DROP TABLE SYM_NODE_GROUP_CHANNEL_WINDOW; +DROP TABLE SYM_NODE_GROUP_CHANNEL_WND; DROP TABLE SYM_DATA_EVENT; DROP TABLE SYM_TRIGGER_HIST; DROP TABLE SYM_TRIGGER_ROUTER; diff --git a/symmetric-server/src/test/resources/org/jumpmind/symmetric/test/WildcardTest.csv b/symmetric-server/src/test/resources/org/jumpmind/symmetric/test/WildcardTest.csv index bf7f15e7e3..1bf6732796 100644 --- a/symmetric-server/src/test/resources/org/jumpmind/symmetric/test/WildcardTest.csv +++ b/symmetric-server/src/test/resources/org/jumpmind/symmetric/test/WildcardTest.csv @@ -76,10 +76,10 @@ columns,TRIGGER_ID,SOURCE_CATALOG_NAME,SOURCE_SCHEMA_NAME,SOURCE_TABLE_NAME,CHAN sql,delete from sym_trigger catalog, schema, -table,SYM_NODE_GROUP_CHANNEL_WINDOW +table,SYM_NODE_GROUP_CHANNEL_WND keys,NODE_GROUP_ID,CHANNEL_ID,START_TIME,END_TIME columns,NODE_GROUP_ID,CHANNEL_ID,START_TIME,END_TIME,ENABLED -sql,delete from sym_node_group_channel_window +sql,delete from sym_node_group_channel_wnd catalog, schema, table,SYM_CHANNEL