All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	David Barr <david.barr@cordelta.com>
Subject: [PATCH 5/8] vcs-svn: Read delta preimage from file descriptor
Date: Sat, 20 Nov 2010 13:27:13 -0600	[thread overview]
Message-ID: <20101120192713.GF17823@burratino> (raw)
In-Reply-To: <20101120192153.GA17823@burratino>

Teach the svndiff routines to read the preimage for a delta from a
file descriptor without reading ahead.  This way, the delta applier
can stream its input directly from fast-import's cat-blob-fd pipe.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 test-svn-fe.c            |   10 +++++-----
 vcs-svn/sliding_window.c |   21 +++++++++------------
 vcs-svn/sliding_window.h |    2 +-
 vcs-svn/svndiff.c        |    6 +++---
 vcs-svn/svndiff.h        |    2 +-
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/test-svn-fe.c b/test-svn-fe.c
index 4799e4c..4ea0cd6 100644
--- a/test-svn-fe.c
+++ b/test-svn-fe.c
@@ -22,20 +22,20 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 	if (argc == 5 && !strcmp(argv[1], "-d")) {
-		struct line_buffer preimage = LINE_BUFFER_INIT;
+		int preimage_fd = -1;
 		struct line_buffer delta = LINE_BUFFER_INIT;
-		if (buffer_init(&preimage, argv[2]))
+		preimage_fd = open(argv[2], O_RDONLY);
+		if (preimage_fd < 0)
 			die_errno("cannot open preimage");
 		if (buffer_init(&delta, argv[3]))
 			die_errno("cannot open delta");
 		if (svndiff0_apply(&delta, (off_t) strtoull(argv[4], NULL, 0),
-				   &preimage, stdout))
+				   preimage_fd, stdout))
 			return 1;
-		if (buffer_deinit(&preimage))
+		if (close(preimage_fd))
 			die_errno("cannot close preimage");
 		if (buffer_deinit(&delta))
 			die_errno("cannot close delta");
-		buffer_reset(&preimage);
 		buffer_reset(&delta);
 		return 0;
 	}
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index 5c08828..6d4261a 100644
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -5,7 +5,7 @@
 
 #include "git-compat-util.h"
 #include "sliding_window.h"
-#include "line_buffer.h"
+#include "fd_buffer.h"
 #include "strbuf.h"
 
 static void strbuf_remove_from_left(struct strbuf *sb, size_t nbytes)
@@ -30,7 +30,7 @@ static int check_overflow(off_t a, size_t b)
 int move_window(struct view *view, off_t off, size_t len)
 {
 	off_t file_offset;
-	assert(view && view->file);
+	assert(view && view->fd >= 0);
 	assert(!check_overflow(view->off, view->buf.len));
 
 	if (check_overflow(off, len))
@@ -47,21 +47,18 @@ int move_window(struct view *view, off_t off, size_t len)
 	if (off > file_offset) {
 		/* Seek ahead to skip the gap. */
 		const off_t gap = off - file_offset;
-		const off_t nread = buffer_skip_bytes(view->file, gap);
+		const off_t nread = fd_skip_bytes(view->fd, gap);
 		if (nread != gap) {
-			if (!buffer_ferror(view->file))
+			if (!nread)
 				return error("Preimage ends early");
-			return error("Cannot seek forward in input: %s",
-				     strerror(errno));
+			return error("Cannot seek forward in input");
 		}
 		file_offset += gap;
 	}
-	buffer_read_binary(&view->buf, len - view->buf.len, view->file);
-	if (view->buf.len != len) {
-		if (!buffer_ferror(view->file))
-			return error("Preimage ends early");
-		return error("Cannot read preimage: %s", strerror(errno));
-	}
+	if (fd_read_binary(&view->buf, len - view->buf.len, view->fd))
+		return error("Cannot read preimage");
+	if (view->buf.len != len)
+		return error("Preimage ends early");
 	view->off = off;
 	return 0;
 }
diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
index b9f0552..532dc93 100644
--- a/vcs-svn/sliding_window.h
+++ b/vcs-svn/sliding_window.h
@@ -4,7 +4,7 @@
 #include "strbuf.h"
 
 struct view {
-	struct line_buffer *file;
+	int fd;
 	off_t off;
 	struct strbuf buf;
 };
diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
index 9ee7411..ef3a921 100644
--- a/vcs-svn/svndiff.c
+++ b/vcs-svn/svndiff.c
@@ -283,10 +283,10 @@ static int apply_one_window(struct line_buffer *delta, off_t *delta_len,
 }
 
 int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
-		   struct line_buffer *preimage, FILE *postimage)
+		   int preimage_fd, FILE *postimage)
 {
-	struct view preimage_view = {preimage, 0, STRBUF_INIT};
-	assert(delta && preimage && postimage);
+	struct view preimage_view = {preimage_fd, 0, STRBUF_INIT};
+	assert(delta && preimage_fd >= 0 && postimage);
 
 	if (read_magic(delta, &delta_len))
 		goto fail;
diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
index a986099..9003d6e 100644
--- a/vcs-svn/svndiff.h
+++ b/vcs-svn/svndiff.h
@@ -4,6 +4,6 @@
 #include "line_buffer.h"
 
 extern int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
-			  struct line_buffer *preimage, FILE *postimage);
+				int preimage_fd, FILE *postimage);
 
 #endif
