subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1532597 [10/10] - in /subversion/branches/log-addressing: ./ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ notes/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/...
Date Tue, 15 Oct 2013 23:44:46 GMT
Modified: subversion/branches/log-addressing/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/tools/dev/unix-build/Makefile.svn?rev=1532597&r1=1532596&r2=1532597&view=diff
==============================================================================
--- subversion/branches/log-addressing/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/log-addressing/tools/dev/unix-build/Makefile.svn Tue Oct 15 23:44:41
2013
@@ -741,6 +741,7 @@ $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR)
 
 # install serf
 $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR)/.compiled
+	rm -rf $(PREFIX)/serf # XXX scons cannot reinstall :(
 	cd $(SERF_SRCDIR) && \
 		scons install
 	touch $@

Modified: subversion/branches/log-addressing/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/tools/dist/backport.pl?rev=1532597&r1=1532596&r2=1532597&view=diff
==============================================================================
--- subversion/branches/log-addressing/tools/dist/backport.pl (original)
+++ subversion/branches/log-addressing/tools/dist/backport.pl Tue Oct 15 23:44:41 2013
@@ -367,13 +367,14 @@ sub parse_entry {
   # summary
   do {
     push @logsummary, shift
-  } until $_[0] =~ /^\s*\w+:/ or not defined $_[0];
+  } until $_[0] =~ /^\s*[][\w]+:/ or not defined $_[0];
 
   # votes
   unshift @votes, pop until $_[-1] =~ /^\s*Votes:/ or not defined $_[-1];
   pop;
 
   # depends, branch, notes
