| Chunk |
|---|
| Conflicting content |
|---|
// CLUSTER!
<<<<<<< HEAD
config = new LocalCluster("fixedsql-cluster.jar", 2, 2,
1, BackendTarget.NATIVE_EE_JNI);
config.setConfParameter("site.exec_adhoc_sql", true);
config.compile(project);
builder.addServerConfig(config);
=======
// config = new LocalCluster("fixedsql-cluster.jar", 2, 1, 1, BackendTarget.NATIVE_EE_JNI);
// config.compile(project);
// builder.addServerConfig(config);
>>>>>>> 4576ce45d7bd7701460fb07bc24ca773578e4b3d
return builder;
} |
| Solution content |
|---|
// CLUSTER!
// config = new LocalCluster("fixedsql-cluster.jar", 2, 1, 1, BackendTarget.NATIVE_EE_JNI);
// config.compile(project);
// builder.addServerConfig(config);
return builder;
} |
| File |
|---|
| TestFixedSQLSuite.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
config.compile(project);
builder.addServerConfig(config);*/
// CONFIG #2: HSQL
<<<<<<< HEAD
config = new LocalSingleProcessServer("testindexes-hsql.jar", 1, BackendTarget.HSQLDB_BACKEND);
config.setConfParameter("site.exec_adhoc_sql", true);
success = config.compile(project);
assertTrue(success);
builder.addServerConfig(config);
=======
// config = new LocalSingleProcessServer("testindexes-hsql.jar", 1, BackendTarget.HSQLDB_BACKEND);
// success = config.compile(project);
// assertTrue(success);
// builder.addServerConfig(config);
>>>>>>> 4576ce45d7bd7701460fb07bc24ca773578e4b3d
// JNI |
| Solution content |
|---|
config.compile(project);
builder.addServerConfig(config);*/
// CONFIG #2: HSQL
// config = new LocalSingleProcessServer("testindexes-hsql.jar", 1, BackendTarget.HSQLDB_BACKEND);
// success = config.compile(project);
// assertTrue(success);
// builder.addServerConfig(config);
// JNI |
| File |
|---|
| TestIndexesSuite.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
assertEquals(b, "Chris");
assertEquals(c, "BetaBuildingBlocks");
}
<<<<<<< HEAD
// This takes a really long time, so commenting it out for now.
// public void testOrderByUseIndex() throws NoConnectionsException,
// ProcCallException,
// IOException, InterruptedException {
// @SuppressWarnings("unused")
// long start, elapsed;
// //long base;
// VoltTable vt;
// Client client = this.getClient();
// if (this.isHSQL())
// return;
//
// loadInOrder(client);
//
// // the duration of doing sequential scan followed by a quicksort
// // start = System.currentTimeMillis();
// // vt = client.callProcedure("OrderByNonIndex")[0];
// // base = System.currentTimeMillis() - start;
//
// // sort one index column of ints ascending
// start = System.currentTimeMillis();
// vt = client.callProcedure("OrderByOneIndex").getResults()[0];
// elapsed = System.currentTimeMillis() - start;
// // at least 3 times faster
// // TODO (nshi): This should really belong to performance tests.
// // assertTrue(elapsed <= base / 3);
// assertTrue(vt.getRowCount() == 3);
// long it = Integer.MAX_VALUE;
// while (vt.advanceRow()) {
// int b = (Integer) vt.get(1, VoltType.INTEGER);
// int c = (Integer) vt.get(2, VoltType.INTEGER);
// int d = (Integer) vt.get(3, VoltType.INTEGER);
//
// assertTrue(b == c && c == d && b <= it);
// it = b;
// }
// }
=======
/** FIXME
public void testOrderByUseIndex() throws NoConnectionsException,
ProcCallException,
IOException, InterruptedException {
@SuppressWarnings("unused")
long start, elapsed;
//long base;
VoltTable vt;
Client client = this.getClient();
if (this.isHSQL())
return;
loadInOrder(client);
// the duration of doing sequential scan followed by a quicksort
// start = System.currentTimeMillis();
// vt = client.callProcedure("OrderByNonIndex")[0];
// base = System.currentTimeMillis() - start;
// sort one index column of ints ascending
start = System.currentTimeMillis();
vt = client.callProcedure("OrderByOneIndex").getResults()[0];
elapsed = System.currentTimeMillis() - start;
// at least 3 times faster
// TODO (nshi): This should really belong to performance tests.
// assertTrue(elapsed <= base / 3);
assertEquals(3, vt.getRowCount());
long it = Integer.MAX_VALUE;
while (vt.advanceRow()) {
int b = (Integer) vt.get(1, VoltType.INTEGER);
int c = (Integer) vt.get(2, VoltType.INTEGER);
int d = (Integer) vt.get(3, VoltType.INTEGER);
assertEquals(b, c);
assertEquals(c, d);
assertTrue(b <= it);
it = b;
}
}
**/
>>>>>>> 4576ce45d7bd7701460fb07bc24ca773578e4b3d
public void testAggOrderByGroupBy() throws IOException, ProcCallException, InterruptedException
{ |
| Solution content |
|---|
assertEquals(b, "Chris");
assertEquals(c, "BetaBuildingBlocks");
}
/** FIXME
public void testOrderByUseIndex() throws NoConnectionsException,
ProcCallException,
IOException, InterruptedException {
@SuppressWarnings("unused")
long start, elapsed;
//long base;
VoltTable vt;
Client client = this.getClient();
if (this.isHSQL())
return;
loadInOrder(client);
// the duration of doing sequential scan followed by a quicksort
// start = System.currentTimeMillis();
// vt = client.callProcedure("OrderByNonIndex")[0];
// base = System.currentTimeMillis() - start;
// sort one index column of ints ascending
start = System.currentTimeMillis();
vt = client.callProcedure("OrderByOneIndex").getResults()[0];
elapsed = System.currentTimeMillis() - start;
// at least 3 times faster
// TODO (nshi): This should really belong to performance tests.
// assertTrue(elapsed <= base / 3);
assertEquals(3, vt.getRowCount());
long it = Integer.MAX_VALUE;
while (vt.advanceRow()) {
int b = (Integer) vt.get(1, VoltType.INTEGER);
int c = (Integer) vt.get(2, VoltType.INTEGER);
int d = (Integer) vt.get(3, VoltType.INTEGER);
assertEquals(b, c);
assertEquals(c, d);
assertTrue(b <= it);
it = b;
}
}
**/
public void testAggOrderByGroupBy() throws IOException, ProcCallException, InterruptedException
{ |
| File |
|---|
| TestOrderBySuite.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
config.compile(project);
builder.addServerConfig(config);
<<<<<<< HEAD
config = new LocalSingleProcessServer("plansgroupby-hsql.jar", 1,
BackendTarget.HSQLDB_BACKEND);
config.setConfParameter("site.exec_adhoc_sql", true);
config.compile(project);
builder.addServerConfig(config);
=======
// config = new LocalSingleProcessServer("plansgroupby-hsql.jar", 1,
// BackendTarget.HSQLDB_BACKEND);
// config.compile(project);
// builder.addServerConfig(config);
>>>>>>> 4576ce45d7bd7701460fb07bc24ca773578e4b3d
// Cluster
config = new LocalCluster("plansgroupby-cluster.jar", 2, 2, |
| Solution content |
|---|
config.compile(project);
builder.addServerConfig(config);
// config = new LocalSingleProcessServer("plansgroupby-hsql.jar", 1,
// BackendTarget.HSQLDB_BACKEND);
// config.compile(project);
// builder.addServerConfig(config);
// Cluster
config = new LocalCluster("plansgroupby-cluster.jar", 2, 2, |
| File |
|---|
| TestPlansGroupBySuite.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |