SQLite: Check-in [16db7384]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Update Makefile.msc to include window.c in the build.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| exp-window-functions
Files:	files \| file ages \| folders
SHA3-256:	16db73842ade5eb0fe02f257b91d1c7b41d830d3f17f8638b8fbaed309d9a852
User & Date:	dan 2018-06-10 07:42:35

Context

2018-06-11
11:19		Fix a typon in main.mk. (check-in: e74f86f2 user: dan tags: exp-window-functions)
2018-06-10
07:42		Update Makefile.msc to include window.c in the build. (check-in: 16db7384 user: dan tags: exp-window-functions)
2018-06-09
18:09		Merge recent trunk changes with this branch. (check-in: c71f2359 user: dan tags: exp-window-functions)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  1192   1192            pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
  1193   1193            random.lo resolve.lo rowset.lo rtree.lo \
  1194   1194            sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
  1195   1195            table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
  1196   1196            update.lo upsert.lo util.lo vacuum.lo \
  1197   1197            vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
  1198   1198            vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
  1199         -         utf.lo vtab.lo
         1199  +         window.lo utf.lo vtab.lo
  1200   1200   # <</mark>>
  1201   1201   
  1202   1202   # Object files for the amalgamation.
  1203   1203   #
  1204   1204   LIBOBJS1 = sqlite3.lo
  1205   1205   
  1206   1206   # Determine the real value of LIBOBJ based on the 'configure' script
................................................................................
  1303   1303     $(TOP)\src\vdbesort.c \
  1304   1304     $(TOP)\src\vdbetrace.c \
  1305   1305     $(TOP)\src\vtab.c \
  1306   1306     $(TOP)\src\wal.c \
  1307   1307     $(TOP)\src\walker.c \
  1308   1308     $(TOP)\src\where.c \
  1309   1309     $(TOP)\src\wherecode.c \
  1310         -  $(TOP)\src\whereexpr.c
         1310  +  $(TOP)\src\whereexpr.c \
         1311  +  $(TOP)\src\window.c
  1311   1312   
  1312   1313   # Core miscellaneous files.
  1313   1314   #
  1314   1315   SRC03 = \
  1315   1316     $(TOP)\src\parse.y
  1316   1317   
  1317   1318   # Core header files, part 1.
................................................................................
  2042   2043   
  2043   2044   wherecode.lo:	$(TOP)\src\wherecode.c $(HDR)
  2044   2045   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\wherecode.c
  2045   2046   
  2046   2047   whereexpr.lo:	$(TOP)\src\whereexpr.c $(HDR)
  2047   2048   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\whereexpr.c
  2048   2049   
         2050  +window.lo:	$(TOP)\src\window.c $(HDR)
         2051  +	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\window.c
         2052  +
  2049   2053   tclsqlite.lo:	$(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
  2050   2054   	$(LTCOMPILE) $(NO_WARN) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
  2051   2055   
  2052   2056   tclsqlite-shell.lo:	$(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
  2053   2057   	$(LTCOMPILE) $(NO_WARN) -DTCLSH -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
  2054   2058   
  2055   2059   tclsqlite3.exe:	tclsqlite-shell.lo $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)

Changes to src/analyze.c.

   481    481   static const FuncDef statInitFuncdef = {
   482    482     2+IsStat34,      /* nArg */
   483    483     SQLITE_UTF8,     /* funcFlags */
   484    484     0,               /* pUserData */
   485    485     0,               /* pNext */
   486    486     statInit,        /* xSFunc */
   487    487     0,               /* xFinalize */
   488         -  0, 0,
          488  +  0, 0,            /* xValue, xInverse */
   489    489     "stat_init",     /* zName */
   490    490     {0}
   491    491   };
   492    492   
   493    493   #ifdef SQLITE_ENABLE_STAT4
   494    494   /*
   495    495   ** pNew and pOld are both candidate non-periodic samples selected for 
................................................................................
   798    798   static const FuncDef statPushFuncdef = {
   799    799     2+IsStat34,      /* nArg */
   800    800     SQLITE_UTF8,     /* funcFlags */
   801    801     0,               /* pUserData */
   802    802     0,               /* pNext */
   803    803     statPush,        /* xSFunc */
   804    804     0,               /* xFinalize */
   805         -  0, 0,
          805  +  0, 0,            /* xValue, xInverse */
   806    806     "stat_push",     /* zName */
   807    807     {0}
   808    808   };
   809    809   
   810    810   #define STAT_GET_STAT1 0          /* "stat" column of stat1 table */
   811    811   #define STAT_GET_ROWID 1          /* "rowid" column of stat[34] entry */
   812    812   #define STAT_GET_NEQ   2          /* "neq" column of stat[34] entry */
................................................................................
   950    950   static const FuncDef statGetFuncdef = {
   951    951     1+IsStat34,      /* nArg */
   952    952     SQLITE_UTF8,     /* funcFlags */
   953    953     0,               /* pUserData */
   954    954     0,               /* pNext */
   955    955     statGet,         /* xSFunc */
   956    956     0,               /* xFinalize */
   957         -  0, 0,
          957  +  0, 0,            /* xValue, xInverse */
   958    958     "stat_get",      /* zName */
   959    959     {0}
   960    960   };
   961    961   
   962    962   static void callStatGet(Vdbe *v, int regStat4, int iParam, int regOut){
   963    963     assert( regOut!=regStat4 && regOut!=regStat4+1 );
   964    964   #ifdef SQLITE_ENABLE_STAT3_OR_STAT4