-- 
1.7.2.3

  parent reply	other threads:[~2010-11-20 19:27 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-18  5:00 [PATCH 0/2] svn-fe: recognize v3 dumps Jonathan Nieder
2010-11-18  5:02 ` [PATCH 1/2] vcs-svn: Error out for " Jonathan Nieder
2010-11-18  5:03 ` [PATCH 2/2] vcs-svn: Allow simple v3 dumps (no deltas yet) Jonathan Nieder
2010-11-20  0:45 ` [RFC/PATCH 0/15] svn-fe: support for property deltas (but not text " Jonathan Nieder
2010-11-20  0:46   ` [PATCH 01/15] vcs-svn: Check for errors from open() Jonathan Nieder
2010-11-20  0:46   ` [PATCH 02/15] vcs-svn: Eliminate node_ctx.srcRev global Jonathan Nieder
2010-11-20  0:46   ` [PATCH 03/15] vcs-svn: Eliminate node_ctx.mark global Jonathan Nieder
2010-11-20  0:47   ` [PATCH 04/15] vcs-svn: Unclutter handle_node by introducing have_props var Jonathan Nieder
2010-11-20  0:48   ` [PATCH 05/15] vcs-svn: Use mark to indicate nodes with included text Jonathan Nieder
2010-11-20  0:49   ` [PATCH 06/15] vcs-svn: handle_node: Handle deletion case early Jonathan Nieder
2010-11-20  0:49   ` [PATCH 07/15] vcs-svn: Replace = Delete + Add Jonathan Nieder
2010-11-20  0:51   ` [PATCH 08/15] vcs-svn: Combine repo_replace and repo_modify functions Jonathan Nieder
2010-11-20  0:52   ` [PATCH 09/15] vcs-svn: Delay read of per-path properties Jonathan Nieder
2010-11-20  0:52   ` [PATCH 10/15] vcs-svn: Reject path nodes without Node-action Jonathan Nieder
2010-11-20 14:53     ` Jonathan Nieder
2010-11-20  0:53   ` [PATCH 11/15] vcs-svn: More dump format sanity checks Jonathan Nieder
2010-11-30 19:48     ` Jonathan Nieder
     [not found]       ` <20101205091605.GA4332@burratino>
2010-12-05  9:32         ` [PATCH 2/2] vcs-svn: fix intermittent repo_tree corruption Jonathan Nieder
2010-12-05  9:33       ` [PATCH jn/svn-fe-maint 0/2] " Jonathan Nieder
2010-12-05  9:35         ` [PATCH 1/2] treap: make treap_insert return inserted node Jonathan Nieder
2010-12-06 22:19     ` [PATCH jn/svn-fe] vcs-svn: Allow change nodes for root of tree (/) Jonathan Nieder
2010-12-06 23:12       ` Jonathan Nieder
2010-11-20  0:53   ` [PATCH 12/15] vcs-svn: Make source easier to read on small screens Jonathan Nieder
2010-11-20  0:54   ` [PATCH 13/15] vcs-svn: Split off function for handling of individual properties Jonathan Nieder
2010-11-20  0:54   ` [PATCH 14/15] vcs-svn: Sharpen parsing of property lines Jonathan Nieder
2010-11-20  0:57   ` [PATCH 15/15] vcs-svn: Implement Prop-delta handling Jonathan Nieder
2010-11-20 19:21   ` [WIP/PATCH 0/8] svn-fe: support for text deltas Jonathan Nieder
2010-11-20 19:22     ` [PATCH 1/8] svn-fe: Prepare for strbuf use Jonathan Nieder
2010-11-20 19:25     ` [PATCH 2/8] vcs-svn: Internal fast_export_save_blob helper Jonathan Nieder
2010-11-20 19:25     ` [PATCH 3/8] vcs-svn: Introduce repo_read_path to check the content at a path Jonathan Nieder
2011-03-06 12:29       ` Jonathan Nieder
2010-11-20 19:26     ` [PATCH 4/8] vcs-svn: Introduce fd_buffer routines Jonathan Nieder
2010-11-20 19:27     ` Jonathan Nieder [this message]
2010-11-20 19:28     ` [PATCH 6/8] vcs-svn: Let caller set up sliding window for delta preimage Jonathan Nieder
2010-11-20 19:31       ` Jonathan Nieder
2010-11-20 19:29     ` [PATCH 7/8] vcs-svn: Teach line_buffer about temporary files Jonathan Nieder
2010-11-20 19:29     ` [PATCH 8/8] vcs-svn: Implement text-delta handling Jonathan Nieder
2010-12-04 17:34       ` [PATCH 10/8] vcs-svn: Consume whole preimage when applying deltas Jonathan Nieder
2010-11-20 19:30     ` [PATCH 9/8] svn-fe: Test script for handling of dumps with --deltas Jonathan Nieder
2010-12-04 17:29       ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101120192713.GF17823@burratino \
    --to=jrnieder@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=david.barr@cordelta.com \
    --cc=git@vger.kernel.org \
    --cc=srabbelier@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.