+  # Ignored headers: Changes[*]
   while (@_) {
     given (shift) {
       when (/^Depends:/) {

Modified: subversion/branches/log-addressing/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/tools/server-side/fsfs-stats.c?rev=1532597&r1=1532596&r2=1532597&view=diff
==============================================================================
--- subversion/branches/log-addressing/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/log-addressing/tools/server-side/fsfs-stats.c Tue Oct 15 23:44:41
2013
@@ -271,6 +271,12 @@ typedef struct fs_fs_t
   /* history of sizes of changed nodes */
   histogram_t node_size_histogram;
 
+  /* history of representation sizes */
+  histogram_t added_rep_size_histogram;
+
+  /* history of sizes of changed nodes */
+  histogram_t added_node_size_histogram;
+
   /* history of unused representations */
   histogram_t unused_rep_histogram;
 
@@ -487,6 +493,7 @@ add_to_histogram(histogram_t *histogram,
 
 /* Update data aggregators in FS with this representation of type KIND, on-
  * disk REP_SIZE and expanded node size EXPANDED_SIZE for PATH in REVSION.
+ * PLAIN_ADDED indicates whether the node has a deltification predecessor.
  */
 static void
 add_change(fs_fs_t *fs,
@@ -494,7 +501,8 @@ add_change(fs_fs_t *fs,
            apr_int64_t expanded_size,
            svn_revnum_t revision,
            const char *path,
-           rep_kind_t kind)
+           rep_kind_t kind,
+           svn_boolean_t plain_added)
 {
   /* identify largest reps */
   if (rep_size >= fs->largest_changes->min_size)
@@ -523,6 +531,12 @@ add_change(fs_fs_t *fs,
   add_to_histogram(&fs->rep_size_histogram, rep_size);
   add_to_histogram(&fs->node_size_histogram, expanded_size);
 
+  if (plain_added)
+    {
+      add_to_histogram(&fs->added_rep_size_histogram, rep_size);
+      add_to_histogram(&fs->added_node_size_histogram, expanded_size);
+    }
+
   /* specific histograms by type */
   switch (kind)
     {
@@ -1289,6 +1303,7 @@ read_noderev(fs_fs_t *fs,
   representation_t *props = NULL;
   apr_size_t start_offset = offset;
   svn_boolean_t is_dir = FALSE;
+  svn_boolean_t has_predecessor = FALSE;
   const char *path = "???";
 
   scratch_pool = svn_pool_create(scratch_pool);
@@ -1349,15 +1364,17 @@ read_noderev(fs_fs_t *fs,
         }
       else if (key_matches(&key, "cpath"))
         path = value.data;
+      else if (key_matches(&key, "pred"))
+        has_predecessor = TRUE;
     }
 
   /* record largest changes */
   if (text && text->ref_count == 1)
     add_change(fs, (apr_int64_t)text->size, (apr_int64_t)text->expanded_size,
-               text->revision, path, text->kind);
+               text->revision, path, text->kind, !has_predecessor);
   if (props && props->ref_count == 1)
     add_change(fs, (apr_int64_t)props->size, (apr_int64_t)props->expanded_size,
-               props->revision, path, props->kind);
+               props->revision, path, props->kind, !has_predecessor);
 
   /* if this is a directory and has not been processed, yet, read and
    * process it recursively */
@@ -2046,6 +2063,7 @@ print_stats(fs_fs_t *fs,
   printf(_("%20s bytes in %12s representations total\n"
            "%20s bytes in %12s directory representations\n"
            "%20s bytes in %12s file representations\n"
+           "%20s bytes in %12s representations of added file nodes\n"
            "%20s bytes in %12s directory property representations\n"
            "%20s bytes in %12s file property representations\n"
            "%20s bytes in header & footer overhead\n"),
@@ -2055,6 +2073,8 @@ print_stats(fs_fs_t *fs,
          svn__i64toa_sep(dir_rep_stats.total.count, ',', pool),
          svn__i64toa_sep(file_rep_stats.total.packed_size, ',', pool),
          svn__i64toa_sep(file_rep_stats.total.count, ',', pool),
+         svn__i64toa_sep(fs->added_rep_size_histogram.total.sum, ',', pool),
+         svn__i64toa_sep(fs->added_rep_size_histogram.total.count, ',', pool),
          svn__i64toa_sep(dir_prop_rep_stats.total.packed_size, ',', pool),
          svn__i64toa_sep(dir_prop_rep_stats.total.count, ',', pool),
          svn__i64toa_sep(file_prop_rep_stats.total.packed_size, ',', pool),

Modified: subversion/branches/log-addressing/tools/server-side/svn-populate-node-origins-index.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/tools/server-side/svn-populate-node-origins-index.c?rev=1532597&r1=1532596&r2=1532597&view=diff
==============================================================================
--- subversion/branches/log-addressing/tools/server-side/svn-populate-node-origins-index.c
(original)
+++ subversion/branches/log-addressing/tools/server-side/svn-populate-node-origins-index.c
Tue Oct 15 23:44:41 2013
@@ -77,7 +77,8 @@ index_revision_adds(int *count, svn_fs_t
 
   *count = 0;
   SVN_ERR(svn_fs_revision_root(&root, fs, revision, pool));
-  SVN_ERR(svn_fs_paths_changed2(&changes, root, pool));
+  SVN_ERR(svn_fs_paths_changed3(&changes, root,
+                                svn_move_behavior_explicit_moves, pool));
 
   /* No paths changed in this revision?  Nothing to do.  */
   if (apr_hash_count(changes) == 0)
@@ -94,7 +95,9 @@ index_revision_adds(int *count, svn_fs_t
       apr_hash_this(hi, &path, NULL, &val);
       change = val;
       if ((change->change_kind == svn_fs_path_change_add)
-          || (change->change_kind == svn_fs_path_change_replace))
+          || (change->change_kind == svn_fs_path_change_replace)
+          || (change->change_kind == svn_fs_path_change_move)
+          || (change->change_kind == svn_fs_path_change_movereplace))
         {
           if (! (change->copyfrom_path
                             && SVN_IS_VALID_REVNUM(change->copyfrom_rev)))

Modified: subversion/branches/log-addressing/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/tools/server-side/svn-rep-sharing-stats.c?rev=1532597&r1=1532596&r2=1532597&view=diff
==============================================================================
--- subversion/branches/log-addressing/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/log-addressing/tools/server-side/svn-rep-sharing-stats.c Tue Oct 15
23:44:41 2013
@@ -269,7 +269,9 @@ process_one_revision(svn_fs_t *fs,
 
   /* Get the changed paths. */
   SVN_ERR(svn_fs_revision_root(&rev_root, fs, revnum, scratch_pool));
-  SVN_ERR(svn_fs_paths_changed2(&paths_changed, rev_root, scratch_pool));
+  SVN_ERR(svn_fs_paths_changed3(&paths_changed, rev_root,
+                                svn_move_behavior_explicit_moves,
+                                scratch_pool));
 
   /* Iterate them. */
   /* ### use iterpool? */



Mime
View raw message