Projects >> spring-hadoop >>e1d3d5eae5885c9338f4fbebf051c556f47f2046

Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Sets the configuration properties.
	 * 
=======
>>>>>>> 4c107cd03db30696c81672ae07f4c1cda76f3a1f
	 * @param properties The properties to set.
	 */
	public void setProperties(Properties properties) {
Solution content 
	}

	/**
	 * Sets the configuration properties.
	 * 
	 * @param properties The properties to set.
	 */
	public void setProperties(Properties properties) {
File
HbaseConfigurationFactoryBean.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
import org.junit.runner.RunWith;
<<<<<<< HEAD
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
=======
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.Assert;
>>>>>>> 4c107cd03db30696c81672ae07f4c1cda76f3a1f

import static org.junit.Assert.*;
Solution content 
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.Assert;

import static org.junit.Assert.*;
File
BasicHBaseTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
 * @author Costin Leau
 */
@RunWith(SpringJUnit4ClassRunner.class)
<<<<<<< HEAD
@ContextConfiguration("/org/springframework/data/hadoop/hbase/basic.xml")
=======
@ContextConfiguration
>>>>>>> 4c107cd03db30696c81672ae07f4c1cda76f3a1f
public class BasicHBaseTest {

	@Resource(name = "hbase-configuration")
Solution content 
 * @author Costin Leau
 */
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class BasicHBaseTest {

	@Resource(name = "hbase-configuration")
File
BasicHBaseTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
	@Test
	@Resource(name = "hbase-configuration")
	Configuration config;

<<<<<<< HEAD
	@Test
	public void testHiveConnection() throws Exception {
		HBaseAdmin admin = new HBaseAdmin(config);
		String tableName = "myTable";
		String columnName = "myColumnFamily";
		String rowName = "myLittleRow";
		String qualifier = "someQualifier";
		String value = "Some Value";
=======
	@Autowired
	HbaseTemplate template;

	String tableName = "myTable";
	String columnName = "myColumnFamily";
	String rowName = "myLittleRow";
	String qualifier = "someQualifier";
	String value = "Some Value";

>>>>>>> 4c107cd03db30696c81672ae07f4c1cda76f3a1f

	public void testHBaseConnection() throws Exception {
Solution content 
	@Resource(name = "hbase-configuration")
	Configuration config;

	@Autowired
	HbaseTemplate template;

	String tableName = "myTable";
	String columnName = "myColumnFamily";
	String rowName = "myLittleRow";
	String qualifier = "someQualifier";
	String value = "Some Value";


	@Test
	public void testHBaseConnection() throws Exception {
File
BasicHBaseTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Method invocation
Method signature
Variable
Chunk
Conflicting content 
			scanner.close();
		}
	}
<<<<<<< HEAD

	@Test
	public void testProperties() throws Exception {
		assertEquals("bar", config.get("foo"));
		assertEquals("there", config.get("lookup"));

		assertEquals("chasing", config.get("star"));
		assertEquals("captain eo", config.get("return"));
		assertEquals("last", config.get("train"));
		assertEquals("the dream", config.get("dancing"));
		assertEquals("in the mirror", config.get("tears"));
		assertEquals("eo", config.get("captain"));
=======

	@Test
	public void testTemplate() throws Exception {
		assertTrue(HbaseSynchronizationManager.getTableNames().isEmpty());

		final HTable t = HbaseUtils.getHTable(config, tableName);

		template.execute(tableName, new TableCallback() {
			@Override
			public Object doInTable(HTable table) throws Throwable {
				assertSame(t, table);
				Put p = new Put(Bytes.toBytes(rowName));
				p.add(Bytes.toBytes(columnName), Bytes.toBytes(qualifier), Bytes.toBytes(value));
				table.put(p);

				System.out.println("Doing put..");
				Get g = new Get(Bytes.toBytes(rowName));
				Result r = table.get(g);
				byte[] val = r.getValue(Bytes.toBytes(columnName), Bytes.toBytes(qualifier));

				assertEquals(value, Bytes.toString(val));
				return null;
			}
		});

		assertFalse(HbaseSynchronizationManager.getTableNames().isEmpty());
		assertTrue(HbaseSynchronizationManager.hasResource(tableName));

		// equivalent of block B
		System.out.println("Found rows " + template.query(tableName, columnName, qualifier, new RowMapper() {
			@Override
			public String mapRow(Result result, int rowNum) throws Exception {
				return result.toString();
			}
		}));

		HbaseSynchronizationManager.unbindResource(tableName).close();
		assertTrue(HbaseSynchronizationManager.getTableNames().isEmpty());
>>>>>>> 4c107cd03db30696c81672ae07f4c1cda76f3a1f
	}
}
Solution content 
			scanner.close();
		}
	}

	@Test
	public void testTemplate() throws Exception {
		assertTrue(HbaseSynchronizationManager.getTableNames().isEmpty());

		final HTable t = HbaseUtils.getHTable(config, tableName);

		template.execute(tableName, new TableCallback() {
			@Override
			public Object doInTable(HTable table) throws Throwable {
				assertSame(t, table);
				Put p = new Put(Bytes.toBytes(rowName));
				p.add(Bytes.toBytes(columnName), Bytes.toBytes(qualifier), Bytes.toBytes(value));
				table.put(p);

				System.out.println("Doing put..");
				Get g = new Get(Bytes.toBytes(rowName));
				Result r = table.get(g);
				byte[] val = r.getValue(Bytes.toBytes(columnName), Bytes.toBytes(qualifier));

				assertEquals(value, Bytes.toString(val));
				return null;
			}
		});

		assertFalse(HbaseSynchronizationManager.getTableNames().isEmpty());
		assertTrue(HbaseSynchronizationManager.hasResource(tableName));

		// equivalent of block B
		System.out.println("Found rows " + template.query(tableName, columnName, qualifier, new RowMapper() {
			@Override
			public String mapRow(Result result, int rowNum) throws Exception {
				return result.toString();
			}
		}));

		HbaseSynchronizationManager.unbindResource(tableName).close();
		assertTrue(HbaseSynchronizationManager.getTableNames().isEmpty());
	}
}
File
BasicHBaseTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method invocation
Method signature
Variable