subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1395164 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c
Date Sat, 06 Oct 2012 20:13:31 GMT
Author: rhuijben
Date: Sat Oct  6 20:13:31 2012
New Revision: 1395164

URL: http://svn.apache.org/viewvc?rev=1395164&view=rev
Log:
Remove unused references to old conflict data columns from wc_db queries.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ACTUAL_NODE,
   STMT_SELECT_ACTUAL_CHILDREN_INFO,
   STMT_INSERT_ACTUAL_CONFLICT,
   STMT_UPDATE_ACTUAL_CONFLICT,
   STMT_DELETE_ACTUAL_EMPTY,
   STMT_DELETE_ACTUAL_EMPTIES,
   STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST,
   STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE,
   STMT_SELECT_CONFLICT_VICTIMS): Remove unused columns.

  (STMT_SELECT_CONFLICT_MARKER_FILES1,
   STMT_SELECT_CONFLICT_MARKER_FILES2,
   STMT_CLEAR_TEXT_CONFLICT,
   STMT_CLEAR_PROPS_CONFLICT,
   STMT_CLEAR_TREE_CONFLICT): Remove unused statements.

  (STMT_INSERT_ACTUAL_NODE,
   STMT_INSERT_ACTUAL_CONFLICT_DATA,
   STMT_CREATE_REVERT_LIST,
   STMT_SELECT_REVERT_LIST): Remove unused columns.

* subversion/libsvn_wc/wc_db.c
  (mark_conflict): Update column offset.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1395164&r1=1395163&r2=1395164&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Sat Oct  6 20:13:31 2012
@@ -102,8 +102,7 @@ ORDER BY op_depth
 LIMIT 1
 
 -- STMT_SELECT_ACTUAL_NODE
-SELECT changelist, properties, conflict_data,
-conflict_old, conflict_new, conflict_working, prop_reject, tree_conflict_data
+SELECT changelist, properties, conflict_data
 FROM actual_node
 WHERE wc_id = ?1 AND local_relpath = ?2
 
@@ -127,8 +126,7 @@ FROM nodes_current
 WHERE wc_id = ?1 AND parent_relpath = ?2
 
 -- STMT_SELECT_ACTUAL_CHILDREN_INFO
-SELECT local_relpath, changelist, properties, conflict_data,
-conflict_old, conflict_new, conflict_working, prop_reject, tree_conflict_data
+SELECT local_relpath, changelist, properties, conflict_data
 FROM actual_node
 WHERE wc_id = ?1 AND parent_relpath = ?2
 
@@ -414,16 +412,11 @@ UPDATE nodes SET translated_size = ?3, l
 WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?5
 
 -- STMT_INSERT_ACTUAL_CONFLICT
-INSERT INTO actual_node (
-  wc_id, local_relpath, conflict_data,
-  conflict_old, conflict_new, conflict_working, prop_reject,
-  tree_conflict_data, parent_relpath)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9)
+INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath)
+VALUES (?1, ?2, ?3, ?4)
 
 -- STMT_UPDATE_ACTUAL_CONFLICT
-UPDATE actual_node SET conflict_data = ?3,
-  conflict_old = ?4, conflict_new = ?5, conflict_working = ?6,
-  prop_reject = ?7, tree_conflict_data = ?8
+UPDATE actual_node SET conflict_data = ?3
 WHERE wc_id = ?1 AND local_relpath = ?2
 
 -- STMT_UPDATE_ACTUAL_CHANGELISTS
@@ -594,10 +587,6 @@ DELETE FROM actual_node
 WHERE wc_id = ?1 AND local_relpath = ?2
   AND properties IS NULL
   AND conflict_data IS NULL
-  AND conflict_old IS NULL
-  AND conflict_new IS NULL
-  AND prop_reject IS NULL
-  AND tree_conflict_data IS NULL
   AND changelist IS NULL
   AND text_mod IS NULL
   AND older_checksum IS NULL
@@ -610,10 +599,6 @@ WHERE wc_id = ?1
   AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
   AND properties IS NULL
   AND conflict_data IS NULL
-  AND conflict_old IS NULL
-  AND conflict_new IS NULL
-  AND prop_reject IS NULL
-  AND tree_conflict_data IS NULL
   AND changelist IS NULL
   AND text_mod IS NULL
   AND older_checksum IS NULL
@@ -684,10 +669,6 @@ UPDATE actual_node
 SET properties = NULL,
     text_mod = NULL,
     conflict_data = NULL,
-    conflict_old = NULL,
-    conflict_new = NULL,
-    conflict_working = NULL,
-    prop_reject = NULL,
     tree_conflict_data = NULL,
     older_checksum = NULL,
     left_checksum = NULL,
@@ -699,10 +680,6 @@ UPDATE actual_node
 SET properties = NULL,
     text_mod = NULL,
     conflict_data = NULL,
-    conflict_old = NULL,
-    conflict_new = NULL,
-    conflict_working = NULL,
-    prop_reject = NULL,
     tree_conflict_data = NULL,
     older_checksum = NULL,
     left_checksum = NULL,
@@ -772,38 +749,7 @@ WHERE checksum = ?1 AND refcount = 0
 SELECT local_relpath, conflict_data
 FROM actual_node
 WHERE wc_id = ?1 AND parent_relpath = ?2 AND
