databaseHolder =
+ new ConcurrentHashMap<>();
- /**
- * If a database with the same URL already exists, it returns the existing instance.
- * Otherwise, it creates a new instance and stores it in the database holder.
- *
- * @param url the URL of the database
- * @param filePath the path to the database file
- * @param properties additional properties for the database connection
- * @return an instance of {@link LimboDB}
- * @throws SQLException if there is an error opening the connection
- * @throws IllegalArgumentException if the fileName is empty
- */
- public static LimboDB open(String url, String filePath, Properties properties) throws SQLException {
- if (databaseHolder.containsKey(url)) {
- return databaseHolder.get(url);
- }
-
- if (filePath.isEmpty()) {
- throw new IllegalArgumentException("filePath should not be empty");
- }
-
- final LimboDB database;
- try {
- LimboDB.load();
- database = LimboDB.create(url, filePath);
- } catch (Exception e) {
- throw new SQLException("Error opening connection", e);
- }
-
- database.open(0);
- databaseHolder.put(url, database);
- return database;
+ /**
+ * If a database with the same URL already exists, it returns the existing instance. Otherwise, it
+ * creates a new instance and stores it in the database holder.
+ *
+ * @param url the URL of the database
+ * @param filePath the path to the database file
+ * @param properties additional properties for the database connection
+ * @return an instance of {@link LimboDB}
+ * @throws SQLException if there is an error opening the connection
+ * @throws IllegalArgumentException if the fileName is empty
+ */
+ public static LimboDB open(String url, String filePath, Properties properties)
+ throws SQLException {
+ if (databaseHolder.containsKey(url)) {
+ return databaseHolder.get(url);
}
+
+ if (filePath.isEmpty()) {
+ throw new IllegalArgumentException("filePath should not be empty");
+ }
+
+ final LimboDB database;
+ try {
+ LimboDB.load();
+ database = LimboDB.create(url, filePath);
+ } catch (Exception e) {
+ throw new SQLException("Error opening connection", e);
+ }
+
+ database.open(0);
+ databaseHolder.put(url, database);
+ return database;
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
index 19d730727..c6cb8d00e 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
@@ -1,111 +1,119 @@
package org.github.tursodatabase.core;
import java.sql.SQLException;
-
import org.github.tursodatabase.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A table of data representing limbo database result set, which is generated by executing a statement that queries the
- * database.
- *
- * A {@link LimboResultSet} object is automatically closed when the {@link LimboStatement} object that generated it is
- * closed or re-executed.
+ * A table of data representing limbo database result set, which is generated by executing a
+ * statement that queries the database.
+ *
+ *
A {@link LimboResultSet} object is automatically closed when the {@link LimboStatement} object
+ * that generated it is closed or re-executed.
*/
public class LimboResultSet {
- private static final Logger log = LoggerFactory.getLogger(LimboResultSet.class);
+ private static final Logger log = LoggerFactory.getLogger(LimboResultSet.class);
- private final LimboStatement statement;
+ private final LimboStatement statement;
- // Whether the result set does not have any rows.
- private boolean isEmptyResultSet = false;
- // If the result set is open. Doesn't mean it has results.
- private boolean open;
- // Maximum number of rows as set by the statement
- private long maxRows;
- // number of current row, starts at 1 (0 is used to represent loading data)
- private int row = 0;
- private boolean pastLastRow = false;
+ // Whether the result set does not have any rows.
+ private boolean isEmptyResultSet = false;
+ // If the result set is open. Doesn't mean it has results.
+ private boolean open;
+ // Maximum number of rows as set by the statement
+ private long maxRows;
+ // number of current row, starts at 1 (0 is used to represent loading data)
+ private int row = 0;
+ private boolean pastLastRow = false;
- @Nullable
- private LimboStepResult lastStepResult;
+ @Nullable private LimboStepResult lastStepResult;
- public static LimboResultSet of(LimboStatement statement) {
- return new LimboResultSet(statement);
+ public static LimboResultSet of(LimboStatement statement) {
+ return new LimboResultSet(statement);
+ }
+
+ private LimboResultSet(LimboStatement statement) {
+ this.open = true;
+ this.statement = statement;
+ }
+
+ /**
+ * Moves the cursor forward one row from its current position. A {@link LimboResultSet} cursor is
+ * initially positioned before the first fow; the first call to the method next makes
+ * the first row the current row; the second call makes the second row the current row, and so on.
+ * When a call to the next method returns false, the cursor is
+ * positioned after the last row.
+ *
+ *
Note that limbo only supports ResultSet.TYPE_FORWARD_ONLY, which means that the
+ * cursor can only move forward.
+ */
+ public boolean next() throws SQLException {
+ if (!open || isEmptyResultSet || pastLastRow) {
+ return false; // completed ResultSet
}
- private LimboResultSet(LimboStatement statement) {
- this.open = true;
- this.statement = statement;
+ if (maxRows != 0 && row == maxRows) {
+ return false;
}
- /**
- * Moves the cursor forward one row from its current position. A {@link LimboResultSet} cursor is initially positioned
- * before the first fow; the first call to the method next makes the first row the current row; the second call
- * makes the second row the current row, and so on.
- * When a call to the next method returns false, the cursor is positioned after the last row.
- *
- * Note that limbo only supports ResultSet.TYPE_FORWARD_ONLY, which means that the cursor can only move forward.
- */
- public boolean next() throws SQLException {
- if (!open || isEmptyResultSet || pastLastRow) {
- return false; // completed ResultSet
- }
-
- if (maxRows != 0 && row == maxRows) {
- return false;
- }
-
- lastStepResult = this.statement.step();
- log.debug("lastStepResult: {}", lastStepResult);
- if (lastStepResult.isRow()) {
- row++;
- }
-
- pastLastRow = lastStepResult.isDone();
- if (pastLastRow) {
- open = false;
- }
- return !pastLastRow;
+ lastStepResult = this.statement.step();
+ log.debug("lastStepResult: {}", lastStepResult);
+ if (lastStepResult.isRow()) {
+ row++;
}
- /**
- * Checks whether the last step result has returned row result.
- */
- public boolean hasLastStepReturnedRow() {
- return lastStepResult != null && lastStepResult.isRow();
+ if (lastStepResult.isInInvalidState()) {
+ open = false;
+ throw new SQLException("step() returned invalid result: " + lastStepResult);
}
- /**
- * Checks the status of the result set.
- *
- * @return true if it's ready to iterate over the result set; false otherwise.
- */
- public boolean isOpen() {
- return open;
+ pastLastRow = lastStepResult.isDone();
+ if (pastLastRow) {
+ open = false;
}
+ return !pastLastRow;
+ }
- /**
- * @throws SQLException if not {@link #open}
- */
- public void checkOpen() throws SQLException {
- if (!open) {
- throw new SQLException("ResultSet closed");
- }
- }
+ /** Checks whether the last step result has returned row result. */
+ public boolean hasLastStepReturnedRow() {
+ return lastStepResult != null && lastStepResult.isRow();
+ }
- @Override
- public String toString() {
- return "LimboResultSet{" +
- "statement=" + statement +
- ", isEmptyResultSet=" + isEmptyResultSet +
- ", open=" + open +
- ", maxRows=" + maxRows +
- ", row=" + row +
- ", pastLastRow=" + pastLastRow +
- ", lastResult=" + lastStepResult +
- '}';
+ /**
+ * Checks the status of the result set.
+ *
+ * @return true if it's ready to iterate over the result set; false otherwise.
+ */
+ public boolean isOpen() {
+ return open;
+ }
+
+ /** @throws SQLException if not {@link #open} */
+ public void checkOpen() throws SQLException {
+ if (!open) {
+ throw new SQLException("ResultSet closed");
}
+ }
+
+ @Override
+ public String toString() {
+ return "LimboResultSet{"
+ + "statement="
+ + statement
+ + ", isEmptyResultSet="
+ + isEmptyResultSet
+ + ", open="
+ + open
+ + ", maxRows="
+ + maxRows
+ + ", row="
+ + row
+ + ", pastLastRow="
+ + pastLastRow
+ + ", lastResult="
+ + lastStepResult
+ + '}';
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStatement.java b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStatement.java
index 747c68c2e..c749e27cc 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStatement.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStatement.java
@@ -1,7 +1,6 @@
package org.github.tursodatabase.core;
import java.sql.SQLException;
-
import org.github.tursodatabase.annotations.NativeInvocation;
import org.github.tursodatabase.annotations.Nullable;
import org.github.tursodatabase.utils.LimboExceptionUtils;
@@ -9,68 +8,73 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * By default, only one resultSet object per LimboStatement can be open at the same time.
- * Therefore, if the reading of one resultSet object is interleaved with the reading of another, each must
- * have been generated by different LimboStatement objects. All execution method in the LimboStatement
- * implicitly close the current resultSet object of the statement if an open one exists.
+ * By default, only one resultSet object per LimboStatement can be open at
+ * the same time. Therefore, if the reading of one resultSet object is interleaved with
+ * the reading of another, each must have been generated by different LimboStatement
+ * objects. All execution method in the LimboStatement implicitly close the current
+ * resultSet object of the statement if an open one exists.
*/
public class LimboStatement {
- private static final Logger log = LoggerFactory.getLogger(LimboStatement.class);
+ private static final Logger log = LoggerFactory.getLogger(LimboStatement.class);
- private final String sql;
- private final long statementPointer;
- private final LimboResultSet resultSet;
+ private final String sql;
+ private final long statementPointer;
+ private final LimboResultSet resultSet;
- // TODO: what if the statement we ran was DDL, update queries and etc. Should we still create a resultSet?
- public LimboStatement(String sql, long statementPointer) {
- this.sql = sql;
- this.statementPointer = statementPointer;
- this.resultSet = LimboResultSet.of(this);
- log.debug("Creating statement with sql: {}", this.sql);
+ // TODO: what if the statement we ran was DDL, update queries and etc. Should we still create a
+ // resultSet?
+ public LimboStatement(String sql, long statementPointer) {
+ this.sql = sql;
+ this.statementPointer = statementPointer;
+ this.resultSet = LimboResultSet.of(this);
+ log.debug("Creating statement with sql: {}", this.sql);
+ }
+
+ public LimboResultSet getResultSet() {
+ return resultSet;
+ }
+
+ /**
+ * Expects a clean statement created right after prepare method is called.
+ *
+ * @return true if the ResultSet has at least one row; false otherwise.
+ */
+ public boolean execute() throws SQLException {
+ resultSet.next();
+ return resultSet.hasLastStepReturnedRow();
+ }
+
+ LimboStepResult step() throws SQLException {
+ final LimboStepResult result = step(this.statementPointer);
+ if (result == null) {
+ throw new SQLException("step() returned null, which is only returned when an error occurs");
}
- public LimboResultSet getResultSet() {
- return resultSet;
- }
+ return result;
+ }
- /**
- * Expects a clean statement created right after prepare method is called.
- *
- * @return true if the ResultSet has at least one row; false otherwise.
- */
- public boolean execute() throws SQLException {
- resultSet.next();
- return resultSet.hasLastStepReturnedRow();
- }
+ @Nullable
+ private native LimboStepResult step(long stmtPointer) throws SQLException;
- LimboStepResult step() throws SQLException {
- final LimboStepResult result = step(this.statementPointer);
- if (result == null) {
- throw new SQLException("step() returned null, which is only returned when an error occurs");
- }
+ /**
+ * Throws formatted SQLException with error code and message.
+ *
+ * @param errorCode Error code.
+ * @param errorMessageBytes Error message.
+ */
+ @NativeInvocation(invokedFrom = "limbo_statement.rs")
+ private void throwLimboException(int errorCode, byte[] errorMessageBytes) throws SQLException {
+ LimboExceptionUtils.throwLimboException(errorCode, errorMessageBytes);
+ }
- return result;
- }
-
- @Nullable
- private native LimboStepResult step(long stmtPointer) throws SQLException;
-
- /**
- * Throws formatted SQLException with error code and message.
- *
- * @param errorCode Error code.
- * @param errorMessageBytes Error message.
- */
- @NativeInvocation(invokedFrom = "limbo_statement.rs")
- private void throwLimboException(int errorCode, byte[] errorMessageBytes) throws SQLException {
- LimboExceptionUtils.throwLimboException(errorCode, errorMessageBytes);
- }
-
- @Override
- public String toString() {
- return "LimboStatement{" +
- "statementPointer=" + statementPointer +
- ", sql='" + sql + '\'' +
- '}';
- }
+ @Override
+ public String toString() {
+ return "LimboStatement{"
+ + "statementPointer="
+ + statementPointer
+ + ", sql='"
+ + sql
+ + '\''
+ + '}';
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStepResult.java b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStepResult.java
index 7870cbeab..93a1878aa 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStepResult.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboStepResult.java
@@ -1,70 +1,78 @@
package org.github.tursodatabase.core;
import java.util.Arrays;
-
import org.github.tursodatabase.annotations.NativeInvocation;
import org.github.tursodatabase.annotations.Nullable;
-/**
- * Represents the step result of limbo's statement's step function.
- */
+/** Represents the step result of limbo's statement's step function. */
public class LimboStepResult {
- private static final int STEP_RESULT_ID_ROW = 10;
- private static final int STEP_RESULT_ID_IO = 20;
- private static final int STEP_RESULT_ID_DONE = 30;
- private static final int STEP_RESULT_ID_INTERRUPT = 40;
- private static final int STEP_RESULT_ID_BUSY = 50;
- private static final int STEP_RESULT_ID_ERROR = 60;
+ private static final int STEP_RESULT_ID_ROW = 10;
+ private static final int STEP_RESULT_ID_IO = 20;
+ private static final int STEP_RESULT_ID_DONE = 30;
+ private static final int STEP_RESULT_ID_INTERRUPT = 40;
+ // Indicates that the database file could not be written because of concurrent activity by some
+ // other connection
+ private static final int STEP_RESULT_ID_BUSY = 50;
+ private static final int STEP_RESULT_ID_ERROR = 60;
- // Identifier for limbo's StepResult
- private final int stepResultId;
- @Nullable
- private final Object[] result;
+ // Identifier for limbo's StepResult
+ private final int stepResultId;
+ @Nullable private final Object[] result;
- @NativeInvocation(invokedFrom = "limbo_statement.rs")
- public LimboStepResult(int stepResultId) {
- this.stepResultId = stepResultId;
- this.result = null;
- }
-
- @NativeInvocation(invokedFrom = "limbo_statement.rs")
- public LimboStepResult(int stepResultId, Object[] result) {
- this.stepResultId = stepResultId;
- this.result = result;
- }
-
- public boolean isRow() {
- return stepResultId == STEP_RESULT_ID_ROW;
- }
-
- public boolean isDone() {
- return stepResultId == STEP_RESULT_ID_DONE;
- }
-
- @Override
- public String toString() {
- return "LimboStepResult{" +
- "stepResultName=" + getStepResultName() +
- ", result=" + Arrays.toString(result) +
- '}';
- }
-
- private String getStepResultName() {
- switch (stepResultId) {
- case STEP_RESULT_ID_ROW:
- return "ROW";
- case STEP_RESULT_ID_IO:
- return "IO";
- case STEP_RESULT_ID_DONE:
- return "DONE";
- case STEP_RESULT_ID_INTERRUPT:
- return "INTERRUPT";
- case STEP_RESULT_ID_BUSY:
- return "BUSY";
- case STEP_RESULT_ID_ERROR:
- return "ERROR";
- default:
- return "UNKNOWN";
- }
+ @NativeInvocation(invokedFrom = "limbo_statement.rs")
+ public LimboStepResult(int stepResultId) {
+ this.stepResultId = stepResultId;
+ this.result = null;
+ }
+
+ @NativeInvocation(invokedFrom = "limbo_statement.rs")
+ public LimboStepResult(int stepResultId, Object[] result) {
+ this.stepResultId = stepResultId;
+ this.result = result;
+ }
+
+ public boolean isRow() {
+ return stepResultId == STEP_RESULT_ID_ROW;
+ }
+
+ public boolean isDone() {
+ return stepResultId == STEP_RESULT_ID_DONE;
+ }
+
+ public boolean isInInvalidState() {
+ // current implementation doesn't allow STEP_RESULT_ID_IO to be returned
+ return stepResultId == STEP_RESULT_ID_IO
+ || stepResultId == STEP_RESULT_ID_INTERRUPT
+ || stepResultId == STEP_RESULT_ID_BUSY
+ || stepResultId == STEP_RESULT_ID_ERROR;
+ }
+
+ @Override
+ public String toString() {
+ return "LimboStepResult{"
+ + "stepResultName="
+ + getStepResultName()
+ + ", result="
+ + Arrays.toString(result)
+ + '}';
+ }
+
+ private String getStepResultName() {
+ switch (stepResultId) {
+ case STEP_RESULT_ID_ROW:
+ return "ROW";
+ case STEP_RESULT_ID_IO:
+ return "IO";
+ case STEP_RESULT_ID_DONE:
+ return "DONE";
+ case STEP_RESULT_ID_INTERRUPT:
+ return "INTERRUPT";
+ case STEP_RESULT_ID_BUSY:
+ return "BUSY";
+ case STEP_RESULT_ID_ERROR:
+ return "ERROR";
+ default:
+ return "UNKNOWN";
}
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/core/SqliteCode.java b/bindings/java/src/main/java/org/github/tursodatabase/core/SqliteCode.java
index 3a879cb46..632750e10 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/core/SqliteCode.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/core/SqliteCode.java
@@ -15,93 +15,91 @@
*/
package org.github.tursodatabase.core;
-/**
- * Sqlite error codes.
- */
+/** Sqlite error codes. */
public class SqliteCode {
- /** Successful result */
- public static final int SQLITE_OK = 0;
+ /** Successful result */
+ public static final int SQLITE_OK = 0;
- /** SQL error or missing database */
- public static final int SQLITE_ERROR = 1;
+ /** SQL error or missing database */
+ public static final int SQLITE_ERROR = 1;
- /** An internal logic error in SQLite */
- public static final int SQLITE_INTERNAL = 2;
+ /** An internal logic error in SQLite */
+ public static final int SQLITE_INTERNAL = 2;
- /** Access permission denied */
- public static final int SQLITE_PERM = 3;
+ /** Access permission denied */
+ public static final int SQLITE_PERM = 3;
- /** Callback routine requested an abort */
- public static final int SQLITE_ABORT = 4;
+ /** Callback routine requested an abort */
+ public static final int SQLITE_ABORT = 4;
- /** The database file is locked */
- public static final int SQLITE_BUSY = 5;
+ /** The database file is locked */
+ public static final int SQLITE_BUSY = 5;
- /** A table in the database is locked */
- public static final int SQLITE_LOCKED = 6;
+ /** A table in the database is locked */
+ public static final int SQLITE_LOCKED = 6;
- /** A malloc() failed */
- public static final int SQLITE_NOMEM = 7;
+ /** A malloc() failed */
+ public static final int SQLITE_NOMEM = 7;
- /** Attempt to write a readonly database */
- public static final int SQLITE_READONLY = 8;
+ /** Attempt to write a readonly database */
+ public static final int SQLITE_READONLY = 8;
- /** Operation terminated by sqlite_interrupt() */
- public static final int SQLITE_INTERRUPT = 9;
+ /** Operation terminated by sqlite_interrupt() */
+ public static final int SQLITE_INTERRUPT = 9;
- /** Some kind of disk I/O error occurred */
- public static final int SQLITE_IOERR = 10;
+ /** Some kind of disk I/O error occurred */
+ public static final int SQLITE_IOERR = 10;
- /** The database disk image is malformed */
- public static final int SQLITE_CORRUPT = 11;
+ /** The database disk image is malformed */
+ public static final int SQLITE_CORRUPT = 11;
- /** (Internal Only) Table or record not found */
- public static final int SQLITE_NOTFOUND = 12;
+ /** (Internal Only) Table or record not found */
+ public static final int SQLITE_NOTFOUND = 12;
- /** Insertion failed because database is full */
- public static final int SQLITE_FULL = 13;
+ /** Insertion failed because database is full */
+ public static final int SQLITE_FULL = 13;
- /** Unable to open the database file */
- public static final int SQLITE_CANTOPEN = 14;
+ /** Unable to open the database file */
+ public static final int SQLITE_CANTOPEN = 14;
- /** Database lock protocol error */
- public static final int SQLITE_PROTOCOL = 15;
+ /** Database lock protocol error */
+ public static final int SQLITE_PROTOCOL = 15;
- /** (Internal Only) Database table is empty */
- public static final int SQLITE_EMPTY = 16;
+ /** (Internal Only) Database table is empty */
+ public static final int SQLITE_EMPTY = 16;
- /** The database schema changed */
- public static final int SQLITE_SCHEMA = 17;
+ /** The database schema changed */
+ public static final int SQLITE_SCHEMA = 17;
- /** Too much data for one row of a table */
- public static final int SQLITE_TOOBIG = 18;
+ /** Too much data for one row of a table */
+ public static final int SQLITE_TOOBIG = 18;
- /** Abort due to constraint violation */
- public static final int SQLITE_CONSTRAINT = 19;
+ /** Abort due to constraint violation */
+ public static final int SQLITE_CONSTRAINT = 19;
- /** Data type mismatch */
- public static final int SQLITE_MISMATCH = 20;
+ /** Data type mismatch */
+ public static final int SQLITE_MISMATCH = 20;
- /** Library used incorrectly */
- public static final int SQLITE_MISUSE = 21;
+ /** Library used incorrectly */
+ public static final int SQLITE_MISUSE = 21;
- /** Uses OS features not supported on host */
- public static final int SQLITE_NOLFS = 22;
+ /** Uses OS features not supported on host */
+ public static final int SQLITE_NOLFS = 22;
- /** Authorization denied */
- public static final int SQLITE_AUTH = 23;
+ /** Authorization denied */
+ public static final int SQLITE_AUTH = 23;
- /** sqlite_step() has another row ready */
- public static final int SQLITE_ROW = 100;
+ /** sqlite_step() has another row ready */
+ public static final int SQLITE_ROW = 100;
- /** sqlite_step() has finished executing */
- public static final int SQLITE_DONE = 101;
+ /** sqlite_step() has finished executing */
+ public static final int SQLITE_DONE = 101;
- // types returned by sqlite3_column_type()
+ // types returned by sqlite3_column_type()
- public static final int SQLITE_INTEGER = 1;
- public static final int SQLITE_FLOAT = 2;
- public static final int SQLITE_TEXT = 3;
- public static final int SQLITE_BLOB = 4;
- public static final int SQLITE_NULL = 5;
+ public static final int SQLITE_INTEGER = 1;
+ public static final int SQLITE_FLOAT = 2;
+ public static final int SQLITE_TEXT = 3;
+ public static final int SQLITE_BLOB = 4;
+ public static final int SQLITE_NULL = 5;
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/exceptions/LimboException.java b/bindings/java/src/main/java/org/github/tursodatabase/exceptions/LimboException.java
index d4526a818..77d07f89a 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/exceptions/LimboException.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/exceptions/LimboException.java
@@ -1,18 +1,17 @@
package org.github.tursodatabase.exceptions;
+import java.sql.SQLException;
import org.github.tursodatabase.LimboErrorCode;
-import java.sql.SQLException;
-
public class LimboException extends SQLException {
- private final LimboErrorCode resultCode;
+ private final LimboErrorCode resultCode;
- public LimboException(String message, LimboErrorCode resultCode) {
- super(message, null, resultCode.code & 0xff);
- this.resultCode = resultCode;
- }
+ public LimboException(String message, LimboErrorCode resultCode) {
+ super(message, null, resultCode.code & 0xff);
+ this.resultCode = resultCode;
+ }
- public LimboErrorCode getResultCode() {
- return resultCode;
- }
+ public LimboErrorCode getResultCode() {
+ return resultCode;
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java
index dc404a9cb..b17c6af36 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java
@@ -1,353 +1,357 @@
package org.github.tursodatabase.jdbc4;
-import org.github.tursodatabase.core.LimboConnection;
-import org.github.tursodatabase.annotations.SkipNullableCheck;
-
import java.sql.*;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
+import org.github.tursodatabase.annotations.SkipNullableCheck;
+import org.github.tursodatabase.core.LimboConnection;
public class JDBC4Connection extends LimboConnection {
- public JDBC4Connection(String url, String filePath) throws SQLException {
- super(url, filePath);
- }
+ public JDBC4Connection(String url, String filePath) throws SQLException {
+ super(url, filePath);
+ }
- public JDBC4Connection(String url, String filePath, Properties properties) throws SQLException {
- super(url, filePath, properties);
- }
+ public JDBC4Connection(String url, String filePath, Properties properties) throws SQLException {
+ super(url, filePath, properties);
+ }
- @Override
- public Statement createStatement() throws SQLException {
- return createStatement(
- ResultSet.TYPE_FORWARD_ONLY,
- ResultSet.CONCUR_READ_ONLY,
- ResultSet.CLOSE_CURSORS_AT_COMMIT
- );
- }
+ @Override
+ public Statement createStatement() throws SQLException {
+ return createStatement(
+ ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
- @Override
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- return createStatement(resultSetType, resultSetConcurrency, ResultSet.CLOSE_CURSORS_AT_COMMIT);
- }
+ @Override
+ public Statement createStatement(int resultSetType, int resultSetConcurrency)
+ throws SQLException {
+ return createStatement(resultSetType, resultSetConcurrency, ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
- @Override
- public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- checkOpen();
- checkCursor(resultSetType, resultSetConcurrency, resultSetHoldability);
+ @Override
+ public Statement createStatement(
+ int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+ checkOpen();
+ checkCursor(resultSetType, resultSetConcurrency, resultSetHoldability);
- return new JDBC4Statement(this);
- }
+ return new JDBC4Statement(this);
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(String sql) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public CallableStatement prepareCall(String sql) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public CallableStatement prepareCall(String sql) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public String nativeSQL(String sql) throws SQLException {
- // TODO
- return "";
- }
+ @Override
+ @SkipNullableCheck
+ public String nativeSQL(String sql) throws SQLException {
+ // TODO
+ return "";
+ }
- @Override
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- // TODO
- }
+ @Override
+ public void setAutoCommit(boolean autoCommit) throws SQLException {
+ // TODO
+ }
- @Override
- public boolean getAutoCommit() throws SQLException {
- // TODO
- return false;
- }
+ @Override
+ public boolean getAutoCommit() throws SQLException {
+ // TODO
+ return false;
+ }
- @Override
- public void commit() throws SQLException {
- // TODO
- }
+ @Override
+ public void commit() throws SQLException {
+ // TODO
+ }
- @Override
- public void rollback() throws SQLException {
- // TODO
- }
+ @Override
+ public void rollback() throws SQLException {
+ // TODO
+ }
- @Override
- public void close() throws SQLException {
- // TODO
- }
+ @Override
+ public void close() throws SQLException {
+ // TODO
+ }
- @Override
- public boolean isClosed() throws SQLException {
- // TODO
- return false;
- }
+ @Override
+ public boolean isClosed() throws SQLException {
+ // TODO
+ return false;
+ }
- @Override
- @SkipNullableCheck
- public DatabaseMetaData getMetaData() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public DatabaseMetaData getMetaData() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public void setReadOnly(boolean readOnly) throws SQLException {
- // TODO
- }
+ @Override
+ public void setReadOnly(boolean readOnly) throws SQLException {
+ // TODO
+ }
- @Override
- public boolean isReadOnly() throws SQLException {
- // TODO
- return false;
- }
+ @Override
+ public boolean isReadOnly() throws SQLException {
+ // TODO
+ return false;
+ }
- @Override
- public void setCatalog(String catalog) throws SQLException {
- // TODO
- }
+ @Override
+ public void setCatalog(String catalog) throws SQLException {
+ // TODO
+ }
- @Override
- public String getCatalog() throws SQLException {
- // TODO
- return "";
- }
+ @Override
+ public String getCatalog() throws SQLException {
+ // TODO
+ return "";
+ }
- @Override
- public void setTransactionIsolation(int level) throws SQLException {
- // TODO
- }
+ @Override
+ public void setTransactionIsolation(int level) throws SQLException {
+ // TODO
+ }
- @Override
- public int getTransactionIsolation() throws SQLException {
- // TODO
- return 0;
- }
+ @Override
+ public int getTransactionIsolation() throws SQLException {
+ // TODO
+ return 0;
+ }
- @Override
- @SkipNullableCheck
- public SQLWarning getWarnings() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public SQLWarning getWarnings() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public void clearWarnings() throws SQLException {
- // TODO
- }
+ @Override
+ public void clearWarnings() throws SQLException {
+ // TODO
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+ throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
+ throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public Map> getTypeMap() throws SQLException {
- // TODO
- return new HashMap<>();
- }
+ @Override
+ public Map> getTypeMap() throws SQLException {
+ // TODO
+ return new HashMap<>();
+ }
- @Override
- public void setTypeMap(Map> map) throws SQLException {
- // TODO
- }
+ @Override
+ public void setTypeMap(Map> map) throws SQLException {
+ // TODO
+ }
- @Override
- public void setHoldability(int holdability) throws SQLException {
- // TODO
- }
+ @Override
+ public void setHoldability(int holdability) throws SQLException {
+ // TODO
+ }
- @Override
- public int getHoldability() throws SQLException {
- return 0;
- }
+ @Override
+ public int getHoldability() throws SQLException {
+ return 0;
+ }
- @Override
- @SkipNullableCheck
- public Savepoint setSavepoint() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Savepoint setSavepoint() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public Savepoint setSavepoint(String name) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Savepoint setSavepoint(String name) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public void rollback(Savepoint savepoint) throws SQLException {
- // TODO
- }
+ @Override
+ public void rollback(Savepoint savepoint) throws SQLException {
+ // TODO
+ }
- @Override
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- // TODO
- }
+ @Override
+ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+ // TODO
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(
+ String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+ throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public CallableStatement prepareCall(
+ String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+ throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public Clob createClob() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Clob createClob() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public Blob createBlob() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Blob createBlob() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public NClob createNClob() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public NClob createNClob() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public SQLXML createSQLXML() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public SQLXML createSQLXML() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public boolean isValid(int timeout) throws SQLException {
- // TODO
- return false;
- }
+ @Override
+ public boolean isValid(int timeout) throws SQLException {
+ // TODO
+ return false;
+ }
- @Override
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- // TODO
- }
+ @Override
+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
+ // TODO
+ }
- @Override
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- // TODO
- }
+ @Override
+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
+ // TODO
+ }
- @Override
- public String getClientInfo(String name) throws SQLException {
- // TODO
- return "";
- }
+ @Override
+ public String getClientInfo(String name) throws SQLException {
+ // TODO
+ return "";
+ }
- @Override
- @SkipNullableCheck
- public Properties getClientInfo() throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Properties getClientInfo() throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- @SkipNullableCheck
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- // TODO
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+ // TODO
+ return null;
+ }
- @Override
- public void setSchema(String schema) throws SQLException {
- // TODO
- }
+ @Override
+ public void setSchema(String schema) throws SQLException {
+ // TODO
+ }
- @Override
- @SkipNullableCheck
- public String getSchema() throws SQLException {
- // TODO
- return "";
- }
+ @Override
+ @SkipNullableCheck
+ public String getSchema() throws SQLException {
+ // TODO
+ return "";
+ }
- @Override
- public void abort(Executor executor) throws SQLException {
- // TODO
- }
+ @Override
+ public void abort(Executor executor) throws SQLException {
+ // TODO
+ }
- @Override
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- // TODO
- }
+ @Override
+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+ // TODO
+ }
- @Override
- public int getNetworkTimeout() throws SQLException {
- // TODO
- return 0;
- }
+ @Override
+ public int getNetworkTimeout() throws SQLException {
+ // TODO
+ return 0;
+ }
- @Override
- @SkipNullableCheck
- public T unwrap(Class iface) throws SQLException {
- return null;
- }
+ @Override
+ @SkipNullableCheck
+ public T unwrap(Class iface) throws SQLException {
+ return null;
+ }
- @Override
- public boolean isWrapperFor(Class iface) throws SQLException {
- // TODO
- return false;
- }
+ @Override
+ public boolean isWrapperFor(Class iface) throws SQLException {
+ // TODO
+ return false;
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4ResultSet.java b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4ResultSet.java
index 0d7cce084..867b2688e 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4ResultSet.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4ResultSet.java
@@ -1,8 +1,5 @@
package org.github.tursodatabase.jdbc4;
-import org.github.tursodatabase.annotations.SkipNullableCheck;
-import org.github.tursodatabase.core.LimboResultSet;
-
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
@@ -10,1117 +7,1127 @@ import java.net.URL;
import java.sql.*;
import java.util.Calendar;
import java.util.Map;
+import org.github.tursodatabase.annotations.SkipNullableCheck;
+import org.github.tursodatabase.core.LimboResultSet;
public class JDBC4ResultSet implements ResultSet {
- private final LimboResultSet resultSet;
-
- public JDBC4ResultSet(LimboResultSet resultSet) {
- this.resultSet = resultSet;
- }
-
- @Override
- public boolean next() throws SQLException {
- return resultSet.next();
- }
-
- @Override
- public void close() throws SQLException {
- // TODO
- }
-
- @Override
- public boolean wasNull() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public String getString(int columnIndex) throws SQLException {
- // TODO
- return "";
- }
-
- @Override
- public boolean getBoolean(int columnIndex) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public byte getByte(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public short getShort(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int getInt(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public long getLong(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public float getFloat(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public double getDouble(int columnIndex) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- @SkipNullableCheck
- public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public byte[] getBytes(int columnIndex) throws SQLException {
- // TODO
- return new byte[0];
- }
-
- @Override
- @SkipNullableCheck
- public Date getDate(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Time getTime(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Timestamp getTimestamp(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getAsciiStream(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getUnicodeStream(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getBinaryStream(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public String getString(String columnLabel) throws SQLException {
- // TODO
- return "";
- }
-
- @Override
- public boolean getBoolean(String columnLabel) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public byte getByte(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public short getShort(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int getInt(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public long getLong(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public float getFloat(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public double getDouble(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- @SkipNullableCheck
- public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public byte[] getBytes(String columnLabel) throws SQLException {
- // TODO
- return new byte[0];
- }
-
- @Override
- @SkipNullableCheck
- public Date getDate(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Time getTime(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Timestamp getTimestamp(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getAsciiStream(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getUnicodeStream(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public InputStream getBinaryStream(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public SQLWarning getWarnings() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void clearWarnings() throws SQLException {
- // TODO
- }
-
- @Override
- public String getCursorName() throws SQLException {
- // TODO
- return "";
- }
-
- @Override
- @SkipNullableCheck
- public ResultSetMetaData getMetaData() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Object getObject(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Object getObject(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public int findColumn(String columnLabel) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- @SkipNullableCheck
- public Reader getCharacterStream(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Reader getCharacterStream(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public boolean isBeforeFirst() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean isAfterLast() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean isFirst() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean isLast() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void beforeFirst() throws SQLException {
- // TODO
- }
-
- @Override
- public void afterLast() throws SQLException {
- // TODO
- }
-
- @Override
- public boolean first() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean last() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public int getRow() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public boolean absolute(int row) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean relative(int rows) throws SQLException {
- return false;
- }
-
- @Override
- public boolean previous() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void setFetchDirection(int direction) throws SQLException {
- // TODO
- }
-
- @Override
- public int getFetchDirection() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public void setFetchSize(int rows) throws SQLException {
- // TODO
- }
-
- @Override
- public int getFetchSize() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int getType() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int getConcurrency() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public boolean rowUpdated() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean rowInserted() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean rowDeleted() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void updateNull(int columnIndex) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBoolean(int columnIndex, boolean x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateByte(int columnIndex, byte x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateShort(int columnIndex, short x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateInt(int columnIndex, int x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateLong(int columnIndex, long x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateFloat(int columnIndex, float x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateDouble(int columnIndex, double x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateString(int columnIndex, String x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBytes(int columnIndex, byte[] x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateDate(int columnIndex, Date x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateTime(int columnIndex, Time x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateObject(int columnIndex, Object x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNull(String columnLabel) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBoolean(String columnLabel, boolean x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateByte(String columnLabel, byte x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateShort(String columnLabel, short x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateInt(String columnLabel, int x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateLong(String columnLabel, long x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateFloat(String columnLabel, float x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateDouble(String columnLabel, double x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateString(String columnLabel, String x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBytes(String columnLabel, byte[] x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateDate(String columnLabel, Date x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateTime(String columnLabel, Time x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(String columnLabel, Reader reader, int length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateObject(String columnLabel, Object x) throws SQLException {
- // TODO
- }
-
- @Override
- public void insertRow() throws SQLException {
- // TODO
- }
-
- @Override
- public void updateRow() throws SQLException {
- // TODO
- }
-
- @Override
- public void deleteRow() throws SQLException {
- // TODO
- }
-
- @Override
- public void refreshRow() throws SQLException {
- // TODO
- }
-
- @Override
- public void cancelRowUpdates() throws SQLException {
- // TODO
- }
-
- @Override
- public void moveToInsertRow() throws SQLException {
- // TODO
- }
-
- @Override
- public void moveToCurrentRow() throws SQLException {
- // TODO
- }
-
- @Override
- @SkipNullableCheck
- public Statement getStatement() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Object getObject(int columnIndex, Map> map) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Ref getRef(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Blob getBlob(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Clob getClob(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Array getArray(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Object getObject(String columnLabel, Map> map) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Ref getRef(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Blob getBlob(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Clob getClob(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Array getArray(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Date getDate(int columnIndex, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Date getDate(String columnLabel, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Time getTime(int columnIndex, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Time getTime(String columnLabel, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public URL getURL(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public URL getURL(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void updateRef(int columnIndex, Ref x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateRef(String columnLabel, Ref x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(int columnIndex, Blob x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(String columnLabel, Blob x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(int columnIndex, Clob x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(String columnLabel, Clob x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateArray(int columnIndex, Array x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateArray(String columnLabel, Array x) throws SQLException {
- // TODO
- }
-
- @Override
- @SkipNullableCheck
- public RowId getRowId(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public RowId getRowId(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void updateRowId(int columnIndex, RowId x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateRowId(String columnLabel, RowId x) throws SQLException {
- // TODO
- }
-
- @Override
- public int getHoldability() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public boolean isClosed() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void updateNString(int columnIndex, String nString) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNString(String columnLabel, String nString) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
- // TODO
- }
-
- @Override
- @SkipNullableCheck
- public NClob getNClob(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public NClob getNClob(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public SQLXML getSQLXML(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public SQLXML getSQLXML(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
- // TODO
- }
-
- @Override
- public String getNString(int columnIndex) throws SQLException {
- // TODO
- return "";
- }
-
- @Override
- public String getNString(String columnLabel) throws SQLException {
- // TODO
- return "";
- }
-
- @Override
- @SkipNullableCheck
- public Reader getNCharacterStream(int columnIndex) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public Reader getNCharacterStream(String columnLabel) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(int columnIndex, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateClob(String columnLabel, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(int columnIndex, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- public void updateNClob(String columnLabel, Reader reader) throws SQLException {
- // TODO
- }
-
- @Override
- @SkipNullableCheck
- public T getObject(int columnIndex, Class type) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public T getObject(String columnLabel, Class type) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- @SkipNullableCheck
- public T unwrap(Class iface) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public boolean isWrapperFor(Class iface) throws SQLException {
- // TODO
- return false;
- }
-
- private SQLException throwNotSupportedException() {
- return new SQLFeatureNotSupportedException("Not implemented by the driver");
- }
+ private final LimboResultSet resultSet;
+
+ public JDBC4ResultSet(LimboResultSet resultSet) {
+ this.resultSet = resultSet;
+ }
+
+ @Override
+ public boolean next() throws SQLException {
+ return resultSet.next();
+ }
+
+ @Override
+ public void close() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public boolean wasNull() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public String getString(int columnIndex) throws SQLException {
+ // TODO
+ return "";
+ }
+
+ @Override
+ public boolean getBoolean(int columnIndex) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public byte getByte(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public short getShort(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int getInt(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public long getLong(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public float getFloat(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public double getDouble(int columnIndex) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public byte[] getBytes(int columnIndex) throws SQLException {
+ // TODO
+ return new byte[0];
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Date getDate(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Time getTime(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Timestamp getTimestamp(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getAsciiStream(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getUnicodeStream(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getBinaryStream(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public String getString(String columnLabel) throws SQLException {
+ // TODO
+ return "";
+ }
+
+ @Override
+ public boolean getBoolean(String columnLabel) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public byte getByte(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public short getShort(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int getInt(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public long getLong(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public float getFloat(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public double getDouble(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public byte[] getBytes(String columnLabel) throws SQLException {
+ // TODO
+ return new byte[0];
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Date getDate(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Time getTime(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Timestamp getTimestamp(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getAsciiStream(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getUnicodeStream(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public InputStream getBinaryStream(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public SQLWarning getWarnings() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void clearWarnings() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public String getCursorName() throws SQLException {
+ // TODO
+ return "";
+ }
+
+ @Override
+ @SkipNullableCheck
+ public ResultSetMetaData getMetaData() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Object getObject(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Object getObject(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public int findColumn(String columnLabel) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Reader getCharacterStream(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Reader getCharacterStream(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public boolean isBeforeFirst() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean isAfterLast() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean isFirst() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean isLast() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void beforeFirst() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void afterLast() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public boolean first() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean last() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public int getRow() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public boolean absolute(int row) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean relative(int rows) throws SQLException {
+ return false;
+ }
+
+ @Override
+ public boolean previous() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void setFetchDirection(int direction) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getFetchDirection() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public void setFetchSize(int rows) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getFetchSize() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int getType() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int getConcurrency() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public boolean rowUpdated() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean rowInserted() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean rowDeleted() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void updateNull(int columnIndex) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBoolean(int columnIndex, boolean x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateByte(int columnIndex, byte x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateShort(int columnIndex, short x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateInt(int columnIndex, int x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateLong(int columnIndex, long x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateFloat(int columnIndex, float x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateDouble(int columnIndex, double x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateString(int columnIndex, String x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBytes(int columnIndex, byte[] x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateDate(int columnIndex, Date x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateTime(int columnIndex, Time x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateObject(int columnIndex, Object x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNull(String columnLabel) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBoolean(String columnLabel, boolean x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateByte(String columnLabel, byte x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateShort(String columnLabel, short x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateInt(String columnLabel, int x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateLong(String columnLabel, long x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateFloat(String columnLabel, float x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateDouble(String columnLabel, double x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateString(String columnLabel, String x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBytes(String columnLabel, byte[] x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateDate(String columnLabel, Date x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateTime(String columnLabel, Time x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(String columnLabel, InputStream x, int length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(String columnLabel, Reader reader, int length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateObject(String columnLabel, Object x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void insertRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void deleteRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void refreshRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void cancelRowUpdates() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void moveToInsertRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void moveToCurrentRow() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Statement getStatement() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Object getObject(int columnIndex, Map> map) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Ref getRef(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Blob getBlob(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Clob getClob(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Array getArray(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Object getObject(String columnLabel, Map> map) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Ref getRef(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Blob getBlob(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Clob getClob(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Array getArray(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Date getDate(int columnIndex, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Date getDate(String columnLabel, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Time getTime(int columnIndex, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Time getTime(String columnLabel, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public URL getURL(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public URL getURL(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void updateRef(int columnIndex, Ref x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateRef(String columnLabel, Ref x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(int columnIndex, Blob x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(String columnLabel, Blob x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(int columnIndex, Clob x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(String columnLabel, Clob x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateArray(int columnIndex, Array x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateArray(String columnLabel, Array x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ @SkipNullableCheck
+ public RowId getRowId(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public RowId getRowId(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void updateRowId(int columnIndex, RowId x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateRowId(String columnLabel, RowId x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getHoldability() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void updateNString(int columnIndex, String nString) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNString(String columnLabel, String nString) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ @SkipNullableCheck
+ public NClob getNClob(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public NClob getNClob(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public SQLXML getSQLXML(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public SQLXML getSQLXML(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public String getNString(int columnIndex) throws SQLException {
+ // TODO
+ return "";
+ }
+
+ @Override
+ public String getNString(String columnLabel) throws SQLException {
+ // TODO
+ return "";
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Reader getNCharacterStream(int columnIndex) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Reader getNCharacterStream(String columnLabel) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNCharacterStream(String columnLabel, Reader reader, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(String columnLabel, InputStream x, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(String columnLabel, InputStream x, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(String columnLabel, Reader reader, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(int columnIndex, InputStream inputStream, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(String columnLabel, InputStream inputStream, long length)
+ throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(int columnIndex, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateClob(String columnLabel, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ @SkipNullableCheck
+ public T getObject(int columnIndex, Class type) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public T getObject(String columnLabel, Class type) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public T unwrap(Class iface) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public boolean isWrapperFor(Class iface) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ private SQLException throwNotSupportedException() {
+ return new SQLFeatureNotSupportedException("Not implemented by the driver");
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
index 24a751857..eee4c95a3 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
@@ -8,7 +8,6 @@ import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.concurrent.locks.ReentrantLock;
-
import org.github.tursodatabase.annotations.Nullable;
import org.github.tursodatabase.annotations.SkipNullableCheck;
import org.github.tursodatabase.core.LimboConnection;
@@ -17,359 +16,366 @@ import org.github.tursodatabase.core.LimboStatement;
public class JDBC4Statement implements Statement {
- private final LimboConnection connection;
- @Nullable
- private LimboStatement statement = null;
+ private final LimboConnection connection;
+ @Nullable private LimboStatement statement = null;
- private boolean closed;
- private boolean closeOnCompletion;
+ private boolean closed;
+ private boolean closeOnCompletion;
- private final int resultSetType;
- private final int resultSetConcurrency;
- private final int resultSetHoldability;
+ private final int resultSetType;
+ private final int resultSetConcurrency;
+ private final int resultSetHoldability;
- private int queryTimeoutSeconds;
- private long updateCount;
- private boolean exhaustedResults = false;
+ private int queryTimeoutSeconds;
+ private long updateCount;
+ private boolean exhaustedResults = false;
- private ReentrantLock connectionLock = new ReentrantLock();
+ private ReentrantLock connectionLock = new ReentrantLock();
- public JDBC4Statement(LimboConnection connection) {
- this(connection, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
- ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ public JDBC4Statement(LimboConnection connection) {
+ this(
+ connection,
+ ResultSet.TYPE_FORWARD_ONLY,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
+
+ public JDBC4Statement(
+ LimboConnection connection,
+ int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldability) {
+ this.connection = connection;
+ this.resultSetType = resultSetType;
+ this.resultSetConcurrency = resultSetConcurrency;
+ this.resultSetHoldability = resultSetHoldability;
+ }
+
+ @Override
+ public ResultSet executeQuery(String sql) throws SQLException {
+ execute(sql);
+
+ requireNonNull(statement, "statement should not be null after running execute method");
+ return new JDBC4ResultSet(statement.getResultSet());
+ }
+
+ @Override
+ public int executeUpdate(String sql) throws SQLException {
+ execute(sql);
+
+ requireNonNull(statement, "statement should not be null after running execute method");
+ final LimboResultSet resultSet = statement.getResultSet();
+ while (resultSet.isOpen()) {
+ resultSet.next();
}
- public JDBC4Statement(LimboConnection connection, int resultSetType, int resultSetConcurrency,
- int resultSetHoldability) {
- this.connection = connection;
- this.resultSetType = resultSetType;
- this.resultSetConcurrency = resultSetConcurrency;
- this.resultSetHoldability = resultSetHoldability;
+ // TODO: return update count;
+ return 0;
+ }
+
+ @Override
+ public void close() throws SQLException {
+ clearGeneratedKeys();
+ internalClose();
+ closed = true;
+ }
+
+ @Override
+ public int getMaxFieldSize() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public void setMaxFieldSize(int max) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getMaxRows() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public void setMaxRows(int max) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void setEscapeProcessing(boolean enable) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getQueryTimeout() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public void setQueryTimeout(int seconds) throws SQLException {
+ if (seconds < 0) {
+ throw new SQLException("Query timeout must be greater than 0");
+ }
+ this.queryTimeoutSeconds = seconds;
+ }
+
+ @Override
+ public void cancel() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ @SkipNullableCheck
+ public SQLWarning getWarnings() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public void clearWarnings() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void setCursorName(String name) throws SQLException {
+ // TODO
+ }
+
+ /**
+ * The execute method executes an SQL statement and indicates the form of the first
+ * result. You must then use the methods getResultSet or getUpdateCount
+ * to retrieve the result, and getMoreResults to move to any subsequent result(s).
+ */
+ @Override
+ public boolean execute(String sql) throws SQLException {
+ internalClose();
+
+ return this.withConnectionTimeout(
+ () -> {
+ try {
+ // TODO: if sql is a readOnly query, do we still need the locks?
+ connectionLock.lock();
+ statement = connection.prepare(sql);
+ final boolean result = statement.execute();
+ updateGeneratedKeys();
+ exhaustedResults = false;
+
+ return result;
+ } finally {
+ connectionLock.unlock();
+ }
+ });
+ }
+
+ @Override
+ public ResultSet getResultSet() throws SQLException {
+ requireNonNull(statement, "statement is null");
+ return new JDBC4ResultSet(statement.getResultSet());
+ }
+
+ @Override
+ public int getUpdateCount() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public boolean getMoreResults() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void setFetchDirection(int direction) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getFetchDirection() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public void setFetchSize(int rows) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int getFetchSize() throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int getResultSetConcurrency() {
+ return resultSetConcurrency;
+ }
+
+ @Override
+ public int getResultSetType() {
+ return resultSetType;
+ }
+
+ @Override
+ public void addBatch(String sql) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public void clearBatch() throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public int[] executeBatch() throws SQLException {
+ // TODO
+ return new int[0];
+ }
+
+ @Override
+ @SkipNullableCheck
+ public Connection getConnection() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public boolean getMoreResults(int current) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public ResultSet getGeneratedKeys() throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public int executeUpdate(String sql, String[] columnNames) throws SQLException {
+ // TODO
+ return 0;
+ }
+
+ @Override
+ public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean execute(String sql, int[] columnIndexes) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public boolean execute(String sql, String[] columnNames) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public int getResultSetHoldability() {
+ return resultSetHoldability;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void setPoolable(boolean poolable) throws SQLException {
+ // TODO
+ }
+
+ @Override
+ public boolean isPoolable() throws SQLException {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public void closeOnCompletion() throws SQLException {
+ if (closed) {
+ throw new SQLException("statement is closed");
+ }
+ closeOnCompletion = true;
+ }
+
+ /**
+ * Indicates whether the statement should be closed automatically when all its dependent result
+ * sets are closed.
+ */
+ @Override
+ public boolean isCloseOnCompletion() throws SQLException {
+ if (closed) {
+ throw new SQLException("statement is closed");
+ }
+ return closeOnCompletion;
+ }
+
+ @Override
+ @SkipNullableCheck
+ public T unwrap(Class iface) throws SQLException {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public boolean isWrapperFor(Class iface) throws SQLException {
+ // TODO
+ return false;
+ }
+
+ protected void internalClose() throws SQLException {
+ // TODO
+ }
+
+ protected void clearGeneratedKeys() throws SQLException {
+ // TODO
+ }
+
+ protected void updateGeneratedKeys() throws SQLException {
+ // TODO
+ }
+
+ private T withConnectionTimeout(SQLCallable callable) throws SQLException {
+ final int originalBusyTimeoutMillis = connection.getBusyTimeout();
+ if (queryTimeoutSeconds > 0) {
+ // TODO: set busy timeout
+ connection.setBusyTimeout(1000 * queryTimeoutSeconds);
}
- @Override
- public ResultSet executeQuery(String sql) throws SQLException {
- execute(sql);
-
- requireNonNull(statement, "statement should not be null after running execute method");
- return new JDBC4ResultSet(statement.getResultSet());
+ try {
+ return callable.call();
+ } finally {
+ if (queryTimeoutSeconds > 0) {
+ connection.setBusyTimeout(originalBusyTimeoutMillis);
+ }
}
+ }
- @Override
- public int executeUpdate(String sql) throws SQLException {
- execute(sql);
-
- requireNonNull(statement, "statement should not be null after running execute method");
- final LimboResultSet resultSet = statement.getResultSet();
- while (resultSet.isOpen()) {
- resultSet.next();
- }
-
- // TODO: return update count;
- return 0;
- }
-
- @Override
- public void close() throws SQLException {
- clearGeneratedKeys();
- internalClose();
- closed = true;
- }
-
- @Override
- public int getMaxFieldSize() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public void setMaxFieldSize(int max) throws SQLException {
- // TODO
- }
-
- @Override
- public int getMaxRows() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public void setMaxRows(int max) throws SQLException {
- // TODO
- }
-
- @Override
- public void setEscapeProcessing(boolean enable) throws SQLException {
- // TODO
- }
-
- @Override
- public int getQueryTimeout() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public void setQueryTimeout(int seconds) throws SQLException {
- if (seconds < 0) {
- throw new SQLException("Query timeout must be greater than 0");
- }
- this.queryTimeoutSeconds = seconds;
- }
-
- @Override
- public void cancel() throws SQLException {
- // TODO
- }
-
- @Override
- @SkipNullableCheck
- public SQLWarning getWarnings() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public void clearWarnings() throws SQLException {
- // TODO
- }
-
- @Override
- public void setCursorName(String name) throws SQLException {
- // TODO
- }
-
- /**
- * The execute method executes an SQL statement and indicates the
- * form of the first result. You must then use the methods
- * getResultSet or getUpdateCount
- * to retrieve the result, and getMoreResults to
- * move to any subsequent result(s).
- */
- @Override
- public boolean execute(String sql) throws SQLException {
- internalClose();
-
- return this.withConnectionTimeout(
- () -> {
- try {
- // TODO: if sql is a readOnly query, do we still need the locks?
- connectionLock.lock();
- statement = connection.prepare(sql);
- final boolean result = statement.execute();
- updateGeneratedKeys();
- exhaustedResults = false;
-
- return result;
- } finally {
- connectionLock.unlock();
- }
- }
- );
- }
-
- @Override
- public ResultSet getResultSet() throws SQLException {
- requireNonNull(statement, "statement is null");
- return new JDBC4ResultSet(statement.getResultSet());
- }
-
- @Override
- public int getUpdateCount() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public boolean getMoreResults() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void setFetchDirection(int direction) throws SQLException {
- // TODO
- }
-
- @Override
- public int getFetchDirection() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public void setFetchSize(int rows) throws SQLException {
- // TODO
- }
-
- @Override
- public int getFetchSize() throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int getResultSetConcurrency() {
- return resultSetConcurrency;
- }
-
- @Override
- public int getResultSetType() {
- return resultSetType;
- }
-
- @Override
- public void addBatch(String sql) throws SQLException {
- // TODO
- }
-
- @Override
- public void clearBatch() throws SQLException {
- // TODO
- }
-
- @Override
- public int[] executeBatch() throws SQLException {
- // TODO
- return new int[0];
- }
-
- @Override
- @SkipNullableCheck
- public Connection getConnection() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public boolean getMoreResults(int current) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- @SkipNullableCheck
- public ResultSet getGeneratedKeys() throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public int executeUpdate(String sql, String[] columnNames) throws SQLException {
- // TODO
- return 0;
- }
-
- @Override
- public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean execute(String sql, int[] columnIndexes) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public boolean execute(String sql, String[] columnNames) throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public int getResultSetHoldability() {
- return resultSetHoldability;
- }
-
- @Override
- public boolean isClosed() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void setPoolable(boolean poolable) throws SQLException {
- // TODO
- }
-
- @Override
- public boolean isPoolable() throws SQLException {
- // TODO
- return false;
- }
-
- @Override
- public void closeOnCompletion() throws SQLException {
- if (closed) {throw new SQLException("statement is closed");}
- closeOnCompletion = true;
- }
-
- /**
- * Indicates whether the statement should be closed automatically when all its dependent result sets are closed.
- */
- @Override
- public boolean isCloseOnCompletion() throws SQLException {
- if (closed) {throw new SQLException("statement is closed");}
- return closeOnCompletion;
- }
-
- @Override
- @SkipNullableCheck
- public T unwrap(Class iface) throws SQLException {
- // TODO
- return null;
- }
-
- @Override
- public boolean isWrapperFor(Class iface) throws SQLException {
- // TODO
- return false;
- }
-
- protected void internalClose() throws SQLException {
- // TODO
- }
-
- protected void clearGeneratedKeys() throws SQLException {
- // TODO
- }
-
- protected void updateGeneratedKeys() throws SQLException {
- // TODO
- }
-
- private T withConnectionTimeout(SQLCallable callable) throws SQLException {
- final int originalBusyTimeoutMillis = connection.getBusyTimeout();
- if (queryTimeoutSeconds > 0) {
- // TODO: set busy timeout
- connection.setBusyTimeout(1000 * queryTimeoutSeconds);
- }
-
- try {
- return callable.call();
- } finally {
- if (queryTimeoutSeconds > 0) {
- connection.setBusyTimeout(originalBusyTimeoutMillis);
- }
- }
- }
-
- @FunctionalInterface
- protected interface SQLCallable {
- T call() throws SQLException;
- }
+ @FunctionalInterface
+ protected interface SQLCallable {
+ T call() throws SQLException;
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/utils/ByteArrayUtils.java b/bindings/java/src/main/java/org/github/tursodatabase/utils/ByteArrayUtils.java
index a89f05042..515fc4e04 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/utils/ByteArrayUtils.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/utils/ByteArrayUtils.java
@@ -1,24 +1,23 @@
package org.github.tursodatabase.utils;
+import java.nio.charset.StandardCharsets;
import org.github.tursodatabase.annotations.Nullable;
-import java.nio.charset.StandardCharsets;
-
public class ByteArrayUtils {
- @Nullable
- public static String utf8ByteBufferToString(@Nullable byte[] buffer) {
- if (buffer == null) {
- return null;
- }
-
- return new String(buffer, StandardCharsets.UTF_8);
+ @Nullable
+ public static String utf8ByteBufferToString(@Nullable byte[] buffer) {
+ if (buffer == null) {
+ return null;
}
- @Nullable
- public static byte[] stringToUtf8ByteArray(@Nullable String str) {
- if (str == null) {
- return null;
- }
- return str.getBytes(StandardCharsets.UTF_8);
+ return new String(buffer, StandardCharsets.UTF_8);
+ }
+
+ @Nullable
+ public static byte[] stringToUtf8ByteArray(@Nullable String str) {
+ if (str == null) {
+ return null;
}
+ return str.getBytes(StandardCharsets.UTF_8);
+ }
}
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/utils/LimboExceptionUtils.java b/bindings/java/src/main/java/org/github/tursodatabase/utils/LimboExceptionUtils.java
index 1525fafc8..88032250e 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/utils/LimboExceptionUtils.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/utils/LimboExceptionUtils.java
@@ -3,39 +3,39 @@ package org.github.tursodatabase.utils;
import static org.github.tursodatabase.utils.ByteArrayUtils.utf8ByteBufferToString;
import java.sql.SQLException;
-
import org.github.tursodatabase.LimboErrorCode;
import org.github.tursodatabase.annotations.Nullable;
import org.github.tursodatabase.exceptions.LimboException;
public class LimboExceptionUtils {
- /**
- * Throws formatted SQLException with error code and message.
- *
- * @param errorCode Error code.
- * @param errorMessageBytes Error message.
- */
- public static void throwLimboException(int errorCode, byte[] errorMessageBytes) throws SQLException {
- String errorMessage = utf8ByteBufferToString(errorMessageBytes);
- throw buildLimboException(errorCode, errorMessage);
+ /**
+ * Throws formatted SQLException with error code and message.
+ *
+ * @param errorCode Error code.
+ * @param errorMessageBytes Error message.
+ */
+ public static void throwLimboException(int errorCode, byte[] errorMessageBytes)
+ throws SQLException {
+ String errorMessage = utf8ByteBufferToString(errorMessageBytes);
+ throw buildLimboException(errorCode, errorMessage);
+ }
+
+ /**
+ * Throws formatted SQLException with error code and message.
+ *
+ * @param errorCode Error code.
+ * @param errorMessage Error message.
+ */
+ public static LimboException buildLimboException(int errorCode, @Nullable String errorMessage)
+ throws SQLException {
+ LimboErrorCode code = LimboErrorCode.getErrorCode(errorCode);
+ String msg;
+ if (code == LimboErrorCode.UNKNOWN_ERROR) {
+ msg = String.format("%s:%s (%s)", code, errorCode, errorMessage);
+ } else {
+ msg = String.format("%s (%s)", code, errorMessage);
}
- /**
- * Throws formatted SQLException with error code and message.
- *
- * @param errorCode Error code.
- * @param errorMessage Error message.
- */
- public static LimboException buildLimboException(int errorCode, @Nullable String errorMessage)
- throws SQLException {
- LimboErrorCode code = LimboErrorCode.getErrorCode(errorCode);
- String msg;
- if (code == LimboErrorCode.UNKNOWN_ERROR) {
- msg = String.format("%s:%s (%s)", code, errorCode, errorMessage);
- } else {
- msg = String.format("%s (%s)", code, errorMessage);
- }
-
- return new LimboException(msg, code);
- }
+ return new LimboException(msg, code);
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/IntegrationTest.java b/bindings/java/src/test/java/org/github/tursodatabase/IntegrationTest.java
index be25ffdff..7688a3352 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/IntegrationTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/IntegrationTest.java
@@ -1,37 +1,36 @@
package org.github.tursodatabase;
-import org.github.tursodatabase.jdbc4.JDBC4Connection;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import org.github.tursodatabase.jdbc4.JDBC4Connection;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class IntegrationTest {
- private JDBC4Connection connection;
+ private JDBC4Connection connection;
- @BeforeEach
- void setUp() throws Exception {
- String filePath = TestUtils.createTempFile();
- String url = "jdbc:sqlite:" + filePath;
- connection = new JDBC4Connection(url, filePath, new Properties());
- }
+ @BeforeEach
+ void setUp() throws Exception {
+ String filePath = TestUtils.createTempFile();
+ String url = "jdbc:sqlite:" + filePath;
+ connection = new JDBC4Connection(url, filePath, new Properties());
+ }
- @Test
- void create_table_multi_inserts_select() throws Exception {
- Statement stmt = createDefaultStatement();
- stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- stmt.execute("INSERT INTO users VALUES (1, 'seonwoo');");
- stmt.execute("INSERT INTO users VALUES (2, 'seonwoo');");
- stmt.execute("INSERT INTO users VALUES (3, 'seonwoo');");
- stmt.execute("SELECT * FROM users");
- }
+ @Test
+ void create_table_multi_inserts_select() throws Exception {
+ Statement stmt = createDefaultStatement();
+ stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ stmt.execute("INSERT INTO users VALUES (1, 'seonwoo');");
+ stmt.execute("INSERT INTO users VALUES (2, 'seonwoo');");
+ stmt.execute("INSERT INTO users VALUES (3, 'seonwoo');");
+ stmt.execute("SELECT * FROM users");
+ }
- private Statement createDefaultStatement() throws SQLException {
- return connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT);
- }
+ private Statement createDefaultStatement() throws SQLException {
+ return connection.createStatement(
+ ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/JDBCTest.java b/bindings/java/src/test/java/org/github/tursodatabase/JDBCTest.java
index 7f28ddb5d..c28ff7cb3 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/JDBCTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/JDBCTest.java
@@ -1,34 +1,33 @@
package org.github.tursodatabase;
-import org.github.tursodatabase.core.LimboConnection;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import org.github.tursodatabase.core.LimboConnection;
+import org.junit.jupiter.api.Test;
class JDBCTest {
- @Test
- void null_is_returned_when_invalid_url_is_passed() throws Exception {
- LimboConnection connection = JDBC.createConnection("jdbc:invalid:xxx", new Properties());
- assertThat(connection).isNull();
- }
+ @Test
+ void null_is_returned_when_invalid_url_is_passed() throws Exception {
+ LimboConnection connection = JDBC.createConnection("jdbc:invalid:xxx", new Properties());
+ assertThat(connection).isNull();
+ }
- @Test
- void non_null_connection_is_returned_when_valid_url_is_passed() throws Exception {
- String fileUrl = TestUtils.createTempFile();
- LimboConnection connection = JDBC.createConnection("jdbc:sqlite:" + fileUrl, new Properties());
- assertThat(connection).isNotNull();
- }
+ @Test
+ void non_null_connection_is_returned_when_valid_url_is_passed() throws Exception {
+ String fileUrl = TestUtils.createTempFile();
+ LimboConnection connection = JDBC.createConnection("jdbc:sqlite:" + fileUrl, new Properties());
+ assertThat(connection).isNotNull();
+ }
- @Test
- void connection_can_be_retrieved_from_DriverManager() throws SQLException {
- try (Connection connection = DriverManager.getConnection("jdbc:sqlite:sample.db")) {
- assertThat(connection).isNotNull();
- }
+ @Test
+ void connection_can_be_retrieved_from_DriverManager() throws SQLException {
+ try (Connection connection = DriverManager.getConnection("jdbc:sqlite:sample.db")) {
+ assertThat(connection).isNotNull();
}
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/TestUtils.java b/bindings/java/src/test/java/org/github/tursodatabase/TestUtils.java
index 0d7e64488..7c39bec6e 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/TestUtils.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/TestUtils.java
@@ -4,10 +4,8 @@ import java.io.IOException;
import java.nio.file.Files;
public class TestUtils {
- /**
- * Create temporary file and returns the path.
- */
- public static String createTempFile() throws IOException {
- return Files.createTempFile("limbo_test_db", null).toAbsolutePath().toString();
- }
+ /** Create temporary file and returns the path. */
+ public static String createTempFile() throws IOException {
+ return Files.createTempFile("limbo_test_db", null).toAbsolutePath().toString();
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBFactoryTest.java b/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBFactoryTest.java
index bc3150f2c..ba7759247 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBFactoryTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBFactoryTest.java
@@ -1,32 +1,31 @@
package org.github.tursodatabase.core;
-import org.github.tursodatabase.TestUtils;
-import org.junit.jupiter.api.Test;
-
-import java.util.Properties;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Properties;
+import org.github.tursodatabase.TestUtils;
+import org.junit.jupiter.api.Test;
+
class LimboDBFactoryTest {
- @Test
- void single_database_should_be_created_when_urls_are_same() throws Exception {
- String filePath = TestUtils.createTempFile();
- String url = "jdbc:sqlite:" + filePath;
- LimboDB db1 = LimboDBFactory.open(url, filePath, new Properties());
- LimboDB db2 = LimboDBFactory.open(url, filePath, new Properties());
- assertEquals(db1, db2);
- }
+ @Test
+ void single_database_should_be_created_when_urls_are_same() throws Exception {
+ String filePath = TestUtils.createTempFile();
+ String url = "jdbc:sqlite:" + filePath;
+ LimboDB db1 = LimboDBFactory.open(url, filePath, new Properties());
+ LimboDB db2 = LimboDBFactory.open(url, filePath, new Properties());
+ assertEquals(db1, db2);
+ }
- @Test
- void multiple_databases_should_be_created_when_urls_differ() throws Exception {
- String filePath1 = TestUtils.createTempFile();
- String filePath2 = TestUtils.createTempFile();
- String url1 = "jdbc:sqlite:" + filePath1;
- String url2 = "jdbc:sqlite:" + filePath2;
- LimboDB db1 = LimboDBFactory.open(url1, filePath1, new Properties());
- LimboDB db2 = LimboDBFactory.open(url2, filePath2, new Properties());
- assertNotEquals(db1, db2);
- }
+ @Test
+ void multiple_databases_should_be_created_when_urls_differ() throws Exception {
+ String filePath1 = TestUtils.createTempFile();
+ String filePath2 = TestUtils.createTempFile();
+ String url1 = "jdbc:sqlite:" + filePath1;
+ String url2 = "jdbc:sqlite:" + filePath2;
+ LimboDB db1 = LimboDBFactory.open(url1, filePath1, new Properties());
+ LimboDB db2 = LimboDBFactory.open(url2, filePath2, new Properties());
+ assertNotEquals(db1, db2);
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBTest.java b/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBTest.java
index 9feb39fb7..ca75ac4c7 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/core/LimboDBTest.java
@@ -1,48 +1,47 @@
package org.github.tursodatabase.core;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.sql.SQLException;
import org.github.tursodatabase.LimboErrorCode;
import org.github.tursodatabase.TestUtils;
import org.github.tursodatabase.exceptions.LimboException;
import org.junit.jupiter.api.Test;
-import java.sql.SQLException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
public class LimboDBTest {
- @Test
- void db_should_open_normally() throws Exception {
- String dbPath = TestUtils.createTempFile();
- LimboDB.load();
- LimboDB db = LimboDB.create("jdbc:sqlite" + dbPath, dbPath);
- db.open(0);
- }
-
- @Test
- void should_throw_exception_when_opened_twice() throws Exception {
- String dbPath = TestUtils.createTempFile();
- LimboDB.load();
- LimboDB db = LimboDB.create("jdbc:sqlite:" + dbPath, dbPath);
- db.open(0);
-
- assertThatThrownBy(() -> db.open(0)).isInstanceOf(SQLException.class);
- }
-
- @Test
- void throwJavaException_should_throw_appropriate_java_exception() throws Exception {
- String dbPath = TestUtils.createTempFile();
- LimboDB.load();
- LimboDB db = LimboDB.create("jdbc:sqlite:" + dbPath, dbPath);
-
- final int limboExceptionCode = LimboErrorCode.LIMBO_ETC.code;
- try {
- db.throwJavaException(limboExceptionCode);
- } catch (Exception e) {
- assertThat(e).isInstanceOf(LimboException.class);
- LimboException limboException = (LimboException) e;
- assertThat(limboException.getResultCode().code).isEqualTo(limboExceptionCode);
- }
+ @Test
+ void db_should_open_normally() throws Exception {
+ String dbPath = TestUtils.createTempFile();
+ LimboDB.load();
+ LimboDB db = LimboDB.create("jdbc:sqlite" + dbPath, dbPath);
+ db.open(0);
+ }
+
+ @Test
+ void should_throw_exception_when_opened_twice() throws Exception {
+ String dbPath = TestUtils.createTempFile();
+ LimboDB.load();
+ LimboDB db = LimboDB.create("jdbc:sqlite:" + dbPath, dbPath);
+ db.open(0);
+
+ assertThatThrownBy(() -> db.open(0)).isInstanceOf(SQLException.class);
+ }
+
+ @Test
+ void throwJavaException_should_throw_appropriate_java_exception() throws Exception {
+ String dbPath = TestUtils.createTempFile();
+ LimboDB.load();
+ LimboDB db = LimboDB.create("jdbc:sqlite:" + dbPath, dbPath);
+
+ final int limboExceptionCode = LimboErrorCode.LIMBO_ETC.code;
+ try {
+ db.throwJavaException(limboExceptionCode);
+ } catch (Exception e) {
+ assertThat(e).isInstanceOf(LimboException.class);
+ LimboException limboException = (LimboException) e;
+ assertThat(limboException.getResultCode().code).isEqualTo(limboExceptionCode);
}
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ConnectionTest.java b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ConnectionTest.java
index c1b9afe56..60f6ee56e 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ConnectionTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ConnectionTest.java
@@ -1,63 +1,68 @@
package org.github.tursodatabase.jdbc4;
-import org.github.tursodatabase.TestUtils;
-import org.github.tursodatabase.core.LimboConnection;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.github.tursodatabase.TestUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
class JDBC4ConnectionTest {
- private JDBC4Connection connection;
+ private JDBC4Connection connection;
- @BeforeEach
- void setUp() throws Exception {
- String filePath = TestUtils.createTempFile();
- String url = "jdbc:sqlite:" + filePath;
- connection = new JDBC4Connection(url, filePath, new Properties());
- }
+ @BeforeEach
+ void setUp() throws Exception {
+ String filePath = TestUtils.createTempFile();
+ String url = "jdbc:sqlite:" + filePath;
+ connection = new JDBC4Connection(url, filePath, new Properties());
+ }
- @Test
- void test_create_statement_valid() throws SQLException {
- Statement stmt = connection.createStatement();
- assertNotNull(stmt);
- assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
- assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
- assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, stmt.getResultSetHoldability());
- }
+ @Test
+ void test_create_statement_valid() throws SQLException {
+ Statement stmt = connection.createStatement();
+ assertNotNull(stmt);
+ assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
+ assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
+ assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, stmt.getResultSetHoldability());
+ }
- @Test
- void test_create_statement_with_type_and_concurrency_valid() throws SQLException {
- Statement stmt = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
- assertNotNull(stmt);
- assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
- assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
- }
+ @Test
+ void test_create_statement_with_type_and_concurrency_valid() throws SQLException {
+ Statement stmt =
+ connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ assertNotNull(stmt);
+ assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
+ assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
+ }
- @Test
- void test_create_statement_with_all_params_valid() throws SQLException {
- Statement stmt = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT);
- assertNotNull(stmt);
- assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
- assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
- assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, stmt.getResultSetHoldability());
- }
+ @Test
+ void test_create_statement_with_all_params_valid() throws SQLException {
+ Statement stmt =
+ connection.createStatement(
+ ResultSet.TYPE_FORWARD_ONLY,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ assertNotNull(stmt);
+ assertEquals(ResultSet.TYPE_FORWARD_ONLY, stmt.getResultSetType());
+ assertEquals(ResultSet.CONCUR_READ_ONLY, stmt.getResultSetConcurrency());
+ assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, stmt.getResultSetHoldability());
+ }
- @Test
- void test_create_statement_invalid() {
- assertThrows(SQLException.class, () -> {
- connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, -1);
+ @Test
+ void test_create_statement_invalid() {
+ assertThrows(
+ SQLException.class,
+ () -> {
+ connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, -1);
});
- }
+ }
- @Test
- void prepare_simple_create_table() throws Exception {
- connection.prepare("CREATE TABLE users (id INT PRIMARY KEY, username TEXT)");
- }
+ @Test
+ void prepare_simple_create_table() throws Exception {
+ connection.prepare("CREATE TABLE users (id INT PRIMARY KEY, username TEXT)");
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
index e717232a8..f764a9361 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
@@ -6,56 +6,55 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
-
import org.github.tursodatabase.TestUtils;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
class JDBC4ResultSetTest {
- private Statement stmt;
+ private Statement stmt;
- @BeforeEach
- void setUp() throws Exception {
- String filePath = TestUtils.createTempFile();
- String url = "jdbc:sqlite:" + filePath;
- final JDBC4Connection connection = new JDBC4Connection(url, filePath, new Properties());
- stmt = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY,
- ResultSet.CONCUR_READ_ONLY,
- ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ @BeforeEach
+ void setUp() throws Exception {
+ String filePath = TestUtils.createTempFile();
+ String url = "jdbc:sqlite:" + filePath;
+ final JDBC4Connection connection = new JDBC4Connection(url, filePath, new Properties());
+ stmt =
+ connection.createStatement(
+ ResultSet.TYPE_FORWARD_ONLY,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
+
+ @Test
+ void invoking_next_before_the_last_row_should_return_true() throws Exception {
+ stmt.executeUpdate("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ stmt.executeUpdate("INSERT INTO users VALUES (1, 'sinwoo');");
+ stmt.executeUpdate("INSERT INTO users VALUES (2, 'seonwoo');");
+
+ // first call to next occur internally
+ stmt.executeQuery("SELECT * FROM users");
+ ResultSet resultSet = stmt.getResultSet();
+
+ assertTrue(resultSet.next());
+ }
+
+ @Test
+ void invoking_next_after_the_last_row_should_return_false() throws Exception {
+ stmt.executeUpdate("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ stmt.executeUpdate("INSERT INTO users VALUES (1, 'sinwoo');");
+ stmt.executeUpdate("INSERT INTO users VALUES (2, 'seonwoo');");
+
+ // first call to next occur internally
+ stmt.executeQuery("SELECT * FROM users");
+ ResultSet resultSet = stmt.getResultSet();
+
+ while (resultSet.next()) {
+ // run until next() returns false
}
- @Test
- @Disabled("https://github.com/tursodatabase/limbo/pull/743#issuecomment-2600746904")
- void invoking_next_before_the_last_row_should_return_true() throws Exception {
- stmt.executeUpdate("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- stmt.executeUpdate("INSERT INTO users VALUES (1, 'sinwoo');");
- stmt.executeUpdate("INSERT INTO users VALUES (2, 'seonwoo');");
-
- // first call to next occur internally
- stmt.executeQuery("SELECT * FROM users");
- ResultSet resultSet = stmt.getResultSet();
-
- assertTrue(resultSet.next());
- }
-
- @Test
- @Disabled("https://github.com/tursodatabase/limbo/pull/743#issuecomment-2600746904")
- void invoking_next_after_the_last_row_should_return_false() throws Exception {
- stmt.executeUpdate("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- stmt.executeUpdate("INSERT INTO users VALUES (1, 'sinwoo');");
- stmt.executeUpdate("INSERT INTO users VALUES (2, 'seonwoo');");
-
- // first call to next occur internally
- stmt.executeQuery("SELECT * FROM users");
- ResultSet resultSet = stmt.getResultSet();
-
- while (resultSet.next()) {
- // run until next() returns false
- }
-
- // if the previous call to next() returned false, consecutive call to next() should return false as well
- assertFalse(resultSet.next());
- }
+ // if the previous call to next() returned false, consecutive call to next() should return false
+ // as well
+ assertFalse(resultSet.next());
+ }
}
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4StatementTest.java b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4StatementTest.java
index f81e9d482..2a837629d 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4StatementTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4StatementTest.java
@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
-
import org.github.tursodatabase.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -13,41 +12,43 @@ import org.junit.jupiter.api.Test;
class JDBC4StatementTest {
- private Statement stmt;
+ private Statement stmt;
- @BeforeEach
- void setUp() throws Exception {
- String filePath = TestUtils.createTempFile();
- String url = "jdbc:sqlite:" + filePath;
- final JDBC4Connection connection = new JDBC4Connection(url, filePath, new Properties());
- stmt = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY,
- ResultSet.CONCUR_READ_ONLY,
- ResultSet.CLOSE_CURSORS_AT_COMMIT);
- }
+ @BeforeEach
+ void setUp() throws Exception {
+ String filePath = TestUtils.createTempFile();
+ String url = "jdbc:sqlite:" + filePath;
+ final JDBC4Connection connection = new JDBC4Connection(url, filePath, new Properties());
+ stmt =
+ connection.createStatement(
+ ResultSet.TYPE_FORWARD_ONLY,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ }
- @Test
- void execute_ddl_should_return_false() throws Exception{
- assertFalse(stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);"));
- }
+ @Test
+ void execute_ddl_should_return_false() throws Exception {
+ assertFalse(stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);"));
+ }
- @Test
- void execute_insert_should_return_false() throws Exception {
- stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- assertFalse(stmt.execute("INSERT INTO users VALUES (1, 'limbo');"));
- }
+ @Test
+ void execute_insert_should_return_false() throws Exception {
+ stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ assertFalse(stmt.execute("INSERT INTO users VALUES (1, 'limbo');"));
+ }
- @Test
- @Disabled("UPDATE not supported yet")
- void execute_update_should_return_false() throws Exception {
- stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- stmt.execute("INSERT INTO users VALUES (1, 'limbo');");
- assertFalse(stmt.execute("UPDATE users SET username = 'seonwoo' WHERE id = 1;"));
- }
+ @Test
+ @Disabled("UPDATE not supported yet")
+ void execute_update_should_return_false() throws Exception {
+ stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ stmt.execute("INSERT INTO users VALUES (1, 'limbo');");
+ assertFalse(stmt.execute("UPDATE users SET username = 'seonwoo' WHERE id = 1;"));
+ }
- @Test
- void execute_select_should_return_true() throws Exception {
- stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
- stmt.execute("INSERT INTO users VALUES (1, 'limbo');");
- assertTrue(stmt.execute("SELECT * FROM users;"));
- }
+ @Test
+ void execute_select_should_return_true() throws Exception {
+ stmt.execute("CREATE TABLE users (id INT PRIMARY KEY, username TEXT);");
+ stmt.execute("INSERT INTO users VALUES (1, 'limbo');");
+ assertTrue(stmt.execute("SELECT * FROM users;"));
+ }
}
diff --git a/bindings/rust/src/lib.rs b/bindings/rust/src/lib.rs
index b2114045a..f19814c38 100644
--- a/bindings/rust/src/lib.rs
+++ b/bindings/rust/src/lib.rs
@@ -110,7 +110,7 @@ pub enum Params {
pub struct Transaction {}
pub struct Rows {
- _inner: Rc,
+ _inner: Rc,
}
impl Rows {
diff --git a/cli/app.rs b/cli/app.rs
index 9c7e17d65..278bbca43 100644
--- a/cli/app.rs
+++ b/cli/app.rs
@@ -3,7 +3,7 @@ use crate::{
opcodes_dictionary::OPCODE_DESCRIPTIONS,
};
use cli_table::{Cell, Table};
-use limbo_core::{Database, LimboError, Rows, StepResult, Value};
+use limbo_core::{Database, LimboError, Statement, StepResult, Value};
use clap::{Parser, ValueEnum};
use std::{
@@ -614,7 +614,7 @@ impl Limbo {
fn print_query_result(
&mut self,
sql: &str,
- mut output: Result, LimboError>,
+ mut output: Result, LimboError>,
) -> anyhow::Result<()> {
match output {
Ok(Some(ref mut rows)) => match self.opts.output_mode {
@@ -624,7 +624,7 @@ impl Limbo {
return Ok(());
}
- match rows.next_row() {
+ match rows.step() {
Ok(StepResult::Row(row)) => {
for (i, value) in row.values.iter().enumerate() {
if i > 0 {
@@ -669,7 +669,7 @@ impl Limbo {
}
let mut table_rows: Vec> = vec![];
loop {
- match rows.next_row() {
+ match rows.step() {
Ok(StepResult::Row(row)) => {
table_rows.push(
row.values
@@ -739,7 +739,7 @@ impl Limbo {
Ok(Some(ref mut rows)) => {
let mut found = false;
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
if let Some(Value::Text(schema)) = row.values.first() {
let _ = self.write_fmt(format_args!("{};", schema));
@@ -796,7 +796,7 @@ impl Limbo {
Ok(Some(ref mut rows)) => {
let mut tables = String::new();
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
if let Some(Value::Text(table)) = row.values.first() {
tables.push_str(table);
diff --git a/cli/import.rs b/cli/import.rs
index a339bd276..b7557d58b 100644
--- a/cli/import.rs
+++ b/cli/import.rs
@@ -95,7 +95,7 @@ impl<'a> ImportFile<'a> {
match self.conn.query(insert_string) {
Ok(rows) => {
if let Some(mut rows) = rows {
- while let Ok(x) = rows.next_row() {
+ while let Ok(x) = rows.step() {
match x {
limbo_core::StepResult::IO => {
self.io.run_once().unwrap();
diff --git a/core/benches/benchmark.rs b/core/benches/benchmark.rs
index 184deac4a..9858a0c56 100644
--- a/core/benches/benchmark.rs
+++ b/core/benches/benchmark.rs
@@ -46,7 +46,7 @@ fn limbo_bench(criterion: &mut Criterion) {
let io = io.clone();
b.iter(|| {
let mut rows = stmt.query().unwrap();
- match rows.next_row().unwrap() {
+ match rows.step().unwrap() {
limbo_core::StepResult::Row(row) => {
assert_eq!(row.get::(0).unwrap(), 1);
}
@@ -74,7 +74,7 @@ fn limbo_bench(criterion: &mut Criterion) {
let io = io.clone();
b.iter(|| {
let mut rows = stmt.query().unwrap();
- match rows.next_row().unwrap() {
+ match rows.step().unwrap() {
limbo_core::StepResult::Row(row) => {
assert_eq!(row.get::(0).unwrap(), 1);
}
@@ -103,7 +103,7 @@ fn limbo_bench(criterion: &mut Criterion) {
let io = io.clone();
b.iter(|| {
let mut rows = stmt.query().unwrap();
- match rows.next_row().unwrap() {
+ match rows.step().unwrap() {
limbo_core::StepResult::Row(row) => {
assert_eq!(row.get::(0).unwrap(), 1);
}
diff --git a/core/function.rs b/core/function.rs
index 5023c3c94..1e5386696 100644
--- a/core/function.rs
+++ b/core/function.rs
@@ -79,6 +79,7 @@ pub enum JsonFunc {
JsonObject,
JsonType,
JsonErrorPosition,
+ JsonValid,
}
#[cfg(feature = "json")]
@@ -97,6 +98,7 @@ impl Display for JsonFunc {
Self::JsonObject => "json_object".to_string(),
Self::JsonType => "json_type".to_string(),
Self::JsonErrorPosition => "json_error_position".to_string(),
+ Self::JsonValid => "json_valid".to_string(),
}
)
}
@@ -213,6 +215,7 @@ pub enum ScalarFunc {
Replace,
#[cfg(not(target_family = "wasm"))]
LoadExtension,
+ StrfTime,
}
impl Display for ScalarFunc {
@@ -264,6 +267,7 @@ impl Display for ScalarFunc {
Self::DateTime => "datetime".to_string(),
#[cfg(not(target_family = "wasm"))]
Self::LoadExtension => "load_extension".to_string(),
+ Self::StrfTime => "strftime".to_string(),
};
write!(f, "{}", str)
}
@@ -517,6 +521,8 @@ impl Func {
"json_type" => Ok(Func::Json(JsonFunc::JsonType)),
#[cfg(feature = "json")]
"json_error_position" => Ok(Self::Json(JsonFunc::JsonErrorPosition)),
+ #[cfg(feature = "json")]
+ "json_valid" => Ok(Self::Json(JsonFunc::JsonValid)),
"unixepoch" => Ok(Self::Scalar(ScalarFunc::UnixEpoch)),
"julianday" => Ok(Self::Scalar(ScalarFunc::JulianDay)),
"hex" => Ok(Self::Scalar(ScalarFunc::Hex)),
@@ -554,6 +560,7 @@ impl Func {
"trunc" => Ok(Self::Math(MathFunc::Trunc)),
#[cfg(not(target_family = "wasm"))]
"load_extension" => Ok(Self::Scalar(ScalarFunc::LoadExtension)),
+ "strftime" => Ok(Self::Scalar(ScalarFunc::StrfTime)),
_ => crate::bail_parse_error!("no such function: {}", name),
}
}
diff --git a/core/json/mod.rs b/core/json/mod.rs
index fee87e3df..10e682148 100644
--- a/core/json/mod.rs
+++ b/core/json/mod.rs
@@ -984,3 +984,17 @@ mod tests {
}
}
}
+pub fn is_json_valid(json_value: &OwnedValue) -> crate::Result {
+ match json_value {
+ OwnedValue::Text(ref t) => match from_str::(&t.value) {
+ Ok(_) => Ok(OwnedValue::Integer(1)),
+ Err(_) => Ok(OwnedValue::Integer(0)),
+ },
+ OwnedValue::Blob(b) => match jsonb::from_slice(b) {
+ Ok(_) => Ok(OwnedValue::Integer(1)),
+ Err(_) => Ok(OwnedValue::Integer(0)),
+ },
+ OwnedValue::Null => Ok(OwnedValue::Null),
+ _ => Ok(OwnedValue::Integer(1)),
+ }
+}
diff --git a/core/lib.rs b/core/lib.rs
index 83cda335f..74557caaa 100644
--- a/core/lib.rs
+++ b/core/lib.rs
@@ -283,7 +283,7 @@ impl Connection {
}
}
- pub fn query(self: &Rc, sql: impl Into) -> Result> {
+ pub fn query(self: &Rc, sql: impl Into) -> Result> {
let sql = sql.into();
trace!("Querying: {}", sql);
let mut parser = Parser::new(sql.as_bytes());
@@ -294,10 +294,9 @@ impl Connection {
}
}
- pub(crate) fn run_cmd(self: &Rc, cmd: Cmd) -> Result> {
+ pub(crate) fn run_cmd(self: &Rc, cmd: Cmd) -> Result> {
let db = self.db.clone();
let syms: &SymbolTable = &db.syms.borrow();
-
match cmd {
Cmd::Stmt(stmt) => {
let program = Rc::new(translate::translate(
@@ -309,7 +308,7 @@ impl Connection {
syms,
)?);
let stmt = Statement::new(program, self.pager.clone());
- Ok(Some(Rows { stmt }))
+ Ok(Some(stmt))
}
Cmd::Explain(stmt) => {
let program = translate::translate(
@@ -375,7 +374,8 @@ impl Connection {
syms,
)?;
- let mut state = vdbe::ProgramState::new(program.max_registers);
+ let mut state =
+ vdbe::ProgramState::new(program.max_registers, program.cursor_ref.len());
program.step(&mut state, self.pager.clone())?;
}
}
@@ -430,6 +430,10 @@ impl Connection {
let prev_total_changes = self.total_changes.get();
self.total_changes.set(prev_total_changes + nchange);
}
+
+ pub fn total_changes(&self) -> i64 {
+ self.total_changes.get()
+ }
}
pub struct Statement {
@@ -440,7 +444,7 @@ pub struct Statement {
impl Statement {
pub fn new(program: Rc, pager: Rc) -> Self {
- let state = vdbe::ProgramState::new(program.max_registers);
+ let state = vdbe::ProgramState::new(program.max_registers, program.cursor_ref.len());
Self {
program,
state,
@@ -463,22 +467,29 @@ impl Statement {
}
}
- pub fn query(&mut self) -> Result {
+ pub fn query(&mut self) -> Result {
let stmt = Statement::new(self.program.clone(), self.pager.clone());
- Ok(Rows::new(stmt))
+ Ok(stmt)
+ }
+
+ pub fn columns(&self) -> &[String] {
+ &self.program.columns
}
pub fn parameters(&self) -> ¶meters::Parameters {
&self.program.parameters
}
+ pub fn parameters_count(&self) -> usize {
+ self.program.parameters.count()
+ }
+
pub fn bind_at(&mut self, index: NonZero, value: Value) {
self.state.bind_at(index, value.into());
}
pub fn reset(&mut self) {
- let state = vdbe::ProgramState::new(self.program.max_registers);
- self.state = state
+ self.state.reset();
}
}
@@ -503,20 +514,6 @@ impl<'a> Row<'a> {
}
}
-pub struct Rows {
- stmt: Statement,
-}
-
-impl Rows {
- pub fn new(stmt: Statement) -> Self {
- Self { stmt }
- }
-
- pub fn next_row(&mut self) -> Result> {
- self.stmt.step()
- }
-}
-
pub(crate) struct SymbolTable {
pub functions: HashMap>,
#[cfg(not(target_family = "wasm"))]
@@ -591,7 +588,7 @@ impl<'a> QueryRunner<'a> {
}
impl Iterator for QueryRunner<'_> {
- type Item = Result>;
+ type Item = Result>;
fn next(&mut self) -> Option {
match self.parser.next() {
diff --git a/core/storage/btree.rs b/core/storage/btree.rs
index c8746702d..7e7ee4289 100644
--- a/core/storage/btree.rs
+++ b/core/storage/btree.rs
@@ -105,7 +105,6 @@ pub struct BTreeCursor {
rowid: RefCell>,
record: RefCell>,
null_flag: bool,
- database_header: Rc>,
/// Index internal pages are consumed on the way up, so we store going upwards flag in case
/// we just moved to a parent page and the parent page is an internal index page which requires
/// to be consumed.
@@ -137,18 +136,13 @@ struct PageStack {
}
impl BTreeCursor {
- pub fn new(
- pager: Rc,
- root_page: usize,
- database_header: Rc>,
- ) -> Self {
+ pub fn new(pager: Rc, root_page: usize) -> Self {
Self {
pager,
root_page,
rowid: RefCell::new(None),
record: RefCell::new(None),
null_flag: false,
- database_header,
going_upwards: false,
write_info: WriteInfo {
state: WriteState::Start,
@@ -750,7 +744,7 @@ impl BTreeCursor {
/// and the overflow cell count is used to determine if the page overflows,
/// i.e. whether we need to balance the btree after the insert.
fn insert_into_cell(&self, page: &mut PageContent, payload: &[u8], cell_idx: usize) {
- let free = self.compute_free_space(page, RefCell::borrow(&self.database_header));
+ let free = self.compute_free_space(page, RefCell::borrow(&self.pager.db_header));
const CELL_POINTER_SIZE_BYTES: usize = 2;
let enough_space = payload.len() + CELL_POINTER_SIZE_BYTES <= free as usize;
if !enough_space {
@@ -832,7 +826,7 @@ impl BTreeCursor {
// then we need to do some more calculation to figure out where to insert the freeblock
// in the freeblock linked list.
let maxpc = {
- let db_header = self.database_header.borrow();
+ let db_header = self.pager.db_header.borrow();
let usable_space = (db_header.page_size - db_header.reserved_space as u16) as usize;
usable_space as u16
};
@@ -1063,7 +1057,7 @@ impl BTreeCursor {
contents.write_u16(PAGE_HEADER_OFFSET_FIRST_FREEBLOCK, 0);
contents.write_u16(PAGE_HEADER_OFFSET_CELL_COUNT, 0);
- let db_header = RefCell::borrow(&self.database_header);
+ let db_header = RefCell::borrow(&self.pager.db_header);
let cell_content_area_start =
db_header.page_size - db_header.reserved_space as u16;
contents.write_u16(
@@ -1294,7 +1288,7 @@ impl BTreeCursor {
/// This marks the page as dirty and writes the page header.
fn allocate_page(&self, page_type: PageType, offset: usize) -> PageRef {
let page = self.pager.allocate_page().unwrap();
- btree_init_page(&page, page_type, &self.database_header.borrow(), offset);
+ btree_init_page(&page, page_type, &self.pager.db_header.borrow(), offset);
page
}
@@ -1322,7 +1316,7 @@ impl BTreeCursor {
// there are free blocks and enough space
if page_ref.first_freeblock() != 0 && gap + 2 <= top {
// find slot
- let db_header = RefCell::borrow(&self.database_header);
+ let db_header = RefCell::borrow(&self.pager.db_header);
let pc = find_free_cell(page_ref, db_header, amount);
if pc != 0 {
return pc as u16;
@@ -1332,11 +1326,11 @@ impl BTreeCursor {
if gap + 2 + amount > top {
// defragment
- self.defragment_page(page_ref, RefCell::borrow(&self.database_header));
+ self.defragment_page(page_ref, RefCell::borrow(&self.pager.db_header));
top = page_ref.read_u16(PAGE_HEADER_OFFSET_CELL_CONTENT_AREA) as usize;
}
- let db_header = RefCell::borrow(&self.database_header);
+ let db_header = RefCell::borrow(&self.pager.db_header);
top -= amount;
page_ref.write_u16(PAGE_HEADER_OFFSET_CELL_CONTENT_AREA, top as u16);
@@ -1656,7 +1650,7 @@ impl BTreeCursor {
/// The usable size of a page might be an odd number. However, the usable size is not allowed to be less than 480.
/// In other words, if the page size is 512, then the reserved space size cannot exceed 32.
fn usable_space(&self) -> usize {
- let db_header = RefCell::borrow(&self.database_header);
+ let db_header = self.pager.db_header.borrow();
(db_header.page_size - db_header.reserved_space as u16) as usize
}
diff --git a/core/storage/page_cache.rs b/core/storage/page_cache.rs
index e21433af1..27ea8244e 100644
--- a/core/storage/page_cache.rs
+++ b/core/storage/page_cache.rs
@@ -6,7 +6,7 @@ use super::pager::PageRef;
// In limbo, page cache is shared by default, meaning that multiple frames from WAL can reside in
// the cache, meaning, we need a way to differentiate between pages cached in different
-// connections. For this we include the max_frame that will read a connection from so that if two
+// connections. For this we include the max_frame that a connection will read from so that if two
// connections have different max_frames, they might or not have different frame read from WAL.
//
// WAL was introduced after Shared cache in SQLite, so this is why these two features don't work
diff --git a/core/storage/pager.rs b/core/storage/pager.rs
index 9cc86b958..559e872ae 100644
--- a/core/storage/pager.rs
+++ b/core/storage/pager.rs
@@ -157,7 +157,7 @@ pub struct Pager {
/// I/O interface for input/output operations.
pub io: Arc,
dirty_pages: Rc>>,
- db_header: Rc>,
+ pub db_header: Rc>,
flush_info: RefCell,
checkpoint_state: RefCell,
diff --git a/core/storage/wal.rs b/core/storage/wal.rs
index 5d40d5a1d..0de3b7590 100644
--- a/core/storage/wal.rs
+++ b/core/storage/wal.rs
@@ -187,7 +187,7 @@ pub enum CheckpointStatus {
// min_frame and max_frame is the range of frames that can be safely transferred from WAL to db
// file.
// current_page is a helper to iterate through all the pages that might have a frame in the safe
-// range. This is inneficient for now.
+// range. This is inefficient for now.
struct OngoingCheckpoint {
page: PageRef,
state: CheckpointState,
@@ -228,13 +228,13 @@ pub struct WalFileShared {
max_frame: u64,
nbackfills: u64,
// Frame cache maps a Page to all the frames it has stored in WAL in ascending order.
- // This is do to easily find the frame it must checkpoint each connection if a checkpoint is
+ // This is to easily find the frame it must checkpoint each connection if a checkpoint is
// necessary.
// One difference between SQLite and limbo is that we will never support multi process, meaning
// we don't need WAL's index file. So we can do stuff like this without shared memory.
- // TODO: this will need refactoring because this is incredible memory inneficient.
+ // TODO: this will need refactoring because this is incredible memory inefficient.
frame_cache: HashMap>,
- // Another memory inneficient array made to just keep track of pages that are in frame_cache.
+ // Another memory inefficient array made to just keep track of pages that are in frame_cache.
pages_in_frames: Vec,
last_checksum: (u32, u32), // Check of last frame in WAL, this is a cumulative checksum over all frames in the WAL
file: Rc,
diff --git a/core/translate/emitter.rs b/core/translate/emitter.rs
index 13daa85ed..939a287f0 100644
--- a/core/translate/emitter.rs
+++ b/core/translate/emitter.rs
@@ -175,7 +175,11 @@ fn emit_program_for_select(
// Finalize program
epilogue(program, init_label, start_offset)?;
-
+ program.columns = plan
+ .result_columns
+ .iter()
+ .map(|rc| rc.name.clone())
+ .collect::>();
Ok(())
}
@@ -286,7 +290,11 @@ fn emit_program_for_delete(
// Finalize program
epilogue(program, init_label, start_offset)?;
-
+ program.columns = plan
+ .result_columns
+ .iter()
+ .map(|rc| rc.name.clone())
+ .collect::>();
Ok(())
}
diff --git a/core/translate/expr.rs b/core/translate/expr.rs
index 476b78d77..9fdf5f9c2 100644
--- a/core/translate/expr.rs
+++ b/core/translate/expr.rs
@@ -605,6 +605,20 @@ pub fn translate_expr(
dest: target_register,
});
}
+ ast::Operator::And => {
+ program.emit_insn(Insn::And {
+ lhs: e1_reg,
+ rhs: e2_reg,
+ dest: target_register,
+ });
+ }
+ ast::Operator::Or => {
+ program.emit_insn(Insn::Or {
+ lhs: e1_reg,
+ rhs: e2_reg,
+ dest: target_register,
+ });
+ }
ast::Operator::BitwiseAnd => {
program.emit_insn(Insn::BitAnd {
lhs: e1_reg,
@@ -915,6 +929,14 @@ pub fn translate_expr(
func_ctx,
)
}
+ JsonFunc::JsonValid => translate_function(
+ program,
+ args.as_deref().unwrap_or_default(),
+ referenced_tables,
+ resolver,
+ target_register,
+ func_ctx,
+ ),
},
Func::Scalar(srf) => {
match srf {
@@ -1517,6 +1539,26 @@ pub fn translate_expr(
});
Ok(target_register)
}
+ ScalarFunc::StrfTime => {
+ if let Some(args) = args {
+ for arg in args.iter() {
+ // register containing result of each argument expression
+ let _ = translate_and_mark(
+ program,
+ referenced_tables,
+ arg,
+ resolver,
+ )?;
+ }
+ }
+ program.emit_insn(Insn::Function {
+ constant_mask: 0,
+ start_reg: target_register + 1,
+ dest: target_register,
+ func: func_ctx,
+ });
+ Ok(target_register)
+ }
}
}
Func::Math(math_func) => match math_func.arity() {
diff --git a/core/types.rs b/core/types.rs
index a3c31e1d9..92e4714c7 100644
--- a/core/types.rs
+++ b/core/types.rs
@@ -2,7 +2,10 @@ use limbo_ext::{AggCtx, FinalizeFunction, StepFunction};
use crate::error::LimboError;
use crate::ext::{ExtValue, ExtValueType};
+use crate::pseudo::PseudoCursor;
+use crate::storage::btree::BTreeCursor;
use crate::storage::sqlite3_ondisk::write_varint;
+use crate::vdbe::sorter::Sorter;
use crate::Result;
use std::fmt::Display;
use std::rc::Rc;
@@ -604,7 +607,59 @@ impl OwnedRecord {
}
}
-#[derive(PartialEq, Debug)]
+pub enum Cursor {
+ Table(BTreeCursor),
+ Index(BTreeCursor),
+ Pseudo(PseudoCursor),
+ Sorter(Sorter),
+}
+
+impl Cursor {
+ pub fn new_table(cursor: BTreeCursor) -> Self {
+ Self::Table(cursor)
+ }
+
+ pub fn new_index(cursor: BTreeCursor) -> Self {
+ Self::Index(cursor)
+ }
+
+ pub fn new_pseudo(cursor: PseudoCursor) -> Self {
+ Self::Pseudo(cursor)
+ }
+
+ pub fn new_sorter(cursor: Sorter) -> Self {
+ Self::Sorter(cursor)
+ }
+
+ pub fn as_table_mut(&mut self) -> &mut BTreeCursor {
+ match self {
+ Self::Table(cursor) => cursor,
+ _ => panic!("Cursor is not a table"),
+ }
+ }
+
+ pub fn as_index_mut(&mut self) -> &mut BTreeCursor {
+ match self {
+ Self::Index(cursor) => cursor,
+ _ => panic!("Cursor is not an index"),
+ }
+ }
+
+ pub fn as_pseudo_mut(&mut self) -> &mut PseudoCursor {
+ match self {
+ Self::Pseudo(cursor) => cursor,
+ _ => panic!("Cursor is not a pseudo cursor"),
+ }
+ }
+
+ pub fn as_sorter_mut(&mut self) -> &mut Sorter {
+ match self {
+ Self::Sorter(cursor) => cursor,
+ _ => panic!("Cursor is not a sorter cursor"),
+ }
+ }
+}
+
pub enum CursorResult {
Ok(T),
IO,
diff --git a/core/util.rs b/core/util.rs
index 9e67313ea..c81747887 100644
--- a/core/util.rs
+++ b/core/util.rs
@@ -4,7 +4,7 @@ use sqlite3_parser::ast::{Expr, FunctionTail, Literal};
use crate::{
schema::{self, Schema},
- Result, Rows, StepResult, IO,
+ Result, Statement, StepResult, IO,
};
// https://sqlite.org/lang_keywords.html
@@ -25,11 +25,15 @@ pub fn normalize_ident(identifier: &str) -> String {
pub const PRIMARY_KEY_AUTOMATIC_INDEX_NAME_PREFIX: &str = "sqlite_autoindex_";
-pub fn parse_schema_rows(rows: Option, schema: &mut Schema, io: Arc) -> Result<()> {
+pub fn parse_schema_rows(
+ rows: Option,
+ schema: &mut Schema,
+ io: Arc,
+) -> Result<()> {
if let Some(mut rows) = rows {
let mut automatic_indexes = Vec::new();
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let ty = row.get::<&str>(0)?;
if ty != "table" && ty != "index" {
diff --git a/core/vdbe/builder.rs b/core/vdbe/builder.rs
index 08b35d9e3..0af4d1182 100644
--- a/core/vdbe/builder.rs
+++ b/core/vdbe/builder.rs
@@ -30,6 +30,7 @@ pub struct ProgramBuilder {
// map of instruction index to manual comment (used in EXPLAIN)
comments: HashMap,
pub parameters: Parameters,
+ pub columns: Vec,
}
#[derive(Debug, Clone)]
@@ -60,6 +61,7 @@ impl ProgramBuilder {
seekrowid_emitted_bitmask: 0,
comments: HashMap::new(),
parameters: Parameters::new(),
+ columns: Vec::new(),
}
}
@@ -352,6 +354,7 @@ impl ProgramBuilder {
parameters: self.parameters,
n_change: Cell::new(0),
change_cnt_on,
+ columns: self.columns,
}
}
}
diff --git a/core/vdbe/datetime.rs b/core/vdbe/datetime.rs
index 2f9cdc601..4cb89a65d 100644
--- a/core/vdbe/datetime.rs
+++ b/core/vdbe/datetime.rs
@@ -22,24 +22,44 @@ pub fn exec_datetime_full(values: &[OwnedValue]) -> OwnedValue {
exec_datetime(values, DateTimeOutput::DateTime)
}
+#[inline(always)]
+pub fn exec_strftime(values: &[OwnedValue]) -> OwnedValue {
+ if values.is_empty() {
+ return OwnedValue::Null;
+ }
+
+ let format_str = match &values[0] {
+ OwnedValue::Text(text) => text.value.to_string(),
+ OwnedValue::Integer(num) => num.to_string(),
+ OwnedValue::Float(num) => format!("{:.14}", num),
+ _ => return OwnedValue::Null,
+ };
+
+ exec_datetime(&values[1..], DateTimeOutput::StrfTime(format_str))
+}
+
enum DateTimeOutput {
Date,
Time,
DateTime,
+ // Holds the format string
+ StrfTime(String),
}
fn exec_datetime(values: &[OwnedValue], output_type: DateTimeOutput) -> OwnedValue {
if values.is_empty() {
- return OwnedValue::build_text(Rc::new(
- parse_naive_date_time(&OwnedValue::build_text(Rc::new("now".to_string())))
- .unwrap()
- .format(match output_type {
- DateTimeOutput::DateTime => "%Y-%m-%d %H:%M:%S",
- DateTimeOutput::Time => "%H:%M:%S",
- DateTimeOutput::Date => "%Y-%m-%d",
- })
- .to_string(),
- ));
+ let now =
+ parse_naive_date_time(&OwnedValue::build_text(Rc::new("now".to_string()))).unwrap();
+
+ let formatted_str = match output_type {
+ DateTimeOutput::DateTime => now.format("%Y-%m-%d %H:%M:%S").to_string(),
+ DateTimeOutput::Time => now.format("%H:%M:%S").to_string(),
+ DateTimeOutput::Date => now.format("%Y-%m-%d").to_string(),
+ DateTimeOutput::StrfTime(ref format_str) => strftime_format(&now, format_str),
+ };
+
+ // Parse here
+ return OwnedValue::build_text(Rc::new(formatted_str));
}
if let Some(mut dt) = parse_naive_date_time(&values[0]) {
// if successful, treat subsequent entries as modifiers
@@ -95,6 +115,31 @@ fn format_dt(dt: NaiveDateTime, output_type: DateTimeOutput, subsec: bool) -> St
dt.format("%Y-%m-%d %H:%M:%S").to_string()
}
}
+ DateTimeOutput::StrfTime(format_str) => strftime_format(&dt, &format_str),
+ }
+}
+
+// Not as fast as if the formatting was native to chrono, but a good enough
+// for now, just to have the feature implemented
+fn strftime_format(dt: &NaiveDateTime, format_str: &str) -> String {
+ use std::fmt::Write;
+ // Necessary to remove %f and %J that are exclusive formatters to sqlite
+ // Chrono does not support them, so it is necessary to replace the modifiers manually
+
+ // Sqlite uses 9 decimal places for julianday in strftime
+ let copy_format = format_str
+ .to_string()
+ .replace("%J", &format!("{:.9}", to_julian_day_exact(dt)));
+ // Just change the formatting here to have fractional seconds using chrono builtin modifier
+ let copy_format = copy_format.replace("%f", "%S.%3f");
+
+ // The write! macro is used here as chrono's format can panic if the formatting string contains
+ // unknown specifiers. By using a writer, we can catch the panic and handle the error
+ let mut formatted = String::new();
+ match write!(formatted, "{}", dt.format(©_format)) {
+ Ok(_) => formatted,
+ // On sqlite when the formatting fails nothing is printed
+ Err(_) => "".to_string(),
}
}
@@ -1729,4 +1774,7 @@ mod tests {
.naive_utc();
assert!(is_leap_second(&dt));
}
+
+ #[test]
+ fn test_strftime() {}
}
diff --git a/core/vdbe/explain.rs b/core/vdbe/explain.rs
index 80f419ed7..89967608a 100644
--- a/core/vdbe/explain.rs
+++ b/core/vdbe/explain.rs
@@ -1120,6 +1120,24 @@ pub fn insn_to_str(
0,
format!("r[{}]=r[{}] + r[{}]", dest, lhs, rhs),
),
+ Insn::And { lhs, rhs, dest } => (
+ "And",
+ *rhs as i32,
+ *lhs as i32,
+ *dest as i32,
+ OwnedValue::build_text(Rc::new("".to_string())),
+ 0,
+ format!("r[{}]=(r[{}] && r[{}])", dest, lhs, rhs),
+ ),
+ Insn::Or { lhs, rhs, dest } => (
+ "Or",
+ *rhs as i32,
+ *lhs as i32,
+ *dest as i32,
+ OwnedValue::build_text(Rc::new("".to_string())),
+ 0,
+ format!("r[{}]=(r[{}] || r[{}])", dest, lhs, rhs),
+ ),
};
format!(
"{:<4} {:<17} {:<4} {:<4} {:<4} {:<13} {:<2} {}",
diff --git a/core/vdbe/insn.rs b/core/vdbe/insn.rs
index f3f5e36a7..f17a1a354 100644
--- a/core/vdbe/insn.rs
+++ b/core/vdbe/insn.rs
@@ -551,6 +551,18 @@ pub enum Insn {
rhs: usize,
dest: usize,
},
+ /// Take the logical AND of the values in registers P1 and P2 and write the result into register P3.
+ And {
+ lhs: usize,
+ rhs: usize,
+ dest: usize,
+ },
+ /// Take the logical OR of the values in register P1 and P2 and store the answer in register P3.
+ Or {
+ lhs: usize,
+ rhs: usize,
+ dest: usize,
+ },
}
fn cast_text_to_numerical(value: &str) -> OwnedValue {
@@ -955,3 +967,167 @@ pub fn exec_concat(lhs: &OwnedValue, rhs: &OwnedValue) -> OwnedValue {
(OwnedValue::Record(_), _) | (_, OwnedValue::Record(_)) => unreachable!(),
}
}
+
+pub fn exec_and(mut lhs: &OwnedValue, mut rhs: &OwnedValue) -> OwnedValue {
+ if let OwnedValue::Agg(agg) = lhs {
+ lhs = agg.final_value();
+ }
+ if let OwnedValue::Agg(agg) = rhs {
+ rhs = agg.final_value();
+ }
+
+ match (lhs, rhs) {
+ (_, OwnedValue::Integer(0))
+ | (OwnedValue::Integer(0), _)
+ | (_, OwnedValue::Float(0.0))
+ | (OwnedValue::Float(0.0), _) => OwnedValue::Integer(0),
+ (OwnedValue::Null, _) | (_, OwnedValue::Null) => OwnedValue::Null,
+ (OwnedValue::Text(lhs), OwnedValue::Text(rhs)) => exec_and(
+ &cast_text_to_numerical(&lhs.value),
+ &cast_text_to_numerical(&rhs.value),
+ ),
+ (OwnedValue::Text(text), other) | (other, OwnedValue::Text(text)) => {
+ exec_and(&cast_text_to_numerical(&text.value), other)
+ }
+ _ => OwnedValue::Integer(1),
+ }
+}
+
+pub fn exec_or(mut lhs: &OwnedValue, mut rhs: &OwnedValue) -> OwnedValue {
+ if let OwnedValue::Agg(agg) = lhs {
+ lhs = agg.final_value();
+ }
+ if let OwnedValue::Agg(agg) = rhs {
+ rhs = agg.final_value();
+ }
+
+ match (lhs, rhs) {
+ (OwnedValue::Null, OwnedValue::Null)
+ | (OwnedValue::Null, OwnedValue::Float(0.0))
+ | (OwnedValue::Float(0.0), OwnedValue::Null)
+ | (OwnedValue::Null, OwnedValue::Integer(0))
+ | (OwnedValue::Integer(0), OwnedValue::Null) => OwnedValue::Null,
+ (OwnedValue::Float(0.0), OwnedValue::Integer(0))
+ | (OwnedValue::Integer(0), OwnedValue::Float(0.0))
+ | (OwnedValue::Float(0.0), OwnedValue::Float(0.0))
+ | (OwnedValue::Integer(0), OwnedValue::Integer(0)) => OwnedValue::Integer(0),
+ (OwnedValue::Text(lhs), OwnedValue::Text(rhs)) => exec_or(
+ &cast_text_to_numerical(&lhs.value),
+ &cast_text_to_numerical(&rhs.value),
+ ),
+ (OwnedValue::Text(text), other) | (other, OwnedValue::Text(text)) => {
+ exec_or(&cast_text_to_numerical(&text.value), other)
+ }
+ _ => OwnedValue::Integer(1),
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::rc::Rc;
+
+ use crate::{
+ types::{LimboText, OwnedValue},
+ vdbe::insn::exec_or,
+ };
+
+ use super::exec_and;
+
+ #[test]
+ fn test_exec_and() {
+ let inputs = vec![
+ (OwnedValue::Integer(0), OwnedValue::Null),
+ (OwnedValue::Null, OwnedValue::Integer(1)),
+ (OwnedValue::Null, OwnedValue::Null),
+ (OwnedValue::Float(0.0), OwnedValue::Null),
+ (OwnedValue::Integer(1), OwnedValue::Float(2.2)),
+ (
+ OwnedValue::Integer(0),
+ OwnedValue::Text(LimboText::new(Rc::new("string".to_string()))),
+ ),
+ (
+ OwnedValue::Integer(0),
+ OwnedValue::Text(LimboText::new(Rc::new("1".to_string()))),
+ ),
+ (
+ OwnedValue::Integer(1),
+ OwnedValue::Text(LimboText::new(Rc::new("1".to_string()))),
+ ),
+ ];
+ let outpus = [
+ OwnedValue::Integer(0),
+ OwnedValue::Null,
+ OwnedValue::Null,
+ OwnedValue::Integer(0),
+ OwnedValue::Integer(1),
+ OwnedValue::Integer(0),
+ OwnedValue::Integer(0),
+ OwnedValue::Integer(1),
+ ];
+
+ assert_eq!(
+ inputs.len(),
+ outpus.len(),
+ "Inputs and Outputs should have same size"
+ );
+ for (i, (lhs, rhs)) in inputs.iter().enumerate() {
+ assert_eq!(
+ exec_and(lhs, rhs),
+ outpus[i],
+ "Wrong AND for lhs: {}, rhs: {}",
+ lhs,
+ rhs
+ );
+ }
+ }
+
+ #[test]
+ fn test_exec_or() {
+ let inputs = vec![
+ (OwnedValue::Integer(0), OwnedValue::Null),
+ (OwnedValue::Null, OwnedValue::Integer(1)),
+ (OwnedValue::Null, OwnedValue::Null),
+ (OwnedValue::Float(0.0), OwnedValue::Null),
+ (OwnedValue::Integer(1), OwnedValue::Float(2.2)),
+ (OwnedValue::Float(0.0), OwnedValue::Integer(0)),
+ (
+ OwnedValue::Integer(0),
+ OwnedValue::Text(LimboText::new(Rc::new("string".to_string()))),
+ ),
+ (
+ OwnedValue::Integer(0),
+ OwnedValue::Text(LimboText::new(Rc::new("1".to_string()))),
+ ),
+ (
+ OwnedValue::Integer(0),
+ OwnedValue::Text(LimboText::new(Rc::new("".to_string()))),
+ ),
+ ];
+ let outpus = [
+ OwnedValue::Null,
+ OwnedValue::Integer(1),
+ OwnedValue::Null,
+ OwnedValue::Null,
+ OwnedValue::Integer(1),
+ OwnedValue::Integer(0),
+ OwnedValue::Integer(0),
+ OwnedValue::Integer(1),
+ OwnedValue::Integer(0),
+ ];
+
+ assert_eq!(
+ inputs.len(),
+ outpus.len(),
+ "Inputs and Outputs should have same size"
+ );
+ for (i, (lhs, rhs)) in inputs.iter().enumerate() {
+ assert_eq!(
+ exec_or(lhs, rhs),
+ outpus[i],
+ "Wrong OR for lhs: {}, rhs: {}",
+ lhs,
+ rhs
+ );
+ }
+ }
+}
diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs
index ebb7bd240..36cc8e4cb 100644
--- a/core/vdbe/mod.rs
+++ b/core/vdbe/mod.rs
@@ -31,22 +31,27 @@ use crate::pseudo::PseudoCursor;
use crate::result::LimboResult;
use crate::storage::sqlite3_ondisk::DatabaseHeader;
use crate::storage::{btree::BTreeCursor, pager::Pager};
-use crate::types::ExternalAggState;
-use crate::types::{AggContext, CursorResult, OwnedRecord, OwnedValue, Record, SeekKey, SeekOp};
+use crate::types::{
+ AggContext, Cursor, CursorResult, ExternalAggState, OwnedRecord, OwnedValue, Record, SeekKey,
+ SeekOp,
+};
use crate::util::parse_schema_rows;
use crate::vdbe::builder::CursorType;
use crate::vdbe::insn::Insn;
#[cfg(feature = "json")]
use crate::{
- function::JsonFunc, json::get_json, json::json_array, json::json_array_length,
- json::json_arrow_extract, json::json_arrow_shift_extract, json::json_error_position,
- json::json_extract, json::json_object, json::json_type,
+ function::JsonFunc, json::get_json, json::is_json_valid, json::json_array,
+ json::json_array_length, json::json_arrow_extract, json::json_arrow_shift_extract,
+ json::json_error_position, json::json_extract, json::json_object, json::json_type,
+};
+use crate::{resolve_ext_path, Connection, Result, TransactionState, DATABASE_VERSION};
+use datetime::{
+ exec_date, exec_datetime_full, exec_julianday, exec_strftime, exec_time, exec_unixepoch,
};
-use crate::{resolve_ext_path, Connection, Result, Rows, TransactionState, DATABASE_VERSION};
-use datetime::{exec_date, exec_datetime_full, exec_julianday, exec_time, exec_unixepoch};
use insn::{
- exec_add, exec_bit_and, exec_bit_not, exec_bit_or, exec_boolean_not, exec_concat, exec_divide,
- exec_multiply, exec_remainder, exec_shift_left, exec_shift_right, exec_subtract,
+ exec_add, exec_and, exec_bit_and, exec_bit_not, exec_bit_or, exec_boolean_not, exec_concat,
+ exec_divide, exec_multiply, exec_or, exec_remainder, exec_shift_left, exec_shift_right,
+ exec_subtract,
};
use likeop::{construct_like_escape_arg, exec_glob, exec_like_with_escape};
use rand::distributions::{Distribution, Uniform};
@@ -54,8 +59,8 @@ use rand::{thread_rng, Rng};
use regex::{Regex, RegexBuilder};
use sorter::Sorter;
use std::borrow::BorrowMut;
-use std::cell::{Cell, RefCell};
-use std::collections::{BTreeMap, HashMap};
+use std::cell::{Cell, RefCell, RefMut};
+use std::collections::HashMap;
use std::num::NonZero;
use std::rc::{Rc, Weak};
@@ -189,40 +194,106 @@ impl RegexCache {
}
}
+fn get_cursor_as_table_mut<'long, 'short>(
+ cursors: &'short mut RefMut<'long, Vec>>,
+ cursor_id: CursorID,
+) -> &'short mut BTreeCursor {
+ let cursor = cursors
+ .get_mut(cursor_id)
+ .expect("cursor id out of bounds")
+ .as_mut()
+ .expect("cursor not allocated")
+ .as_table_mut();
+ cursor
+}
+
+fn get_cursor_as_index_mut<'long, 'short>(
+ cursors: &'short mut RefMut<'long, Vec>>,
+ cursor_id: CursorID,
+) -> &'short mut BTreeCursor {
+ let cursor = cursors
+ .get_mut(cursor_id)
+ .expect("cursor id out of bounds")
+ .as_mut()
+ .expect("cursor not allocated")
+ .as_index_mut();
+ cursor
+}
+
+fn get_cursor_as_pseudo_mut<'long, 'short>(
+ cursors: &'short mut RefMut<'long, Vec>>,
+ cursor_id: CursorID,
+) -> &'short mut PseudoCursor {
+ let cursor = cursors
+ .get_mut(cursor_id)
+ .expect("cursor id out of bounds")
+ .as_mut()
+ .expect("cursor not allocated")
+ .as_pseudo_mut();
+ cursor
+}
+
+fn get_cursor_as_sorter_mut<'long, 'short>(
+ cursors: &'short mut RefMut<'long, Vec>>,
+ cursor_id: CursorID,
+) -> &'short mut Sorter {
+ let cursor = cursors
+ .get_mut(cursor_id)
+ .expect("cursor id out of bounds")
+ .as_mut()
+ .expect("cursor not allocated")
+ .as_sorter_mut();
+ cursor
+}
+
+struct Bitfield([u64; N]);
+
+impl Bitfield {
+ fn new() -> Self {
+ Self([0; N])
+ }
+
+ fn set(&mut self, bit: usize) {
+ assert!(bit < N * 64, "bit out of bounds");
+ self.0[bit / 64] |= 1 << (bit % 64);
+ }
+
+ fn unset(&mut self, bit: usize) {
+ assert!(bit < N * 64, "bit out of bounds");
+ self.0[bit / 64] &= !(1 << (bit % 64));
+ }
+
+ fn get(&self, bit: usize) -> bool {
+ assert!(bit < N * 64, "bit out of bounds");
+ (self.0[bit / 64] & (1 << (bit % 64))) != 0
+ }
+}
+
/// The program state describes the environment in which the program executes.
pub struct ProgramState {
pub pc: InsnReference,
- btree_table_cursors: RefCell>,
- btree_index_cursors: RefCell>,
- pseudo_cursors: RefCell>,
- sorter_cursors: RefCell>,
+ cursors: RefCell>>,
registers: Vec,
last_compare: Option,
deferred_seek: Option<(CursorID, CursorID)>,
- ended_coroutine: HashMap, // flag to indicate that a coroutine has ended (key is the yield register)
+ ended_coroutine: Bitfield<4>, // flag to indicate that a coroutine has ended (key is the yield register. currently we assume that the yield register is always between 0-255, YOLO)
regex_cache: RegexCache,
interrupted: bool,
parameters: HashMap, OwnedValue>,
}
impl ProgramState {
- pub fn new(max_registers: usize) -> Self {
- let btree_table_cursors = RefCell::new(BTreeMap::new());
- let btree_index_cursors = RefCell::new(BTreeMap::new());
- let pseudo_cursors = RefCell::new(BTreeMap::new());
- let sorter_cursors = RefCell::new(BTreeMap::new());
- let mut registers = Vec::with_capacity(max_registers);
- registers.resize(max_registers, OwnedValue::Null);
+ pub fn new(max_registers: usize, max_cursors: usize) -> Self {
+ let cursors: RefCell>> =
+ RefCell::new((0..max_cursors).map(|_| None).collect());
+ let registers = vec![OwnedValue::Null; max_registers];
Self {
pc: 0,
- btree_table_cursors,
- btree_index_cursors,
- pseudo_cursors,
- sorter_cursors,
+ cursors,
registers,
last_compare: None,
deferred_seek: None,
- ended_coroutine: HashMap::new(),
+ ended_coroutine: Bitfield::new(),
regex_cache: RegexCache::new(),
interrupted: false,
parameters: HashMap::new(),
@@ -254,16 +325,26 @@ impl ProgramState {
}
pub fn reset(&mut self) {
+ self.pc = 0;
+ self.cursors.borrow_mut().iter_mut().for_each(|c| *c = None);
+ self.registers
+ .iter_mut()
+ .for_each(|r| *r = OwnedValue::Null);
+ self.last_compare = None;
+ self.deferred_seek = None;
+ self.ended_coroutine.0 = [0; 4];
+ self.regex_cache.like.clear();
+ self.interrupted = false;
self.parameters.clear();
}
}
macro_rules! must_be_btree_cursor {
- ($cursor_id:expr, $cursor_ref:expr, $btree_table_cursors:expr, $btree_index_cursors:expr, $insn_name:expr) => {{
+ ($cursor_id:expr, $cursor_ref:expr, $cursors:expr, $insn_name:expr) => {{
let (_, cursor_type) = $cursor_ref.get($cursor_id).unwrap();
let cursor = match cursor_type {
- CursorType::BTreeTable(_) => $btree_table_cursors.get_mut(&$cursor_id).unwrap(),
- CursorType::BTreeIndex(_) => $btree_index_cursors.get_mut(&$cursor_id).unwrap(),
+ CursorType::BTreeTable(_) => get_cursor_as_table_mut(&mut $cursors, $cursor_id),
+ CursorType::BTreeIndex(_) => get_cursor_as_index_mut(&mut $cursors, $cursor_id),
CursorType::Pseudo(_) => panic!("{} on pseudo cursor", $insn_name),
CursorType::Sorter => panic!("{} on sorter cursor", $insn_name),
};
@@ -283,6 +364,7 @@ pub struct Program {
pub auto_commit: bool,
pub n_change: Cell,
pub change_cnt_on: bool,
+ pub columns: Vec,
}
impl Program {
@@ -315,10 +397,7 @@ impl Program {
}
let insn = &self.insns[state.pc as usize];
trace_insn(self, state.pc as InsnReference, insn);
- let mut btree_table_cursors = state.btree_table_cursors.borrow_mut();
- let mut btree_index_cursors = state.btree_index_cursors.borrow_mut();
- let mut pseudo_cursors = state.pseudo_cursors.borrow_mut();
- let mut sorter_cursors = state.sorter_cursors.borrow_mut();
+ let mut cursors = state.cursors.borrow_mut();
match insn {
Insn::Init { target_pc } => {
assert!(target_pc.is_offset());
@@ -396,13 +475,8 @@ impl Program {
state.pc += 1;
}
Insn::NullRow { cursor_id } => {
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "NullRow"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "NullRow");
cursor.set_null_flag(true);
state.pc += 1;
}
@@ -698,14 +772,19 @@ impl Program {
root_page,
} => {
let (_, cursor_type) = self.cursor_ref.get(*cursor_id).unwrap();
- let cursor =
- BTreeCursor::new(pager.clone(), *root_page, self.database_header.clone());
+ let cursor = BTreeCursor::new(pager.clone(), *root_page);
match cursor_type {
CursorType::BTreeTable(_) => {
- btree_table_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_table(cursor));
}
CursorType::BTreeIndex(_) => {
- btree_index_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_index(cursor));
}
CursorType::Pseudo(_) => {
panic!("OpenReadAsync on pseudo cursor");
@@ -725,28 +804,21 @@ impl Program {
num_fields: _,
} => {
let cursor = PseudoCursor::new();
- pseudo_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_pseudo(cursor));
state.pc += 1;
}
Insn::RewindAsync { cursor_id } => {
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "RewindAsync"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "RewindAsync");
return_if_io!(cursor.rewind());
state.pc += 1;
}
Insn::LastAsync { cursor_id } => {
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "LastAsync"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "LastAsync");
return_if_io!(cursor.last());
state.pc += 1;
}
@@ -755,13 +827,8 @@ impl Program {
pc_if_empty,
} => {
assert!(pc_if_empty.is_offset());
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "LastAwait"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "LastAwait");
cursor.wait_for_completion()?;
if cursor.is_empty() {
state.pc = pc_if_empty.to_offset_int();
@@ -774,13 +841,8 @@ impl Program {
pc_if_empty,
} => {
assert!(pc_if_empty.is_offset());
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "RewindAwait"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "RewindAwait");
cursor.wait_for_completion()?;
if cursor.is_empty() {
state.pc = pc_if_empty.to_offset_int();
@@ -794,9 +856,9 @@ impl Program {
dest,
} => {
if let Some((index_cursor_id, table_cursor_id)) = state.deferred_seek.take() {
- let index_cursor = btree_index_cursors.get_mut(&index_cursor_id).unwrap();
+ let index_cursor = get_cursor_as_index_mut(&mut cursors, index_cursor_id);
let rowid = index_cursor.rowid()?;
- let table_cursor = btree_table_cursors.get_mut(&table_cursor_id).unwrap();
+ let table_cursor = get_cursor_as_table_mut(&mut cursors, table_cursor_id);
match table_cursor.seek(SeekKey::TableRowId(rowid.unwrap()), SeekOp::EQ)? {
CursorResult::Ok(_) => {}
CursorResult::IO => {
@@ -811,8 +873,7 @@ impl Program {
let cursor = must_be_btree_cursor!(
*cursor_id,
self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
+ cursors,
"Column"
);
let record = cursor.record()?;
@@ -827,7 +888,7 @@ impl Program {
}
}
CursorType::Sorter => {
- let cursor = sorter_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_sorter_mut(&mut cursors, *cursor_id);
if let Some(record) = cursor.record() {
state.registers[*dest] = record.values[*column].clone();
} else {
@@ -835,7 +896,7 @@ impl Program {
}
}
CursorType::Pseudo(_) => {
- let cursor = pseudo_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_pseudo_mut(&mut cursors, *cursor_id);
if let Some(record) = cursor.record() {
state.registers[*dest] = record.values[*column].clone();
} else {
@@ -861,25 +922,15 @@ impl Program {
return Ok(StepResult::Row(record));
}
Insn::NextAsync { cursor_id } => {
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "NextAsync"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "NextAsync");
cursor.set_null_flag(false);
return_if_io!(cursor.next());
state.pc += 1;
}
Insn::PrevAsync { cursor_id } => {
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "PrevAsync"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "PrevAsync");
cursor.set_null_flag(false);
return_if_io!(cursor.prev());
state.pc += 1;
@@ -889,13 +940,8 @@ impl Program {
pc_if_next,
} => {
assert!(pc_if_next.is_offset());
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "PrevAwait"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "PrevAwait");
cursor.wait_for_completion()?;
if !cursor.is_empty() {
state.pc = pc_if_next.to_offset_int();
@@ -908,13 +954,8 @@ impl Program {
pc_if_next,
} => {
assert!(pc_if_next.is_offset());
- let cursor = must_be_btree_cursor!(
- *cursor_id,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "NextAwait"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor_id, self.cursor_ref, cursors, "NextAwait");
cursor.wait_for_completion()?;
if !cursor.is_empty() {
state.pc = pc_if_next.to_offset_int();
@@ -1044,9 +1085,9 @@ impl Program {
}
Insn::RowId { cursor_id, dest } => {
if let Some((index_cursor_id, table_cursor_id)) = state.deferred_seek.take() {
- let index_cursor = btree_index_cursors.get_mut(&index_cursor_id).unwrap();
+ let index_cursor = get_cursor_as_index_mut(&mut cursors, index_cursor_id);
let rowid = index_cursor.rowid()?;
- let table_cursor = btree_table_cursors.get_mut(&table_cursor_id).unwrap();
+ let table_cursor = get_cursor_as_table_mut(&mut cursors, table_cursor_id);
match table_cursor.seek(SeekKey::TableRowId(rowid.unwrap()), SeekOp::EQ)? {
CursorResult::Ok(_) => {}
CursorResult::IO => {
@@ -1056,7 +1097,7 @@ impl Program {
}
}
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
if let Some(ref rowid) = cursor.rowid()? {
state.registers[*dest] = OwnedValue::Integer(*rowid as i64);
} else {
@@ -1070,7 +1111,7 @@ impl Program {
target_pc,
} => {
assert!(target_pc.is_offset());
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
let rowid = match &state.registers[*src_reg] {
OwnedValue::Integer(rowid) => *rowid as u64,
OwnedValue::Null => {
@@ -1106,7 +1147,7 @@ impl Program {
} => {
assert!(target_pc.is_offset());
if *is_index {
- let cursor = btree_index_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_index_mut(&mut cursors, *cursor_id);
let record_from_regs: OwnedRecord =
make_owned_record(&state.registers, start_reg, num_regs);
let found = return_if_io!(
@@ -1118,7 +1159,7 @@ impl Program {
state.pc += 1;
}
} else {
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
let rowid = match &state.registers[*start_reg] {
OwnedValue::Null => {
// All integer values are greater than null so we just rewind the cursor
@@ -1151,7 +1192,7 @@ impl Program {
} => {
assert!(target_pc.is_offset());
if *is_index {
- let cursor = btree_index_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_index_mut(&mut cursors, *cursor_id);
let record_from_regs: OwnedRecord =
make_owned_record(&state.registers, start_reg, num_regs);
let found = return_if_io!(
@@ -1163,7 +1204,7 @@ impl Program {
state.pc += 1;
}
} else {
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
let rowid = match &state.registers[*start_reg] {
OwnedValue::Null => {
// All integer values are greater than null so we just rewind the cursor
@@ -1194,7 +1235,7 @@ impl Program {
target_pc,
} => {
assert!(target_pc.is_offset());
- let cursor = btree_index_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_index_mut(&mut cursors, *cursor_id);
let record_from_regs: OwnedRecord =
make_owned_record(&state.registers, start_reg, num_regs);
if let Some(ref idx_record) = *cursor.record()? {
@@ -1217,7 +1258,7 @@ impl Program {
target_pc,
} => {
assert!(target_pc.is_offset());
- let cursor = btree_index_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_index_mut(&mut cursors, *cursor_id);
let record_from_regs: OwnedRecord =
make_owned_record(&state.registers, start_reg, num_regs);
if let Some(ref idx_record) = *cursor.record()? {
@@ -1547,7 +1588,10 @@ impl Program {
})
.collect();
let cursor = Sorter::new(order);
- sorter_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_sorter(cursor));
state.pc += 1;
}
Insn::SorterData {
@@ -1555,7 +1599,7 @@ impl Program {
dest_reg,
pseudo_cursor,
} => {
- let sorter_cursor = sorter_cursors.get_mut(cursor_id).unwrap();
+ let sorter_cursor = get_cursor_as_sorter_mut(&mut cursors, *cursor_id);
let record = match sorter_cursor.record() {
Some(record) => record.clone(),
None => {
@@ -1564,7 +1608,7 @@ impl Program {
}
};
state.registers[*dest_reg] = OwnedValue::Record(record.clone());
- let pseudo_cursor = pseudo_cursors.get_mut(pseudo_cursor).unwrap();
+ let pseudo_cursor = get_cursor_as_pseudo_mut(&mut cursors, *pseudo_cursor);
pseudo_cursor.insert(record);
state.pc += 1;
}
@@ -1572,7 +1616,7 @@ impl Program {
cursor_id,
record_reg,
} => {
- let cursor = sorter_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_sorter_mut(&mut cursors, *cursor_id);
let record = match &state.registers[*record_reg] {
OwnedValue::Record(record) => record,
_ => unreachable!("SorterInsert on non-record register"),
@@ -1584,11 +1628,12 @@ impl Program {
cursor_id,
pc_if_empty,
} => {
- if let Some(cursor) = sorter_cursors.get_mut(cursor_id) {
+ let cursor = get_cursor_as_sorter_mut(&mut cursors, *cursor_id);
+ if cursor.is_empty() {
+ state.pc = pc_if_empty.to_offset_int();
+ } else {
cursor.sort();
state.pc += 1;
- } else {
- state.pc = pc_if_empty.to_offset_int();
}
}
Insn::SorterNext {
@@ -1596,9 +1641,9 @@ impl Program {
pc_if_next,
} => {
assert!(pc_if_next.is_offset());
- let cursor = sorter_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_sorter_mut(&mut cursors, *cursor_id);
cursor.next();
- if !cursor.is_empty() {
+ if cursor.has_more() {
state.pc = pc_if_next.to_offset_int();
} else {
state.pc += 1;
@@ -1697,6 +1742,10 @@ impl Program {
Err(e) => return Err(e),
}
}
+ JsonFunc::JsonValid => {
+ let json_value = &state.registers[*start_reg];
+ state.registers[*dest] = is_json_valid(json_value)?;
+ }
},
crate::function::Func::Scalar(scalar_func) => match scalar_func {
ScalarFunc::Cast => {
@@ -2004,6 +2053,12 @@ impl Program {
conn.load_extension(ext)?;
}
}
+ ScalarFunc::StrfTime => {
+ let result = exec_strftime(
+ &state.registers[*start_reg..*start_reg + arg_count],
+ );
+ state.registers[*dest] = result;
+ }
},
crate::function::Func::External(f) => match f.func {
ExtFunc::Scalar(f) => {
@@ -2077,7 +2132,7 @@ impl Program {
assert!(jump_on_definition.is_offset());
let start_offset = start_offset.to_offset_int();
state.registers[*yield_reg] = OwnedValue::Integer(start_offset as i64);
- state.ended_coroutine.insert(*yield_reg, false);
+ state.ended_coroutine.unset(*yield_reg);
let jump_on_definition = jump_on_definition.to_offset_int();
state.pc = if jump_on_definition == 0 {
state.pc + 1
@@ -2087,7 +2142,7 @@ impl Program {
}
Insn::EndCoroutine { yield_reg } => {
if let OwnedValue::Integer(pc) = state.registers[*yield_reg] {
- state.ended_coroutine.insert(*yield_reg, true);
+ state.ended_coroutine.set(*yield_reg);
let pc: u32 = pc
.try_into()
.unwrap_or_else(|_| panic!("EndCoroutine: pc overflow: {}", pc));
@@ -2101,11 +2156,7 @@ impl Program {
end_offset,
} => {
if let OwnedValue::Integer(pc) = state.registers[*yield_reg] {
- if *state
- .ended_coroutine
- .get(yield_reg)
- .expect("coroutine not initialized")
- {
+ if state.ended_coroutine.get(*yield_reg) {
state.pc = end_offset.to_offset_int();
} else {
let pc: u32 = pc
@@ -2129,7 +2180,7 @@ impl Program {
record_reg,
flag: _,
} => {
- let cursor = btree_table_cursors.get_mut(cursor).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor);
let record = match &state.registers[*record_reg] {
OwnedValue::Record(r) => r,
_ => unreachable!("Not a record! Cannot insert a non record value."),
@@ -2139,7 +2190,7 @@ impl Program {
state.pc += 1;
}
Insn::InsertAwait { cursor_id } => {
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
cursor.wait_for_completion()?;
// Only update last_insert_rowid for regular table inserts, not schema modifications
if cursor.root_page() != 1 {
@@ -2154,12 +2205,12 @@ impl Program {
state.pc += 1;
}
Insn::DeleteAsync { cursor_id } => {
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
return_if_io!(cursor.delete());
state.pc += 1;
}
Insn::DeleteAwait { cursor_id } => {
- let cursor = btree_table_cursors.get_mut(cursor_id).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor_id);
cursor.wait_for_completion()?;
let prev_changes = self.n_change.get();
self.n_change.set(prev_changes + 1);
@@ -2168,7 +2219,7 @@ impl Program {
Insn::NewRowid {
cursor, rowid_reg, ..
} => {
- let cursor = btree_table_cursors.get_mut(cursor).unwrap();
+ let cursor = get_cursor_as_table_mut(&mut cursors, *cursor);
// TODO: make io handle rng
let rowid = return_if_io!(get_new_rowid(cursor, thread_rng()));
state.registers[*rowid_reg] = OwnedValue::Integer(rowid);
@@ -2208,13 +2259,8 @@ impl Program {
rowid_reg,
target_pc,
} => {
- let cursor = must_be_btree_cursor!(
- *cursor,
- self.cursor_ref,
- btree_table_cursors,
- btree_index_cursors,
- "NotExists"
- );
+ let cursor =
+ must_be_btree_cursor!(*cursor, self.cursor_ref, cursors, "NotExists");
let exists = return_if_io!(cursor.exists(&state.registers[*rowid_reg]));
if exists {
state.pc += 1;
@@ -2231,12 +2277,17 @@ impl Program {
} => {
let (_, cursor_type) = self.cursor_ref.get(*cursor_id).unwrap();
let is_index = cursor_type.is_index();
- let cursor =
- BTreeCursor::new(pager.clone(), *root_page, self.database_header.clone());
+ let cursor = BTreeCursor::new(pager.clone(), *root_page);
if is_index {
- btree_index_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_index(cursor));
} else {
- btree_table_cursors.insert(*cursor_id, cursor);
+ cursors
+ .get_mut(*cursor_id)
+ .unwrap()
+ .replace(Cursor::new_table(cursor));
}
state.pc += 1;
}
@@ -2258,32 +2309,14 @@ impl Program {
// TODO: implement temp datbases
todo!("temp databases not implemented yet");
}
- let mut cursor = Box::new(BTreeCursor::new(
- pager.clone(),
- 0,
- self.database_header.clone(),
- ));
+ let mut cursor = Box::new(BTreeCursor::new(pager.clone(), 0));
let root_page = cursor.btree_create(*flags);
state.registers[*root] = OwnedValue::Integer(root_page as i64);
state.pc += 1;
}
Insn::Close { cursor_id } => {
- let (_, cursor_type) = self.cursor_ref.get(*cursor_id).unwrap();
- match cursor_type {
- CursorType::BTreeTable(_) => {
- let _ = btree_table_cursors.remove(cursor_id);
- }
- CursorType::BTreeIndex(_) => {
- let _ = btree_index_cursors.remove(cursor_id);
- }
- CursorType::Pseudo(_) => {
- let _ = pseudo_cursors.remove(cursor_id);
- }
- CursorType::Sorter => {
- let _ = sorter_cursors.remove(cursor_id);
- }
- }
+ cursors.get_mut(*cursor_id).unwrap().take();
state.pc += 1;
}
Insn::IsNull { src, target_pc } => {
@@ -2303,10 +2336,9 @@ impl Program {
"SELECT * FROM sqlite_schema WHERE {}",
where_clause
))?;
- let rows = Rows { stmt };
let mut schema = RefCell::borrow_mut(&conn.schema);
// TODO: This function below is synchronous, make it not async
- parse_schema_rows(Some(rows), &mut schema, conn.pager.io.clone())?;
+ parse_schema_rows(Some(stmt), &mut schema, conn.pager.io.clone())?;
state.pc += 1;
}
Insn::ShiftRight { lhs, rhs, dest } => {
@@ -2345,6 +2377,16 @@ impl Program {
exec_concat(&state.registers[*lhs], &state.registers[*rhs]);
state.pc += 1;
}
+ Insn::And { lhs, rhs, dest } => {
+ state.registers[*dest] =
+ exec_and(&state.registers[*lhs], &state.registers[*rhs]);
+ state.pc += 1;
+ }
+ Insn::Or { lhs, rhs, dest } => {
+ state.registers[*dest] =
+ exec_or(&state.registers[*lhs], &state.registers[*rhs]);
+ state.pc += 1;
+ }
}
}
}
@@ -3403,7 +3445,7 @@ mod tests {
exec_ltrim, exec_max, exec_min, exec_nullif, exec_quote, exec_random, exec_randomblob,
exec_round, exec_rtrim, exec_sign, exec_soundex, exec_substring, exec_trim, exec_typeof,
exec_unhex, exec_unicode, exec_upper, exec_zeroblob, execute_sqlite_version, AggContext,
- OwnedValue,
+ Bitfield, OwnedValue,
};
use std::{collections::HashMap, rc::Rc};
@@ -4292,4 +4334,23 @@ mod tests {
expected_str
);
}
+
+ #[test]
+ fn test_bitfield() {
+ let mut bitfield = Bitfield::<4>::new();
+ for i in 0..256 {
+ bitfield.set(i);
+ assert!(bitfield.get(i));
+ for j in 0..i {
+ assert!(bitfield.get(j));
+ }
+ for j in i + 1..256 {
+ assert!(!bitfield.get(j));
+ }
+ }
+ for i in 0..256 {
+ bitfield.unset(i);
+ assert!(!bitfield.get(i));
+ }
+ }
}
diff --git a/core/vdbe/sorter.rs b/core/vdbe/sorter.rs
index d23a3bef0..2682c5f46 100644
--- a/core/vdbe/sorter.rs
+++ b/core/vdbe/sorter.rs
@@ -16,8 +16,13 @@ impl Sorter {
}
}
pub fn is_empty(&self) -> bool {
- self.current.is_none()
+ self.records.is_empty()
}
+
+ pub fn has_more(&self) -> bool {
+ self.current.is_some()
+ }
+
// We do the sorting here since this is what is called by the SorterSort instruction
pub fn sort(&mut self) {
self.records.sort_by(|a, b| {
diff --git a/licenses/bindings/java/spotless-license.md b/licenses/bindings/java/spotless-license.md
new file mode 100644
index 000000000..635a39306
--- /dev/null
+++ b/licenses/bindings/java/spotless-license.md
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "{}" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+Copyright {yyyy} {name of copyright owner}
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/perf/latency/limbo/src/main.rs b/perf/latency/limbo/src/main.rs
index b51ffb406..a7302e38a 100644
--- a/perf/latency/limbo/src/main.rs
+++ b/perf/latency/limbo/src/main.rs
@@ -36,7 +36,7 @@ fn main() {
let mut rows = stmt.query().unwrap();
let mut count = 0;
loop {
- let row = rows.next_row().unwrap();
+ let row = rows.step().unwrap();
match row {
limbo_core::StepResult::Row(_) => {
count += 1;
diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml
index 31a54f1e6..43956e5e2 100644
--- a/simulator/Cargo.toml
+++ b/simulator/Cargo.toml
@@ -23,3 +23,6 @@ tempfile = "3.0.7"
env_logger = "0.10.1"
anarchist-readable-name-generator-lib = "0.1.2"
clap = { version = "4.5", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0" }
+notify = "8.0.0"
diff --git a/simulator/generation/plan.rs b/simulator/generation/plan.rs
index 8cd484cd2..2a794fbbc 100644
--- a/simulator/generation/plan.rs
+++ b/simulator/generation/plan.rs
@@ -1,13 +1,15 @@
-use std::{fmt::Display, rc::Rc, vec};
+use std::{fmt::Display, path::Path, rc::Rc, vec};
use limbo_core::{Connection, Result, StepResult};
+use serde::{Deserialize, Serialize};
use crate::{
model::{
query::{Create, Insert, Query, Select},
table::Value,
},
- SimConnection, SimulatorEnv,
+ runner::env::SimConnection,
+ SimulatorEnv,
};
use crate::generation::{frequency, Arbitrary, ArbitraryFrom};
@@ -19,18 +21,81 @@ use super::{
pub(crate) type ResultSet = Result>>;
-#[derive(Clone)]
+#[derive(Clone, Serialize, Deserialize)]
pub(crate) struct InteractionPlan {
pub(crate) plan: Vec,
}
+impl InteractionPlan {
+ /// Compute via diff computes a a plan from a given `.plan` file without the need to parse
+ /// sql. This is possible because there are two versions of the plan file, one that is human
+ /// readable and one that is serialized as JSON. Under watch mode, the users will be able to
+ /// delete interactions from the human readable file, and this function uses the JSON file as
+ /// a baseline to detect with interactions were deleted and constructs the plan from the
+ /// remaining interactions.
+ pub(crate) fn compute_via_diff(plan_path: &Path) -> Vec> {
+ let interactions = std::fs::read_to_string(plan_path).unwrap();
+ let interactions = interactions.lines().collect::>();
+
+ let plan: InteractionPlan = serde_json::from_str(
+ std::fs::read_to_string(plan_path.with_extension("plan.json"))
+ .unwrap()
+ .as_str(),
+ )
+ .unwrap();
+
+ let mut plan = plan
+ .plan
+ .into_iter()
+ .map(|i| i.interactions())
+ .collect::>();
+
+ let (mut i, mut j1, mut j2) = (0, 0, 0);
+
+ while i < interactions.len() && j1 < plan.len() {
+ if interactions[i].starts_with("-- begin")
+ || interactions[i].starts_with("-- end")
+ || interactions[i].is_empty()
+ {
+ i += 1;
+ continue;
+ }
+
+ if interactions[i].contains(plan[j1][j2].to_string().as_str()) {
+ i += 1;
+ if j2 + 1 < plan[j1].len() {
+ j2 += 1;
+ } else {
+ j1 += 1;
+ j2 = 0;
+ }
+ } else {
+ plan[j1].remove(j2);
+
+ if plan[j1].is_empty() {
+ plan.remove(j1);
+ j2 = 0;
+ }
+ }
+ }
+ if j1 < plan.len() {
+ if j2 < plan[j1].len() {
+ let _ = plan[j1].split_off(j2);
+ }
+ let _ = plan.split_off(j1);
+ }
+
+ plan
+ }
+}
+
pub(crate) struct InteractionPlanState {
pub(crate) stack: Vec,
pub(crate) interaction_pointer: usize,
pub(crate) secondary_pointer: usize,
}
-#[derive(Clone)]
+#[derive(Clone, Serialize, Deserialize)]
pub(crate) enum Interactions {
Property(Property),
Query(Query),
@@ -108,12 +173,12 @@ impl Display for InteractionPlan {
match interaction {
Interaction::Query(query) => writeln!(f, "{};", query)?,
Interaction::Assumption(assumption) => {
- writeln!(f, "-- ASSUME: {};", assumption.message)?
+ writeln!(f, "-- ASSUME {};", assumption.message)?
}
Interaction::Assertion(assertion) => {
- writeln!(f, "-- ASSERT: {};", assertion.message)?
+ writeln!(f, "-- ASSERT {};", assertion.message)?
}
- Interaction::Fault(fault) => writeln!(f, "-- FAULT: {};", fault)?,
+ Interaction::Fault(fault) => writeln!(f, "-- FAULT '{}';", fault)?,
}
}
writeln!(f, "-- end testing '{}'", name)?;
@@ -160,9 +225,9 @@ impl Display for Interaction {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::Query(query) => write!(f, "{}", query),
- Self::Assumption(assumption) => write!(f, "ASSUME: {}", assumption.message),
- Self::Assertion(assertion) => write!(f, "ASSERT: {}", assertion.message),
- Self::Fault(fault) => write!(f, "FAULT: {}", fault),
+ Self::Assumption(assumption) => write!(f, "ASSUME {}", assumption.message),
+ Self::Assertion(assertion) => write!(f, "ASSERT {}", assertion.message),
+ Self::Fault(fault) => write!(f, "FAULT '{}'", fault),
}
}
}
@@ -178,7 +243,7 @@ pub(crate) struct Assertion {
pub(crate) message: String,
}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) enum Fault {
Disconnect,
}
@@ -195,6 +260,29 @@ impl Interactions {
pub(crate) fn shadow(&self, env: &mut SimulatorEnv) {
match self {
Interactions::Property(property) => {
+ match property {
+ Property::InsertSelect {
+ insert,
+ row_index: _,
+ queries,
+ select,
+ } => {
+ insert.shadow(env);
+ for query in queries {
+ query.shadow(env);
+ }
+ select.shadow(env);
+ }
+ Property::DoubleCreateFailure { create, queries } => {
+ if env.tables.iter().any(|t| t.name == create.table.name) {
+ return;
+ }
+ create.shadow(env);
+ for query in queries {
+ query.shadow(env);
+ }
+ }
+ }
for interaction in property.interactions() {
match interaction {
Interaction::Query(query) => match query {
@@ -220,23 +308,7 @@ impl Interactions {
}
}
}
- Interactions::Query(query) => match query {
- Query::Create(create) => {
- if !env.tables.iter().any(|t| t.name == create.table.name) {
- env.tables.push(create.table.clone());
- }
- }
- Query::Insert(insert) => {
- let table = env
- .tables
- .iter_mut()
- .find(|t| t.name == insert.table)
- .unwrap();
- table.rows.extend(insert.values.clone());
- }
- Query::Delete(_) => todo!(),
- Query::Select(_) => {}
- },
+ Interactions::Query(query) => query.shadow(env),
Interactions::Fault(_) => {}
}
}
@@ -317,6 +389,14 @@ impl ArbitraryFrom<&mut SimulatorEnv> for InteractionPlan {
}
impl Interaction {
+ pub(crate) fn shadow(&self, env: &mut SimulatorEnv) {
+ match self {
+ Self::Query(query) => query.shadow(env),
+ Self::Assumption(_) => {}
+ Self::Assertion(_) => {}
+ Self::Fault(_) => {}
+ }
+ }
pub(crate) fn execute_query(&self, conn: &mut Rc) -> ResultSet {
if let Self::Query(query) = self {
let query_str = query.to_string();
@@ -334,7 +414,7 @@ impl Interaction {
assert!(rows.is_some());
let mut rows = rows.unwrap();
let mut out = Vec::new();
- while let Ok(row) = rows.next_row() {
+ while let Ok(row) = rows.step() {
match row {
StepResult::Row(row) => {
let mut r = Vec::new();
diff --git a/simulator/generation/property.rs b/simulator/generation/property.rs
index c902aca9d..bfa1e1ed5 100644
--- a/simulator/generation/property.rs
+++ b/simulator/generation/property.rs
@@ -1,4 +1,5 @@
use limbo_core::LimboError;
+use serde::{Deserialize, Serialize};
use crate::{
model::{
@@ -16,7 +17,7 @@ use super::{
/// Properties are representations of executable specifications
/// about the database behavior.
-#[derive(Clone)]
+#[derive(Clone, Serialize, Deserialize)]
pub(crate) enum Property {
/// Insert-Select is a property in which the inserted row
/// must be in the resulting rows of a select query that has a
@@ -103,7 +104,6 @@ impl Property {
let assertion = Interaction::Assertion(Assertion {
message: format!(
- // todo: add the part inserting ({} = {})",
"row [{:?}] not found in table {}",
row.iter().map(|v| v.to_string()).collect::>(),
insert.table,
diff --git a/simulator/main.rs b/simulator/main.rs
index cb182ce5d..82c39b809 100644
--- a/simulator/main.rs
+++ b/simulator/main.rs
@@ -1,20 +1,20 @@
#![allow(clippy::arc_with_non_send_sync, dead_code)]
use clap::Parser;
-use core::panic;
-use generation::plan::{InteractionPlan, InteractionPlanState};
+use generation::plan::{Interaction, InteractionPlan, InteractionPlanState};
use generation::ArbitraryFrom;
use limbo_core::Database;
+use notify::event::{DataChange, ModifyKind};
+use notify::{EventKind, RecursiveMode, Watcher};
use rand::prelude::*;
-use rand_chacha::ChaCha8Rng;
use runner::cli::SimulatorCLI;
-use runner::env::{SimConnection, SimulatorEnv, SimulatorOpts};
+use runner::env::SimulatorEnv;
use runner::execution::{execute_plans, Execution, ExecutionHistory, ExecutionResult};
-use runner::io::SimulatorIO;
+use runner::watch;
use std::any::Any;
use std::backtrace::Backtrace;
use std::io::Write;
use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
+use std::sync::{mpsc, Arc, Mutex};
use tempfile::TempDir;
mod generation;
@@ -49,6 +49,10 @@ impl Paths {
log::info!("shrunk database path: {:?}", paths.shrunk_db);
}
log::info!("simulator plan path: {:?}", paths.plan);
+ log::info!(
+ "simulator plan serialized path: {:?}",
+ paths.plan.with_extension("plan.json")
+ );
if shrink {
log::info!("shrunk plan path: {:?}", paths.shrunk_plan);
}
@@ -77,7 +81,85 @@ fn main() -> Result<(), String> {
log::info!("seed: {}", seed);
let last_execution = Arc::new(Mutex::new(Execution::new(0, 0, 0)));
+ let (env, plans) = setup_simulation(seed, &cli_opts, &paths.db, &paths.plan);
+ if cli_opts.watch {
+ watch_mode(seed, &cli_opts, &paths, last_execution.clone()).unwrap();
+ } else {
+ run_simulator(seed, &cli_opts, &paths, env, plans, last_execution.clone());
+ }
+
+ Ok(())
+}
+
+fn watch_mode(
+ seed: u64,
+ cli_opts: &SimulatorCLI,
+ paths: &Paths,
+ last_execution: Arc>,
+) -> notify::Result<()> {
+ let (tx, rx) = mpsc::channel::>();
+ println!("watching {:?}", paths.plan);
+ // Use recommended_watcher() to automatically select the best implementation
+ // for your platform. The `EventHandler` passed to this constructor can be a
+ // closure, a `std::sync::mpsc::Sender`, a `crossbeam_channel::Sender`, or
+ // another type the trait is implemented for.
+ let mut watcher = notify::recommended_watcher(tx)?;
+
+ // Add a path to be watched. All files and directories at that path and
+ // below will be monitored for changes.
+ watcher.watch(&paths.plan, RecursiveMode::NonRecursive)?;
+ // Block forever, printing out events as they come in
+ for res in rx {
+ match res {
+ Ok(event) => {
+ if let EventKind::Modify(ModifyKind::Data(DataChange::Content)) = event.kind {
+ log::info!("plan file modified, rerunning simulation");
+
+ let result = SandboxedResult::from(
+ std::panic::catch_unwind(|| {
+ let plan: Vec> =
+ InteractionPlan::compute_via_diff(&paths.plan);
+
+ let mut env = SimulatorEnv::new(seed, cli_opts, &paths.db);
+ plan.iter().for_each(|is| {
+ is.iter().for_each(|i| {
+ i.shadow(&mut env);
+ });
+ });
+ let env = Arc::new(Mutex::new(env.clone()));
+ watch::run_simulation(env, &mut [plan], last_execution.clone())
+ }),
+ last_execution.clone(),
+ );
+ match result {
+ SandboxedResult::Correct => {
+ log::info!("simulation succeeded");
+ println!("simulation succeeded");
+ }
+ SandboxedResult::Panicked { error, .. }
+ | SandboxedResult::FoundBug { error, .. } => {
+ log::error!("simulation failed: '{}'", error);
+ println!("simulation failed: '{}'", error);
+ }
+ }
+ }
+ }
+ Err(e) => println!("watch error: {:?}", e),
+ }
+ }
+
+ Ok(())
+}
+
+fn run_simulator(
+ seed: u64,
+ cli_opts: &SimulatorCLI,
+ paths: &Paths,
+ env: SimulatorEnv,
+ plans: Vec,
+ last_execution: Arc>,
+) {
std::panic::set_hook(Box::new(move |info| {
log::error!("panic occurred");
@@ -94,81 +176,22 @@ fn main() -> Result<(), String> {
log::error!("captured backtrace:\n{}", bt);
}));
+ let env = Arc::new(Mutex::new(env));
let result = SandboxedResult::from(
std::panic::catch_unwind(|| {
- run_simulation(
- seed,
- &cli_opts,
- &paths.db,
- &paths.plan,
- last_execution.clone(),
- None,
- )
+ run_simulation(env.clone(), &mut plans.clone(), last_execution.clone())
}),
last_execution.clone(),
);
if cli_opts.doublecheck {
- // Run the simulation again
- let result2 = SandboxedResult::from(
- std::panic::catch_unwind(|| {
- run_simulation(
- seed,
- &cli_opts,
- &paths.doublecheck_db,
- &paths.plan,
- last_execution.clone(),
- None,
- )
- }),
- last_execution.clone(),
- );
-
- match (result, result2) {
- (SandboxedResult::Correct, SandboxedResult::Panicked { .. }) => {
- log::error!("doublecheck failed! first run succeeded, but second run panicked.");
- }
- (SandboxedResult::FoundBug { .. }, SandboxedResult::Panicked { .. }) => {
- log::error!(
- "doublecheck failed! first run failed an assertion, but second run panicked."
- );
- }
- (SandboxedResult::Panicked { .. }, SandboxedResult::Correct) => {
- log::error!("doublecheck failed! first run panicked, but second run succeeded.");
- }
- (SandboxedResult::Panicked { .. }, SandboxedResult::FoundBug { .. }) => {
- log::error!(
- "doublecheck failed! first run panicked, but second run failed an assertion."
- );
- }
- (SandboxedResult::Correct, SandboxedResult::FoundBug { .. }) => {
- log::error!(
- "doublecheck failed! first run succeeded, but second run failed an assertion."
- );
- }
- (SandboxedResult::FoundBug { .. }, SandboxedResult::Correct) => {
- log::error!(
- "doublecheck failed! first run failed an assertion, but second run succeeded."
- );
- }
- (SandboxedResult::Correct, SandboxedResult::Correct)
- | (SandboxedResult::FoundBug { .. }, SandboxedResult::FoundBug { .. })
- | (SandboxedResult::Panicked { .. }, SandboxedResult::Panicked { .. }) => {
- // Compare the two database files byte by byte
- let db_bytes = std::fs::read(&paths.db).unwrap();
- let doublecheck_db_bytes = std::fs::read(&paths.doublecheck_db).unwrap();
- if db_bytes != doublecheck_db_bytes {
- log::error!("doublecheck failed! database files are different.");
- } else {
- log::info!("doublecheck succeeded! database files are the same.");
- }
- }
- }
+ doublecheck(env.clone(), paths, &plans, last_execution.clone(), result);
} else {
// No doublecheck, run shrinking if panicking or found a bug.
match &result {
SandboxedResult::Correct => {
log::info!("simulation succeeded");
+ println!("simulation succeeded");
}
SandboxedResult::Panicked {
error,
@@ -196,21 +219,28 @@ fn main() -> Result<(), String> {
}
log::error!("simulation failed: '{}'", error);
+ println!("simulation failed: '{}'", error);
if cli_opts.shrink {
log::info!("Starting to shrink");
- let shrink = Some(last_execution);
+
+ let shrunk_plans = plans
+ .iter()
+ .map(|plan| {
+ let shrunk = plan.shrink_interaction_plan(last_execution);
+ log::info!("{}", shrunk.stats());
+ shrunk
+ })
+ .collect::>();
+
let last_execution = Arc::new(Mutex::new(*last_execution));
let shrunk = SandboxedResult::from(
std::panic::catch_unwind(|| {
run_simulation(
- seed,
- &cli_opts,
- &paths.shrunk_db,
- &paths.shrunk_plan,
+ env.clone(),
+ &mut shrunk_plans.clone(),
last_execution.clone(),
- shrink,
)
}),
last_execution,
@@ -258,35 +288,78 @@ fn main() -> Result<(), String> {
println!("shrunk database path: {:?}", paths.shrunk_db);
}
println!("simulator plan path: {:?}", paths.plan);
+ println!(
+ "simulator plan serialized path: {:?}",
+ paths.plan.with_extension("plan.json")
+ );
if cli_opts.shrink {
println!("shrunk plan path: {:?}", paths.shrunk_plan);
}
println!("simulator history path: {:?}", paths.history);
println!("seed: {}", seed);
-
- Ok(())
}
-fn move_db_and_plan_files(output_dir: &Path) {
- let old_db_path = output_dir.join("simulator.db");
- let old_plan_path = output_dir.join("simulator.plan");
+fn doublecheck(
+ env: Arc>,
+ paths: &Paths,
+ plans: &[InteractionPlan],
+ last_execution: Arc>,
+ result: SandboxedResult,
+) {
+ {
+ let mut env_ = env.lock().unwrap();
+ env_.db =
+ Database::open_file(env_.io.clone(), paths.doublecheck_db.to_str().unwrap()).unwrap();
+ }
- let new_db_path = output_dir.join("simulator_double.db");
- let new_plan_path = output_dir.join("simulator_double.plan");
+ // Run the simulation again
+ let result2 = SandboxedResult::from(
+ std::panic::catch_unwind(|| {
+ run_simulation(env.clone(), &mut plans.to_owned(), last_execution.clone())
+ }),
+ last_execution.clone(),
+ );
- std::fs::rename(&old_db_path, &new_db_path).unwrap();
- std::fs::rename(&old_plan_path, &new_plan_path).unwrap();
-}
-
-fn revert_db_and_plan_files(output_dir: &Path) {
- let old_db_path = output_dir.join("simulator.db");
- let old_plan_path = output_dir.join("simulator.plan");
-
- let new_db_path = output_dir.join("simulator_double.db");
- let new_plan_path = output_dir.join("simulator_double.plan");
-
- std::fs::rename(&new_db_path, &old_db_path).unwrap();
- std::fs::rename(&new_plan_path, &old_plan_path).unwrap();
+ match (result, result2) {
+ (SandboxedResult::Correct, SandboxedResult::Panicked { .. }) => {
+ log::error!("doublecheck failed! first run succeeded, but second run panicked.");
+ }
+ (SandboxedResult::FoundBug { .. }, SandboxedResult::Panicked { .. }) => {
+ log::error!(
+ "doublecheck failed! first run failed an assertion, but second run panicked."
+ );
+ }
+ (SandboxedResult::Panicked { .. }, SandboxedResult::Correct) => {
+ log::error!("doublecheck failed! first run panicked, but second run succeeded.");
+ }
+ (SandboxedResult::Panicked { .. }, SandboxedResult::FoundBug { .. }) => {
+ log::error!(
+ "doublecheck failed! first run panicked, but second run failed an assertion."
+ );
+ }
+ (SandboxedResult::Correct, SandboxedResult::FoundBug { .. }) => {
+ log::error!(
+ "doublecheck failed! first run succeeded, but second run failed an assertion."
+ );
+ }
+ (SandboxedResult::FoundBug { .. }, SandboxedResult::Correct) => {
+ log::error!(
+ "doublecheck failed! first run failed an assertion, but second run succeeded."
+ );
+ }
+ (SandboxedResult::Correct, SandboxedResult::Correct)
+ | (SandboxedResult::FoundBug { .. }, SandboxedResult::FoundBug { .. })
+ | (SandboxedResult::Panicked { .. }, SandboxedResult::Panicked { .. }) => {
+ // Compare the two database files byte by byte
+ let db_bytes = std::fs::read(&paths.db).unwrap();
+ let doublecheck_db_bytes = std::fs::read(&paths.doublecheck_db).unwrap();
+ if db_bytes != doublecheck_db_bytes {
+ log::error!("doublecheck failed! database files are different.");
+ } else {
+ log::info!("doublecheck succeeded! database files are the same.");
+ }
+ }
+ }
}
#[derive(Debug)]
@@ -342,67 +415,64 @@ impl SandboxedResult {
}
}
-fn run_simulation(
- seed: u64,
+fn setup_simulation(
+ mut seed: u64,
cli_opts: &SimulatorCLI,
db_path: &Path,
plan_path: &Path,
+) -> (SimulatorEnv, Vec) {
+ if let Some(load) = &cli_opts.load {
+ let seed_path = PathBuf::from(load).with_extension("seed");
+ let seed_str = std::fs::read_to_string(&seed_path).unwrap();
+ seed = seed_str.parse().unwrap();
+ }
+
+ let mut env = SimulatorEnv::new(seed, cli_opts, db_path);
+
+ // todo: the loading works correctly because of a hacky decision
+ // Rigth now, the plan generation is the only point we use the rng, so the environment doesn't
+ // even need it. In the future, especially with multi-connections and multi-threading, we might
+ // use the RNG for more things such as scheduling, so this assumption will fail. When that happens,
+ // we'll need to reachitect this logic by saving and loading RNG state.
+ let plans = if let Some(load) = &cli_opts.load {
+ log::info!("Loading database interaction plan...");
+ let plan = std::fs::read_to_string(load).unwrap();
+ let plan: InteractionPlan = serde_json::from_str(&plan).unwrap();
+ vec![plan]
+ } else {
+ log::info!("Generating database interaction plan...");
+ (1..=env.opts.max_connections)
+ .map(|_| InteractionPlan::arbitrary_from(&mut env.rng.clone(), &mut env))
+ .collect::>()
+ };
+
+ // todo: for now, we only use 1 connection, so it's safe to use the first plan.
+ let plan = plans[0].clone();
+
+ let mut f = std::fs::File::create(plan_path).unwrap();
+ // todo: create a detailed plan file with all the plans. for now, we only use 1 connection, so it's safe to use the first plan.
+ f.write_all(plan.to_string().as_bytes()).unwrap();
+
+ let serialized_plan_path = plan_path.with_extension("plan.json");
+ let mut f = std::fs::File::create(&serialized_plan_path).unwrap();
+ f.write_all(serde_json::to_string(&plan).unwrap().as_bytes())
+ .unwrap();
+
+ let seed_path = plan_path.with_extension("seed");
+ let mut f = std::fs::File::create(&seed_path).unwrap();
+ f.write_all(seed.to_string().as_bytes()).unwrap();
+
+ log::info!("{}", plan.stats());
+ (env, plans)
+}
+
+fn run_simulation(
+ env: Arc>,
+ plans: &mut [InteractionPlan],
last_execution: Arc>,
- shrink: Option<&Execution>,
) -> ExecutionResult {
- let mut rng = ChaCha8Rng::seed_from_u64(seed);
+ log::info!("Executing database interaction plan...");
- let (create_percent, read_percent, write_percent, delete_percent) = {
- let mut remaining = 100.0;
- let read_percent = rng.gen_range(0.0..=remaining);
- remaining -= read_percent;
- let write_percent = rng.gen_range(0.0..=remaining);
- remaining -= write_percent;
- let delete_percent = remaining;
-
- let create_percent = write_percent / 10.0;
- let write_percent = write_percent - create_percent;
-
- (create_percent, read_percent, write_percent, delete_percent)
- };
-
- let opts = SimulatorOpts {
- ticks: rng.gen_range(cli_opts.minimum_size..=cli_opts.maximum_size),
- max_connections: 1, // TODO: for now let's use one connection as we didn't implement
- // correct transactions procesing
- max_tables: rng.gen_range(0..128),
- create_percent,
- read_percent,
- write_percent,
- delete_percent,
- page_size: 4096, // TODO: randomize this too
- max_interactions: rng.gen_range(cli_opts.minimum_size..=cli_opts.maximum_size),
- max_time_simulation: cli_opts.maximum_time,
- };
- let io = Arc::new(SimulatorIO::new(seed, opts.page_size).unwrap());
-
- let db = match Database::open_file(io.clone(), db_path.to_str().unwrap()) {
- Ok(db) => db,
- Err(e) => {
- panic!("error opening simulator test file {:?}: {:?}", db_path, e);
- }
- };
-
- let connections = vec![SimConnection::Disconnected; opts.max_connections];
-
- let mut env = SimulatorEnv {
- opts,
- tables: Vec::new(),
- connections,
- rng,
- io,
- db,
- };
-
- log::info!("Generating database interaction plan...");
- let mut plans = (1..=env.opts.max_connections)
- .map(|_| InteractionPlan::arbitrary_from(&mut env.rng.clone(), &mut env))
- .collect::>();
let mut states = plans
.iter()
.map(|_| InteractionPlanState {
@@ -411,27 +481,9 @@ fn run_simulation(
secondary_pointer: 0,
})
.collect::>();
+ let result = execute_plans(env.clone(), plans, &mut states, last_execution);
- let plan = if let Some(failing_execution) = shrink {
- // todo: for now, we only use 1 connection, so it's safe to use the first plan.
- println!("Interactions Before: {}", plans[0].plan.len());
- let shrunk = plans[0].shrink_interaction_plan(failing_execution);
- println!("Interactions After: {}", shrunk.plan.len());
- shrunk
- } else {
- plans[0].clone()
- };
-
- let mut f = std::fs::File::create(plan_path).unwrap();
- // todo: create a detailed plan file with all the plans. for now, we only use 1 connection, so it's safe to use the first plan.
- f.write_all(plan.to_string().as_bytes()).unwrap();
-
- log::info!("{}", plan.stats());
-
- log::info!("Executing database interaction plan...");
-
- let result = execute_plans(&mut env, &mut plans, &mut states, last_execution);
-
+ let env = env.lock().unwrap();
env.io.print_stats();
log::info!("Simulation completed");
diff --git a/simulator/model/query.rs b/simulator/model/query.rs
index 9138b1988..f03bbde6f 100644
--- a/simulator/model/query.rs
+++ b/simulator/model/query.rs
@@ -1,8 +1,13 @@
use std::fmt::Display;
-use crate::model::table::{Table, Value};
+use serde::{Deserialize, Serialize};
-#[derive(Clone, Debug, PartialEq)]
+use crate::{
+ model::table::{Table, Value},
+ runner::env::SimulatorEnv,
+};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub(crate) enum Predicate {
And(Vec), // p1 AND p2 AND p3... AND pn
Or(Vec), // p1 OR p2 OR p3... OR pn
@@ -83,7 +88,7 @@ impl Display for Predicate {
}
// This type represents the potential queries on the database.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) enum Query {
Create(Create),
Select(Select),
@@ -108,30 +113,65 @@ impl Query {
| Query::Delete(Delete { table, .. }) => vec![table.clone()],
}
}
+
+ pub(crate) fn shadow(&self, env: &mut SimulatorEnv) {
+ match self {
+ Query::Create(create) => create.shadow(env),
+ Query::Insert(insert) => insert.shadow(env),
+ Query::Delete(delete) => delete.shadow(env),
+ Query::Select(select) => select.shadow(env),
+ }
+ }
}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct Create {
pub(crate) table: Table,
}
-#[derive(Clone, Debug, PartialEq)]
+impl Create {
+ pub(crate) fn shadow(&self, env: &mut SimulatorEnv) {
+ if !env.tables.iter().any(|t| t.name == self.table.name) {
+ env.tables.push(self.table.clone());
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub(crate) struct Select {
pub(crate) table: String,
pub(crate) predicate: Predicate,
}
-#[derive(Clone, Debug, PartialEq)]
+impl Select {
+ pub(crate) fn shadow(&self, _env: &mut SimulatorEnv) {}
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub(crate) struct Insert {
pub(crate) table: String,
pub(crate) values: Vec>,
}
-#[derive(Clone, Debug, PartialEq)]
+impl Insert {
+ pub(crate) fn shadow(&self, env: &mut SimulatorEnv) {
+ if let Some(t) = env.tables.iter_mut().find(|t| t.name == self.table) {
+ t.rows.extend(self.values.clone());
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub(crate) struct Delete {
pub(crate) table: String,
pub(crate) predicate: Predicate,
}
+impl Delete {
+ pub(crate) fn shadow(&self, _env: &mut SimulatorEnv) {
+ todo!()
+ }
+}
+
impl Display for Query {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
diff --git a/simulator/model/table.rs b/simulator/model/table.rs
index ab3b003af..ff3e2e5bf 100644
--- a/simulator/model/table.rs
+++ b/simulator/model/table.rs
@@ -1,5 +1,7 @@
use std::{fmt::Display, ops::Deref};
+use serde::{Deserialize, Serialize};
+
pub(crate) struct Name(pub(crate) String);
impl Deref for Name {
@@ -10,14 +12,14 @@ impl Deref for Name {
}
}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct Table {
pub(crate) rows: Vec>,
pub(crate) name: String,
pub(crate) columns: Vec,
}
-#[allow(dead_code)]
-#[derive(Debug, Clone)]
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct Column {
pub(crate) name: String,
pub(crate) column_type: ColumnType,
@@ -25,7 +27,7 @@ pub(crate) struct Column {
pub(crate) unique: bool,
}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) enum ColumnType {
Integer,
Float,
@@ -44,10 +46,30 @@ impl Display for ColumnType {
}
}
-#[derive(Clone, Debug, PartialEq)]
+fn float_to_string(float: &f64, serializer: S) -> Result
+where
+ S: serde::Serializer,
+{
+ serializer.serialize_str(&format!("{}", float))
+}
+
+fn string_to_float<'de, D>(deserializer: D) -> Result
+where
+ D: serde::Deserializer<'de>,
+{
+ let s = String::deserialize(deserializer)?;
+ s.parse().map_err(serde::de::Error::custom)
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub(crate) enum Value {
Null,
Integer(i64),
+ // we use custom serialization to preserve float precision
+ #[serde(
+ serialize_with = "float_to_string",
+ deserialize_with = "string_to_float"
+ )]
Float(f64),
Text(String),
Blob(Vec),
diff --git a/simulator/runner/cli.rs b/simulator/runner/cli.rs
index b4a6d94f1..93a14849f 100644
--- a/simulator/runner/cli.rs
+++ b/simulator/runner/cli.rs
@@ -41,6 +41,14 @@ pub struct SimulatorCLI {
help = "minimize(shrink) the failing counterexample"
)]
pub shrink: bool,
+ #[clap(short = 'l', long, help = "load plan from a file")]
+ pub load: Option,
+ #[clap(
+ short = 'w',
+ long,
+ help = "enable watch mode that reruns the simulation on file changes"
+ )]
+ pub watch: bool,
}
impl SimulatorCLI {
@@ -51,9 +59,21 @@ impl SimulatorCLI {
if self.maximum_size < 1 {
return Err("maximum size must be at least 1".to_string());
}
+ // todo: fix an issue here where if minimum size is not defined, it prevents setting low maximum sizes.
if self.minimum_size > self.maximum_size {
return Err("Minimum size cannot be greater than maximum size".to_string());
}
+
+ // Make sure uncompatible options are not set
+ if self.shrink && self.doublecheck {
+ return Err("Cannot use shrink and doublecheck at the same time".to_string());
+ }
+
+ if let Some(plan_path) = &self.load {
+ std::fs::File::open(plan_path)
+ .map_err(|_| format!("Plan file '{}' could not be opened", plan_path))?;
+ }
+
Ok(())
}
}
diff --git a/simulator/runner/env.rs b/simulator/runner/env.rs
index 7edad025f..2813b80e8 100644
--- a/simulator/runner/env.rs
+++ b/simulator/runner/env.rs
@@ -1,13 +1,18 @@
+use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
use limbo_core::{Connection, Database};
+use rand::{Rng, SeedableRng};
use rand_chacha::ChaCha8Rng;
use crate::model::table::Table;
use crate::runner::io::SimulatorIO;
+use super::cli::SimulatorCLI;
+
+#[derive(Clone)]
pub(crate) struct SimulatorEnv {
pub(crate) opts: SimulatorOpts,
pub(crate) tables: Vec,
@@ -17,6 +22,65 @@ pub(crate) struct SimulatorEnv {
pub(crate) rng: ChaCha8Rng,
}
+impl SimulatorEnv {
+ pub(crate) fn new(seed: u64, cli_opts: &SimulatorCLI, db_path: &Path) -> Self {
+ let mut rng = ChaCha8Rng::seed_from_u64(seed);
+
+ let (create_percent, read_percent, write_percent, delete_percent) = {
+ let mut remaining = 100.0;
+ let read_percent = rng.gen_range(0.0..=remaining);
+ remaining -= read_percent;
+ let write_percent = rng.gen_range(0.0..=remaining);
+ remaining -= write_percent;
+ let delete_percent = remaining;
+
+ let create_percent = write_percent / 10.0;
+ let write_percent = write_percent - create_percent;
+
+ (create_percent, read_percent, write_percent, delete_percent)
+ };
+
+ let opts = SimulatorOpts {
+ ticks: rng.gen_range(cli_opts.minimum_size..=cli_opts.maximum_size),
+ max_connections: 1, // TODO: for now let's use one connection as we didn't implement
+ // correct transactions procesing
+ max_tables: rng.gen_range(0..128),
+ create_percent,
+ read_percent,
+ write_percent,
+ delete_percent,
+ page_size: 4096, // TODO: randomize this too
+ max_interactions: rng.gen_range(cli_opts.minimum_size..=cli_opts.maximum_size),
+ max_time_simulation: cli_opts.maximum_time,
+ };
+
+ let io = Arc::new(SimulatorIO::new(seed, opts.page_size).unwrap());
+
+ // Remove existing database file if it exists
+ if db_path.exists() {
+ std::fs::remove_file(db_path).unwrap();
+ }
+
+ let db = match Database::open_file(io.clone(), db_path.to_str().unwrap()) {
+ Ok(db) => db,
+ Err(e) => {
+ panic!("error opening simulator test file {:?}: {:?}", db_path, e);
+ }
+ };
+
+ let connections = vec![SimConnection::Disconnected; opts.max_connections];
+
+ SimulatorEnv {
+ opts,
+ tables: Vec::new(),
+ connections,
+ rng,
+ io,
+ db,
+ }
+ }
+}
+
#[derive(Clone)]
pub(crate) enum SimConnection {
Connected(Rc),
diff --git a/simulator/runner/execution.rs b/simulator/runner/execution.rs
index e39fed01f..6544928a1 100644
--- a/simulator/runner/execution.rs
+++ b/simulator/runner/execution.rs
@@ -36,7 +36,7 @@ pub(crate) struct ExecutionHistory {
}
impl ExecutionHistory {
- fn new() -> Self {
+ pub(crate) fn new() -> Self {
Self {
history: Vec::new(),
}
@@ -49,19 +49,20 @@ pub(crate) struct ExecutionResult {
}
impl ExecutionResult {
- fn new(history: ExecutionHistory, error: Option) -> Self {
+ pub(crate) fn new(history: ExecutionHistory, error: Option) -> Self {
Self { history, error }
}
}
pub(crate) fn execute_plans(
- env: &mut SimulatorEnv,
+ env: Arc>,
plans: &mut [InteractionPlan],
states: &mut [InteractionPlanState],
last_execution: Arc>,
) -> ExecutionResult {
let mut history = ExecutionHistory::new();
let now = std::time::Instant::now();
+ let mut env = env.lock().unwrap();
for _tick in 0..env.opts.ticks {
// Pick the connection to interact with
let connection_index = pick_index(env.connections.len(), &mut env.rng);
@@ -77,7 +78,7 @@ pub(crate) fn execute_plans(
last_execution.interaction_index = state.interaction_pointer;
last_execution.secondary_index = state.secondary_pointer;
// Execute the interaction for the selected connection
- match execute_plan(env, connection_index, plans, states) {
+ match execute_plan(&mut env, connection_index, plans, states) {
Ok(_) => {}
Err(err) => {
return ExecutionResult::new(history, Some(err));
@@ -155,14 +156,14 @@ fn execute_plan(
/// `execute_interaction` uses this type in conjunction with a result, where
/// the `Err` case indicates a full-stop due to a bug, and the `Ok` case
/// indicates the next step in the plan.
-enum ExecutionContinuation {
+pub(crate) enum ExecutionContinuation {
/// Default continuation, execute the next interaction.
NextInteraction,
/// Typically used in the case of preconditions failures, skip to the next property.
NextProperty,
}
-fn execute_interaction(
+pub(crate) fn execute_interaction(
env: &mut SimulatorEnv,
connection_index: usize,
interaction: &Interaction,
diff --git a/simulator/runner/mod.rs b/simulator/runner/mod.rs
index 3f014bef0..2eabaef8b 100644
--- a/simulator/runner/mod.rs
+++ b/simulator/runner/mod.rs
@@ -4,3 +4,4 @@ pub mod execution;
#[allow(dead_code)]
pub mod file;
pub mod io;
+pub mod watch;
diff --git a/simulator/runner/watch.rs b/simulator/runner/watch.rs
new file mode 100644
index 000000000..75ecb1801
--- /dev/null
+++ b/simulator/runner/watch.rs
@@ -0,0 +1,133 @@
+use std::sync::{Arc, Mutex};
+
+use crate::{
+ generation::{
+ pick_index,
+ plan::{Interaction, InteractionPlanState},
+ },
+ runner::execution::ExecutionContinuation,
+};
+
+use super::{
+ env::{SimConnection, SimulatorEnv},
+ execution::{execute_interaction, Execution, ExecutionHistory, ExecutionResult},
+};
+
+pub(crate) fn run_simulation(
+ env: Arc>,
+ plans: &mut [Vec>],
+ last_execution: Arc>,
+) -> ExecutionResult {
+ let mut states = plans
+ .iter()
+ .map(|_| InteractionPlanState {
+ stack: vec![],
+ interaction_pointer: 0,
+ secondary_pointer: 0,
+ })
+ .collect::>();
+ let result = execute_plans(env.clone(), plans, &mut states, last_execution);
+
+ let env = env.lock().unwrap();
+ env.io.print_stats();
+
+ log::info!("Simulation completed");
+
+ result
+}
+
+pub(crate) fn execute_plans(
+ env: Arc>,
+ plans: &mut [Vec>],
+ states: &mut [InteractionPlanState],
+ last_execution: Arc>,
+) -> ExecutionResult {
+ let mut history = ExecutionHistory::new();
+ let now = std::time::Instant::now();
+ let mut env = env.lock().unwrap();
+ for _tick in 0..env.opts.ticks {
+ // Pick the connection to interact with
+ let connection_index = pick_index(env.connections.len(), &mut env.rng);
+ let state = &mut states[connection_index];
+
+ history.history.push(Execution::new(
+ connection_index,
+ state.interaction_pointer,
+ state.secondary_pointer,
+ ));
+ let mut last_execution = last_execution.lock().unwrap();
+ last_execution.connection_index = connection_index;
+ last_execution.interaction_index = state.interaction_pointer;
+ last_execution.secondary_index = state.secondary_pointer;
+ // Execute the interaction for the selected connection
+ match execute_plan(&mut env, connection_index, plans, states) {
+ Ok(_) => {}
+ Err(err) => {
+ return ExecutionResult::new(history, Some(err));
+ }
+ }
+ // Check if the maximum time for the simulation has been reached
+ if now.elapsed().as_secs() >= env.opts.max_time_simulation as u64 {
+ return ExecutionResult::new(
+ history,
+ Some(limbo_core::LimboError::InternalError(
+ "maximum time for simulation reached".into(),
+ )),
+ );
+ }
+ }
+
+ ExecutionResult::new(history, None)
+}
+
+fn execute_plan(
+ env: &mut SimulatorEnv,
+ connection_index: usize,
+ plans: &mut [Vec>],
+ states: &mut [InteractionPlanState],
+) -> limbo_core::Result<()> {
+ let connection = &env.connections[connection_index];
+ let plan = &mut plans[connection_index];
+ let state = &mut states[connection_index];
+
+ if state.interaction_pointer >= plan.len() {
+ return Ok(());
+ }
+
+ let interaction = &plan[state.interaction_pointer][state.secondary_pointer];
+
+ if let SimConnection::Disconnected = connection {
+ log::info!("connecting {}", connection_index);
+ env.connections[connection_index] = SimConnection::Connected(env.db.connect());
+ } else {
+ match execute_interaction(env, connection_index, interaction, &mut state.stack) {
+ Ok(next_execution) => {
+ log::debug!("connection {} processed", connection_index);
+ // Move to the next interaction or property
+ match next_execution {
+ ExecutionContinuation::NextInteraction => {
+ if state.secondary_pointer + 1 >= plan[state.interaction_pointer].len() {
+ // If we have reached the end of the interactions for this property, move to the next property
+ state.interaction_pointer += 1;
+ state.secondary_pointer = 0;
+ } else {
+ // Otherwise, move to the next interaction
+ state.secondary_pointer += 1;
+ }
+ }
+ ExecutionContinuation::NextProperty => {
+ // Skip to the next property
+ state.interaction_pointer += 1;
+ state.secondary_pointer = 0;
+ }
+ }
+ }
+ Err(err) => {
+ log::error!("error {}", err);
+ return Err(err);
+ }
+ }
+ }
+
+ Ok(())
+}
diff --git a/testing/json.test b/testing/json.test
index ea1c9bf0f..5817a8c55 100755
--- a/testing/json.test
+++ b/testing/json.test
@@ -544,3 +544,35 @@ do_execsql_test json_from_json_object {
#do_execsql_test json_object_duplicated_keys {
# SELECT json_object('key', 'value', 'key', 'value2');
#} {{{"key":"value2"}}}
+#
+
+do_execsql_test json_valid_1 {
+ SELECT json_valid('{"a":55,"b":72}');
+} {1}
+do_execsql_test json_valid_2 {
+ SELECT json_valid('["a",55,"b",72]');
+} {1}
+do_execsql_test json_valid_3 {
+ SELECT json_valid( CAST('{"a":1}' AS BLOB) );
+} {1}
+do_execsql_test json_valid_4 {
+ SELECT json_valid(123);
+} {1}
+do_execsql_test json_valid_5 {
+ SELECT json_valid(12.3);
+} {1}
+do_execsql_test json_valid_6 {
+ SELECT json_valid('not a valid json');
+} {0}
+do_execsql_test json_valid_7 {
+ SELECT json_valid('{"a":"55,"b":72}');
+} {0}
+do_execsql_test json_valid_8 {
+ SELECT json_valid('{"a":55 "b":72}');
+} {0}
+do_execsql_test json_valid_3 {
+ SELECT json_valid( CAST('{"a":"1}' AS BLOB) );
+} {0}
+do_execsql_test json_valid_9 {
+ SELECT json_valid(NULL);
+} {}
diff --git a/testing/scalar-functions-datetime.test b/testing/scalar-functions-datetime.test
index 8831f723e..2917167ac 100755
--- a/testing/scalar-functions-datetime.test
+++ b/testing/scalar-functions-datetime.test
@@ -443,3 +443,140 @@ do_execsql_test julianday-time-only {
# SELECT julianday('2023-05-18');
#} {2460082.5}
+
+
+
+# Strftime tests
+
+
+set FMT {%d,%e,%f,%F,%G,%g,%H,%I,%j,%J,%k,%l,%i,%m,%M,%p,%P,%R,%s,%S,%T,%U,%u,%V,%w,%W,%Y,%%}
+
+do_execsql_test strftime-day {
+ SELECT strftime('%d', '2025-01-23T13:10:30.567');
+} {23}
+
+do_execsql_test strftime-day-without-leading-zero-1 {
+ SELECT strftime('%e', '2025-01-23T13:10:30.567');
+} {23}
+
+do_execsql_test strftime-day-without-leading-zero-2 {
+ SELECT strftime('%e', '2025-01-02T13:10:30.567');
+} {" 2"}
+# TODO not a typo in sqlite there is also a space
+
+do_execsql_test strftime-fractional-seconds {
+ SELECT strftime('%f', '2025-01-02T13:10:30.567');
+} {30.567}
+
+do_execsql_test strftime-iso-8601-date {
+ SELECT strftime('%F', '2025-01-23T13:10:30.567');
+} {2025-01-23}
+
+do_execsql_test strftime-iso-8601-year {
+ SELECT strftime('%G', '2025-01-23T13:10:30.567');
+} {2025}
+
+do_execsql_test strftime-iso-8601-year-2_digit {
+ SELECT strftime('%g', '2025-01-23T13:10:30.567');
+} {25}
+
+do_execsql_test strftime-hour {
+ SELECT strftime('%H', '2025-01-23T13:10:30.567');
+} {13}
+
+do_execsql_test strftime-hour-12-hour-clock {
+ SELECT strftime('%I', '2025-01-23T13:10:30.567');
+} {01}
+
+do_execsql_test strftime-day-of-year {
+ SELECT strftime('%j', '2025-01-23T13:10:30.567');
+} {023}
+
+do_execsql_test strftime-julianday {
+ SELECT strftime('%J', '2025-01-23T13:10:30.567');
+} {2460699.048964896}
+
+do_execsql_test strftime-hour-without-leading-zero-1 {
+ SELECT strftime('%k', '2025-01-23T13:10:30.567');
+} {13}
+
+do_execsql_test strftime-hour-without-leading-zero-2 {
+ SELECT strftime('%k', '2025-01-23T02:10:30.567');
+} {" 2"}
+
+do_execsql_test strftime-hour-12-hour-clock-without-leading-zero-2 {
+ SELECT strftime('%l', '2025-01-23T13:10:30.567');
+} {" 1"}
+
+do_execsql_test strftime-month {
+ SELECT strftime('%m', '2025-01-23T13:10:30.567');
+} {01}
+
+do_execsql_test strftime-minute {
+ SELECT strftime('%M', '2025-01-23T13:14:30.567');
+} {14}
+
+do_execsql_test strftime-am-pm=1 {
+ SELECT strftime('%p', '2025-01-23T11:14:30.567');
+} {AM}
+
+do_execsql_test strftime-am-pm-2 {
+ SELECT strftime('%p', '2025-01-23T13:14:30.567');
+} {PM}
+
+do_execsql_test strftime-am-pm-lower-1 {
+ SELECT strftime('%P', '2025-01-23T11:14:30.567');
+} {am}
+
+do_execsql_test strftime-am-pm-lower-2 {
+ SELECT strftime('%P', '2025-01-23T13:14:30.567');
+} {pm}
+
+do_execsql_test strftime-iso8601-time {
+ SELECT strftime('%R', '2025-01-23T13:14:30.567');
+} {13:14}
+
+do_execsql_test strftime-seconds-since-epoch {
+ SELECT strftime('%s', '2025-01-23T13:14:30.567');
+} {1737638070}
+
+do_execsql_test strftime-seconds {
+ SELECT strftime('%S', '2025-01-23T13:14:30.567');
+} {30}
+
+do_execsql_test strftime-iso8601-with-seconds {
+ SELECT strftime('%T', '2025-01-23T13:14:30.567');
+} {13:14:30}
+
+do_execsql_test strftime-week-year-start-sunday {
+ SELECT strftime('%U', '2025-01-23T13:14:30.567');
+} {03}
+
+do_execsql_test strftime-day-week-start-monday {
+ SELECT strftime('%u', '2025-01-23T13:14:30.567');
+} {4}
+
+do_execsql_test strftime-iso8601-week-year {
+ SELECT strftime('%V', '2025-01-23T13:14:30.567');
+} {04}
+
+do_execsql_test strftime-day-week-start-sunday {
+ SELECT strftime('%w', '2025-01-23T13:14:30.567');
+} {4}
+
+do_execsql_test strftime-day-week-start-sunday {
+ SELECT strftime('%w', '2025-01-23T13:14:30.567');
+} {4}
+
+do_execsql_test strftime-week-year-start-sunday {
+ SELECT strftime('%W', '2025-01-23T13:14:30.567');
+} {03}
+
+do_execsql_test strftime-year {
+ SELECT strftime('%Y', '2025-01-23T13:14:30.567');
+} {2025}
+
+do_execsql_test strftime-percent {
+ SELECT strftime('%%', '2025-01-23T13:14:30.567');
+} {%}
+
diff --git a/tests/integration/common.rs b/tests/integration/common.rs
index 86f4b7b3f..07c840b23 100644
--- a/tests/integration/common.rs
+++ b/tests/integration/common.rs
@@ -67,3 +67,45 @@ pub(crate) fn compare_string(a: &String, b: &String) {
}
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::TempDatabase;
+
+ #[test]
+ fn test_statement_columns() -> anyhow::Result<()> {
+ let _ = env_logger::try_init();
+ let tmp_db =
+ TempDatabase::new("create table test (foo integer, bar integer, baz integer);");
+ let conn = tmp_db.connect_limbo();
+
+ let stmt = conn.prepare("select * from test;")?;
+
+ let columns = stmt.columns();
+ assert_eq!(columns.len(), 3);
+ assert_eq!(&columns[0], "foo");
+ assert_eq!(&columns[1], "bar");
+ assert_eq!(&columns[2], "baz");
+
+ let stmt = conn.prepare("select foo, bar from test;")?;
+
+ let columns = stmt.columns();
+ assert_eq!(columns.len(), 2);
+ assert_eq!(&columns[0], "foo");
+ assert_eq!(&columns[1], "bar");
+
+ let stmt = conn.prepare("delete from test;")?;
+ let columns = stmt.columns();
+ assert_eq!(columns.len(), 0);
+
+ let stmt = conn.prepare("insert into test (foo, bar, baz) values (1, 2, 3);")?;
+ let columns = stmt.columns();
+ assert_eq!(columns.len(), 0);
+
+ let stmt = conn.prepare("delete from test where foo = 1")?;
+ let columns = stmt.columns();
+ assert_eq!(columns.len(), 0);
+
+ Ok(())
+ }
+}
diff --git a/tests/integration/functions/test_function_rowid.rs b/tests/integration/functions/test_function_rowid.rs
index 6655cee0d..54b72c680 100644
--- a/tests/integration/functions/test_function_rowid.rs
+++ b/tests/integration/functions/test_function_rowid.rs
@@ -11,7 +11,7 @@ fn test_last_insert_rowid_basic() -> anyhow::Result<()> {
let mut insert_query = conn.query("INSERT INTO test_rowid (id, val) VALUES (NULL, 'test1')")?;
if let Some(ref mut rows) = insert_query {
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -25,7 +25,7 @@ fn test_last_insert_rowid_basic() -> anyhow::Result<()> {
let mut select_query = conn.query("SELECT last_insert_rowid()")?;
if let Some(ref mut rows) = select_query {
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
if let Value::Integer(id) = row.values[0] {
assert_eq!(id, 1, "First insert should have rowid 1");
@@ -44,7 +44,7 @@ fn test_last_insert_rowid_basic() -> anyhow::Result<()> {
// Test explicit rowid
match conn.query("INSERT INTO test_rowid (id, val) VALUES (5, 'test2')") {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -60,7 +60,7 @@ fn test_last_insert_rowid_basic() -> anyhow::Result<()> {
let mut last_id = 0;
match conn.query("SELECT last_insert_rowid()") {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
if let Value::Integer(id) = row.values[0] {
last_id = id;
diff --git a/tests/integration/query_processing/test_write_path.rs b/tests/integration/query_processing/test_write_path.rs
index 97b68a804..50d159a96 100644
--- a/tests/integration/query_processing/test_write_path.rs
+++ b/tests/integration/query_processing/test_write_path.rs
@@ -20,7 +20,7 @@ fn test_simple_overflow_page() -> anyhow::Result<()> {
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -39,7 +39,7 @@ fn test_simple_overflow_page() -> anyhow::Result<()> {
match conn.query(list_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = &row.values[0];
let text = &row.values[1];
@@ -93,7 +93,7 @@ fn test_sequential_overflow_page() -> anyhow::Result<()> {
let insert_query = format!("INSERT INTO test VALUES ({}, '{}')", i, huge_text.as_str());
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -112,7 +112,7 @@ fn test_sequential_overflow_page() -> anyhow::Result<()> {
let mut current_index = 0;
match conn.query(list_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = &row.values[0];
let text = &row.values[1];
@@ -166,7 +166,7 @@ fn test_sequential_write() -> anyhow::Result<()> {
let insert_query = format!("INSERT INTO test VALUES ({})", i);
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -183,7 +183,7 @@ fn test_sequential_write() -> anyhow::Result<()> {
let mut current_read_index = 0;
match conn.query(list_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = row.values.first().expect("missing id");
let id = match first_value {
@@ -227,7 +227,7 @@ fn test_regression_multi_row_insert() -> anyhow::Result<()> {
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -248,7 +248,7 @@ fn test_regression_multi_row_insert() -> anyhow::Result<()> {
let mut actual_ids = Vec::new();
match conn.query(list_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = row.values.first().expect("missing id");
let id = match first_value {
@@ -334,7 +334,7 @@ fn test_wal_checkpoint() -> anyhow::Result<()> {
conn.checkpoint()?;
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -355,7 +355,7 @@ fn test_wal_checkpoint() -> anyhow::Result<()> {
let mut current_index = 0;
match conn.query(list_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = &row.values[0];
let id = match first_value {
@@ -394,7 +394,7 @@ fn test_wal_restart() -> anyhow::Result<()> {
let insert_query = format!("INSERT INTO test VALUES ({})", i);
match conn.query(insert_query) {
Ok(Some(ref mut rows)) => loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::IO => {
tmp_db.io.run_once()?;
}
@@ -418,7 +418,7 @@ fn test_wal_restart() -> anyhow::Result<()> {
loop {
if let Some(ref mut rows) = conn.query(list_query)? {
loop {
- match rows.next_row()? {
+ match rows.step()? {
StepResult::Row(row) => {
let first_value = &row.values[0];
let count = match first_value {
