diff --git a/mysql-test/suite/oqgraph/basic.result b/mysql-test/suite/oqgraph/basic.result index 38dc51567dd..3aa7325aee7 100644 --- a/mysql-test/suite/oqgraph/basic.result +++ b/mysql-test/suite/oqgraph/basic.result @@ -410,40 +410,83 @@ breadth_first 12 NULL 2 3 11 breadth_first 12 NULL 1 2 10 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 1; latch origid destid weight seq linkid +breadth_first NULL 1 2 4 4 +breadth_first NULL 1 1 3 3 +breadth_first NULL 1 1 2 2 +breadth_first NULL 1 0 1 1 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 2; latch origid destid weight seq linkid +breadth_first NULL 2 3 4 4 +breadth_first NULL 2 2 3 3 +breadth_first NULL 2 1 2 1 +breadth_first NULL 2 0 1 2 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 3; latch origid destid weight seq linkid +breadth_first NULL 3 2 4 2 +breadth_first NULL 3 1 3 4 +breadth_first NULL 3 1 2 1 +breadth_first NULL 3 0 1 3 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 4; latch origid destid weight seq linkid +breadth_first NULL 4 3 4 2 +breadth_first NULL 4 2 3 1 +breadth_first NULL 4 1 2 3 +breadth_first NULL 4 0 1 4 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 5; latch origid destid weight seq linkid +breadth_first NULL 5 1 3 7 +breadth_first NULL 5 1 2 6 +breadth_first NULL 5 0 1 5 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 6; latch origid destid weight seq linkid +breadth_first NULL 6 2 3 7 +breadth_first NULL 6 1 2 5 +breadth_first NULL 6 0 1 6 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 7; latch origid destid weight seq linkid +breadth_first NULL 7 0 1 7 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 8; latch origid destid weight seq linkid +breadth_first NULL 8 0 1 8 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 9; latch origid destid weight seq linkid +breadth_first NULL 9 0 1 9 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 10; latch origid destid weight seq linkid +breadth_first NULL 10 2 3 12 +breadth_first NULL 10 1 2 11 +breadth_first NULL 10 0 1 10 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 11; latch origid destid weight seq linkid +breadth_first NULL 11 2 3 10 +breadth_first NULL 11 1 2 12 +breadth_first NULL 11 0 1 11 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 12; latch origid destid weight seq linkid +breadth_first NULL 12 2 3 11 +breadth_first NULL 12 1 2 10 +breadth_first NULL 12 0 1 12 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 1 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 1 1 3 3 +breadth_first NULL 1 1 2 2 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 2 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 2 1 2 1 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 3 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 3 1 3 4 +breadth_first NULL 3 1 2 1 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 4 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 4 1 2 3 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 5 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 5 1 3 7 +breadth_first NULL 5 1 2 6 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 6 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 6 1 2 5 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 7 and weight = 1; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 8 and weight = 1; @@ -452,22 +495,30 @@ SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 9 and weight = 1; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 10 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 10 1 2 11 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 11 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 11 1 2 12 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 12 and weight = 1; latch origid destid weight seq linkid +breadth_first NULL 12 1 2 10 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 1 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 1 2 4 4 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 2 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 2 2 3 3 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 3 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 3 2 4 2 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 4 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 4 2 3 1 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 5 and weight = 2; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 6 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 6 2 3 7 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 7 and weight = 2; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 8 and weight = 2; @@ -476,18 +527,23 @@ SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 9 and weight = 2; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 10 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 10 2 3 12 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 11 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 11 2 3 10 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 12 and weight = 2; latch origid destid weight seq linkid +breadth_first NULL 12 2 3 11 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 1 and weight = 3; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 2 and weight = 3; latch origid destid weight seq linkid +breadth_first NULL 2 3 4 4 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 3 and weight = 3; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 4 and weight = 3; latch origid destid weight seq linkid +breadth_first NULL 4 3 4 2 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 5 and weight = 3; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 6 and weight = 3; @@ -747,9 +803,161 @@ SELECT * FROM graph WHERE latch = '2' AND origid = 12 AND (weight = 1 or weight latch origid destid weight seq linkid 2 12 NULL 2 3 11 2 12 NULL 1 2 10 +SELECT * FROM graph WHERE latch = '2' AND destid = 1; +latch origid destid weight seq linkid +2 NULL 1 2 4 4 +2 NULL 1 1 3 3 +2 NULL 1 1 2 2 +2 NULL 1 0 1 1 +SELECT * FROM graph WHERE latch = '2' AND destid = 2; +latch origid destid weight seq linkid +2 NULL 2 3 4 4 +2 NULL 2 2 3 3 +2 NULL 2 1 2 1 +2 NULL 2 0 1 2 +SELECT * FROM graph WHERE latch = '2' AND destid = 3; +latch origid destid weight seq linkid +2 NULL 3 2 4 2 +2 NULL 3 1 3 4 +2 NULL 3 1 2 1 +2 NULL 3 0 1 3 +SELECT * FROM graph WHERE latch = '2' AND destid = 4; +latch origid destid weight seq linkid +2 NULL 4 3 4 2 +2 NULL 4 2 3 1 +2 NULL 4 1 2 3 +2 NULL 4 0 1 4 +SELECT * FROM graph WHERE latch = '2' AND destid = 5; +latch origid destid weight seq linkid +2 NULL 5 1 3 7 +2 NULL 5 1 2 6 +2 NULL 5 0 1 5 +SELECT * FROM graph WHERE latch = '2' AND destid = 6; +latch origid destid weight seq linkid +2 NULL 6 2 3 7 +2 NULL 6 1 2 5 +2 NULL 6 0 1 6 +SELECT * FROM graph WHERE latch = '2' AND destid = 7; +latch origid destid weight seq linkid +2 NULL 7 0 1 7 +SELECT * FROM graph WHERE latch = '2' AND destid = 8; +latch origid destid weight seq linkid +2 NULL 8 0 1 8 +SELECT * FROM graph WHERE latch = '2' AND destid = 9; +latch origid destid weight seq linkid +2 NULL 9 0 1 9 +SELECT * FROM graph WHERE latch = '2' AND destid = 10; +latch origid destid weight seq linkid +2 NULL 10 2 3 12 +2 NULL 10 1 2 11 +2 NULL 10 0 1 10 +SELECT * FROM graph WHERE latch = '2' AND destid = 11; +latch origid destid weight seq linkid +2 NULL 11 2 3 10 +2 NULL 11 1 2 12 +2 NULL 11 0 1 11 +SELECT * FROM graph WHERE latch = '2' AND destid = 12; +latch origid destid weight seq linkid +2 NULL 12 2 3 11 +2 NULL 12 1 2 10 +2 NULL 12 0 1 12 +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 1; +latch origid destid weight seq linkid +2 NULL 1 1 3 3 +2 NULL 1 1 2 2 +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 1; +latch origid destid weight seq linkid +2 NULL 2 1 2 1 +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 1; +latch origid destid weight seq linkid +2 NULL 3 1 3 4 +2 NULL 3 1 2 1 +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 1; +latch origid destid weight seq linkid +2 NULL 4 1 2 3 +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 1; +latch origid destid weight seq linkid +2 NULL 5 1 3 7 +2 NULL 5 1 2 6 +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 1; +latch origid destid weight seq linkid +2 NULL 6 1 2 5 +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 1; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 1; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 1; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 1; +latch origid destid weight seq linkid +2 NULL 10 1 2 11 +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 1; +latch origid destid weight seq linkid +2 NULL 11 1 2 12 +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 1; +latch origid destid weight seq linkid +2 NULL 12 1 2 10 +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 2; +latch origid destid weight seq linkid +2 NULL 1 2 4 4 +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 2; +latch origid destid weight seq linkid +2 NULL 2 2 3 3 +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 2; +latch origid destid weight seq linkid +2 NULL 3 2 4 2 +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 2; +latch origid destid weight seq linkid +2 NULL 4 2 3 1 +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 2; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 2; +latch origid destid weight seq linkid +2 NULL 6 2 3 7 +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 2; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 2; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 2; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 2; +latch origid destid weight seq linkid +2 NULL 10 2 3 12 +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 2; +latch origid destid weight seq linkid +2 NULL 11 2 3 10 +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 2; +latch origid destid weight seq linkid +2 NULL 12 2 3 11 +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 3; +latch origid destid weight seq linkid +2 NULL 2 3 4 4 +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 3; +latch origid destid weight seq linkid +2 NULL 4 3 4 2 +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 3; +latch origid destid weight seq linkid +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 3; +latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = '2' AND origid = NULL; latch origid destid weight seq linkid -SELECT * FROM graph WHERE latch = '2' AND destid = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = NULL; latch origid destid weight seq linkid SELECT * FROM graph WHERE latch = '2' AND weight = 1; latch origid destid weight seq linkid diff --git a/mysql-test/suite/oqgraph/basic.test b/mysql-test/suite/oqgraph/basic.test index a549d45b3bd..86cb483d3e0 100644 --- a/mysql-test/suite/oqgraph/basic.test +++ b/mysql-test/suite/oqgraph/basic.test @@ -226,6 +226,8 @@ SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 4; SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 5; SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 6; SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 7; +#-- FIXME This is returning one result set, suspect this is a bug...? +#-- https://bugs.launchpad.net/oqgraph/+bug/1196020 SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 8; SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 9; SELECT * FROM graph WHERE latch = 'breadth_first' AND destid = 10; @@ -354,15 +356,66 @@ SELECT * FROM graph WHERE latch = '2' AND origid = 10 AND (weight = 1 or weight SELECT * FROM graph WHERE latch = '2' AND origid = 11 AND (weight = 1 or weight = 2); SELECT * FROM graph WHERE latch = '2' AND origid = 12 AND (weight = 1 or weight = 2); +SELECT * FROM graph WHERE latch = '2' AND destid = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 4; +SELECT * FROM graph WHERE latch = '2' AND destid = 5; +SELECT * FROM graph WHERE latch = '2' AND destid = 6; +SELECT * FROM graph WHERE latch = '2' AND destid = 7; +#-- FIXME This is returning one result set, suspect this is a bug...? +#-- https://bugs.launchpad.net/oqgraph/+bug/1196020 +SELECT * FROM graph WHERE latch = '2' AND destid = 8; +SELECT * FROM graph WHERE latch = '2' AND destid = 9; +SELECT * FROM graph WHERE latch = '2' AND destid = 10; +SELECT * FROM graph WHERE latch = '2' AND destid = 11; +SELECT * FROM graph WHERE latch = '2' AND destid = 12; +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 2; +SELECT * FROM graph WHERE latch = '2' AND destid = 1 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 2 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 3 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 4 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 5 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 6 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 7 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 8 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 9 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 10 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 11 and weight = 3; +SELECT * FROM graph WHERE latch = '2' AND destid = 12 and weight = 3; + #-- These return empty sets - origid must be specified and non null to get a result set SELECT * FROM graph WHERE latch = '2' AND origid = NULL; -SELECT * FROM graph WHERE latch = '2' AND destid = 1; +SELECT * FROM graph WHERE latch = '2' AND destid = NULL; SELECT * FROM graph WHERE latch = '2' AND weight = 1; SELECT * FROM graph WHERE latch = '2'; --echo # Dijkstras algorithm tests -#-- We ask 'What is the path (if any) between 'origid' and 'destid' +#-- We ask 'What is the shortest path (if any) between 'origid' and 'destid' #-- This returns the number of directed hops +1 (for the starting node) #-- 'weight' is NULL for the starting point, or 1 #-- 'linkid' is the way point id @@ -396,6 +449,41 @@ SELECT * FROM graph WHERE latch='dijkstras' AND origid=11 AND destid=12; SELECT * FROM graph WHERE latch='dijkstras' AND origid=12 AND destid=10; SELECT * FROM graph WHERE latch='dijkstras' AND origid=12 AND destid=11; +#-- reachable vertices +SELECT * FROM graph WHERE latch='dijkstras' AND origid=1; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=2; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=3; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=4; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=5; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=6; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=7; +#-- FIXME This is returning one result set, suspect this is a bug...? +#-- https://bugs.launchpad.net/oqgraph/+bug/1196020 +SELECT * FROM graph WHERE latch='dijkstras' AND origid=8; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=9; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=10; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=11; +SELECT * FROM graph WHERE latch='dijkstras' AND origid=12; +#-- FIXME This is returning one result set, suspect this is a bug...? +#-- https://bugs.launchpad.net/oqgraph/+bug/1196020 +SELECT * FROM graph WHERE latch='dijkstras' AND origid=666; + +#-- originating vertices +SELECT * FROM graph WHERE latch='dijkstras' AND destid=1; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=2; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=3; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=4; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=5; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=6; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=7; +#-- FIXME This is returning one result set, suspect this is a bug...? +#-- https://bugs.launchpad.net/oqgraph/+bug/1196020 +SELECT * FROM graph WHERE latch='dijkstras' AND destid=8; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=9; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=10; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=11; +SELECT * FROM graph WHERE latch='dijkstras' AND destid=12; + --echo # legacy string number SELECT * FROM graph WHERE latch='1' AND origid=1 AND destid=1; SELECT * FROM graph WHERE latch='1' AND origid=1 AND destid=2; diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc index ae6fa07f183..7167c1683d5 100644 --- a/storage/oqgraph/graphcore.cc +++ b/storage/oqgraph/graphcore.cc @@ -856,10 +856,10 @@ namespace open_query } } break; -#if 0 - case BREADTH_FIRST | HAVE_DEST: +#ifdef FIXME case DIJKSTRAS | HAVE_DEST: +#endif if ((cursor= new (std::nothrow) stack_cursor(share)) && (orig || dest)) { boost::unordered_map p; @@ -870,6 +870,7 @@ namespace open_query d[ *dest ] = EdgeWeight(); switch (ALGORITHM & op) { +#ifdef FIXME case DIJKSTRAS: dijkstra_shortest_paths_no_init(share->g, *dest, make_lazy_property_map(p, identity_initializer()), @@ -891,6 +892,7 @@ namespace open_query ), make_two_bit_judy_map(get(vertex_index, share->g))); break; +#endif case BREADTH_FIRST: breadth_first_visit(share->g, *dest, Q, make_bfs_visitor( @@ -918,7 +920,6 @@ namespace open_query } } break; -#endif default: break; }