Changeset: 331b9f3fe9a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=331b9f3fe9a0
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
monetdb5/modules/kernel/Tests/vacuum.stable.err
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/modules/mal/Tests/remote07.stable.err
monetdb5/modules/mal/mal_init.mx
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_mitosis.mx
monetdb5/optimizer/opt_prelude.mx
monetdb5/optimizer/opt_support.mx
monetdb5/optimizer/opt_tarantula.mx
monetdb5/scheduler/Makefile.ag
monetdb5/scheduler/run_tarantula.mx
sql/benchmarks/tpch/LOCKED/Tests/alter.stable.err
sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.err
sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err
sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.stable.err
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.err
sql/test/BugTracker-2010/Tests/sequence-restart-with-null.Bug-2648.stable.err
sql/test/BugTracker-2010/Tests/vacuum.stable.err
sql/test/BugTracker-2010/Tests/values_type_cast.Bug-2735.stable.err
sql/test/BugTracker-2010/Tests/with-between.Bug-2732.stable.err
sql/test/BugTracker-2011/Tests/correlated-update.Bug-2771.stable.err
sql/test/LSST/Tests/dbQuery007.stable.err
sql/test/LSST/Tests/dbQuery009.stable.err
sql/test/LSST/Tests/dbQuery035.stable.err
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/LSST/Tests/dbQuery043.stable.err
sql/test/LSST/Tests/functions.stable.err
sql/test/LSST/Tests/schema_3_1_88.stable.err
Branch: Aug2011
Log Message:
Removed tarantula.
diffs (truncated from 2138 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -267,12 +267,6 @@
}
"Entry"
{
- "MsmKey" = "8:_42926A9FCCE04738A23BD54972BE73E5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_455196B50BC54D958DEFB4D1603A7D23"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -519,12 +513,6 @@
}
"Entry"
{
- "MsmKey" = "8:_756EFB7E9A6C4F0591F4237A9E50E44A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_75A9D2F132214C66865F35074A8EE9EA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2057,26 +2045,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42926A9FCCE04738A23BD54972BE73E5"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_tarantula.mal"
- "TargetName" = "8:opt_tarantula.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_455196B50BC54D958DEFB4D1603A7D23"
{
"SourcePath" = "8:lib\\monetdb5\\opt_selcrack.mal"
@@ -2897,26 +2865,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_756EFB7E9A6C4F0591F4237A9E50E44A"
- {
- "SourcePath" = "8:lib\\monetdb5\\run_tarantula.mal"
- "TargetName" = "8:run_tarantula.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_75A9D2F132214C66865F35074A8EE9EA"
{
"SourcePath" = "8:lib\\monetdb5\\batmtime.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -267,12 +267,6 @@
}
"Entry"
{
- "MsmKey" = "8:_42926A9FCCE04738A23BD54972BE73E5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_455196B50BC54D958DEFB4D1603A7D23"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -519,12 +513,6 @@
}
"Entry"
{
- "MsmKey" = "8:_756EFB7E9A6C4F0591F4237A9E50E44A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_75A9D2F132214C66865F35074A8EE9EA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2057,26 +2045,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42926A9FCCE04738A23BD54972BE73E5"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_tarantula.mal"
- "TargetName" = "8:opt_tarantula.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_455196B50BC54D958DEFB4D1603A7D23"
{
"SourcePath" = "8:lib\\monetdb5\\opt_selcrack.mal"
@@ -2897,26 +2865,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_756EFB7E9A6C4F0591F4237A9E50E44A"
- {
- "SourcePath" = "8:lib\\monetdb5\\run_tarantula.mal"
- "TargetName" = "8:run_tarantula.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_75A9D2F132214C66865F35074A8EE9EA"
{
"SourcePath" = "8:lib\\monetdb5\\batmtime.mal"
diff --git a/monetdb5/modules/kernel/Tests/vacuum.stable.err
b/monetdb5/modules/kernel/Tests/vacuum.stable.err
--- a/monetdb5/modules/kernel/Tests/vacuum.stable.err
+++ b/monetdb5/modules/kernel/Tests/vacuum.stable.err
@@ -49,7 +49,6 @@
# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,octopus,reduce,dataflow,history,multiplex,garbageCollector
-# config opt tarantula_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,tarantula,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -183,10 +183,6 @@
[ "split", "pattern", "cluster",
"(clustered:bat[:oid,:any_1],psum:bat[:oid,:wrd]):bat[:oid,:any_1]... ",
"CLS_split;" ]
[ "table", "pattern", "cluster",
"(b:bat[:oid,:any]...):bat[:oid,:oid] ",
"CLUSTER_table;"
]
[ "getCloud", "command", "mapreduce",
"(nme:str):bat[:oid,:str] ",
"MRgetCloud;"
]
-[ "connect", "command", "tarantula",
"(dbname:int):str ",
"TARconnect;"
]
-[ "getBid", "pattern", "tarantula",
"(node:int,fname:str...):int... ",
"TARbidding;"
]
-[ "register", "pattern", "tarantula",
"(node:int,fname:str...):void ",
"TARregister;"
]
-[ "schedule", "pattern", "tarantula",
"(cost:int...):int... ",
"TARschedule;"
]
[ "multiplex", "pattern", "mal",
"(a:any...):any ",
"OPTremapMultiplex;"
]
[ "argRecord", "pattern", "sql",
"(a:any...):str ",
"SQLargRecord;" ]
[ "argRecord", "pattern", "sql", "():str ",
"SQLargRecord;" ]
@@ -420,8 +416,6 @@
[ "showPlan", "pattern", "optimizer",
"(M:str,F:str,s:str):void ",
"QOTshowPlan;"
]
[ "showFlowGraph", "pattern", "optimizer",
"(M:str,F:str,s:str):void ",
"QOTshowFlowGraph;"
]
[ "setDebug", "pattern", "optimizer", "():void ",
"QOTdebugOptimizers;"
]
-[ "tarantula", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTtarantula;"
]
-[ "tarantula", "pattern", "optimizer", "():str ",
"OPTtarantula;"
]
[ "trace", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdeadcode;"
]
[ "trace", "pattern", "optimizer", "():str ",
"OPTtrace;"
]
[ "close", "pattern", "statistics", "():void ",
"STATclose;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -172,10 +172,6 @@
[ "split", "pattern", "cluster",
"(clustered:bat[:oid,:any_1],psum:bat[:oid,:wrd]):bat[:oid,:any_1]... ",
"CLS_split;" ]
[ "table", "pattern", "cluster",
"(b:bat[:oid,:any]...):bat[:oid,:oid] ",
"CLUSTER_table;"
]
[ "getCloud", "command", "mapreduce",
"(nme:str):bat[:oid,:str] ",
"MRgetCloud;"
]
-[ "connect", "command", "tarantula",
"(dbname:int):str ",
"TARconnect;"
]
-[ "getBid", "pattern", "tarantula",
"(node:int,fname:str...):int... ",
"TARbidding;"
]
-[ "register", "pattern", "tarantula",
"(node:int,fname:str...):void ",
"TARregister;"
]
-[ "schedule", "pattern", "tarantula",
"(cost:int...):int... ",
"TARschedule;"
]
[ "multiplex", "pattern", "mal",
"(a:any...):any ",
"OPTremapMultiplex;"
]
[ "argRecord", "pattern", "sql", "(a:any...):str ",
"SQLargRecord;" ]
[ "argRecord", "pattern", "sql", "():str ",
"SQLargRecord;" ]
@@ -409,8 +405,6 @@
[ "showPlan", "pattern", "optimizer",
"(M:str,F:str,s:str):void ",
"QOTshowPlan;"
]
[ "showFlowGraph", "pattern", "optimizer",
"(M:str,F:str,s:str):void ",
"QOTshowFlowGraph;"
]
[ "setDebug", "pattern", "optimizer", "():void ",
"QOTdebugOptimizers;"
]
-[ "tarantula", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTtarantula;"
]
-[ "tarantula", "pattern", "optimizer", "():str ",
"OPTtarantula;"
]
[ "trace", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdeadcode;"
]
[ "trace", "pattern", "optimizer", "():str ",
"OPTtrace;"
]
[ "close", "pattern", "statistics", "():void ",
"STATclose;"
]
diff --git a/monetdb5/modules/mal/Tests/remote07.stable.err
b/monetdb5/modules/mal/Tests/remote07.stable.err
--- a/monetdb5/modules/mal/Tests/remote07.stable.err
+++ b/monetdb5/modules/mal/Tests/remote07.stable.err
@@ -49,7 +49,6 @@
# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt tarantula_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,tarantula,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
diff --git a/monetdb5/modules/mal/mal_init.mx b/monetdb5/modules/mal/mal_init.mx
--- a/monetdb5/modules/mal/mal_init.mx
+++ b/monetdb5/modules/mal/mal_init.mx
@@ -154,7 +154,6 @@
include opt_strengthReduction;
include opt_statistics;
include opt_trace;
-include opt_tarantula;
include opt_mapreduce;
include opt_remoteQueries;
@@ -177,7 +176,6 @@
include run_isolate;
include run_memo;
include run_octopus;
-include run_tarantula;
@-
Cracker schemes, disabled by default
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -74,7 +74,6 @@
opt_statistics.mx \
opt_strengthReduction.mx \
opt_support.mx \
- opt_tarantula.mx \
opt_trace.mx
}
@@ -94,7 +93,7 @@
opt_accessmode.mx opt_joinpath.mx opt_heuristics.mx
opt_remap.mx \
opt_statistics.mx opt_trace.mx opt_recycler.mx opt_dataflow.mx
\
opt_cluster.mx opt_dictionary.mx opt_mapreduce.mx opt_origin.mx
\
- opt_mitosis.mx opt_octopus.mx opt_tarantula.mx opt_history.mx
+ opt_mitosis.mx opt_octopus.mx opt_history.mx
}
EXTRA_DIST = optimizerWrapper.mx
diff --git a/monetdb5/optimizer/opt_mitosis.mx
b/monetdb5/optimizer/opt_mitosis.mx
--- a/monetdb5/optimizer/opt_mitosis.mx
+++ b/monetdb5/optimizer/opt_mitosis.mx
@@ -68,7 +68,6 @@
#include "monetdb_config.h"
#include "opt_mitosis.h"
#include "opt_octopus.h"
-#include "opt_tarantula.h"
#include "mal_interpreter.h"
#define PARTITION_THRESHOLD (wrd) threads /* should be increased in
production version */
@@ -143,14 +142,9 @@
Experience shows that the pieces should not be too small.
To keep the threads working, we create more pieces than threads.
-The pieces to be used may be overruled by the octopus and
-tarantula optimizer.
@c
if ( (i = OPTlegAdviceInternal(mb,stk,p)) > 0 )
pieces = i;
- else
- if ( (i = OPTtarantulaAdviceInternal(mb,stk,p)) > 0 )
- pieces = i;
else {
/* ensure that GDKnr_threads partitions fit into main memory */
r = (BUN) (monet_memory / typewidth / threads);
@@ -243,7 +237,7 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
