You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/18 16:11:32 UTC
svn commit: r1159234 - in /subversion/branches/1.7.x: ./ STATUS
build/transform_sql.py subversion/libsvn_wc/wc-queries.sql
Author: hwright
Date: Thu Aug 18 14:11:32 2011
New Revision: 1159234
URL: http://svn.apache.org/viewvc?rev=1159234&view=rev
Log:
Reintegrate the 1.7.x-r1159093 branch:
* r1159093
Use a macro in wc-queries.sql.
Justification:
Source code readability. Avoid conflicts in future backports.
Branch:
1.7.x-r1159093
Votes:
+1: danielsh, rhuijben, cmpilato
-0: stsp (we can backport this when we need to)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/transform_sql.py
subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 18 14:11:32 2011
@@ -4,6 +4,7 @@
/subversion/branches/1.7.x-neon-default:1148803-1158680
/subversion/branches/1.7.x-r1152189:1152759-1154249
/subversion/branches/1.7.x-r1155160:1158704-1159223
+/subversion/branches/1.7.x-r1159093:1159097-1159230
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
@@ -58,4 +59,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158196,1158201,115
8207,1158209-1158210,1158217,1158285,1158288,1158303,1158407,1158419,1158421,1158436,1158455,1158634,1158854,1158893
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158196,1158201,115
8207,1158209-1158210,1158217,1158285,1158288,1158303,1158407,1158419,1158421,1158436,1158455,1158634,1158854,1158893,1159093,1159098,1159101
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1159234&r1=1159233&r2=1159234&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 18 14:11:32 2011
@@ -149,13 +149,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1159093
- Use a macro in wc-queries.sql.
- Justification:
- Source code readability. Avoid conflicts in future backports.
- Branch:
- 1.7.x-r1159093
- Votes:
- +1: danielsh, rhuijben, cmpilato
- -0: stsp (we can backport this when we need to)
Modified: subversion/branches/1.7.x/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/transform_sql.py?rev=1159234&r1=1159233&r2=1159234&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/transform_sql.py (original)
+++ subversion/branches/1.7.x/build/transform_sql.py Thu Aug 18 14:11:32 2011
@@ -102,6 +102,9 @@ class Processor(object):
for line in input.split('\n'):
line = line.replace('"', '\\"')
+ line = re.sub(r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
+ r"((\1) > (\2) || '/' AND (\1) < (\2) || '0') ",
+ line)
if line.strip():
handled = False
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql?rev=1159234&r1=1159233&r2=1159234&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql Thu Aug 18 14:11:32 2011
@@ -178,7 +178,7 @@ WHERE wc_id = ?1 AND parent_relpath = ?2
DELETE FROM nodes
WHERE wc_id = ?1
AND (local_relpath = ?2
- OR ((local_relpath > ?2 || '/') AND (local_relpath < ?2 || '0')))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND (op_depth < ?3
OR (op_depth = ?3 AND presence = 'base-deleted'))
@@ -186,7 +186,7 @@ WHERE wc_id = ?1
SELECT local_relpath FROM nodes
WHERE wc_id = ?1 AND op_depth = ?3
AND (parent_relpath = ?2
- OR ((parent_relpath > ?2 || '/') AND (parent_relpath < ?2 || '0')))
+ OR IS_STRICT_DESCENDANT_OF(parent_relpath, ?2))
AND presence == 'not-present'
-- STMT_COMMIT_DESCENDANT_TO_BASE
@@ -263,7 +263,7 @@ LEFT JOIN lock ON nodes.repos_id = lock.
WHERE wc_id = ?1 AND op_depth = 0
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_INSERT_WCROOT
INSERT INTO wcroot (local_abspath)
@@ -298,7 +298,7 @@ UPDATE nodes SET dav_cache = NULL
WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_RECURSIVE_UPDATE_NODE_REPO
UPDATE nodes SET repos_id = ?4, dav_cache = NULL
@@ -306,7 +306,7 @@ WHERE wc_id = ?1
AND repos_id = ?3
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_UPDATE_LOCK_REPOS_ID
UPDATE lock SET repos_id = ?2
@@ -476,7 +476,7 @@ FROM nodes_current
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_INSERT_TARGET_WITH_CHANGELIST
INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind)
@@ -509,7 +509,7 @@ SELECT N.wc_id, N.local_relpath, N.paren
WHERE N.wc_id = ?1
AND (?2 = ''
OR N.local_relpath = ?2
- OR (N.local_relpath > ?2 || '/' AND N.local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(N.local_relpath, ?2))
AND A.changelist = ?3
-- STMT_SELECT_TARGETS
@@ -578,7 +578,7 @@ DELETE FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
-- STMT_DELETE_ACTUAL_NODE
@@ -590,7 +590,7 @@ DELETE FROM actual_node
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_DELETE_ACTUAL_NODE_WITHOUT_CONFLICT
DELETE FROM actual_node
@@ -611,7 +611,7 @@ DELETE FROM actual_node
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND (changelist IS NULL
OR NOT EXISTS (SELECT 1 FROM nodes_current c
WHERE c.wc_id = ?1
@@ -647,7 +647,7 @@ SET properties = NULL,
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_UPDATE_NODE_BASE_DEPTH
UPDATE nodes SET depth = ?3
@@ -779,7 +779,7 @@ DELETE FROM wc_lock
WHERE wc_id = ?1
AND (?2 = ''
OR local_dir_relpath = ?2
- OR (local_dir_relpath > ?2 || '/' AND local_dir_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_dir_relpath, ?2))
AND NOT EXISTS (SELECT 1 FROM nodes
WHERE nodes.wc_id = ?1
AND nodes.local_relpath = wc_lock.local_dir_relpath)
@@ -813,7 +813,7 @@ SELECT wc_id, local_relpath, ?4 /*op_dep
FROM nodes
WHERE wc_id = ?1
AND (local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
@@ -842,7 +842,7 @@ WHERE wc_id = ?1 AND local_relpath = ?2
UPDATE nodes SET op_depth = ?3 + 1
WHERE wc_id = ?1
AND (?2 = ''
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
-- STMT_DOES_NODE_EXIST
@@ -854,7 +854,7 @@ SELECT local_relpath FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0 AND presence = 'absent'
LIMIT 1
@@ -864,7 +864,7 @@ SELECT local_relpath FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND presence = 'absent'
@@ -955,7 +955,7 @@ FROM externals
WHERE wc_id = ?1
AND (?2 = ''
OR def_local_relpath = ?2
- OR (def_local_relpath > ?2 || '/' AND def_local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(def_local_relpath, ?2))
-- STMT_UPDATE_EXTERNAL_FILEINFO
UPDATE externals SET recorded_size = ?3, recorded_mod_time = ?4
@@ -974,7 +974,7 @@ FROM nodes n
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND kind = 'dir' AND presence='normal'
AND op_depth=(SELECT MAX(op_depth) FROM nodes o
WHERE o.wc_id = ?1 AND o.local_relpath = n.local_relpath)
@@ -1182,7 +1182,7 @@ INSERT INTO delete_list(local_relpath)
SELECT local_relpath FROM nodes n
WHERE wc_id = ?1
AND (local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
AND op_depth = (SELECT MAX(op_depth) FROM nodes s
@@ -1207,7 +1207,7 @@ SELECT MIN(revision), MAX(revision),
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND presence IN ('normal', 'incomplete')
AND file_external IS NULL
AND op_depth = 0
@@ -1217,7 +1217,7 @@ SELECT 1 FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND (presence IN ('absent', 'excluded')
OR depth NOT IN ('infinity', 'unknown'))
@@ -1229,7 +1229,7 @@ SELECT 1 FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth > 0
LIMIT 1
@@ -1238,7 +1238,7 @@ SELECT 1 FROM actual_node
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND properties IS NOT NULL
LIMIT 1
@@ -1261,7 +1261,7 @@ SELECT o.repos_path || '/' || SUBSTR(s.l
FROM nodes AS o
LEFT JOIN nodes AS s
ON o.wc_id = s.wc_id
- AND s.local_relpath > ?2 || '/' AND s.local_relpath < ?2 || '0'
+ AND IS_STRICT_DESCENDANT_OF(s.local_relpath, ?2)
AND s.op_depth = 0
AND s.repos_id = o.repos_id
AND s.file_external IS NULL
@@ -1275,7 +1275,7 @@ SELECT SUBSTR(s.local_relpath, LENGTH(?2
FROM nodes AS o
LEFT JOIN nodes AS s
ON o.wc_id = s.wc_id
- AND s.local_relpath > ?2 || '/' AND s.local_relpath < ?2 || '0'
+ AND IS_STRICT_DESCENDANT_OF(s.local_relpath, ?2)
AND s.op_depth = 0
AND s.repos_id = o.repos_id
AND s.file_external IS NULL
@@ -1316,7 +1316,7 @@ SELECT local_relpath, translated_size, l
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND kind='file'
AND presence='normal'