Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 94258 invoked from network); 1 Jun 2010 11:48:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 11:48:38 -0000 Received: (qmail 2105 invoked by uid 500); 1 Jun 2010 11:48:38 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 2012 invoked by uid 500); 1 Jun 2010 11:48:37 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 1997 invoked by uid 99); 1 Jun 2010 11:48:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 11:48:37 +0000 X-ASF-Spam-Status: No, hits=2.9 required=10.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [74.125.83.43] (HELO mail-gw0-f43.google.com) (74.125.83.43) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 11:48:26 +0000 Received: by gwb11 with SMTP id 11so3476610gwb.16 for ; Tue, 01 Jun 2010 04:48:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.242.1 with SMTP id lg1mr891513qcb.156.1275392884529; Tue, 01 Jun 2010 04:48:04 -0700 (PDT) Sender: hyrum@hyrumwright.org Received: by 10.229.221.3 with HTTP; Tue, 1 Jun 2010 04:48:04 -0700 (PDT) X-Originating-IP: [12.175.159.130] In-Reply-To: <20100601083309.37B6323889D7@eris.apache.org> References: <20100601083309.37B6323889D7@eris.apache.org> Date: Tue, 1 Jun 2010 07:48:04 -0400 X-Google-Sender-Auth: PAdu8zY3kBB8uGRHR1VST3MouJ8 Message-ID: Subject: Re: svn commit: r949964 - /subversion/trunk/subversion/libsvn_wc/wc_db.c From: "Hyrum K. Wright" To: dev@subversion.apache.org Cc: commits@subversion.apache.org Content-Type: multipart/alternative; boundary=0016363b7e04d4d8fd0487f68b4d X-Virus-Checked: Checked by ClamAV on apache.org --0016363b7e04d4d8fd0487f68b4d Content-Type: text/plain; charset=ISO-8859-1 On Tue, Jun 1, 2010 at 4:33 AM, wrote: > Author: philip > Date: Tue Jun 1 08:33:08 2010 > New Revision: 949964 > > URL: http://svn.apache.org/viewvc?rev=949964&view=rev > Log: > * subversion/libsvn_wc/wc_db.c > (temp_cross_db_copy): Bind all the parameters when copying the > ACTUAL_NODE, use a blob for properties. > > Modified: > subversion/trunk/subversion/libsvn_wc/wc_db.c > > Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=949964&r1=949963&r2=949964&view=diff > > ============================================================================== > --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) > +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun 1 08:33:08 2010 > @@ -2267,14 +2267,16 @@ temp_cross_db_copy(svn_wc__db_t *db, > scratch_pool); > const char *tree_conflict_data = svn_sqlite__column_text(stmt, 5, > > scratch_pool); > - const char *properties = svn_sqlite__column_text(stmt, 6, > scratch_pool); > + apr_size_t props_size; > + const char *properties = svn_sqlite__column_blob(stmt, 6, > &props_size, > + scratch_pool); > Should we be using svn_sqlite__column_properties() here (and extending _bindf() so that it knows about properties)? I understand we're just doing a straight copy, so we don't necessarily need to parse and unparse the properties, but if this is the case, perhaps a comment in the code would be useful. > SVN_ERR(svn_sqlite__reset(stmt)); > SVN_ERR(svn_sqlite__get_statement(&stmt, dst_pdh->wcroot->sdb, > STMT_INSERT_ACTUAL_NODE)); > - SVN_ERR(svn_sqlite__bindf(stmt, "isss", > + SVN_ERR(svn_sqlite__bindf(stmt, "issbsssss", > dst_pdh->wcroot->wc_id, dst_relpath, > svn_relpath_dirname(dst_relpath, > scratch_pool), > - properties, > + properties, props_size, > conflict_old, conflict_new, > conflict_working, > changelist, tree_conflict_data)); > SVN_ERR(svn_sqlite__step(&have_row, stmt)); > > > -Hyrum --0016363b7e04d4d8fd0487f68b4d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On Tue, Jun 1, 2010 at 4:33 AM, <philip@apache.org&g= t; wrote:
Author: philip
Date: Tue Jun =A01 08:33:08 2010
New Revision: 949964

URL: http://svn.apache.org/viewvc?rev=3D949964&view=3Drev
Log:
* subversion/libsvn_wc/wc_db.c
=A0(temp_cross_db_copy): Bind all the parameters when copying the
=A0 ACTUAL_NODE, use a blob for properties.

Modified:
=A0 =A0subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversi= on/libsvn_wc/wc_db.c?rev=3D949964&r1=3D949963&r2=3D949964&view= =3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun =A01 08:33:08 201= 0
@@ -2267,14 +2267,16 @@ temp_cross_db_copy(svn_wc__db_t *db,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0scratch_pool);
=A0 =A0 =A0 const char *tree_conflict_data =3D svn_sqlite__column_text(stm= t, 5,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0scratch_pool);
- =A0 =A0 =A0const char *properties =3D svn_sqlite__column_text(stmt, 6, sc= ratch_pool);
+ =A0 =A0 =A0apr_size_t props_size;
+ =A0 =A0 =A0const char *properties =3D svn_sqlite__column_blob(stmt, 6, &a= mp;props_size,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 scratch_pool);
Should we be using svn_sqlite__column_properties() here (and extending _bi= ndf() so that it knows about properties)?=A0 I understand we're just do= ing a straight copy, so we don't necessarily need to parse and unparse = the properties, but if this is the case, perhaps a comment in the code woul= d be useful.
=A0
=A0 =A0 =A0 SVN_ERR(svn_sqlite__reset(stmt));
=A0 =A0 =A0 SVN_ERR(svn_sqlite__get_statement(&stmt, dst_pdh->wcroo= t->sdb,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 STMT_INSERT_ACTUAL_NODE));
- =A0 =A0 =A0SVN_ERR(svn_sqlite__bindf(stmt, "isss",
+ =A0 =A0 =A0SVN_ERR(svn_sqlite__bindf(stmt, "issbsssss",
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 dst_pdh-&g= t;wcroot->wc_id, dst_relpath,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 svn_relpat= h_dirname(dst_relpath, scratch_pool),
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0properties= ,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0properties= , props_size,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 conflict_o= ld, conflict_new, conflict_working,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 changelist= , tree_conflict_data));
=A0 =A0 =A0 SVN_ERR(svn_sqlite__step(&have_row, stmt));



-Hyrum
--0016363b7e04d4d8fd0487f68b4d--