Skip to content

Commit

Permalink
simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
@max-hoffman
max-hoffman committed Aug 13, 2024
1 parent e583d54 commit 225085b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
4 changes: 4 additions & 0 deletions enginetest/queries/index_queries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ var ComplexIndexQueries = []QueryTest{
Query: `SELECT * FROM comp_index_t0 WHERE ((v1<25) OR (v1>24));`,
Expected: []sql.Row{sql.Row{19, 16, 95}, sql.Row{58, 56, 0}, sql.Row{61, 57, 49}, sql.Row{72, 65, 80}, sql.Row{85, 81, 4}, sql.Row{3, 2, 10}, sql.Row{49, 45, 86}, sql.Row{5, 5, 36}, sql.Row{9, 6, 60}, sql.Row{50, 46, 46}, sql.Row{62, 58, 12}, sql.Row{92, 86, 88}, sql.Row{15, 14, 57}, sql.Row{47, 45, 31}, sql.Row{54, 50, 0}, sql.Row{55, 50, 14}, sql.Row{87, 83, 30}, sql.Row{91, 86, 56}, sql.Row{16, 14, 98}, sql.Row{66, 59, 54}, sql.Row{76, 69, 34}, sql.Row{79, 76, 39}, sql.Row{21, 19, 48}, sql.Row{46, 45, 22}, sql.Row{57, 54, 38}, sql.Row{68, 61, 3}, sql.Row{93, 87, 51}, sql.Row{4, 3, 35}, sql.Row{7, 6, 1}, sql.Row{45, 44, 67}, sql.Row{52, 48, 22}, sql.Row{2, 2, 4}, sql.Row{12, 9, 97}, sql.Row{30, 28, 83}, sql.Row{53, 49, 0}, sql.Row{69, 61, 34}, sql.Row{73, 65, 97}, sql.Row{90, 84, 45}, sql.Row{82, 79, 36}, sql.Row{0, 0, 48}, sql.Row{10, 6, 73}, sql.Row{11, 9, 44}, sql.Row{20, 18, 31}, sql.Row{41, 42, 0}, sql.Row{43, 43, 63}, sql.Row{65, 59, 45}, sql.Row{100, 98, 61}, sql.Row{95, 93, 19}, sql.Row{1, 0, 52}, sql.Row{13, 13, 44}, sql.Row{56, 51, 35}, sql.Row{59, 56, 60}, sql.Row{67, 60, 66}, sql.Row{77, 72, 52}, sql.Row{89, 84, 9}, sql.Row{24, 24, 60}, sql.Row{33, 34, 22}, sql.Row{35, 35, 89}, sql.Row{63, 58, 32}, sql.Row{83, 80, 61}, sql.Row{39, 39, 86}, sql.Row{8, 6, 51}, sql.Row{14, 14, 53}, sql.Row{17, 16, 19}, sql.Row{23, 19, 97}, sql.Row{26, 25, 31}, sql.Row{29, 28, 24}, sql.Row{38, 39, 55}, sql.Row{40, 40, 97}, sql.Row{74, 67, 95}, sql.Row{78, 74, 81}, sql.Row{81, 78, 90}, sql.Row{88, 83, 74}, sql.Row{28, 27, 24}, sql.Row{37, 38, 66}, sql.Row{48, 45, 63}, sql.Row{51, 47, 5}, sql.Row{64, 59, 29}, sql.Row{80, 78, 0}, sql.Row{86, 82, 16}, sql.Row{96, 93, 21}, sql.Row{98, 98, 0}, sql.Row{25, 25, 14}, sql.Row{27, 27, 9}, sql.Row{32, 33, 39}, sql.Row{75, 68, 11}, sql.Row{84, 80, 88}, sql.Row{99, 98, 51}, sql.Row{6, 5, 60}, sql.Row{22, 19, 75}, sql.Row{31, 31, 14}, sql.Row{44, 44, 48}, sql.Row{60, 57, 29}, sql.Row{70, 63, 19}, sql.Row{71, 63, 69}, sql.Row{18, 16, 53}, sql.Row{34, 34, 91}, sql.Row{36, 38, 20}, sql.Row{42, 42, 82}, sql.Row{94, 89, 3}, sql.Row{97, 93, 96}},
},
{
Query: `SELECT * FROM comp_index_t0 WHERE v1>98 or v2 is NULL;`,
Expected: []sql.Row{{99, 98, 51}, {100, 98, 61}}},
},
{

Check failure on line 32 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected {, expected expression

Check failure on line 32 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test 

syntax error: unexpected {, expected expression

Check failure on line 32 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / Format PR 

expected operand, found '{'

Check failure on line 32 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

syntax error: unexpected {, expected expression
Query: `SELECT * FROM comp_index_t0 WHERE ((v1>=99 AND v2<>83) OR (v1>=1));`,
Expected: []sql.Row{sql.Row{19, 16, 95}, sql.Row{58, 56, 0}, sql.Row{61, 57, 49}, sql.Row{72, 65, 80}, sql.Row{85, 81, 4}, sql.Row{3, 2, 10}, sql.Row{49, 45, 86}, sql.Row{5, 5, 36}, sql.Row{9, 6, 60}, sql.Row{50, 46, 46}, sql.Row{62, 58, 12}, sql.Row{92, 86, 88}, sql.Row{15, 14, 57}, sql.Row{47, 45, 31}, sql.Row{54, 50, 0}, sql.Row{55, 50, 14}, sql.Row{87, 83, 30}, sql.Row{91, 86, 56}, sql.Row{16, 14, 98}, sql.Row{66, 59, 54}, sql.Row{76, 69, 34}, sql.Row{79, 76, 39}, sql.Row{21, 19, 48}, sql.Row{46, 45, 22}, sql.Row{57, 54, 38}, sql.Row{68, 61, 3}, sql.Row{93, 87, 51}, sql.Row{4, 3, 35}, sql.Row{7, 6, 1}, sql.Row{45, 44, 67}, sql.Row{52, 48, 22}, sql.Row{2, 2, 4}, sql.Row{12, 9, 97}, sql.Row{30, 28, 83}, sql.Row{53, 49, 0}, sql.Row{69, 61, 34}, sql.Row{73, 65, 97}, sql.Row{90, 84, 45}, sql.Row{82, 79, 36}, sql.Row{10, 6, 73}, sql.Row{11, 9, 44}, sql.Row{20, 18, 31}, sql.Row{41, 42, 0}, sql.Row{43, 43, 63}, sql.Row{65, 59, 45}, sql.Row{100, 98, 61}, sql.Row{95, 93, 19}, sql.Row{13, 13, 44}, sql.Row{56, 51, 35}, sql.Row{59, 56, 60}, sql.Row{67, 60, 66}, sql.Row{77, 72, 52}, sql.Row{89, 84, 9}, sql.Row{24, 24, 60}, sql.Row{33, 34, 22}, sql.Row{35, 35, 89}, sql.Row{63, 58, 32}, sql.Row{83, 80, 61}, sql.Row{39, 39, 86}, sql.Row{8, 6, 51}, sql.Row{14, 14, 53}, sql.Row{17, 16, 19}, sql.Row{23, 19, 97}, sql.Row{26, 25, 31}, sql.Row{29, 28, 24}, sql.Row{38, 39, 55}, sql.Row{40, 40, 97}, sql.Row{74, 67, 95}, sql.Row{78, 74, 81}, sql.Row{81, 78, 90}, sql.Row{88, 83, 74}, sql.Row{28, 27, 24}, sql.Row{37, 38, 66}, sql.Row{48, 45, 63}, sql.Row{51, 47, 5}, sql.Row{64, 59, 29}, sql.Row{80, 78, 0}, sql.Row{86, 82, 16}, sql.Row{96, 93, 21}, sql.Row{98, 98, 0}, sql.Row{25, 25, 14}, sql.Row{27, 27, 9}, sql.Row{32, 33, 39}, sql.Row{75, 68, 11}, sql.Row{84, 80, 88}, sql.Row{99, 98, 51}, sql.Row{6, 5, 60}, sql.Row{22, 19, 75}, sql.Row{31, 31, 14}, sql.Row{44, 44, 48}, sql.Row{60, 57, 29}, sql.Row{70, 63, 19}, sql.Row{71, 63, 69}, sql.Row{18, 16, 53}, sql.Row{34, 34, 91}, sql.Row{36, 38, 20}, sql.Row{42, 42, 82}, sql.Row{94, 89, 3}, sql.Row{97, 93, 96}},

Check failure on line 34 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected ] after top level declaration

Check failure on line 34 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test 

syntax error: unexpected ] after top level declaration

Check failure on line 34 in enginetest/queries/index_queries.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

syntax error: unexpected ] after top level declaration
Expand Down
25 changes: 0 additions & 25 deletions enginetest/queries/script_queries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,31 +171,6 @@ CREATE TABLE sourceTable_test (
},
},
},
{
Name: "null index access edge case",
SetUpScript: []string{
"CREATE TABLE tab2(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2 TEXT, col3 INTEGER, col4 FLOAT, col5 TEXT)",
"CREATE UNIQUE INDEX idx_tab2_1 ON tab2 (col4 DESC,col3)",
"CREATE UNIQUE INDEX idx_tab2_2 ON tab2 (col3 DESC,col0)",
"CREATE UNIQUE INDEX idx_tab2_3 ON tab2 (col3 DESC,col1)",
"INSERT INTO tab2 VALUES(0,42,58.92,'fnbtk',54,68.41,'xmttf')",
"INSERT INTO tab2 VALUES(1,31,46.55,'sksjf',46,53.20,'wiuva')",
"INSERT INTO tab2 VALUES(2,30,31.11,'oldqn',41,5.26,'ulaay')",
"INSERT INTO tab2 VALUES(3,77,44.90,'pmsir',70,84.14,'vcmyo')",
"INSERT INTO tab2 VALUES(4,23,95.26,'qcwxh',32,48.53,'rvtbr')",
"INSERT INTO tab2 VALUES(5,43,6.75,'snvwg',3,14.38,'gnfxz')",
"INSERT INTO tab2 VALUES(6,47,98.26,'bzzva',60,15.2,'imzeq')",
"INSERT INTO tab2 VALUES(7,98,40.9,'lsrpi',78,66.30,'ephwy')",
"INSERT INTO tab2 VALUES(8,19,15.16,'ycvjz',55,38.70,'dnkkz')",
"INSERT INTO tab2 VALUES(9,7,84.4,'ptovf',17,2.46,'hrxsf')",
},
Assertions: []ScriptTestAssertion{
{
Query: " SELECT pk FROM tab2 WHERE (col3 <= 87 AND col3 <= 42) OR (col0 IS NULL)",
Expected: []sql.Row{{5}, {9}, {4}, {2}},
},
},
},
{
Name: "histogram bucket merging error for implementor buckets",
SetUpScript: []string{
Expand Down

0 comments on commit 225085b

Please sign in to comment.