Projects >> realm-java >>d9d9546f49a34805d7dfb25005e91032cc2c9bc2

Chunk
Conflicting content 
	public static void main(String[] args) {
		showLongExample();
<<<<<<< HEAD

		// Enable below to compare Tightdb performance against a Java ArrayList
		 Performance.TestTightdb(250000);
		 Performance.TestJavaArray(250000);
=======
>>>>>>> d12db8815afb49e2492db7c2bb304e609425b0e5
	}

	/******************************************************************/
Solution content 
	public static void main(String[] args) {
		showLongExample();
	}

	/******************************************************************/
File
Example.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
		// using implicit AND
		TightDB.print("Search example 2", employees.firstName.eq("Johnny").lastName.startsWith("B").findLast());

<<<<<<< HEAD
		TightDB.print("Employees", employees);

		employees.firstName.is("John").findLast().salary.set(30000);
=======
		employees.firstName.eq("John").findLast().salary.set(30000);
>>>>>>> d12db8815afb49e2492db7c2bb304e609425b0e5

		
		/****************************** ITERATION OF ALL RECORDS *****************************/
Solution content 
		// using implicit AND
		TightDB.print("Search example 2", employees.firstName.eq("Johnny").lastName.startsWith("B").findLast());

		employees.firstName.eq("John").findLast().salary.set(30000);

		/****************************** ITERATION OF ALL RECORDS *****************************/
File
Example.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD:src/main/java/com/tightdb/example/FailureExample.java
package com.tightdb.example;

import java.io.IOException;
import java.util.Date;

import com.tightdb.Group;
import com.tightdb.generated.EmployeeTable;
import com.tightdb.lib.TightDB;

import com.tightdb.TableBase;

public class FailureExample {

	public static void main(String[] args) {
		Group group = new Group();
		EmployeeTable employees = new EmployeeTable(group);
		
		employees.add("John", "Doe", 10000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");

		employees.at(0).phones.get();

		try {
			group.writeToFile("employees.tdb");
		} catch (IOException e) {
			throw new RuntimeException("Couldn't save the data!", e);
		}
				
		employees.clear();

	}

}
=======
package com.tightdb;

import java.io.IOException;
import java.util.Date;

import com.tightdb.Group;
import com.tightdb.generated.EmployeeTable;

public class FailureExample {

	public static void main(String[] args) {
		Group group = new Group();
		EmployeeTable employees = new EmployeeTable(group);

		employees.add("John", "Doe", 10000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");

		employees.at(0).phones.get();

		try {
			group.writeToFile("employees.tdb");
		} catch (IOException e) {
			throw new RuntimeException("Couldn't save the data!", e);
		}

		employees.clear();
		System.out.println("DONE");
	}

}
>>>>>>> d12db8815afb49e2492db7c2bb304e609425b0e5:src/test/java/com/tightdb/FailureExample.java
Solution content 
package com.tightdb.example;

import java.io.IOException;
import java.util.Date;

import com.tightdb.Group;
import com.tightdb.generated.EmployeeTable;

public class FailureExample {

	public static void main(String[] args) {
		Group group = new Group();
		EmployeeTable employees = new EmployeeTable(group);

		employees.add("John", "Doe", 10000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");

		employees.at(0).phones.get();

		try {
			group.writeToFile("employees.tdb");
		} catch (IOException e) {
			throw new RuntimeException("Couldn't save the data!", e);
		}

		employees.clear();
		System.out.println("DONE");
	}

}
File
FailureExample.java
Developer's decision
Combination
Kind of conflict
Class declaration
Import
Package declaration