Skip to content
Snippets Groups Projects
Commit bfd698f5 authored by Julien Lopez's avatar Julien Lopez
Browse files

[MINOR] Fix formatting and comments

parent 2a35d2c1
No related branches found
No related tags found
No related merge requests found
......@@ -52,8 +52,7 @@ public final class QIRIf extends QIRNode {
return true;
if (!(other instanceof QIRIf))
return false;
return condition.equals(((QIRIf) other).condition) && thenNode.equals(((QIRIf) other).thenNode) &&
elseNode.equals(((QIRIf) other).elseNode);
return condition.equals(((QIRIf) other).condition) && thenNode.equals(((QIRIf) other).thenNode) && elseNode.equals(((QIRIf) other).elseNode);
}
@Override
......
......@@ -44,8 +44,7 @@ public class QIRVariable extends QIRNode {
return true;
if (!(other instanceof QIRVariable))
return false;
return id.equals(((QIRVariable) other).id) && ((slot == null && ((QIRVariable) other).slot == null) ||
slot.equals(((QIRVariable) other).slot));
return id.equals(((QIRVariable) other).id) && ((slot == null && ((QIRVariable) other).slot == null) || slot.equals(((QIRVariable) other).slot));
}
@Override
......
......@@ -56,8 +56,7 @@ public final class QIRLdestr extends QIRNode {
return true;
if (!(other instanceof QIRLdestr))
return false;
return list.equals(((QIRLdestr) other).list) && ifEmpty.equals(((QIRLdestr) other).ifEmpty) &&
handler.equals(((QIRLdestr) other).handler);
return list.equals(((QIRLdestr) other).list) && ifEmpty.equals(((QIRLdestr) other).ifEmpty) && handler.equals(((QIRLdestr) other).handler);
}
@Override
......
......@@ -61,8 +61,7 @@ public final class QIRTcons extends QIRTuple {
return true;
if (!(other instanceof QIRTcons))
return false;
return id.equals(((QIRTcons) other).id) && value.equals(((QIRTcons) other).value) &&
tail.equals(((QIRTcons) other).tail);
return id.equals(((QIRTcons) other).id) && value.equals(((QIRTcons) other).value) && tail.equals(((QIRTcons) other).tail);
}
@Override
......
......@@ -60,8 +60,7 @@ public final class QIRGroup extends QIROperator {
return true;
if (!(other instanceof QIRGroup))
return false;
return eq.equals(((QIRGroup) other).eq) && group.equals(((QIRGroup) other).group) &&
child.equals(((QIRGroup) other).child);
return eq.equals(((QIRGroup) other).eq) && group.equals(((QIRGroup) other).group) && child.equals(((QIRGroup) other).child);
}
@Override
......
......@@ -56,8 +56,7 @@ public final class QIRJoin extends QIROperator {
return true;
if (!(other instanceof QIRJoin))
return false;
return filter.equals(((QIRJoin) other).filter) && left.equals(((QIRJoin) other).left) &&
right.equals(((QIRJoin) other).right);
return filter.equals(((QIRJoin) other).filter) && left.equals(((QIRJoin) other).left) && right.equals(((QIRJoin) other).right);
}
@Override
......
......@@ -7,8 +7,7 @@ public final class ConnectionData {
public final String userName;
public final String password;
public ConnectionData(final String sid, final String serverName, final int portNumber, final String userName,
final String password) {
public ConnectionData(final String sid, final String serverName, final int portNumber, final String userName, final String password) {
this.sid = sid;
this.serverName = serverName;
this.portNumber = portNumber;
......
......@@ -4,6 +4,9 @@ import qir.ast.*;
import qir.ast.data.*;
import qir.util.QIRException;
/**
* Generic driver for databases.
*/
public abstract class DBDriver {
protected ConnectionData connData;
......
......@@ -86,8 +86,7 @@ public final class OracleDriver extends SQLDriver {
}
oraArguments += ") RETURN NUMBER";
final String query = "begin sys." + (update ? "update" : "add") + "_UDF_Function ('scott', '" + name + "', ' " +
oraArguments + " ', '" + function + "', 'SLSQL'); end;";
final String query = "begin sys." + (update ? "update" : "add") + "_UDF_Function ('scott', '" + name + "', ' " + oraArguments + " ', '" + function + "', 'SLSQL'); end;";
try (final Statement stmt = conn.createStatement()) {
stmt.executeUpdate(query);
}
......@@ -101,8 +100,7 @@ public final class OracleDriver extends SQLDriver {
private final boolean functionExists(final String name) throws SQLException {
try (final Statement stmt = conn.createStatement()) {
return stmt.executeQuery("select * from all_objects where object_type = 'FUNCTION' and object_name = '" +
name + "' ").next();
return stmt.executeQuery("select * from all_objects where object_type = 'FUNCTION' and object_name = '" + name + "' ").next();
}
}
}
\ No newline at end of file
......@@ -15,8 +15,7 @@ import qir.ast.value.*;
import qir.util.QIRException;
/**
* This driver is the intermediate between QIR and the Oracle database. This class is temporary. The
* database should ultimately take a QIR tree directly.
* Abstract driver for SQL databases. Drivers for SQL databases should extend this class.
*/
public abstract class SQLDriver extends DBDriver {
protected Connection conn;
......@@ -66,8 +65,7 @@ public abstract class SQLDriver extends DBDriver {
case Types.INTEGER:
case Types.DOUBLE:
// TODO: Handle overflow
data = new QIRNumber(SourceSection.createUnavailable("QIRNode", "QIRNumber"),
rs.getLong(i));
data = new QIRNumber(SourceSection.createUnavailable("QIRNode", "QIRNumber"), rs.getLong(i));
break;
case Types.OTHER:
String v = rs.getString(i);
......@@ -79,25 +77,20 @@ public abstract class SQLDriver extends DBDriver {
Serializable value = (Serializable) ois.readObject();
ois.close();
if (value instanceof Long)
data = new QIRNumber(SourceSection.createUnavailable("QIRNode", "QIRNumber"),
(Long) value);
data = new QIRNumber(SourceSection.createUnavailable("QIRNode", "QIRNumber"), (Long) value);
else if (value instanceof Boolean)
data = new QIRBoolean(SourceSection.createUnavailable("QIRNode", "QIRBoolean"),
(Boolean) value);
data = new QIRBoolean(SourceSection.createUnavailable("QIRNode", "QIRBoolean"), (Boolean) value);
else
data = new QIRString(SourceSection.createUnavailable("QIRNode", "QIRString"),
value.toString());
data = new QIRString(SourceSection.createUnavailable("QIRNode", "QIRString"), value.toString());
} catch (IOException | ClassNotFoundException e) {
throw new QIRException(e.getMessage());
}
break;
default:
data = new QIRString(SourceSection.createUnavailable("QIRNode", "QIRString"),
rs.getString(i));
data = new QIRString(SourceSection.createUnavailable("QIRNode", "QIRString"), rs.getString(i));
break;
}
newTuple = new QIRTcons(SourceSection.createUnavailable("QIRNode", "QIRTcons"),
rs.getMetaData().getColumnLabel(i), data, newTuple);
newTuple = new QIRTcons(SourceSection.createUnavailable("QIRNode", "QIRTcons"), rs.getMetaData().getColumnLabel(i), data, newTuple);
}
tmp.push(newTuple);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment