Projects >> accumulo >>3eccc35334949692d706eb80bdfb4835c581f6bf

Chunk
Conflicting content 
  @Test(timeout = 2 * 60 * 1000)
  public void run() throws Exception {
<<<<<<< HEAD:test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
    String tableName = getTableNames(1)[0];
    Connector c = getConnector();
    c.tableOperations().create(tableName);

    c.tableOperations().addSplits(tableName, TestIngest.getSplitPoints(0, 100000, 50));

    TestIngest.Opts opts = new TestIngest.Opts();
    opts.random = 89;
    opts.timestamp = 7;
    opts.dataSize = 50;
    opts.rows = 100000;
    opts.cols = 1;
    opts.tableName = tableName;
    TestIngest.ingest(c, opts, new BatchWriterOpts());

    c.tableOperations().flush(tableName, null, null, true);

=======
    getConnector().tableOperations().create("test_ingest");
    
    getConnector().tableOperations().addSplits("test_ingest", TestIngest.getSplitPoints(0, 100000, 50));
    
    TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "89", "--timestamp", "7", "--size", "" + 50, "--rows", "100000", "--start", "0",
        "--cols", "1"});

    getConnector().tableOperations().flush("test_ingest", null, null, true);
    
>>>>>>> 6716227f441eaae35bd25a9c95d33c7fa29753df:test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
    List splits = new ArrayList(TestIngest.getSplitPoints(0, 100000, 67));
    Random rand = new Random();
Solution content 
  @Test(timeout = 2 * 60 * 1000)
  public void run() throws Exception {
    String tableName = getTableNames(1)[0];
    Connector c = getConnector();
    c.tableOperations().create(tableName);

    c.tableOperations().addSplits(tableName, TestIngest.getSplitPoints(0, 100000, 50));

    TestIngest.Opts opts = new TestIngest.Opts();
    opts.random = 89;
    opts.timestamp = 7;
    opts.dataSize = 50;
    opts.rows = 100000;
    opts.cols = 1;
    opts.tableName = tableName;
    TestIngest.ingest(c, opts, new BatchWriterOpts());

    c.tableOperations().flush(tableName, null, null, true);

    List splits = new ArrayList(TestIngest.getSplitPoints(0, 100000, 67));
    Random rand = new Random();
File
FateStarvationIT.java
Developer's decision
Version 1
Kind of conflict
Array access
Method invocation
Variable
Chunk
Conflicting content 
      opts.random = i;
      TestIngest.ingest(c, opts, new BatchWriterOpts());
      
<<<<<<< HEAD:test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
      c.tableOperations().flush("test_ingest", null, null, true);
      FunctionalTestUtils.checkRFiles(c, "test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
=======
      TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "" + i, "--timestamp", "" + i, "--size", "" + 50, "--rows", "" + NUM_TO_INGEST, "--start", "0", "--cols", "1"});
      
      getConnector().tableOperations().flush("test_ingest", null, null, true);
      checkRFiles("test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
>>>>>>> 6716227f441eaae35bd25a9c95d33c7fa29753df:test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
    }
    
    List ranges = new ArrayList(NUM_TO_INGEST);
Solution content 
      opts.random = i;
      TestIngest.ingest(c, opts, new BatchWriterOpts());
      
      c.tableOperations().flush("test_ingest", null, null, true);
      FunctionalTestUtils.checkRFiles(c, "test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
    }
    
    List ranges = new ArrayList(NUM_TO_INGEST);
File
MaxOpenIT.java
Developer's decision
Version 1
Kind of conflict
Method invocation