procClass) {
- return (T)(this.class_procedures.get(procClass));
+ public final P getProcedure(Class
procClass) {
+ return (P) (this.class_procedures.get(procClass));
}
-
+
public final Histogram getTransactionSuccessHistogram() {
return (this.txnSuccess);
}
+
public final Histogram getTransactionRetryHistogram() {
return (this.txnRetry);
}
+
public final Histogram getTransactionAbortHistogram() {
return (this.txnAbort);
}
+
public final Histogram getTransactionErrorHistogram() {
return (this.txnErrors);
}
+
public final Map> getTransactionAbortMessageHistogram() {
return (this.txnAbortMessages);
}
-
+
synchronized public void setCurrStatement(Statement s) {
this.currStatement = s;
}
@@ -159,44 +197,36 @@ synchronized public void cancelStatement() {
try {
if (this.currStatement != null)
this.currStatement.cancel();
- } catch(SQLException e) {
+ } catch (SQLException e) {
LOG.error("Failed to cancel statement: " + e.getMessage());
}
}
- /**
- * Get unique name for this worker's thread
- */
- public final String getName() {
- return String.format("worker%03d", this.getId());
- }
-
- @Override
- public final void run() {
- Thread t = Thread.currentThread();
+ @Override
+ public final void run() {
+ Thread t = Thread.currentThread();
SubmittedProcedure pieceOfWork;
- t.setName(this.getName());
-
- // In case of reuse reset the measurements
- latencies = new LatencyRecord(wrkldState.getTestStartNs());
-
- // Invoke the initialize callback
- try {
- this.initialize();
- } catch (Throwable ex) {
- throw new RuntimeException("Unexpected error when initializing " + this.getName(), ex);
- }
-
- // wait for start
- wrkldState.blockForStart();
+ t.setName(this.toString());
+
+ // In case of reuse reset the measurements
+ latencies = new LatencyRecord(wrkldState.getTestStartNs());
+
+ // Invoke the initialize callback
+ try {
+ this.initialize();
+ } catch (Throwable ex) {
+ throw new RuntimeException("Unexpected error when initializing " + this, ex);
+ }
+
+ // wait for start
+ wrkldState.blockForStart();
State preState, postState;
Phase phase;
-
- TransactionType invalidTT = TransactionType.INVALID;
- assert(invalidTT != null);
-
-work:
- while (true) {
+
+ TransactionType invalidTT = TransactionType.INVALID;
+ assert (invalidTT != null);
+
+ work: while (true) {
// PART 1: Init and check if done
@@ -209,17 +239,19 @@ public final void run() {
// This is the first time we have observed that the
// test is done notify the global test state, then
// continue applying load
- seenDone = true;
- wrkldState.signalDone();
+ seenDone = true;
+ wrkldState.signalDone();
break work;
}
- break;
- }
+ break;
+ default:
+ // Do nothing
+ }
// PART 2: Wait for work
// Sleep if there's nothing to do.
- wrkldState.stayAwake();
+ wrkldState.stayAwake();
phase = this.wrkldState.getCurrentPhase();
if (phase == null)
continue work;
@@ -240,18 +272,20 @@ public final void run() {
// Once a latency run is complete, we wait until the next
// phase or until DONE.
continue work;
- }
+ default:
+ // Do nothing
+ }
// PART 3: Execute work
- // TODO: Measuring latency when not rate limited is ... a little
+ // TODO: Measuring latency when not rate limited is ... a little
// weird because if you add more simultaneous clients, you will
// increase latency (queue delay) but we do this anyway since it is
// useful sometimes
long start = pieceOfWork.getStartTime();
- TransactionType type = invalidTT;
+ TransactionType type = invalidTT;
try {
type = doWork(preState == State.MEASURE, pieceOfWork);
} catch (IndexOutOfBoundsException e) {
@@ -262,15 +296,14 @@ public final void run() {
if (phase.id == this.wrkldState.getCurrentPhase().id) {
switch (preState) {
case WARMUP:
- // Don't quit yet: we haven't even begun!
+ // Don't quit yet: we haven't even begun!
phase.resetSerial();
break;
case COLD_QUERY:
case MEASURE:
// The serial phase is over. Finish the run early.
wrkldState.signalLatencyComplete();
- LOG.info("[Serial] Serial execution of all"
- + " transactions complete.");
+ LOG.info("[Serial] Serial execution of all" + " transactions complete.");
break;
default:
throw e;
@@ -279,21 +312,20 @@ public final void run() {
}
// PART 4: Record results
-
- long end = System.nanoTime();
+
+ long end = System.nanoTime();
postState = wrkldState.getGlobalState();
- switch(postState) {
+ switch (postState) {
case MEASURE:
// Non-serial measurement. Only measure if the state both
// before and after was MEASURE, and the phase hasn't
// changed, otherwise we're recording results for a query
// that either started during the warmup phase or ended
// after the timer went off.
- if (preState == State.MEASURE && type != null
- && this.wrkldState.getCurrentPhase().id == phase.id) {
- latencies.addLatency(type.getId(), start, end, this.id
- , phase.id);
+ if (preState == State.MEASURE && type != null && this.wrkldState.getCurrentPhase().id == phase.id) {
+ latencies.addLatency(type.getId(), start, end, this.id, phase.id);
+ intervalRequests.incrementAndGet();
}
if (phase.isLatencyRun())
this.wrkldState.startColdQuery();
@@ -304,51 +336,55 @@ public final void run() {
if (preState == State.COLD_QUERY)
this.wrkldState.startHotQuery();
break;
- }
+ default:
+ // Do nothing
+ }
wrkldState.finishedWork();
- }
-
- tearDown(false);
- }
-
- /**
- * Called in a loop in the thread to exercise the system under test.
- * Each implementing worker should return the TransactionType handle that
- * was executed.
- *
- * @param llr
- */
+ }
+
+ tearDown(false);
+ }
+
+ /**
+ * Called in a loop in the thread to exercise the system under test. Each
+ * implementing worker should return the TransactionType handle that was
+ * executed.
+ *
+ * @param llr
+ */
protected final TransactionType doWork(boolean measure, SubmittedProcedure pieceOfWork) {
- TransactionType next = null;
- TransactionStatus status = TransactionStatus.RETRY;
- Savepoint savepoint = null;
- final DatabaseType dbType = wrkld.getDBType();
- final boolean recordAbortMessages = wrkld.getRecordAbortMessages();
-
- try {
- while (status == TransactionStatus.RETRY && this.wrkldState.getGlobalState() != State.DONE) {
+ TransactionType next = null;
+ TransactionStatus status = TransactionStatus.RETRY;
+ Savepoint savepoint = null;
+ final DatabaseType dbType = wrkld.getDBType();
+ final boolean recordAbortMessages = wrkld.getRecordAbortMessages();
+
+ try {
+ while (status == TransactionStatus.RETRY && this.wrkldState.getGlobalState() != State.DONE) {
if (next == null) {
next = transactionTypes.getType(pieceOfWork.getType());
}
- assert(next.isSupplemental() == false) :
- "Trying to select a supplemental transaction " + next;
-
- try {
- // For Postgres, we have to create a savepoint in order
- // to rollback a user aborted transaction
-// if (dbType == DatabaseType.POSTGRES) {
-// savepoint = this.conn.setSavepoint();
-// // if (LOG.isDebugEnabled())
-// LOG.info("Created SavePoint: " + savepoint);
-// }
-
- status = this.executeWork(next);
- // User Abort Handling
- // These are not errors
- } catch (UserAbortException ex) {
- if (LOG.isDebugEnabled()) LOG.debug(next + " Aborted", ex);
-
+ assert (next.isSupplemental() == false) : "Trying to select a supplemental transaction " + next;
+
+ try {
+ // For Postgres, we have to create a savepoint in order
+ // to rollback a user aborted transaction
+ // if (dbType == DatabaseType.POSTGRES) {
+ // savepoint = this.conn.setSavepoint();
+ // // if (LOG.isDebugEnabled())
+ // LOG.info("Created SavePoint: " + savepoint);
+ // }
+
+ status = TransactionStatus.UNKNOWN;
+ status = this.executeWork(next);
+
+ // User Abort Handling
+ // These are not errors
+ } catch (UserAbortException ex) {
+ if (LOG.isDebugEnabled())
+ LOG.trace(next + " Aborted", ex);
+
/* PAVLO */
if (recordAbortMessages) {
Histogram error_h = this.txnAbortMessages.get(next);
@@ -358,23 +394,27 @@ protected final TransactionType doWork(boolean measure, SubmittedProcedure piece
}
error_h.put(StringUtil.abbrv(ex.getMessage(), 20));
}
-
+
if (savepoint != null) {
this.conn.rollback(savepoint);
} else {
this.conn.rollback();
}
- this.txnAbort.put(next);
- break;
+ status = TransactionStatus.USER_ABORTED;
+ break;
+
// Database System Specific Exception Handling
} catch (SQLException ex) {
-
- //TODO: Handle acceptable error codes for every DBMS
- LOG.debug(next+ " " + ex.getMessage()+" "+ex.getErrorCode()+ " - " +ex.getSQLState());
+ // TODO: Handle acceptable error codes for every DBMS
+ if (LOG.isDebugEnabled())
+ LOG.warn(String.format("%s thrown when executing '%s' on '%s' " +
+ "[Message='%s', ErrorCode='%d', SQLState='%s']",
+ ex.getClass().getSimpleName(), next, this.toString(),
+ ex.getMessage(), ex.getErrorCode(), ex.getSQLState()), ex);
this.txnErrors.put(next);
-
+
if (savepoint != null) {
this.conn.rollback(savepoint);
} else {
@@ -383,113 +423,156 @@ protected final TransactionType doWork(boolean measure, SubmittedProcedure piece
if (ex.getSQLState() == null) {
continue;
- }
- else if (ex.getErrorCode() == 1213 && ex.getSQLState().equals("40001")) {
+ // ------------------
+ // MYSQL
+ // ------------------
+ } else if (ex.getErrorCode() == 1213 && ex.getSQLState().equals("40001")) {
// MySQLTransactionRollbackException
continue;
- }
- else if (ex.getErrorCode() == 1205 && ex.getSQLState().equals("41000")) {
+ } else if (ex.getErrorCode() == 1205 && ex.getSQLState().equals("41000")) {
// MySQL Lock timeout
continue;
- }
- else if (ex.getErrorCode() == 1205 && ex.getSQLState().equals("40001")) {
+
+ // ------------------
+ // SQL SERVER
+ // ------------------
+ } else if (ex.getErrorCode() == 1205 && ex.getSQLState().equals("40001")) {
// SQLServerException Deadlock
continue;
- }
- else if (ex.getErrorCode() == -911 && ex.getSQLState().equals("40001")) {
- // DB2Exception Deadlock
- continue;
- }
- else if (ex.getErrorCode() == 0 && ex.getSQLState() != null && ex.getSQLState().equals("40001")) {
+
+ // ------------------
+ // POSTGRES
+ // ------------------
+ } else if (ex.getErrorCode() == 0 && ex.getSQLState() != null && ex.getSQLState().equals("40001")) {
// Postgres serialization
continue;
- }
- else if (ex.getErrorCode() == 8177 && ex.getSQLState().equals("72000")) {
+ } else if (ex.getErrorCode() == 0 && ex.getSQLState() != null && ex.getSQLState().equals("53200")) {
+ // Postgres OOM error
+ throw ex;
+
+ // ------------------
+ // ORACLE
+ // ------------------
+ } else if (ex.getErrorCode() == 8177 && ex.getSQLState().equals("72000")) {
// ORA-08177: Oracle Serialization
continue;
- }
- else if ( (ex.getErrorCode() == 0 && ex.getSQLState().equals("57014"))
- || (ex.getErrorCode() == -952 && ex.getSQLState().equals("57014")) // DB2
- )
- {
+
+ // ------------------
+ // DB2
+ // ------------------
+ } else if (ex.getErrorCode() == -911 && ex.getSQLState().equals("40001")) {
+ // DB2Exception Deadlock
+ continue;
+ } else if ((ex.getErrorCode() == 0 && ex.getSQLState().equals("57014")) ||
+ (ex.getErrorCode() == -952 && ex.getSQLState().equals("57014"))) {
// Query cancelled by benchmark because we changed
// state. That's fine! We expected/caused this.
status = TransactionStatus.RETRY_DIFFERENT;
continue;
- }
- else if (ex.getErrorCode() == 0 && ex.getSQLState().equals("02000")) {
+ } else if (ex.getErrorCode() == 0 && ex.getSQLState().equals("02000")) {
// No results returned. That's okay, we can proceed to
// a different query. But we should send out a warning,
// too, since this is unusual.
status = TransactionStatus.RETRY_DIFFERENT;
continue;
- }
- else {
+
+ // ------------------
+ // UNKNOWN!
+ // ------------------
+ } else {
// UNKNOWN: In this case .. Retry as well!
+ LOG.warn("The DBMS rejected the transaction without an error code", ex);
continue;
- //FIXME Disable this for now
+ // FIXME Disable this for now
// throw ex;
}
- }
- finally {
+ // Assertion Error
+ } catch (Error ex) {
+ LOG.error("Fatal error when invoking " + next, ex);
+ throw ex;
+ // Random Error
+ } catch (Exception ex) {
+ LOG.error("Fatal error when invoking " + next, ex);
+ throw new RuntimeException(ex);
+
+ } finally {
+ if (LOG.isDebugEnabled())
+ LOG.debug(String.format("%s %s Result: %s", this, next, status));
+
switch (status) {
case SUCCESS:
this.txnSuccess.put(next);
- LOG.debug("Executed a new invocation of " + next);
break;
case RETRY_DIFFERENT:
this.txnRetry.put(next);
return null;
+ case USER_ABORTED:
+ this.txnAbort.put(next);
+ break;
case RETRY:
- LOG.debug("Retrying transaction...");
continue;
default:
- assert(false) :
- String.format("Unexpected status '%s' for %s", status, next);
+ assert (false) : String.format("Unexpected status '%s' for %s", status, next);
} // SWITCH
}
- } // WHILE
- } catch (SQLException ex) {
- throw new RuntimeException(String.format("Unexpected error in %s when executing %s [%s]",
- this.getName(), next, dbType), ex);
- }
-
+ } // WHILE
+ } catch (SQLException ex) {
+ String msg = String.format("Unexpected fatal, error in '%s' when executing '%s' [%s]",
+ this, next, dbType);
+ // FIXME: PAVLO 2016-12-29
+ // Right now our DBMS throws an exception when the txn gets aborted
+ // due to a conflict, so for now we have to not kill ourselves.
+ // This *does not* incorrectly inflate our performance numbers.
+ // It's more of a workaround for now until I can figure out how to do
+ // this correctly in JDBC.
+ if (dbType == DatabaseType.PELOTON) {
+ msg += "\nBut we are not stopping because " + dbType + " cannot handle this correctly";
+ LOG.warn(msg);
+ } else {
+ throw new RuntimeException(msg, ex);
+ }
+ }
+
return (next);
- }
-
- /**
- * Optional callback that can be used to initialize the Worker
- * right before the benchmark execution begins
- */
- protected void initialize() {
- // The default is to do nothing
- }
-
+ }
+
+ /**
+ * Optional callback that can be used to initialize the Worker right before
+ * the benchmark execution begins
+ */
+ protected void initialize() {
+ // The default is to do nothing
+ }
+
/**
* Invoke a single transaction for the given TransactionType
+ *
* @param txnType
* @return TODO
- * @throws UserAbortException TODO
- * @throws SQLException TODO
+ * @throws UserAbortException
+ * TODO
+ * @throws SQLException
+ * TODO
+ */
+ protected abstract TransactionStatus executeWork(TransactionType txnType) throws UserAbortException, SQLException;
+
+ /**
+ * Called at the end of the test to do any clean up that may be required.
+ *
+ * @param error
+ * TODO
*/
- protected abstract TransactionStatus executeWork(TransactionType txnType) throws UserAbortException, SQLException;
-
- /**
- * Called at the end of the test to do any clean up that may be
- * required.
- * @param error TODO
- */
- public void tearDown(boolean error) {
- try {
- conn.close();
- } catch (SQLException e) {
- LOG.warn("No connection to close");
- }
- }
-
- public void initializeState() {
- assert (this.wrkldState == null);
- this.wrkldState = this.wrkld.getWorkloadState();
- }
+ public void tearDown(boolean error) {
+ try {
+ conn.close();
+ } catch (SQLException e) {
+ LOG.warn("No connection to close");
+ }
+ }
+
+ public void initializeState() {
+ assert (this.wrkldState == null);
+ this.wrkldState = this.wrkld.getWorkloadState();
+ }
}
diff --git a/src/com/oltpbenchmark/api/collectors/DBCollector.java b/src/com/oltpbenchmark/api/collectors/DBCollector.java
new file mode 100644
index 000000000..8d93cad00
--- /dev/null
+++ b/src/com/oltpbenchmark/api/collectors/DBCollector.java
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+package com.oltpbenchmark.api.collectors;
+
+import org.apache.log4j.Logger;
+
+import com.oltpbenchmark.util.JSONUtil;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+public class DBCollector implements DBParameterCollector {
+
+ private static final Logger LOG = Logger.getLogger(DBCollector.class);
+
+ protected final Map dbParameters = new TreeMap();
+
+ protected final Map dbMetrics = new TreeMap();
+
+ protected final StringBuilder version = new StringBuilder();
+
+ @Override
+ public boolean hasParameters() {
+ return (dbParameters.isEmpty() == false);
+ }
+
+ @Override
+ public boolean hasMetrics() {
+ return (dbMetrics.isEmpty() == false);
+ }
+
+ @Override
+ public String collectParameters() {
+ return JSONUtil.format(JSONUtil.toJSONString(dbParameters));
+ }
+
+ @Override
+ public String collectMetrics() {
+ return JSONUtil.format(JSONUtil.toJSONString(dbMetrics));
+ }
+
+ @Override
+ public String collectVersion() {
+ return version.toString();
+ }
+}
diff --git a/src/com/oltpbenchmark/api/collectors/DBParameterCollector.java b/src/com/oltpbenchmark/api/collectors/DBParameterCollector.java
new file mode 100644
index 000000000..2ab2e7835
--- /dev/null
+++ b/src/com/oltpbenchmark/api/collectors/DBParameterCollector.java
@@ -0,0 +1,25 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+package com.oltpbenchmark.api.collectors;
+
+public interface DBParameterCollector {
+ boolean hasParameters();
+ boolean hasMetrics();
+ String collectParameters();
+ String collectMetrics();
+ String collectVersion();
+}
diff --git a/src/com/oltpbenchmark/api/collectors/DBParameterCollectorGen.java b/src/com/oltpbenchmark/api/collectors/DBParameterCollectorGen.java
new file mode 100644
index 000000000..1a5762513
--- /dev/null
+++ b/src/com/oltpbenchmark/api/collectors/DBParameterCollectorGen.java
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+package com.oltpbenchmark.api.collectors;
+
+public class DBParameterCollectorGen {
+ public static DBParameterCollector getCollector(String dbType, String dbUrl, String username, String password) {
+ String db = dbType.toLowerCase();
+ if (db.equals("mysql")) {
+ return new MySQLCollector(dbUrl, username, password);
+ } else if (db.equals("postgres")) {
+ return new PostgresCollector(dbUrl, username, password);
+ } else {
+ return new DBCollector();
+ }
+ }
+}
diff --git a/src/com/oltpbenchmark/api/collectors/MySQLCollector.java b/src/com/oltpbenchmark/api/collectors/MySQLCollector.java
new file mode 100644
index 000000000..d9608cb3e
--- /dev/null
+++ b/src/com/oltpbenchmark/api/collectors/MySQLCollector.java
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+package com.oltpbenchmark.api.collectors;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.log4j.Logger;
+
+import com.oltpbenchmark.catalog.Catalog;
+
+public class MySQLCollector extends DBCollector {
+ private static final Logger LOG = Logger.getLogger(MySQLCollector.class);
+
+ private static final String VERSION_SQL = "SELECT @@GLOBAL.version;";
+
+ private static final String PARAMETERS_SQL = "SHOW VARIABLES;";
+
+ private static final String METRICS_SQL = "SHOW STATUS";
+
+ public MySQLCollector(String oriDBUrl, String username, String password) {
+ try {
+ Connection conn = DriverManager.getConnection(oriDBUrl, username, password);
+ Catalog.setSeparator(conn);
+ Statement s = conn.createStatement();
+
+ // Collect DBMS version
+ ResultSet out = s.executeQuery(VERSION_SQL);
+ if (out.next()) {
+ this.version.append(out.getString(1));
+ }
+
+ // Collect DBMS parameters
+ out = s.executeQuery(PARAMETERS_SQL);
+ while(out.next()) {
+ dbParameters.put(out.getString(1).toLowerCase(), out.getString(2));
+ }
+
+ // Collect DBMS internal metrics
+ out = s.executeQuery(METRICS_SQL);
+ while (out.next()) {
+ dbMetrics.put(out.getString(1).toLowerCase(), out.getString(2));
+ }
+ } catch (SQLException e) {
+ LOG.error("Error while collecting DB parameters: " + e.getMessage());
+ }
+ }
+}
diff --git a/src/com/oltpbenchmark/api/collectors/PostgresCollector.java b/src/com/oltpbenchmark/api/collectors/PostgresCollector.java
new file mode 100644
index 000000000..18fa2378b
--- /dev/null
+++ b/src/com/oltpbenchmark/api/collectors/PostgresCollector.java
@@ -0,0 +1,109 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+package com.oltpbenchmark.api.collectors;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.log4j.Logger;
+
+import com.oltpbenchmark.catalog.Catalog;
+import com.oltpbenchmark.util.JSONUtil;
+
+public class PostgresCollector extends DBCollector {
+ private static final Logger LOG = Logger.getLogger(PostgresCollector.class);
+
+ private static final String VERSION_SQL = "SELECT version();";
+
+ private static final String PARAMETERS_SQL = "SHOW ALL;";
+
+ private static final String[] PG_STAT_VIEWS = {
+ "pg_stat_archiver", "pg_stat_bgwriter", "pg_stat_database",
+ "pg_stat_database_conflicts", "pg_stat_user_tables", "pg_statio_user_tables",
+ "pg_stat_user_indexes", "pg_statio_user_indexes"
+ };
+
+ private final Map>> pgMetrics;
+
+ public PostgresCollector(String oriDBUrl, String username, String password) {
+ pgMetrics = new HashMap>>();
+ try {
+ Connection conn = DriverManager.getConnection(oriDBUrl, username, password);
+ Catalog.setSeparator(conn);
+ Statement s = conn.createStatement();
+
+ // Collect DBMS version
+ ResultSet out = s.executeQuery(VERSION_SQL);
+ if (out.next()) {
+ this.version.append(out.getString(1));
+ }
+
+ // Collect DBMS parameters
+ out = s.executeQuery(PARAMETERS_SQL);
+ while (out.next()) {
+ dbParameters.put(out.getString("name"), out.getString("setting"));
+ }
+
+ // Collect DBMS internal metrics
+ for (String viewName : PG_STAT_VIEWS) {
+ out = s.executeQuery("SELECT * FROM " + viewName);
+ pgMetrics.put(viewName, getMetrics(out));
+ }
+ } catch (SQLException e) {
+ LOG.error("Error while collecting DB parameters: " + e.getMessage());
+ }
+ }
+
+ @Override
+ public boolean hasMetrics() {
+ return (pgMetrics.isEmpty() == false);
+ }
+
+ @Override
+ public String collectMetrics() {
+ return JSONUtil.format(JSONUtil.toJSONString(pgMetrics));
+ }
+
+ private static List> getMetrics(ResultSet out) throws SQLException {
+ ResultSetMetaData metadata = out.getMetaData();
+ int numColumns = metadata.getColumnCount();
+ String[] columnNames = new String[numColumns];
+ for (int i = 0; i < numColumns; ++i) {
+ columnNames[i] = metadata.getColumnName(i + 1).toLowerCase();
+ }
+
+ List> metrics = new ArrayList>();
+ while (out.next()) {
+ Map metricMap = new TreeMap();
+ for (int i = 0; i < numColumns; ++i) {
+ metricMap.put(columnNames[i], out.getString(i + 1));
+ }
+ metrics.add(metricMap);
+ }
+ return metrics;
+ }
+
+}
diff --git a/src/com/oltpbenchmark/api/dialects/DialectType.java b/src/com/oltpbenchmark/api/dialects/DialectType.java
index c4c6a84a7..c9d11ed95 100644
--- a/src/com/oltpbenchmark/api/dialects/DialectType.java
+++ b/src/com/oltpbenchmark/api/dialects/DialectType.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
// See http://java.sun.com/xml/jaxb
diff --git a/src/com/oltpbenchmark/api/dialects/DialectsType.java b/src/com/oltpbenchmark/api/dialects/DialectsType.java
index 1b766b65c..300ac3284 100644
--- a/src/com/oltpbenchmark/api/dialects/DialectsType.java
+++ b/src/com/oltpbenchmark/api/dialects/DialectsType.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
// See http://java.sun.com/xml/jaxb
diff --git a/src/com/oltpbenchmark/api/dialects/ObjectFactory.java b/src/com/oltpbenchmark/api/dialects/ObjectFactory.java
index 3538f33b5..af7765def 100644
--- a/src/com/oltpbenchmark/api/dialects/ObjectFactory.java
+++ b/src/com/oltpbenchmark/api/dialects/ObjectFactory.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
// See http://java.sun.com/xml/jaxb
diff --git a/src/com/oltpbenchmark/api/dialects/ProcedureType.java b/src/com/oltpbenchmark/api/dialects/ProcedureType.java
index a7547a114..226a5a939 100644
--- a/src/com/oltpbenchmark/api/dialects/ProcedureType.java
+++ b/src/com/oltpbenchmark/api/dialects/ProcedureType.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
// See http://java.sun.com/xml/jaxb
diff --git a/src/com/oltpbenchmark/api/dialects/StatementType.java b/src/com/oltpbenchmark/api/dialects/StatementType.java
index bb7cf13a2..c82c82b56 100644
--- a/src/com/oltpbenchmark/api/dialects/StatementType.java
+++ b/src/com/oltpbenchmark/api/dialects/StatementType.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
// See http://java.sun.com/xml/jaxb
diff --git a/src/com/oltpbenchmark/benchmarks/README.md b/src/com/oltpbenchmark/benchmarks/README.md
new file mode 100644
index 000000000..f9881b72c
--- /dev/null
+++ b/src/com/oltpbenchmark/benchmarks/README.md
@@ -0,0 +1,10 @@
+# Benchmark Implementations
+
+Each of these directories contains all of the code for a particular benchmark.
+Each directory has the following layout:
+
+* `{Prefix}Benchmark.java` - This is the BenchmarkModule implementation that is responsible for setting up all the class paths for the benchmark.
+* `{Prefix}Loader.java` - This is the Loader implementation that is responsible for populating the database.
+* `{Prefix}Worker.java` - The Worker for this benchmark. It is provided a random TransactionType from the abstract Worker driver code and then invokes the proper procedure
+* `ddls` - The location of the DBMS-specific DDL files. The filename has to match the supported systems defined in `com.oltpbenchmark.types.DatabaseType`.
+* `procedures` - The implementations for all of the transaction types in the benchmark.
\ No newline at end of file
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkBenchmark.java b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkBenchmark.java
index 6195659b5..0592794fa 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkBenchmark.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkBenchmark.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2011 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark;
import java.io.File;
@@ -76,8 +66,8 @@ protected Package getProcedurePackageImpl() {
}
@Override
- protected List makeWorkersImpl(boolean verbose) throws IOException {
- List workers = new ArrayList();
+ protected List> makeWorkersImpl(boolean verbose) throws IOException {
+ List> workers = new ArrayList>();
for (int i = 0; i < workConf.getTerminals(); ++i) {
workers.add(new AuctionMarkWorker(i, this));
} // FOR
@@ -85,7 +75,7 @@ protected List makeWorkersImpl(boolean verbose) throws IOException {
}
@Override
- protected Loader makeLoaderImpl(Connection conn) throws SQLException {
+ protected Loader makeLoaderImpl(Connection conn) throws SQLException {
return new AuctionMarkLoader(this, conn);
}
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkConstants.java b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkConstants.java
index 6a3ac87ed..15aca89ab 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkConstants.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkConstants.java
@@ -1,34 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2010 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * Andy Pavlo (pavlo@cs.brown.edu) *
- * http://www.cs.brown.edu/~pavlo/ *
- * *
- * Visawee Angkanawaraphan (visawee@cs.brown.edu) *
- * http://www.cs.brown.edu/~visawee/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark;
import java.util.*;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkLoader.java b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkLoader.java
index 5b15d74b7..96351486a 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkLoader.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkLoader.java
@@ -1,34 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2010 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * Andy Pavlo (pavlo@cs.brown.edu) *
- * http://www.cs.brown.edu/~pavlo/ *
- * *
- * Visawee Angkanawaraphan (visawee@cs.brown.edu) *
- * http://www.cs.brown.edu/~visawee/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark;
import java.io.File;
@@ -68,7 +54,7 @@
* @author pavlo
* @author visawee
*/
-public class AuctionMarkLoader extends Loader {
+public class AuctionMarkLoader extends Loader {
private static final Logger LOG = Logger.getLogger(AuctionMarkLoader.class);
// -----------------------------------------------------------------
@@ -143,6 +129,10 @@ public AuctionMarkLoader(AuctionMarkBenchmark benchmark, Connection conn) {
// LOADING METHODS
// -----------------------------------------------------------------
+ public List createLoaderTheads() throws SQLException {
+ return (null);
+ }
+
@Override
public void load() {
if (LOG.isDebugEnabled())
@@ -201,6 +191,7 @@ public void update(EventObservable> o, Pair {
private static final Logger LOG = Logger.getLogger(AuctionMarkWorker.class);
// -----------------------------------------------------------------
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-dialects.xml b/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-dialects.xml
index 953f69f03..49087d122 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-dialects.xml
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-dialects.xml
@@ -17,7 +17,7 @@
SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status FROM "USERACCT_ITEM", "ITEM" WHERE ui_u_id = ? AND ui_i_id = i_id AND ui_i_u_id = i_u_id ORDER BY i_end_date DESC LIMIT 25
SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status FROM "ITEM" WHERE i_u_id = ? ORDER BY i_end_date DESC LIMIT 25
SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status, uw_u_id, uw_created FROM "USERACCT_WATCH", "ITEM" WHERE uw_u_id = ? AND uw_i_id = i_id AND uw_i_u_id = i_u_id ORDER BY i_end_date DESC LIMIT 25
- SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status, ic_id, ic_i_id, ic_u_id, ic_buyer_id, ic_question, ic_created FROM "ITEM", "ITEM_COMMENT" WHERE i_u_id = ? AND i_status = 0 AND i_id = ic_i_id AND i_u_id = ic_u_id AND ic_response IS NULL ORDER BY ic_created DESC LIMIT 25
+ SELECT i_id, i_u_id, i_name, i_current_price, i_num_bids, i_end_date, i_status, ic_id, ic_i_id, ic_u_id, ic_buyer_id, ic_question, ic_created FROM "ITEM", "ITEM_COMMENT" WHERE i_u_id = ? AND i_status = ? AND i_id = ic_i_id AND i_u_id = ic_u_id AND ic_response IS NULL ORDER BY ic_created DESC LIMIT 25
SELECT * FROM "CONFIG_PROFILE"
@@ -209,4 +209,4 @@
-
\ No newline at end of file
+
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-ddl.sql b/src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-nuodb-ddl.sql b/src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-nuodb-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-nuodb-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-nuodb-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-oracle-ddl.sql b/src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-oracle-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-oracle-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-oracle-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-postgres-ddl.sql b/src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-postgres-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-postgres-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-postgres-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-sqlserver-ddl.sql b/src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-sqlserver-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/auctionmark/auctionmark-sqlserver-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/auctionmark/ddls/auctionmark-sqlserver-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/exceptions/DuplicateItemIdException.java b/src/com/oltpbenchmark/benchmarks/auctionmark/exceptions/DuplicateItemIdException.java
index 8a5299d96..70bc81e00 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/exceptions/DuplicateItemIdException.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/exceptions/DuplicateItemIdException.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.auctionmark.exceptions;
import com.oltpbenchmark.api.Procedure.UserAbortException;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/CloseAuctions.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/CloseAuctions.java
index 27d962abe..d8f072a91 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/CloseAuctions.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/CloseAuctions.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetItem.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetItem.java
index 678e39435..7465b3711 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetItem.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetItem.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetUserInfo.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetUserInfo.java
index 8aaa77be8..b631be631 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetUserInfo.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/GetUserInfo.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/LoadConfig.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/LoadConfig.java
index 937aef7f7..10f8ce686 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/LoadConfig.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/LoadConfig.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewBid.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewBid.java
index 9ba9da187..37103e174 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewBid.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewBid.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewComment.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewComment.java
index cd0805ec7..8b3874ae3 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewComment.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewComment.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewCommentResponse.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewCommentResponse.java
index c4b22e8b0..d933f743d 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewCommentResponse.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewCommentResponse.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewFeedback.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewFeedback.java
index 3d07e7f2c..65340b5d8 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewFeedback.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewFeedback.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewItem.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewItem.java
index acc687892..ba4d862ea 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewItem.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewItem.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewPurchase.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewPurchase.java
index 82a9d1002..78d75d04a 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewPurchase.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/NewPurchase.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/ResetDatabase.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/ResetDatabase.java
index 419bc6d3e..3f43373aa 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/ResetDatabase.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/ResetDatabase.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/UpdateItem.java b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/UpdateItem.java
index e522dd555..4f294af70 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/UpdateItem.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/procedures/UpdateItem.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.procedures;
import java.sql.Connection;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/AuctionMarkUtil.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/AuctionMarkUtil.java
index 430d10f7c..26880c267 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/AuctionMarkUtil.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/AuctionMarkUtil.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import java.io.File;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/Category.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/Category.java
index 9ecbb477d..89e676b13 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/Category.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/Category.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
public class Category {
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/CategoryParser.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/CategoryParser.java
index e191887a0..14ec16aad 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/CategoryParser.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/CategoryParser.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import java.io.BufferedReader;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeGroupId.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeGroupId.java
index 0d4f7750e..f50b32cde 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeGroupId.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeGroupId.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import com.oltpbenchmark.util.CompositeId;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeValueId.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeValueId.java
index f7e5fdc03..8d0050c7e 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeValueId.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/GlobalAttributeValueId.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import com.oltpbenchmark.util.CompositeId;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemCommentResponse.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemCommentResponse.java
index fefb4116f..170ae7210 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemCommentResponse.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemCommentResponse.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
public class ItemCommentResponse {
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemId.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemId.java
index d778f0f8f..47fae9d67 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemId.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemId.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import com.oltpbenchmark.util.CompositeId;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemInfo.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemInfo.java
index 31713daee..92d9d80ec 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemInfo.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemInfo.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import java.io.IOException;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemStatus.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemStatus.java
index d9eec2bf2..f78632e5d 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemStatus.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/ItemStatus.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
/**
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/LoaderItemInfo.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/LoaderItemInfo.java
index fac3f657b..5da8a439a 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/LoaderItemInfo.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/LoaderItemInfo.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import java.lang.reflect.Field;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserId.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserId.java
index 5b2b6122c..343017aaa 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserId.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserId.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import com.oltpbenchmark.util.CompositeId;
diff --git a/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserIdGenerator.java b/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserIdGenerator.java
index 235dd45db..e6911150b 100644
--- a/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserIdGenerator.java
+++ b/src/com/oltpbenchmark/benchmarks/auctionmark/util/UserIdGenerator.java
@@ -1,30 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2012 by H-Store Project *
- * Brown University *
- * Massachusetts Institute of Technology *
- * Yale University *
- * *
- * http://hstore.cs.brown.edu/ *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining *
- * a copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, sublicense, and/or sell copies of the Software, and to *
- * permit persons to whom the Software is furnished to do so, subject to *
- * the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be *
- * included in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR *
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, *
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR *
- * OTHER DEALINGS IN THE SOFTWARE. *
- ***************************************************************************/
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.auctionmark.util;
import java.util.Arrays;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmark.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmark.java
index 5a69200a4..123b4c2bb 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmark.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmark.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark;
@@ -14,7 +30,7 @@
import com.oltpbenchmark.api.Loader;
import com.oltpbenchmark.api.Worker;
import com.oltpbenchmark.benchmarks.chbenchmark.queries.Q1;
-import com.oltpbenchmark.benchmarks.tpcc.jTPCCConfig;
+import com.oltpbenchmark.benchmarks.tpcc.TPCCConfig;
public class CHBenCHmark extends BenchmarkModule {
private static final Logger LOG = Logger.getLogger(CHBenCHmark.class);
@@ -31,36 +47,19 @@ protected Package getProcedurePackageImpl() {
* @param Bool
*/
@Override
- protected List makeWorkersImpl(boolean verbose) throws IOException {
+ protected List> makeWorkersImpl(boolean verbose) throws IOException {
// HACK: Turn off terminal messages
- jTPCCConfig.TERMINAL_MESSAGES = false;
- ArrayList workers = new ArrayList();
+ List> workers = new ArrayList>();
- try {
- List terminals = createCHTerminals();
- workers.addAll(terminals);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ int numTerminals = workConf.getTerminals();
+ LOG.info(String.format("Creating %d workers for CHBenCHMark", numTerminals));
+ for (int i = 0; i < numTerminals; i++)
+ workers.add(new CHBenCHmarkWorker(this, i));
return workers;
}
- protected ArrayList createCHTerminals() throws SQLException {
-
- int numTerminals = workConf.getTerminals();
-
-
-
- ArrayList ret = new ArrayList();
- LOG.info(String.format("Creating %d workers for CHBenCHMark", numTerminals));
- for (int i = 0; i < numTerminals; i++)
-
- ret.add(new CHBenCHmarkWorker(this));
- return ret;
- }
-
- protected Loader makeLoaderImpl(Connection conn) throws SQLException {
+ protected Loader makeLoaderImpl(Connection conn) throws SQLException {
return new CHBenCHmarkLoader(this, conn);
}
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkLoader.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkLoader.java
index ba0104c15..e32367c85 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkLoader.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkLoader.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark;
@@ -10,19 +26,20 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Date;
+import java.util.List;
import java.util.StringTokenizer;
import org.apache.log4j.Logger;
-import com.oltpbenchmark.api.BenchmarkModule;
import com.oltpbenchmark.api.Loader;
import com.oltpbenchmark.benchmarks.chbenchmark.pojo.Nation;
import com.oltpbenchmark.benchmarks.chbenchmark.pojo.Region;
import com.oltpbenchmark.benchmarks.chbenchmark.pojo.Supplier;
import com.oltpbenchmark.util.RandomGenerator;
-public class CHBenCHmarkLoader extends Loader {
+public class CHBenCHmarkLoader extends Loader {
private static final Logger LOG = Logger.getLogger(CHBenCHmarkLoader.class);
+
private final static int configCommitCount = 1000; // commit every n records
private static final RandomGenerator ran = new RandomGenerator(0);
private static PreparedStatement regionPrepStmt;
@@ -47,10 +64,16 @@ public class CHBenCHmarkLoader extends Loader {
}
}
- public CHBenCHmarkLoader(BenchmarkModule benchmark, Connection c) {
+ public CHBenCHmarkLoader(CHBenCHmark benchmark, Connection c) {
super(benchmark, c);
conn =c;
}
+
+ @Override
+ public List createLoaderTheads() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
public void load() throws SQLException {
try {
@@ -76,9 +99,6 @@ public void load() throws SQLException {
} // end try
-// truncateTable("supplier");
-// truncateTable("nation");
-// truncateTable("region");
loadHelper();
conn.commit();
}
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkWorker.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkWorker.java
index 5e3b5e3e6..3866faea5 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkWorker.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkWorker.java
@@ -1,22 +1,34 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark;
import java.sql.SQLException;
-import java.util.concurrent.atomic.AtomicInteger;
-import com.oltpbenchmark.api.BenchmarkModule;
import com.oltpbenchmark.api.Procedure.UserAbortException;
import com.oltpbenchmark.api.TransactionType;
import com.oltpbenchmark.api.Worker;
import com.oltpbenchmark.benchmarks.chbenchmark.queries.GenericQuery;
import com.oltpbenchmark.types.TransactionStatus;
-public class CHBenCHmarkWorker extends Worker {
- public CHBenCHmarkWorker(BenchmarkModule benchmarkModule) {
- super(benchmarkModule, terminalId.getAndIncrement());
+public class CHBenCHmarkWorker extends Worker {
+ public CHBenCHmarkWorker(CHBenCHmark benchmarkModule, int id) {
+ super(benchmarkModule, id);
}
-private static final AtomicInteger terminalId = new AtomicInteger(0);
-
@Override
protected TransactionStatus executeWork(TransactionType nextTransaction) throws UserAbortException, SQLException {
try {
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-monetdb-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-monetdb-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-monetdb-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-monetdb-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-mysql-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-mysql-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-mysql-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-mysql-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-nuodb-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-nuodb-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-nuodb-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-nuodb-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-postgres-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-postgres-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-postgres-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-postgres-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-sqlserver-ddl.sql b/src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-sqlserver-ddl.sql
similarity index 100%
rename from src/com/oltpbenchmark/benchmarks/chbenchmark/chbenchmark-sqlserver-ddl.sql
rename to src/com/oltpbenchmark/benchmarks/chbenchmark/ddls/chbenchmark-sqlserver-ddl.sql
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Nation.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Nation.java
index ca4d21204..e842f994d 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Nation.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Nation.java
@@ -1,22 +1,20 @@
-/*******************************************************************************
- * oltpbenchmark.com
- *
- * Project Info: http://oltpbenchmark.com
- * Project Members: Carlo Curino
- * Evan Jones
- * DIFALLAH Djellel Eddine
- * Andy Pavlo
- * CUDRE-MAUROUX Philippe
- * Yang Zhang
- *
- * This library is free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation;
- * either version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.chbenchmark.pojo;
//>>> CH-benCHmark
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Region.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Region.java
index 7e9bd8df5..e262c6e3a 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Region.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Region.java
@@ -1,22 +1,20 @@
-/*******************************************************************************
- * oltpbenchmark.com
- *
- * Project Info: http://oltpbenchmark.com
- * Project Members: Carlo Curino
- * Evan Jones
- * DIFALLAH Djellel Eddine
- * Andy Pavlo
- * CUDRE-MAUROUX Philippe
- * Yang Zhang
- *
- * This library is free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation;
- * either version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.chbenchmark.pojo;
//>>> CH-benCHmark
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Supplier.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Supplier.java
index 0f155bc29..a3fa25fc3 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Supplier.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/pojo/Supplier.java
@@ -1,22 +1,20 @@
-/*******************************************************************************
- * oltpbenchmark.com
- *
- * Project Info: http://oltpbenchmark.com
- * Project Members: Carlo Curino
- * Evan Jones
- * DIFALLAH Djellel Eddine
- * Andy Pavlo
- * CUDRE-MAUROUX Philippe
- * Yang Zhang
- *
- * This library is free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation;
- * either version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.chbenchmark.pojo;
//>>> CH-benCHmark
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/GenericQuery.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/GenericQuery.java
index e550a29d2..880e64968 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/GenericQuery.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/GenericQuery.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import java.io.BufferedReader;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q1.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q1.java
index 917538efc..ee996ce6f 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q1.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q1.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q10.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q10.java
index 96fee538f..356937720 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q10.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q10.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q11.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q11.java
index 5ecfab24b..3d947ae65 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q11.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q11.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q12.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q12.java
index dc78b25a5..49f400aac 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q12.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q12.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q13.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q13.java
index d95181451..eeb323830 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q13.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q13.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q14.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q14.java
index 73931c4b3..ecf624226 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q14.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q14.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q15.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q15.java
index bc7fa9bee..c7902f779 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q15.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q15.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q16.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q16.java
index fb8378c05..59b8de9df 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q16.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q16.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q17.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q17.java
index 1fa1eb040..853095a27 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q17.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q17.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q18.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q18.java
index c5e3c15e6..3c50ba1a6 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q18.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q18.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q19.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q19.java
index 5c58a2792..51518d87a 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q19.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q19.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q2.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q2.java
index e894129a3..f50640862 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q2.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q2.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q20.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q20.java
index 54f693c08..2a50a60c7 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q20.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q20.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q21.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q21.java
index 2a8465b36..02d857b60 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q21.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q21.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q22.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q22.java
index b9b096477..f7e8b73ff 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q22.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q22.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q3.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q3.java
index 861723fc5..e5ed32776 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q3.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q3.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q4.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q4.java
index 4ccfc0fd3..ddd027c47 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q4.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q4.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q5.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q5.java
index e047f7f4e..402368b98 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q5.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q5.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q6.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q6.java
index 0614e8b47..3e2cc8566 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q6.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q6.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q7.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q7.java
index e249d3943..cce563a0b 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q7.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q7.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q8.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q8.java
index 59c0c2b2a..997b4454f 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q8.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q8.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q9.java b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q9.java
index 8574b62c6..3f572464a 100644
--- a/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q9.java
+++ b/src/com/oltpbenchmark/benchmarks/chbenchmark/queries/Q9.java
@@ -1,3 +1,19 @@
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
+ ******************************************************************************/
+
package com.oltpbenchmark.benchmarks.chbenchmark.queries;
import com.oltpbenchmark.api.SQLStmt;
diff --git a/src/com/oltpbenchmark/benchmarks/epinions/EpinionsBenchmark.java b/src/com/oltpbenchmark/benchmarks/epinions/EpinionsBenchmark.java
index 613445fff..2ffcc1b42 100644
--- a/src/com/oltpbenchmark/benchmarks/epinions/EpinionsBenchmark.java
+++ b/src/com/oltpbenchmark/benchmarks/epinions/EpinionsBenchmark.java
@@ -1,22 +1,20 @@
-/*******************************************************************************
- * oltpbenchmark.com
- *
- * Project Info: http://oltpbenchmark.com
- * Project Members: Carlo Curino
- * Evan Jones
- * DIFALLAH Djellel Eddine
- * Andy Pavlo
- * CUDRE-MAUROUX Philippe
- * Yang Zhang
- *
- * This library is free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation;
- * either version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+/******************************************************************************
+ * Copyright 2015 by OLTPBenchmark Project *
+ * *
+ * 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. *
******************************************************************************/
+
+
package com.oltpbenchmark.benchmarks.epinions;
import java.io.IOException;
@@ -51,8 +49,8 @@ protected Package getProcedurePackageImpl() {
}
@Override
- protected List makeWorkersImpl(boolean verbose) throws IOException {
- ArrayList workers = new ArrayList();
+ protected List> makeWorkersImpl(boolean verbose) throws IOException {
+ List> workers = new ArrayList>();
try {
Connection metaConn = this.makeConnection();
@@ -63,7 +61,7 @@ protected List makeWorkersImpl(boolean verbose) throws IOException {
Table t = this.catalog.getTable("USER");
assert (t != null) : "Invalid table name '" + t + "' " + this.catalog.getTables();
- String userCount = SQLUtil.selectColValues(t, "u_id");
+ String userCount = SQLUtil.selectColValues(this.workConf.getDBType(), t, "u_id");
Statement stmt = metaConn.createStatement();
ResultSet res = stmt.executeQuery(userCount);
ArrayList user_ids = new ArrayList();
@@ -75,7 +73,7 @@ protected List makeWorkersImpl(boolean verbose) throws IOException {
// LIST OF ITEMS AND
t = this.catalog.getTable("ITEM");
assert (t != null) : "Invalid table name '" + t + "' " + this.catalog.getTables();
- String itemCount = SQLUtil.selectColValues(t, "i_id");
+ String itemCount = SQLUtil.selectColValues(this.workConf.getDBType(), t, "i_id");
res = stmt.executeQuery(itemCount);
ArrayList item_ids = new ArrayList();
while (res.next()) {
@@ -86,7 +84,7 @@ protected List