Merge branch 'PollingTriggerIssue' of https://github.com/elasticio/jdbc-component into PollingTriggerIssue

Author: shulkaolka

src/main/java/io/elastic/jdbc/QueryBuilders/MySQL.java

@@ -23,14 +23,13 @@ public ArrayList executePolling(Connection connection) throws SQLException {
     sql.append(pollingField);
     sql.append(" > ?");
     if (orderField != null) {
-      sql.append(" ORDER BY ").append(orderField);
+      sql.append(" ORDER BY ").append(orderField).append(" ASC");
     }
-    sql.append(" ASC LIMIT ? OFFSET ?");
+    sql.append(" LIMIT ?");
 
     try (PreparedStatement stmt = connection.prepareStatement(sql.toString())) {
       stmt.setTimestamp(1, pollingValue);
       stmt.setInt(2, countNumber);
-      stmt.setInt(3, skipNumber);
       try (ResultSet rs = stmt.executeQuery()) {
         ArrayList listResult = new ArrayList();
         JsonObjectBuilder row = Json.createObjectBuilder();

src/main/java/io/elastic/jdbc/QueryBuilders/PostgreSQL.java

@@ -27,12 +27,10 @@ public ArrayList executePolling(Connection connection) throws SQLException {
         " )" +
         " SELECT *" +
         " FROM results_cte" +
-        " WHERE rownum > ?" +
-        " AND rownum < ?";
+        " WHERE rownum =< ?";
     try (PreparedStatement stmt = connection.prepareStatement(sql)) {
       stmt.setTimestamp(1, pollingValue);
-      stmt.setInt(2, skipNumber);
-      stmt.setInt(3, countNumber + skipNumber);
+      stmt.setInt(2, countNumber);
       try (ResultSet rs = stmt.executeQuery()) {
         ArrayList listResult = new ArrayList();
         JsonObjectBuilder row = Json.createObjectBuilder();

src/main/java/io/elastic/jdbc/triggers/GetRowsPollingTrigger.java

@@ -64,22 +64,12 @@ public final void execute(ExecutionParameters parameters) {
       pollingValue = cts;
     }
 
-    if (snapshot.containsKey(PROPERTY_SKIP_NUMBER)) {
-      skipNumber = snapshot.getInt(PROPERTY_SKIP_NUMBER);
-    }
-
-    if (snapshot.containsKey(PROPERTY_TABLE_NAME) && snapshot.get(PROPERTY_TABLE_NAME) != null
-        && !snapshot.getString(PROPERTY_TABLE_NAME)
-        .equals(tableName)) {
-      skipNumber = 0;
-    }
-
     LOGGER.info("Executing row polling trigger");
     try {
       connection = Utils.getConnection(configuration);
       QueryFactory queryFactory = new QueryFactory();
       Query query = queryFactory.getQuery(dbEngine);
-      query.from(tableName).skip(skipNumber).orderBy(pollingField)
+      query.from(tableName).orderBy(pollingField)
           .rowsPolling(pollingField, pollingValue);
       query.setMaxPollingValue(cts);
       ArrayList<JsonObject> resultList = query.executePolling(connection);
@@ -94,7 +84,6 @@ public final void execute(ExecutionParameters parameters) {
         formattedDate = new SimpleDateFormat(PROPERTY_DATETIME_FORMAT)
             .format(query.getMaxPollingValue());
         snapshot = Json.createObjectBuilder()
-            .add(PROPERTY_SKIP_NUMBER, skipNumber + resultList.size())
             .add(PROPERTY_TABLE_NAME, tableName)
             .add(PROPERTY_POLLING_FIELD, pollingField)
             .add(PROPERTY_POLLING_VALUE, formattedDate).build();