-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* fix sourcetype IN not working, cleanup searchQualifier in LogicalStatementCatalyst/XML, enable sourcetype IN test in logicalOperationTest * introduce OrColumn object with tests * run spotless * add archive(xml) and spark query tests for sourcetype IN * applied spotless
- Loading branch information
Showing
5 changed files
with
284 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Teragrep Data Processing Language (DPL) translator for Apache Spark (pth_10) | ||
| * Copyright (C) 2019-2024 Suomen Kanuuna Oy | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * | ||
| * Additional permission under GNU Affero General Public License version 3 | ||
| * section 7 | ||
| * | ||
| * If you modify this Program, or any covered work, by linking or combining it | ||
| * with other code, such other code is not for that reason alone subject to any | ||
| * of the requirements of the GNU Affero GPL version 3 as long as this Program | ||
| * is the same Program as licensed from Suomen Kanuuna Oy without any additional | ||
| * modifications. | ||
| * | ||
| * Supplemented terms under GNU Affero General Public License version 3 | ||
| * section 7 | ||
| * | ||
| * Origin of the software must be attributed to Suomen Kanuuna Oy. Any modified | ||
| * versions must be marked as "Modified version of" The Program. | ||
| * | ||
| * Names of the licensors and authors may not be used for publicity purposes. | ||
| * | ||
| * No rights are granted for use of trade names, trademarks, or service marks | ||
| * which are in The Program if any. | ||
| * | ||
| * Licensee must indemnify licensors and authors for any liability that these | ||
| * contractual assumptions impose on licensors and authors. | ||
| * | ||
| * To the extent this program is licensed as part of the Commercial versions of | ||
| * Teragrep, the applicable Commercial License may apply to this file if you as | ||
| * a licensee so wish it. | ||
| */ | ||
| package com.teragrep.pth10.ast; | ||
|
|
||
| import org.apache.spark.sql.Column; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| public final class OrColumn { | ||
|
|
||
| private final List<Column> columns; | ||
|
|
||
| public OrColumn(Column ... columns) { | ||
| this(Arrays.asList(columns)); | ||
| } | ||
|
|
||
| public OrColumn(List<Column> columns) { | ||
| this.columns = columns; | ||
| } | ||
|
|
||
| public Column column() { | ||
| if (columns.isEmpty()) { | ||
| throw new IllegalStateException("No columns found"); | ||
| } | ||
|
|
||
| Column rv = columns.get(0); | ||
| for (Column current : columns.subList(1, columns.size())) { | ||
| rv = rv.or(current); | ||
| } | ||
| return rv; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) | ||
| return true; | ||
| if (o == null || getClass() != o.getClass()) | ||
| return false; | ||
| OrColumn orColumn = (OrColumn) o; | ||
| return Objects.equals(columns, orColumn.columns); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hashCode(columns); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Teragrep Data Processing Language (DPL) translator for Apache Spark (pth_10) | ||
| * Copyright (C) 2019-2024 Suomen Kanuuna Oy | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * | ||
| * Additional permission under GNU Affero General Public License version 3 | ||
| * section 7 | ||
| * | ||
| * If you modify this Program, or any covered work, by linking or combining it | ||
| * with other code, such other code is not for that reason alone subject to any | ||
| * of the requirements of the GNU Affero GPL version 3 as long as this Program | ||
| * is the same Program as licensed from Suomen Kanuuna Oy without any additional | ||
| * modifications. | ||
| * | ||
| * Supplemented terms under GNU Affero General Public License version 3 | ||
| * section 7 | ||
| * | ||
| * Origin of the software must be attributed to Suomen Kanuuna Oy. Any modified | ||
| * versions must be marked as "Modified version of" The Program. | ||
| * | ||
| * Names of the licensors and authors may not be used for publicity purposes. | ||
| * | ||
| * No rights are granted for use of trade names, trademarks, or service marks | ||
| * which are in The Program if any. | ||
| * | ||
| * Licensee must indemnify licensors and authors for any liability that these | ||
| * contractual assumptions impose on licensors and authors. | ||
| * | ||
| * To the extent this program is licensed as part of the Commercial versions of | ||
| * Teragrep, the applicable Commercial License may apply to this file if you as | ||
| * a licensee so wish it. | ||
| */ | ||
| package com.teragrep.pth10; | ||
|
|
||
| import com.teragrep.pth10.ast.OrColumn; | ||
| import org.apache.spark.sql.Column; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class OrColumnTest { | ||
|
|
||
| @Test | ||
| void testOrColumn() { | ||
| OrColumn orColumn = new OrColumn(new Column("a"), new Column("b")); | ||
|
|
||
| Assertions.assertEquals(new Column("a").or(new Column("b")), orColumn.column()); | ||
| } | ||
|
|
||
| @Test | ||
| void testOrColumnWithOneColumn() { | ||
| OrColumn orColumn = new OrColumn(new Column("a")); | ||
|
|
||
| Assertions.assertEquals(new Column("a"), orColumn.column()); | ||
| } | ||
|
|
||
| @Test | ||
| void testOrColumnWithNoColumn() { | ||
| OrColumn orColumn = new OrColumn(); | ||
|
|
||
| IllegalStateException ise = Assertions.assertThrows(IllegalStateException.class, orColumn::column); | ||
| Assertions.assertEquals("No columns found", ise.getMessage()); | ||
| } | ||
|
|
||
| @Test | ||
| void testEquals() { | ||
| OrColumn orColumn = new OrColumn(); | ||
| OrColumn orColumn2 = new OrColumn(); | ||
| Assertions.assertEquals(orColumn, orColumn2); | ||
| } | ||
|
|
||
| @Test | ||
| void testNotEquals() { | ||
| OrColumn orColumn = new OrColumn(); | ||
| OrColumn orColumn2 = new OrColumn(new Column("a")); | ||
| Assertions.assertNotEquals(orColumn, orColumn2); | ||
| } | ||
| } |
Oops, something went wrong.