Merge branch 'main' into main

Author: eivanov89

src/main/java/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkProfile.java

@@ -698,9 +698,9 @@ public ItemId getNextItemId(UserId seller_id) {
         Integer cnt = this.seller_item_cnt.get(seller_id);
         if (cnt == null || cnt == 0) {
             cnt = seller_id.getItemCount();
-            //this.seller_item_cnt.put(seller_id, cnt);
+            this.seller_item_cnt.put(seller_id, cnt);
         }
-        this.seller_item_cnt.put(seller_id, cnt);
+        this.seller_item_cnt.put(seller_id, 1);
         return (new ItemId(seller_id, cnt));
     }
 

src/main/java/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkWorker.java

@@ -444,8 +444,8 @@ protected boolean executeCloseAuctions(Connection conn, CloseAuctions proc) thro
             LOG.debug("Executing {}", proc);
         }
         Timestamp[] benchmarkTimes = this.getTimestampParameterArray();
-        Timestamp startTime = profile.getLastCloseAuctionsTime();
-        Timestamp endTime = profile.updateAndGetLastCloseAuctionsTime();
+        Timestamp startTime = Timestamp.from(profile.getLastCloseAuctionsTime().toInstant());
+        Timestamp endTime = Timestamp.from(profile.updateAndGetLastCloseAuctionsTime().toInstant());
 
         List<Object[]> results = proc.run(conn, benchmarkTimes, startTime, endTime);
 

src/main/java/com/oltpbenchmark/benchmarks/auctionmark/procedures/CloseAuctions.java

@@ -116,15 +116,15 @@ public List<Object[]> run(Connection conn, Timestamp[] benchmarkTimes,
                     output_rows.clear();
                     while (dueItemsTable.next()) {
                         col = 1;
-                        long itemId = dueItemsTable.getLong(col++);
-                        long sellerId = dueItemsTable.getLong(col++);
+                        String itemId = dueItemsTable.getString(col++);
+                        String sellerId = dueItemsTable.getString(col++);
                         String i_name = dueItemsTable.getString(col++);
                         double currentPrice = dueItemsTable.getDouble(col++);
                         long numBids = dueItemsTable.getLong(col++);
                         Timestamp endDate = dueItemsTable.getTimestamp(col++);
                         ItemStatus itemStatus = ItemStatus.get(dueItemsTable.getLong(col++));
                         Long bidId = null;
-                        Long buyerId = null;
+                        String buyerId = null;
 
                         if (debug) {
                             LOG.debug(String.format("Getting max bid for itemId=%d / sellerId=%d", itemId, sellerId));
@@ -139,15 +139,15 @@ public List<Object[]> run(Connection conn, Timestamp[] benchmarkTimes,
                             waiting_ctr++;
 
                             param = 1;
-                            maxBidStmt.setLong(param++, itemId);
-                            maxBidStmt.setLong(param++, sellerId);
+                            maxBidStmt.setString(param++, itemId);
+                            maxBidStmt.setString(param++, sellerId);
                             try (ResultSet maxBidResults = maxBidStmt.executeQuery()) {
                                 adv = maxBidResults.next();
 
 
                                 col = 1;
                                 bidId = maxBidResults.getLong(col++);
-                                buyerId = maxBidResults.getLong(col++);
+                                buyerId = maxBidResults.getString(col++);
                                 try (PreparedStatement preparedStatement = this.getPreparedStatement(conn, insertUserItem, buyerId, itemId, sellerId, currentTime)) {
                                     preparedStatement.executeUpdate();
                                 }

src/main/resources/benchmarks/auctionmark/dialect-postgres.xml

@@ -3,7 +3,7 @@
     <dialect type="POSTGRES">
         <procedure name="CloseAuctions">
             <statement name="updateItemStatus">UPDATE item SET i_status = ?, i_updated = ? WHERE i_id = ? AND i_u_id = ?</statement>
-            <statement name="getDueItems">SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status FROM item WHERE (i_start_date BETWEEN ? AND ?) AND i_status = 0 ORDER BY i_id ASC LIMIT 100</statement>
+            <statement name="getDueItems">SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status FROM item WHERE (i_start_date BETWEEN ? AND ?) AND i_status = ? ORDER BY i_id ASC LIMIT 100</statement>
             <statement name="getMaxBid">SELECT imb_ib_id, ib_buyer_id FROM item_max_bid, item_bid WHERE imb_i_id = ? AND imb_u_id = ? AND ib_id = imb_ib_id AND ib_i_id = imb_i_id AND ib_u_id = imb_u_id</statement>
             <statement name="insertUserItem">INSERT INTO useracct_item(ui_u_id, ui_i_id, ui_i_u_id, ui_created) VALUES(?, ?, ?, ?)</statement>
         </procedure>