Removed line limit on rows.

FossilOrigin-Name: ec08b15f77741efd38dadd6aff492ccbb841471e

diff --git a/ext/csv/csv.c b/ext/csv/csv.c
index 9244922d849fc0eed98ac7d739b8fd3b8c6b7723..9bd157c2d826bdb6ee75e3e504ad68fb94d52362 100644 (file)
--- a/ext/csv/csv.c
+++ b/ext/csv/csv.c
@@ -56,7 +56,8 @@ struct CSV {
   FILE *f;                     /* File pointer for source CSV file */
   long offsetFirstRow;         /* ftell position of first row */
   int eof;                     /* True when at end of file */
-  char zRow[4096];             /* Buffer for current CSV row */
+  int maxRow;                  /* Size of zRow buffer */
+  char *zRow;                  /* Buffer for current CSV row */
   char cDelim;                 /* Character to use for delimiting columns */
   int nCol;                    /* Number of columns in current row */
   int maxCol;                  /* Size of aCols array */
@@ -104,8 +105,62 @@ static int csv_seek( CSV *pCSV, long pos ){
 static long csv_tell( CSV *pCSV ){
   return ftell( pCSV->f );
 }
-static char *csv_gets( CSV *pCSV ){
-  return fgets( pCSV->zRow, sizeof(pCSV->zRow), pCSV->f );
+
+
+/*
+** This routine reads a line of text from FILE in, stores
+** the text in memory obtained from malloc() and returns a pointer
+** to the text.  NULL is returned at end of file, or if malloc()
+** fails.
+**
+** The interface is like "readline" but no command-line editing
+** is done.
+**
+** This code was modified from existing code in shell.c of the sqlite3 CLI.
+*/
+static char *csv_getline( CSV *pCSV ){
+  int n = 0;
+  int bEol = 0;
+  int bShrink = 0;
+
+  /* allocate initial row buffer */
+  if( pCSV->maxRow < 1 ){
+    pCSV->zRow = sqlite3_malloc( 100 );
+    if( pCSV->zRow ){
+      pCSV->maxRow = 100;
+    }
+  }
+  if( !pCSV->zRow ) return 0;
+
+  /* read until eol */
+  while( !bEol ){
+    /* grow row buffer as needed */
+    if( n+100>pCSV->maxRow ){
+      int newSize = pCSV->maxRow*2 + 100;
+      char *p = sqlite3_realloc(pCSV->zRow, newSize);
+      if( !p ) return 0;
+      pCSV->maxRow = newSize;
+      pCSV->zRow = p;
+      bShrink = -1;
+    }
+    if( fgets(&pCSV->zRow[n], pCSV->maxRow-n, pCSV->f)==0 ){
+      if( n==0 ){
+        break;
+      }
+      pCSV->zRow[n] = '\0';
+      bEol = -1;
+      break;
+    }
+    /* look for line delimiter */
+    while( pCSV->zRow[n] ){ n++; }
+    if( (n>0) && ((pCSV->zRow[n-1]=='\n') || (pCSV->zRow[n-1]=='\r')) ){
+      pCSV->zRow[n-1] = '\n'; /* uniform line ending */
+      pCSV->zRow[n] = '\0';
+      bEol = -1;
+    }
+  }
+  if( bShrink ){ pCSV->zRow = realloc( pCSV->zRow, n+1 ); }
+  return bEol ? pCSV->zRow : 0;
 }
 
 
@@ -238,7 +293,7 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
   CSVCursor *pCsr = (CSVCursor *)pVtabCursor;
   int nCol = 0;
   char *s;
-  char zDelims[4] = ",\r\n";
+  char zDelims[3] = ",\n";
   char cDelim; /* char that delimited current col */
 
   if( pCSV->eof ){
@@ -249,7 +304,7 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
   pCsr->csvpos = csv_tell( pCSV );
 
   /* read the next row of data */
-  s = csv_gets( pCSV );
+  s = csv_getline( pCSV );
   if( !s ){
     /* and error or eof occured */
     pCSV->eof = -1;
@@ -259,14 +314,13 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
   /* allocate initial space for the column pointers */
   if( pCSV->maxCol < 1 ){
     /* take a guess */
-    pCSV->maxCol = (int)(strlen(pCSV->zRow) / 5 + 1);
-    if( pCSV->aCols ) sqlite3_free( pCSV->aCols );
-    pCSV->aCols = (char **)sqlite3_malloc( sizeof(char*) * pCSV->maxCol );
-    if( !pCSV->aCols ){
-      /* out of memory */
-      return SQLITE_NOMEM;
+    int maxCol = (int)(strlen(pCSV->zRow) / 5 + 1);
+    pCSV->aCols = (char **)sqlite3_malloc( sizeof(char*) * maxCol );
+    if( pCSV->aCols ){
+      pCSV->maxCol = maxCol;
     }
   }
+  if( !pCSV->aCols ) return SQLITE_NOMEM;
 
   /* add custom delim character */
   zDelims[0] = pCSV->cDelim;
@@ -277,8 +331,8 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
     if( *s=='\"' ){
       s++;  /* skip quote */
       pCSV->aCols[nCol] = s; /* save pointer for this col */
+      /* TBD: handle escaped quotes "" */
       /* find closing quote */
-#if 1
       s = strchr(s, '\"');
       if( !s ){
         /* no closing quote */
@@ -286,19 +340,8 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
         return SQLITE_ERROR;
       }
       *s = '\0'; /* null terminate this col */
-      /* fall through and look for following ",\n\r" */
+      /* fall through and look for following ",\n" */
       s++;
-#else
-      /* TBD: handle escaped quotes "" */
-      while( s[0] ){
-        if( s[0]=='\"' ){
-          if( s[1]=='\"' ){
-          }
-          break;
-        }
-        s++;
-      }
-#endif
     }else{
       pCSV->aCols[nCol] = s; /* save pointer for this col */
     }
@@ -313,7 +356,7 @@ static int csvNext( sqlite3_vtab_cursor* pVtabCursor ){
     *s = '\0';
     nCol++;
     /* if end of zRow, stop parsing cols */
-    if( (cDelim == '\n') || (cDelim == '\r') ) break;
+    if( cDelim == '\n' ) break;
     /* move to start of next col */
     s++; /* skip delimiter */
 
@@ -427,6 +470,7 @@ static int csvRelease( CSV *pCSV ){
     /* finalize any prepared statements here */
 
     csv_close( pCSV );
+    if( pCSV->zRow ) sqlite3_free( pCSV->zRow );
     if( pCSV->aCols ) sqlite3_free( pCSV->aCols );
     sqlite3_free( pCSV );
   }

diff --git a/manifest b/manifest
index ec48b249c4c33419988badac89392b2bbf8747e7..3201d899b8482e6025b1d6f0bafa626ccb7186a5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\simplementation\sof\sa\svirtual\stable\sfor\sCSV\sfiles.
-D 2009-11-05T02:34:43
+C Removed\sline\slimit\son\srows.
+D 2009-11-05T04:01:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -27,7 +27,7 @@ F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/async/README.txt 0c541f418b14b415212264cbaaf51c924ec62e5b
 F ext/async/sqlite3async.c 3d5396cd69851f5633ef29c7491ca9249eac903a
 F ext/async/sqlite3async.h a21e1252deb14a2c211f0e165c4b9122a8f1f344
-F ext/csv/csv.c 7df206eadb1faf0d02cd06df76e37917643f9813
+F ext/csv/csv.c 8180ed6901f7ebe4609a5ae242ebb463b83a319e
 F ext/csv/csv.h 9d200dd0511a41f22561d3100cd3cc924818c04a
 F ext/csv/csv1.test 822780d05036796c3f2ff4432b5451fe47ae3355
 F ext/csv/test1.csv 888555e2a197fecaf9d0b90133551ebb8cbac8ce
@@ -767,11 +767,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P eb7a544fe49d1626bacecfe53ddc03fe082e3243
-R 27eb092351aa8c08879582048eb7304c
-T *bgcolor * orange
-T *branch * csv_ext
-T *sym-csv_ext *
-T -sym-trunk *
+P 90e63b7d845bacc9a1a1db13c1e9a406e5306faa
+R 83bf0c403b72a6abf0e42b60e4c904e3
 U shaneh
-Z c880cba03cce7d6961f66416059a9bd1
+Z 5a62ad1ad3faa27f07afe28862888de9

diff --git a/manifest.uuid b/manifest.uuid
index 37e351a30bb7415c6b8bddee4c28abc57f5dacdd..ce9d7667b8d092b130001c822f8e366f6a33c5db 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-90e63b7d845bacc9a1a1db13c1e9a406e5306faa
\ No newline at end of file
+ec08b15f77741efd38dadd6aff492ccbb841471e
\ No newline at end of file