Skip to content

Commit

Permalink
Rename IdentityTable to JoinIdentityTable.
Browse files Browse the repository at this point in the history
  • Loading branch information
@broneill
broneill committed Sep 15, 2024
1 parent 3177d5a commit 0a0a551
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions ...a/org/cojen/tupl/table/IdentityTable.java → ...g/cojen/tupl/table/JoinIdentityTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
*
* @author Brian S. O'Neill
*/
public final class IdentityTable extends MultiCache<Object, Object, Object, IOException>
public final class JoinIdentityTable extends MultiCache<Object, Object, Object, IOException>
implements Table<Row>, Query<Row>
{
// Singleton instance.
public static final IdentityTable THE = new IdentityTable();
public static final JoinIdentityTable THE = new JoinIdentityTable();

private static volatile EmptyQuery<Row> cEmptyQuery;

Expand All @@ -73,7 +73,7 @@ public final class IdentityTable extends MultiCache<Object, Object, Object, IOEx
}
}

private IdentityTable() {
private JoinIdentityTable() {
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/cojen/tupl/table/expr/Parser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public Parser(int paramDelta, RelationExpr from, Reader in) {
private Parser(int paramDelta, RelationExpr from, Tokenizer tokenizer) {
mParamDelta = paramDelta;
if (from == null) {
from = TableExpr.identity();
from = TableExpr.joinIdentity();
}
mFrom = from;
mTokenizer = tokenizer;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/cojen/tupl/table/expr/QueryExpr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static RelationExpr make(int startPos, int endPos,
List<ProjExpr> projection, int groupBy)
{
if (from == null) {
from = TableExpr.identity();
from = TableExpr.joinIdentity();
}

if (filter != null) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/cojen/tupl/table/expr/TableExpr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.cojen.tupl.Table;

import org.cojen.tupl.table.IdentityTable;
import org.cojen.tupl.table.JoinIdentityTable;

import org.cojen.tupl.table.filter.QuerySpec;
import org.cojen.tupl.table.filter.TrueFilter;
Expand All @@ -36,8 +36,8 @@ public final class TableExpr extends RelationExpr {
/**
* Uses an unmodifiable table consisting of one row with no columns.
*/
public static TableExpr identity() {
return make(-1, -1, IdentityTable.THE);
public static TableExpr joinIdentity() {
return make(-1, -1, JoinIdentityTable.THE);
}

/**
Expand All @@ -54,7 +54,7 @@ public static TableExpr make(int startPos, int endPos, Table table) {
* @param projection consists of column names; can pass null to project all columns
*/
public static TableExpr make(int startPos, int endPos, Table table, Set<String> projection) {
var cardinality = table instanceof IdentityTable ? Cardinality.ONE : Cardinality.MANY;
var cardinality = table instanceof JoinIdentityTable ? Cardinality.ONE : Cardinality.MANY;
var type = RelationType.make(TupleType.make(table.rowType(), projection), cardinality);
return new TableExpr(startPos, endPos, type, table);
}
Expand Down Expand Up @@ -101,7 +101,7 @@ public int maxArgument() {

@Override
public boolean isPureFunction() {
return mTable != null && mTable instanceof IdentityTable;
return mTable != null && mTable instanceof JoinIdentityTable;
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/cojen/tupl/table/expr/BinaryOpTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.cojen.tupl.Table;
import org.cojen.tupl.Unsigned;

import org.cojen.tupl.table.IdentityTable;
import org.cojen.tupl.table.JoinIdentityTable;

import static org.cojen.tupl.table.expr.Token.*;
import static org.cojen.tupl.table.expr.Type.*;
Expand Down Expand Up @@ -433,21 +433,21 @@ private static BigDecimal toBigDecimal(Object value) {
@Test
public void broken() throws Exception {
try {
Parser.parse(IdentityTable.THE, "true < 0");
Parser.parse(JoinIdentityTable.THE, "true < 0");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("No common type"));
}

try {
Parser.parse(IdentityTable.THE, "0 && 1");
Parser.parse(JoinIdentityTable.THE, "0 && 1");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("Boolean operation not allowed"));
}

try {
Parser.parse(IdentityTable.THE, "'a' & 'b'");
Parser.parse(JoinIdentityTable.THE, "'a' & 'b'");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("Bitwise operation not allowed"));
Expand Down
44 changes: 22 additions & 22 deletions src/test/java/org/cojen/tupl/table/expr/FunctionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.cojen.tupl.Table;
import org.cojen.tupl.Unsigned;

import org.cojen.tupl.table.IdentityTable;
import org.cojen.tupl.table.JoinIdentityTable;

/**
*
Expand All @@ -57,7 +57,7 @@ public void teardown() throws Exception {
}

private static RelationExpr parse(String query) {
return parse(IdentityTable.THE, query);
return parse(JoinIdentityTable.THE, query);
}

private static RelationExpr parse(Table table, String query) {
Expand Down Expand Up @@ -149,14 +149,14 @@ private Table<TestRow> fill(int num) throws Exception {
@Test
public void coalesce() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{c = coalesce()}");
Parser.parse(JoinIdentityTable.THE, "{c = coalesce()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("at least 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{c = coalesce(5, true)}");
Parser.parse(JoinIdentityTable.THE, "{c = coalesce(5, true)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("no common type"));
Expand Down Expand Up @@ -192,21 +192,21 @@ public void coalesce() throws Exception {
@Test
public void iif() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = iif(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = iif(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 3 unnamed arguments"));
}

try {
Parser.parse(IdentityTable.THE, "{v = iif(1, 2, 3)}");
Parser.parse(JoinIdentityTable.THE, "{v = iif(1, 2, 3)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("boolean type"));
}

try {
Parser.parse(IdentityTable.THE, "{v = iif(true, 2, false)}");
Parser.parse(JoinIdentityTable.THE, "{v = iif(true, 2, false)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("no common type"));
Expand Down Expand Up @@ -237,21 +237,21 @@ public void iif() throws Exception {
@Test
public void random() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = random(1, 2, 3)}");
Parser.parse(JoinIdentityTable.THE, "{v = random(1, 2, 3)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("at most 2 unnamed arguments"));
}

try {
Parser.parse(IdentityTable.THE, "{v = random(1, true)}");
Parser.parse(JoinIdentityTable.THE, "{v = random(1, true)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("must be a number"));
}

try {
Parser.parse(IdentityTable.THE, "{v = random(99999999999999999999999999999)}");
Parser.parse(JoinIdentityTable.THE, "{v = random(99999999999999999999999999999)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("unsupported argument type"));
Expand Down Expand Up @@ -300,14 +300,14 @@ public void random() throws Exception {
@Test
public void count() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = count(1, 2)}");
Parser.parse(JoinIdentityTable.THE, "{v = count(1, 2)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("at most 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = count()}");
Parser.parse(JoinIdentityTable.THE, "{v = count()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down Expand Up @@ -339,14 +339,14 @@ public void count() throws Exception {
@Test
public void first() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = first()}");
Parser.parse(JoinIdentityTable.THE, "{v = first()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = first(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = first(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down Expand Up @@ -382,14 +382,14 @@ public void first() throws Exception {
@Test
public void last() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = last()}");
Parser.parse(JoinIdentityTable.THE, "{v = last()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = last(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = last(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down Expand Up @@ -425,14 +425,14 @@ public void last() throws Exception {
@Test
public void min() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = min()}");
Parser.parse(JoinIdentityTable.THE, "{v = min()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = min(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = min(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down Expand Up @@ -480,14 +480,14 @@ public void min() throws Exception {
@Test
public void max() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = max()}");
Parser.parse(JoinIdentityTable.THE, "{v = max()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = max(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = max(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down Expand Up @@ -629,14 +629,14 @@ private Table<SumRow> fillSum(int num) throws Exception {
@Test
public void countSumAvg() throws Exception {
try {
Parser.parse(IdentityTable.THE, "{v = sum()}");
Parser.parse(JoinIdentityTable.THE, "{v = sum()}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("exactly 1 unnamed argument"));
}

try {
Parser.parse(IdentityTable.THE, "{v = sum(1)}");
Parser.parse(JoinIdentityTable.THE, "{v = sum(1)}");
fail();
} catch (QueryException e) {
assertTrue(e.getMessage().contains("requires grouping"));
Expand Down

0 comments on commit 0a0a551

Please sign in to comment.