-  NOT ((conflict_data IS NULL) AND (conflict_old IS NULL)
-       AND (conflict_new IS NULL) AND (conflict_working IS NULL)
-       AND (prop_reject IS NULL) AND (tree_conflict_data IS NULL))
-
--- STMT_SELECT_CONFLICT_MARKER_FILES1
-SELECT prop_reject
-FROM actual_node
-WHERE wc_id = ?1 AND local_relpath = ?2
-  AND (prop_reject IS NOT NULL)
-
--- STMT_SELECT_CONFLICT_MARKER_FILES2
-SELECT prop_reject, conflict_old, conflict_new, conflict_working
-FROM actual_node
-WHERE wc_id = ?1 AND parent_relpath = ?2
-  AND ((prop_reject IS NOT NULL) OR (conflict_old IS NOT NULL)
-       OR (conflict_new IS NOT NULL) OR (conflict_working IS NOT NULL))
-
--- STMT_CLEAR_TEXT_CONFLICT
-UPDATE actual_node SET
-  conflict_old = NULL,
-  conflict_new = NULL,
-  conflict_working = NULL
-WHERE wc_id = ?1 AND local_relpath = ?2
-
--- STMT_CLEAR_PROPS_CONFLICT
-UPDATE actual_node SET
-  prop_reject = NULL
-WHERE wc_id = ?1 AND local_relpath = ?2
-
--- STMT_CLEAR_TREE_CONFLICT
-UPDATE actual_node SET tree_conflict_data = NULL
-WHERE wc_id = ?1 AND local_relpath = ?2
+  NOT (conflict_data IS NULL)
 
 -- STMT_INSERT_WC_LOCK
 INSERT INTO wc_lock (wc_id, local_dir_relpath, locked_levels)
@@ -1100,9 +1046,8 @@ WHERE (wc_id = ?1 AND local_relpath = ?2
 
 -- STMT_INSERT_ACTUAL_NODE
 INSERT OR REPLACE INTO actual_node (
-  wc_id, local_relpath, parent_relpath, properties, changelist, conflict_data,
-  conflict_old, conflict_new, conflict_working, prop_reject, tree_conflict_data)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)
+  wc_id, local_relpath, parent_relpath, properties, changelist, conflict_data)
+VALUES (?1, ?2, ?3, ?4, ?5, ?6)
 
 /* ------------------------------------------------------------------------- */
 
@@ -1113,8 +1058,7 @@ UPDATE actual_node SET conflict_data = ?
 WHERE wc_id = ?1 AND local_relpath = ?2
 
 -- STMT_INSERT_ACTUAL_CONFLICT_DATA
-INSERT INTO actual_node (
-  wc_id, local_relpath, conflict_data, parent_relpath)
+INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath)
 VALUES (?1, ?2, ?3, ?4)
 
 -- STMT_SELECT_ALL_FILES
@@ -1214,10 +1158,6 @@ CREATE TEMPORARY TABLE revert_list (
    local_relpath TEXT NOT NULL,
    actual INTEGER NOT NULL,         /* 1 if an actual row, 0 if a nodes row */
    conflict_data BLOB,
-   conflict_old TEXT,
-   conflict_new TEXT,
-   conflict_working TEXT,
-   prop_reject TEXT,
    notify INTEGER,         /* 1 if an actual row had props or tree conflict */
    op_depth INTEGER,
    repos_id INTEGER,
@@ -1237,11 +1177,8 @@ CREATE TEMPORARY TRIGGER trigger_revert_
 BEFORE DELETE ON actual_node
 BEGIN
    INSERT OR REPLACE INTO revert_list(local_relpath, actual, conflict_data,
-                                      conflict_old, conflict_new,
-                                      conflict_working, prop_reject, notify)
+                                      notify)
    SELECT OLD.local_relpath, 1, OLD.conflict_data,
-          OLD.conflict_old, OLD.conflict_new, OLD.conflict_working,
-          OLD.prop_reject,
           CASE
             WHEN OLD.properties IS NOT NULL
             THEN 1
@@ -1257,11 +1194,8 @@ CREATE TEMPORARY TRIGGER trigger_revert_
 BEFORE UPDATE ON actual_node
 BEGIN
    INSERT OR REPLACE INTO revert_list(local_relpath, actual, conflict_data,
-                                      conflict_old, conflict_new,
-                                      conflict_working, prop_reject, notify)
+                                      notify)
    SELECT OLD.local_relpath, 1, OLD.conflict_data,
-          OLD.conflict_old, OLD.conflict_new, OLD.conflict_working,
-          OLD.prop_reject,
           CASE
             WHEN OLD.properties IS NOT NULL
             THEN 1
@@ -1279,8 +1213,7 @@ DROP TRIGGER trigger_revert_list_actual_
 DROP TRIGGER trigger_revert_list_actual_update
 
 -- STMT_SELECT_REVERT_LIST
-SELECT actual, notify, kind, op_depth, repos_id, conflict_data,
-       conflict_old, conflict_new, conflict_working, prop_reject
+SELECT actual, notify, kind, op_depth, repos_id, conflict_data
 FROM revert_list
 WHERE local_relpath = ?1
 ORDER BY actual DESC

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1395164&r1=1395163&r2=1395164&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sat Oct  6 20:13:31 2012
@@ -5589,7 +5589,7 @@ mark_conflict(svn_wc__db_wcroot_t *wcroo
                                         STMT_INSERT_ACTUAL_CONFLICT));
       SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
       if (*local_relpath != '\0')
-        SVN_ERR(svn_sqlite__bind_text(stmt, 9,
+        SVN_ERR(svn_sqlite__bind_text(stmt, 4,
                                       svn_relpath_dirname(local_relpath,
                                                           scratch_pool)));
     }



Mime
View raw message