Merge pull request #1 from yuriy-glotanov/master

sql parse errors -> log

Author: interference-project

src/main/java/su/interference/sql/SQLSelect.java

@@ -41,6 +41,7 @@ this software and associated documentation files (the "Software"), to deal in
 
 public class SQLSelect implements SQLStatement {
     private static final String SELECT_CLAUSE = "SELECT";
+    private static final String STREAM_CLAUSE = " STREAM ";
     private static final String DISTINCT_CLAUSE = " DISTINCT ";
     private static final String FROM_CLAUSE = " FROM ";
     private static final String WHERE_CLAUSE = " WHERE ";
@@ -55,13 +56,14 @@ public class SQLSelect implements SQLStatement {
     private SQLJoin             join;
     private ArrayList<SQLNode>  nodes;
 
+    private boolean stream;
     private boolean distinct;
     private boolean entityResult;
     private Table   entityTable;
-    private String  SQLErrorText;
+    private SQLException sqlException;
 
-    public String getSQLErrorText() {
-        return SQLErrorText;
+    public SQLException getSQLException() {
+        return sqlException;
     }
 
     public SQLSelect () {
@@ -79,10 +81,11 @@ public SQLSelect (String sql, Cursor cur, Session s) {
         try {
             parseSQL(sql, cur, s);
         } catch (SQLException e) {
-            SQLErrorText = e.getSQLErrorText();
+            sqlException = e;
+            logger.error(e.getClass().getSimpleName()+" thrown during parse of sql statement: "+sql);
         } catch (Exception e) {
-            e.printStackTrace();
-            SQLErrorText = e.getMessage();
+            sqlException = new SQLException(e.getMessage());
+            logger.error(e.getClass().getSimpleName()+" thrown during parse of sql statement: "+sql);
         }
     }
 
@@ -151,10 +154,13 @@ private final void parseSQL (String s, Cursor cur, Session sn) throws Exception
         if (!SQL.startsWith(SELECT_CLAUSE)) {
             throw new InvalidSQLStatement();
         }
-        if (SQL.indexOf(DISTINCT_CLAUSE)>6) {
+        if (SQL.indexOf(STREAM_CLAUSE) >6 ) {
+            this.stream = true;
+        }
+        if (SQL.indexOf(DISTINCT_CLAUSE) >6 ) {
             this.distinct = true;
         }
-        if (SQL.indexOf(FROM_CLAUSE) < SELECT_CLAUSE.length()+1) {
+        if (SQL.indexOf(FROM_CLAUSE) < SELECT_CLAUSE.length() + 1) {
             throw new MissingFromClause();
         }
         if (sql.substring(SELECT_CLAUSE.length(), SQL.indexOf(" FROM ")).trim().equals("")) {

src/main/java/su/interference/sql/SQLStatement.java

@@ -36,7 +36,7 @@ this software and associated documentation files (the "Software"), to deal in
 public interface SQLStatement {
 
     DataSet executeSQL (Session s) throws SQLException;
-    String getSQLErrorText();
+    SQLException getSQLException();
     CList getCols();
 
 }

src/main/java/su/interference/sql/SQLSystem.java

@@ -114,27 +114,7 @@ public SQLSystem (String sql, Session s) {
     public DataSet executeSQL (Session s) throws SQLException {
 
         String message    = "";
-        String action     = "";
-        String actionName = "";
-        boolean nowrap  = false;
-        boolean command = true;
-/*
-        if (stmt.equals("initStorage")) {
-            Storage.getStorage().initStorage();
-        }
-        if (stmt.equals("checkStorage")) {
-            Storage.getStorage().checkStorage();
-        }
-        if (stmt.equals("openStorage")) {
-            Storage.getStorage().openStorage();
-        }
-        if (stmt.equals("closeStorage")) {
-            Storage.getStorage().closeStorage();
-        }
-        if (stmt.equals("dropStorage")) {
-            Storage.getStorage().dropStorage();
-        }
-*/
+
         try {
             /*
             if (stmt.equals("createInstance")) {
@@ -202,7 +182,7 @@ public CList getCols() {
         return null;
     }
 
-    public String getSQLErrorText() {
+    public SQLException getSQLException() {
         return null;
     }
 

src/main/java/su/interference/sqlexception/SQLException.java

@@ -30,18 +30,18 @@ this software and associated documentation files (the "Software"), to deal in
  */
 
 public class SQLException extends Exception {
-    private String SQLErrorText;
+    private String message;
 
     public SQLException () {
 
     }
 
     public SQLException (String e) {
-        SQLErrorText = e;
+        message = e;
     }
 
-    public String getSQLErrorText () {
-        return SQLErrorText;
+    public String getSQLExceptionMessage () {
+        return message;
     }
 
 }

src/main/java/su/interference/transport/SQLEvent.java

@@ -112,18 +112,18 @@ public EventResult process() {
             //s.startStatement();
             final SQLStatement sql = cur == null ? SQLStatementFactory.getInstance(this.sql, s) : SQLStatementFactory.getInstance(this.sql, cur, s);
             //todo temp solution
-            try {
-                if (sql instanceof SQLSystem) {
-                    sql.executeSQL(s);
+            if (sql.getSQLException() != null) {
+                return new EventResult(TransportCallback.FAILURE, cur.getCursorId(), null, sql.getSQLException());
+            } else {
+                try {
+                    if (sql instanceof SQLSystem) {
+                        sql.executeSQL(s);
+                    }
+                } catch (SQLException e) {
+                    return new EventResult(TransportCallback.FAILURE, cur.getCursorId(), null, e);
                 }
-            } catch (SQLException e) {
-                return new EventResult(TransportCallback.FAILURE, cur.getCursorId(), null, e);
-            }
-            //todo process exceptions
-            if (sql.getSQLErrorText() != null) {
-                return new EventResult(TransportCallback.FAILURE, cur.getCursorId(), null, new RuntimeException(sql.getSQLErrorText()));
+                return new EventResult(TransportCallback.SUCCESS, cur.getCursorId(), null, null);
             }
-            return new EventResult(TransportCallback.SUCCESS, cur.getCursorId(), null, null);
         }
     }
 

src/main/java/su/interference/transport/SyncFrameEvent.java

@@ -78,7 +78,9 @@ public synchronized int rframe2(SyncFrame[] sb) throws Exception {
                     for (DataFile f : dfs) {
                         final int order = (f.getFileId() % Storage.MAX_NODES) % Config.getConfig().FILES_AMOUNT;
                         if (order == allocOrder) {
+                            //final LLT llt = LLT.getLLT();
                             bd = t.createNewFrame(null, f.getFileId(), b.getFrameType(), b.getAllocId(), b.isStarted(), false, true, s, null);
+                            //llt.commit();
                             //bd.setAllocId(b.getAllocId());
                             bd.setFrame(null);
                             b.setDf(f);