MonetDB: DVframework - plan reordering: remove unused code.

[Yagiz Kargin]

Changeset: 0a9062b8b305 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a9062b8b305
Modified Files:
        monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql
        sql/include/sql_catalog.h
Branch: DVframework
Log Message:

plan reordering: remove unused code.


diffs (35 lines):

diff --git a/monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql 
b/monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql
--- a/monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql
+++ b/monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql
@@ -54,7 +54,7 @@ CREATE VIEW mseed.dataview AS
 SELECT f.file_location, dataquality, network, station, location, channel, 
encoding, byte_order, s.segment_id, start_time, end_time, prev_gap, frequency, 
sample_count, sample_type, sample_time, sample_value
 FROM mseed.files AS f 
        JOIN mseed.segments AS s
-               ON f.file_location = s.file_location 
+               ON f.file_location = s.file_location
        JOIN mseed.data AS d 
                ON s.file_location = d.file_location AND s.segment_id = 
d.segment_id;
 
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -434,8 +434,7 @@ typedef enum table_types {
        tt_merge_table = 3,     /* multiple tables form one table */
        tt_stream = 4,          /* stream */
        tt_remote = 5,          /* stored on a remote server */
-       tt_replica_table = 6,   /* multiple replica of the same table */
-       tt_actual_data_table = 7        /* dvf: a table that is never filled in 
*/
+       tt_replica_table = 6    /* multiple replica of the same table */
 } table_types;
 
 #define isTable(x)       (x->type==tt_table)
@@ -445,8 +444,7 @@ typedef enum table_types {
 #define isStream(x)      (x->type==tt_stream)
 #define isRemote(x)      (x->type==tt_remote)
 #define isReplicaTable(x) (x->type==tt_replica_table)
-#define isActualDataTable(x) (x->type==tt_actual_data_table)
-#define isKindOfTable(x)  (isTable(x) || isMergeTable(x) || isRemote(x) || 
isReplicaTable(x) || isActualDataTable(x))
+#define isKindOfTable(x)  (isTable(x) || isMergeTable(x) || isRemote(x) || 
isReplicaTable(x))
 
 typedef struct sql_table {
        sql_base base;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list