mirror of https://git.wownero.com/dsc/mxe.git
Update spatialite for style and functionality.
This commit is contained in:
Luke
Tony Theodore
parent
c335c5f97b
commit
9043fec8b6
|
|
@ -36,3 +36,21 @@ index 1111111..2222222 100644
|
|||
|
||||
#-----------------------------------------------------------------------
|
||||
# --enable-controlpoints
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
|
||||
Date: Mon, 2 Oct 2017 11:27:24 +0200
|
||||
Subject: [PATCH] Add static dependency to .pc file
|
||||
|
||||
|
||||
diff --git a/spatialite.pc.in b/spatialite.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/spatialite.pc.in
|
||||
+++ b/spatialite.pc.in
|
||||
@@ -8,5 +8,5 @@ includedir=@includedir@
|
||||
Name: spatialite
|
||||
Description: Spatial SQL database engine based on SQLite
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -lspatialite
|
||||
+Libs: -L${libdir} -lspatialite -lgeos_c -lgeos -lxml2 -lws2_32 -lstdc++ -lm
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
|
|
@ -1,362 +0,0 @@
|
|||
/*
|
||||
|
||||
demo4.c
|
||||
|
||||
Author: Sandro Furieri a.furieri@lqt.it
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the author be held liable for any
|
||||
damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any
|
||||
purpose, including commercial applications, and to alter it and
|
||||
redistribute it freely
|
||||
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
/*
|
||||
these headers are required in order to support
|
||||
SQLite/SpatiaLite */
|
||||
#include <sqlite3.h>
|
||||
#include <spatialite/gaiageo.h>
|
||||
#include <spatialite.h>
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
int ret;
|
||||
sqlite3 *handle;
|
||||
sqlite3_stmt *stmt;
|
||||
char sql[256];
|
||||
char *err_msg = NULL;
|
||||
double x;
|
||||
double y;
|
||||
int pk;
|
||||
int ix;
|
||||
int iy;
|
||||
gaiaGeomCollPtr geo = NULL;
|
||||
unsigned char *blob;
|
||||
int blob_size;
|
||||
int i;
|
||||
char **results;
|
||||
int n_rows;
|
||||
int n_columns;
|
||||
char *count;
|
||||
clock_t t0;
|
||||
clock_t t1;
|
||||
void *cache;
|
||||
|
||||
|
||||
if (argc != 2)
|
||||
{
|
||||
fprintf (stderr, "usage: %s test_db_path\n", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
trying to connect the test DB:
|
||||
- this demo is intended to create a new, empty database
|
||||
*/
|
||||
ret = sqlite3_open_v2 (argv[1], &handle,
|
||||
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
printf ("cannot open '%s': %s\n", argv[1], sqlite3_errmsg (handle));
|
||||
sqlite3_close (handle);
|
||||
return -1;
|
||||
}
|
||||
cache = spatialite_alloc_connection ();
|
||||
spatialite_init_ex (handle, cache, 0);
|
||||
|
||||
|
||||
/* showing the SQLite version */
|
||||
printf ("SQLite version: %s\n", sqlite3_libversion ());
|
||||
/* showing the SpatiaLite version */
|
||||
printf ("SpatiaLite version: %s\n", spatialite_version ());
|
||||
printf ("\n\n");
|
||||
|
||||
|
||||
/*
|
||||
we are supposing this one is an empty database,
|
||||
so we have to create the Spatial Metadata
|
||||
*/
|
||||
strcpy (sql, "SELECT InitSpatialMetadata(1)");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* some error occurred */
|
||||
printf ("InitSpatialMetadata() error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
now we can create the test table
|
||||
for simplicity we'll define only one column, the primary key
|
||||
*/
|
||||
strcpy (sql, "CREATE TABLE test (");
|
||||
strcat (sql, "PK INTEGER NOT NULL PRIMARY KEY)");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("CREATE TABLE 'test' error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
... we'll add a Geometry column of POINT type to the test table
|
||||
*/
|
||||
strcpy (sql, "SELECT AddGeometryColumn('test', 'geom', 3003, 'POINT', 2)");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("AddGeometryColumn() error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
and finally we'll enable this geo-column to have a Spatial Index based on MBR caching
|
||||
*/
|
||||
strcpy (sql, "SELECT CreateMbrCache('test', 'geom')");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("CreateMbrCache() error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
printf
|
||||
("\nnow we are going to insert 1 million POINTs; wait, please ...\n\n");
|
||||
|
||||
t0 = clock ();
|
||||
/*
|
||||
beginning a transaction
|
||||
|
||||
*** this step is absolutely critical ***
|
||||
|
||||
the SQLite engine is a TRANSACTIONAL one
|
||||
the whole batch of INSERTs has to be performed as an unique transaction,
|
||||
otherwise performance will be surely very poor
|
||||
*/
|
||||
strcpy (sql, "BEGIN");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("BEGIN error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
preparing to populate the test table
|
||||
we'll use a Prepared Statement we can reuse in order to insert each row
|
||||
*/
|
||||
strcpy (sql, "INSERT INTO test (pk, geom) VALUES (?, ?)");
|
||||
ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("INSERT SQL error: %s\n", sqlite3_errmsg (handle));
|
||||
goto abort;
|
||||
}
|
||||
|
||||
pk = 0;
|
||||
for (ix = 0; ix < 1000; ix++)
|
||||
{
|
||||
x = 1000000.0 + (ix * 10.0);
|
||||
for (iy = 0; iy < 1000; iy++)
|
||||
{
|
||||
/* this double loop will insert 1 million rows into the the test table */
|
||||
|
||||
y = 4000000.0 + (iy * 10.0);
|
||||
pk++;
|
||||
if ((pk % 25000) == 0)
|
||||
{
|
||||
t1 = clock ();
|
||||
printf ("insert row: %d\t\t[elapsed time: %1.3f]\n",
|
||||
pk, (double) (t1 - t0) / CLOCKS_PER_SEC);
|
||||
}
|
||||
|
||||
/* preparing the geometry to insert */
|
||||
geo = gaiaAllocGeomColl ();
|
||||
geo->Srid = 3003;
|
||||
gaiaAddPointToGeomColl (geo, x, y);
|
||||
|
||||
/* transforming this geometry into the SpatiaLite BLOB format */
|
||||
gaiaToSpatiaLiteBlobWkb (geo, &blob, &blob_size);
|
||||
|
||||
/* we can now destroy the geometry object */
|
||||
gaiaFreeGeomColl (geo);
|
||||
|
||||
/* resetting Prepared Statement and bindings */
|
||||
sqlite3_reset (stmt);
|
||||
sqlite3_clear_bindings (stmt);
|
||||
|
||||
/* binding parameters to Prepared Statement */
|
||||
sqlite3_bind_int64 (stmt, 1, pk);
|
||||
sqlite3_bind_blob (stmt, 2, blob, blob_size, free);
|
||||
|
||||
/* performing actual row insert */
|
||||
ret = sqlite3_step (stmt);
|
||||
if (ret == SQLITE_DONE || ret == SQLITE_ROW)
|
||||
;
|
||||
else
|
||||
{
|
||||
/* an unexpected error occurred */
|
||||
printf ("sqlite3_step() error: %s\n",
|
||||
sqlite3_errmsg (handle));
|
||||
sqlite3_finalize (stmt);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
/* we have now to finalize the query [memory cleanup] */
|
||||
sqlite3_finalize (stmt);
|
||||
|
||||
|
||||
|
||||
/*
|
||||
committing the transaction
|
||||
|
||||
*** this step is absolutely critical ***
|
||||
|
||||
if we don't confirm the still pending transaction,
|
||||
any update will be lost
|
||||
*/
|
||||
strcpy (sql, "COMMIT");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("COMMIT error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
now we'll optimize the table
|
||||
*/
|
||||
strcpy (sql, "ANALYZE test");
|
||||
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("ANALYZE error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
|
||||
for (ix = 0; ix < 3; ix++)
|
||||
{
|
||||
printf ("\nperforming test#%d - not using Spatial Index\n", ix);
|
||||
/*
|
||||
now we'll perform the spatial query WITHOUT using the Spatial Index
|
||||
we'll loop 3 times in order to avoid buffering-caching side effects
|
||||
*/
|
||||
strcpy (sql, "SELECT Count(*) FROM test ");
|
||||
strcat (sql, "WHERE MbrWithin(geom, BuildMbr(");
|
||||
strcat (sql, "1000400.5, 4000400.5, ");
|
||||
strcat (sql, "1000450.5, 4000450.5))");
|
||||
t0 = clock ();
|
||||
ret = sqlite3_get_table (handle, sql, &results, &n_rows, &n_columns,
|
||||
&err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("NoSpatialIndex SQL error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
count = (char*) "";
|
||||
for (i = 1; i <= n_rows; i++)
|
||||
{
|
||||
count = results[(i * n_columns) + 0];
|
||||
}
|
||||
t1 = clock ();
|
||||
printf ("Count(*) = %d\t\t[elapsed time: %1.4f]\n", atoi (count),
|
||||
(double) (t1 - t0) / CLOCKS_PER_SEC);
|
||||
/* we can now free the table results */
|
||||
sqlite3_free_table (results);
|
||||
}
|
||||
|
||||
|
||||
for (ix = 0; ix < 3; ix++)
|
||||
{
|
||||
printf ("\nperforming test#%d - using the MBR cache Spatial Index\n",
|
||||
ix);
|
||||
/*
|
||||
now we'll perform the spatial query USING the MBR cache Spatial Index
|
||||
we'll loop 3 times in order to avoid buffering-caching side effects
|
||||
*/
|
||||
strcpy (sql, "SELECT Count(*) FROM test ");
|
||||
strcat (sql, "WHERE ROWID IN (");
|
||||
strcat (sql, "SELECT rowid FROM cache_test_geom WHERE ");
|
||||
strcat (sql,
|
||||
"mbr = FilterMbrWithin(1000400.5, 4000400.5, 1000450.5, 4000450.5))");
|
||||
|
||||
/*
|
||||
YES, this query is a very unhappy one
|
||||
the idea is simply to simulate exactly the same conditions as above
|
||||
*/
|
||||
t0 = clock ();
|
||||
ret = sqlite3_get_table (handle, sql, &results, &n_rows, &n_columns,
|
||||
&err_msg);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
/* an error occurred */
|
||||
printf ("SpatialIndex SQL error: %s\n", err_msg);
|
||||
sqlite3_free (err_msg);
|
||||
goto abort;
|
||||
}
|
||||
count = (char*) "";
|
||||
for (i = 1; i <= n_rows; i++)
|
||||
{
|
||||
count = results[(i * n_columns) + 0];
|
||||
}
|
||||
t1 = clock ();
|
||||
printf ("Count(*) = %d\t\t[elapsed time: %1.4f]\n", atoi (count),
|
||||
(double) (t1 - t0) / CLOCKS_PER_SEC);
|
||||
/* we can now free the table results */
|
||||
sqlite3_free_table (results);
|
||||
}
|
||||
|
||||
|
||||
/* disconnecting the test DB */
|
||||
ret = sqlite3_close (handle);
|
||||
if (ret != SQLITE_OK)
|
||||
{
|
||||
printf ("close() error: %s\n", sqlite3_errmsg (handle));
|
||||
return -1;
|
||||
}
|
||||
printf ("\n\nsample successfully terminated\n");
|
||||
spatialite_cleanup_ex (cache);
|
||||
return 0;
|
||||
|
||||
abort:
|
||||
sqlite3_close (handle);
|
||||
spatialite_cleanup_ex (cache);
|
||||
spatialite_shutdown();
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -19,25 +19,23 @@ endef
|
|||
|
||||
define $(PKG)_BUILD
|
||||
# freeXL support is only necessary if you want to be able to parse .xls files.
|
||||
# If you disable freexl support, remove -lfreexl from the test program below.
|
||||
cd '$(1)' && autoreconf -fi -I ./m4
|
||||
cd '$(1)' && ./configure \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--enable-freexl=yes \
|
||||
--with-geosconfig='$(PREFIX)/$(TARGET)/bin/geos-config'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' $(if $(BUILD_SHARED), LDFLAGS='-no-undefined')
|
||||
$(MAKE) -C '$(1)' -j 1 $(INSTALL_STRIP_LIB)
|
||||
# If you disable freexl support, remove freexl from the test program below.
|
||||
cd '$(SOURCE_DIR)' && autoreconf -fi -I ./m4
|
||||
cd '$(SOURCE_DIR)' && ./configure \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--enable-freexl=yes \
|
||||
--with-geosconfig='$(PREFIX)/$(TARGET)/bin/geos-config'
|
||||
$(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' $(if $(BUILD_SHARED), LDFLAGS='-no-undefined')
|
||||
$(MAKE) -C '$(SOURCE_DIR)' -j 1 $(INSTALL_STRIP_LIB)
|
||||
|
||||
# compile one of the demo programs (copied from the source package)
|
||||
'$(TARGET)-g++' $(if $(BUILD_SHARED), -Wno-undefined) \
|
||||
-W -Wall -Werror -ansi -pedantic \
|
||||
'$(TOP_DIR)/src/spatialite-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-spatialite.exe' \
|
||||
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs` \
|
||||
`'$(TARGET)-pkg-config' sqlite3 --cflags --libs` \
|
||||
$(if $(BUILD_STATIC), -lgeos_c -lgeos -lfreexl -lxml2 -liconv -llzma -lproj -lws2_32 -lz -lstdc++ -lm)
|
||||
# compile one of the demo programs
|
||||
'$(TARGET)-gcc' $(if $(BUILD_SHARED), -Wno-undefined) \
|
||||
-W -Wall -ansi -pedantic \
|
||||
'$(SOURCE_DIR)/examples/demo4.c' -o '$(PREFIX)/$(TARGET)/bin/test-spatialite.exe' \
|
||||
`'$(TARGET)-pkg-config' $(PKG) sqlite3 freexl proj zlib liblzma --cflags --libs`
|
||||
|
||||
# create a batch file to run the test program (as the program requires arguments)
|
||||
(printf 'REM run against a database that should not exist, but remove afterward to save space.\r\n'; \
|
||||
(printf 'REM run against a database that should not exist, but will be removed afterward to save space.\r\n'; \
|
||||
printf 'test-spatialite.exe test-db.sqlite\r\n'; \
|
||||
printf 'del test-db.sqlite\r\n';) \
|
||||
> '$(PREFIX)/$(TARGET)/bin/test-spatialite.bat'
|
||||
|
|
|
|||
Loading…
Reference in New Issue