Changeset: 2d17a5925c2c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d17a5925c2c Modified Files: sql/backends/monet5/vaults/lidar/lidar.c Branch: data-vaults Log Message:
[LiDAR]: Some aesthetic changes (reindentation etc)
diffs (truncated from 827 to 300 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -40,8 +40,7 @@ static MT_Lock mt_lidar_lock;
#define LIDAR_LOCK MT_lock_set(&mt_lidar_lock)
#define LIDAR_UNLOCK MT_lock_unset(&mt_lidar_lock)
-#define LIDAR_INS_COL "INSERT INTO lidar_columns(id, name, type, units,
number, table_id) \
- VALUES(%d,'%s','%s','%s',%d,%d);"
+#define LIDAR_INS_COL "INSERT INTO lidar_columns(id, name, type, units,
number, table_id) VALUES(%d,'%s','%s','%s',%d,%d);"
#define FILE_INS "INSERT INTO lidar_files(id, name) VALUES (%d, '%s');"
#define DEL_TABLE "DELETE FROM lidarfiles;"
#define ATTACHDIR "CALL lidarattach('%s');"
@@ -526,7 +525,7 @@ LIDARopenFile(str fname)
MT_lock_unset(&mt_lidar_lock);
if (LASError_GetErrorCount() != 0) {
res->msg = createException(MAL, "lidar.openfile", "Error
accessing LIDAR file %s (%s)",
- fname,
LASError_GetLastErrorMsg());
+ fname,
LASError_GetLastErrorMsg());
return res;
}
@@ -534,7 +533,7 @@ LIDARopenFile(str fname)
header = LASReader_GetHeader(reader);
if (!header) {
res->msg = createException(MAL, "lidar.openfile", "Error
accessing LIDAR file %s (%s)",
- fname,
LASError_GetLastErrorMsg());
+ fname,
LASError_GetLastErrorMsg());
return res;
}
#ifndef NDEBUG
@@ -997,7 +996,6 @@ LIDARattach(Client cntxt, MalBlkPtr mb,
store_funcs.append_col(m->session->tr,
mvc_bind_column(m,
lidar_tbl, "LoadParams"), &input_params.parameters, TYPE_int);
-
/* store */
store_funcs.append_col(m->session->tr,
mvc_bind_column(m,
lidar_col, "id"), &cid, TYPE_int);
@@ -1394,172 +1392,172 @@ LIDARloadTable_(mvc *m, sql_schema *sch,
for (prm = 1, idx=0; prm <= PARAM_INTENSITY; prm <<= 1) {
if (input_params & prm) {
switch (prm) {
- case PARAM_X_COORD:
- columns[idx] = mvc_bind_column(m, tbl,
"x");
- if (precisionx <= 2)
- bats[idx] = COLnew(0, TYPE_bte,
rows, PERSISTENT);
- else if (precisionx <= 4)
- bats[idx] = COLnew(0, TYPE_sht,
rows, PERSISTENT);
- else if (precisionx <= 16)
- bats[idx] = COLnew(0, TYPE_int,
rows, PERSISTENT);
- else if (precisionx <= 32)
- bats[idx] = COLnew(0, TYPE_lng,
rows, PERSISTENT);
+ case PARAM_X_COORD:
+ columns[idx] = mvc_bind_column(m, tbl, "x");
+ if (precisionx <= 2)
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ else if (precisionx <= 4)
+ bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
+ else if (precisionx <= 16)
+ bats[idx] = COLnew(0, TYPE_int, rows,
PERSISTENT);
+ else if (precisionx <= 32)
+ bats[idx] = COLnew(0, TYPE_lng, rows,
PERSISTENT);
#ifdef HAVE_HGE
- else if (precisionx <= 64)
- bats[idx] = COLnew(0, TYPE_hge,
rows, PERSISTENT);
+ else if (precisionx <= 64)
+ bats[idx] = COLnew(0, TYPE_hge, rows,
PERSISTENT);
#endif
- else { /* Unknown precision */
- bats[idx] = NULL;
- error_code = 3;
- }
- if (bats[idx] == NULL && error_code ==
0) {
- error_code = 1;
- }
- break;
- case PARAM_Y_COORD:
- columns[idx] = mvc_bind_column(m, tbl,
"y");
- if (precisiony <= 2)
- bats[idx] = COLnew(0, TYPE_bte,
rows, PERSISTENT);
- else if (precisiony <= 4)
- bats[idx] = COLnew(0, TYPE_sht,
rows, PERSISTENT);
- else if (precisiony <= 16)
- bats[idx] = COLnew(0, TYPE_int,
rows, PERSISTENT);
- else if (precisiony <= 32)
- bats[idx] = COLnew(0, TYPE_lng,
rows, PERSISTENT);
+ else { /* Unknown precision */
+ bats[idx] = NULL;
+ error_code = 3;
+ }
+ if (bats[idx] == NULL && error_code == 0) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_Y_COORD:
+ columns[idx] = mvc_bind_column(m, tbl, "y");
+ if (precisiony <= 2)
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ else if (precisiony <= 4)
+ bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
+ else if (precisiony <= 16)
+ bats[idx] = COLnew(0, TYPE_int, rows,
PERSISTENT);
+ else if (precisiony <= 32)
+ bats[idx] = COLnew(0, TYPE_lng, rows,
PERSISTENT);
#ifdef HAVE_HGE
- else if (precisiony <= 64)
- bats[idx] = COLnew(0, TYPE_hge,
rows, PERSISTENT);
+ else if (precisiony <= 64)
+ bats[idx] = COLnew(0, TYPE_hge, rows,
PERSISTENT);
#endif
- else { /* Unknown precision */
- bats[idx] = NULL;
- error_code = 4;
- }
- if (bats[idx] == NULL && error_code ==
0) {
- error_code = 1;
- }
- break;
- case PARAM_Z_COORD:
- columns[idx] = mvc_bind_column(m, tbl,
"z");
- if (precisionz <= 2)
- bats[idx] = COLnew(0, TYPE_bte,
rows, PERSISTENT);
- else if (precisionz <= 4)
- bats[idx] = COLnew(0, TYPE_sht,
rows, PERSISTENT);
- else if (precisionz <= 16)
- bats[idx] = COLnew(0, TYPE_int,
rows, PERSISTENT);
- else if (precisionz <= 32)
- bats[idx] = COLnew(0, TYPE_lng,
rows, PERSISTENT);
+ else { /* Unknown precision */
+ bats[idx] = NULL;
+ error_code = 4;
+ }
+ if (bats[idx] == NULL && error_code == 0) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_Z_COORD:
+ columns[idx] = mvc_bind_column(m, tbl, "z");
+ if (precisionz <= 2)
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ else if (precisionz <= 4)
+ bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
+ else if (precisionz <= 16)
+ bats[idx] = COLnew(0, TYPE_int, rows,
PERSISTENT);
+ else if (precisionz <= 32)
+ bats[idx] = COLnew(0, TYPE_lng, rows,
PERSISTENT);
#ifdef HAVE_HGE
- else if (precisionz <= 64)
- bats[idx] = COLnew(0, TYPE_hge,
rows, PERSISTENT);
+ else if (precisionz <= 64)
+ bats[idx] = COLnew(0, TYPE_hge, rows,
PERSISTENT);
#endif
- else { /* Unknown precision */
- bats[idx] = NULL;
- error_code = 5;
- }
- if (bats[idx] == NULL && error_code ==
0) {
- error_code = 1;
- }
- break;
- case PARAM_GPS_TIME:
- columns[idx] = mvc_bind_column(m, tbl,
"gpstime");
- bats[idx] = COLnew(0, TYPE_dbl, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_SCAN_ANGLE:
- columns[idx] = mvc_bind_column(m, tbl,
"scan_angle");
- bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_CLASSIFICATION_NUMBER:
- columns[idx] = mvc_bind_column(m, tbl,
"classification_number");
- bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_USER_DATA:
- columns[idx] = mvc_bind_column(m, tbl,
"user_data");
- bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_INTENSITY:
- columns[idx] = mvc_bind_column(m, tbl,
"intensity");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_N_RETURNS:
- columns[idx] = mvc_bind_column(m, tbl,
"n_returns");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_N_THIS_RETURN:
- columns[idx] = mvc_bind_column(m, tbl,
"n_this_return");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_POINT_SOURCE_ID:
- columns[idx] = mvc_bind_column(m, tbl,
"point_source_id");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_EDGE_OF_FLIGHT_LINE:
- columns[idx] = mvc_bind_column(m, tbl,
"edge_of_flight_line");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_DIRECTION_OF_SCAN_FLAG:
- columns[idx] = mvc_bind_column(m, tbl,
"direction_of_scan_flag");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_RED_CHANNEL:
- columns[idx] = mvc_bind_column(m, tbl,
"red_channel");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_GREEN_CHANNEL:
- columns[idx] = mvc_bind_column(m, tbl,
"green_channel");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_BLUE_CHANNEL:
- columns[idx] = mvc_bind_column(m, tbl,
"blue_channel");
- bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- case PARAM_VERTEX_INDEX:
- columns[idx] = mvc_bind_column(m, tbl,
"vertex_index");
- bats[idx] = COLnew(0, TYPE_int, rows,
PERSISTENT);
- if (bats[idx] == NULL) {
- error_code = 1;
- }
- break;
- default:
- error_code = 2;
+ else { /* Unknown precision */
+ bats[idx] = NULL;
+ error_code = 5;
+ }
+ if (bats[idx] == NULL && error_code == 0) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_GPS_TIME:
+ columns[idx] = mvc_bind_column(m, tbl,
"gpstime");
+ bats[idx] = COLnew(0, TYPE_dbl, rows,
PERSISTENT);
+ if (bats[idx] == NULL) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_SCAN_ANGLE:
+ columns[idx] = mvc_bind_column(m, tbl,
"scan_angle");
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ if (bats[idx] == NULL) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_CLASSIFICATION_NUMBER:
+ columns[idx] = mvc_bind_column(m, tbl,
"classification_number");
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ if (bats[idx] == NULL) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_USER_DATA:
+ columns[idx] = mvc_bind_column(m, tbl,
"user_data");
+ bats[idx] = COLnew(0, TYPE_bte, rows,
PERSISTENT);
+ if (bats[idx] == NULL) {
+ error_code = 1;
+ }
+ break;
+ case PARAM_INTENSITY:
+ columns[idx] = mvc_bind_column(m, tbl,
"intensity");
+ bats[idx] = COLnew(0, TYPE_sht, rows,
PERSISTENT);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
