Projects >> Synapse-Repository-Services >>23b3323942cd6ddb67df247b373b589c535dc125

Chunk
Conflicting content
import javax.sql.DataSource;

<<<<<<< HEAD
import org.sagebionetworks.repo.model.dao.table.RowAndHeaderHandler;
=======
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelUtils;
>>>>>>> 432753135e0a3c57c3481899309549bfb4b22369
import org.sagebionetworks.repo.model.table.ColumnModel;
import org.sagebionetworks.repo.model.table.ColumnType;
import org.sagebionetworks.repo.model.table.Row;
Solution content
import org.sagebionetworks.repo.model.table.Row;

import javax.sql.DataSource;

import org.sagebionetworks.repo.model.dao.table.RowAndHeaderHandler;
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelUtils;
import org.sagebionetworks.repo.model.table.ColumnModel;
import org.sagebionetworks.repo.model.table.ColumnType;
File
TableIndexDAOImpl.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content
				List values = new LinkedList();
				Row row = new Row();
	public RowSet query(final SqlQuery query) {
		if (query == null)
			throw new IllegalArgumentException("SqlQuery cannot be null");
<<<<<<< HEAD
		
		final List rows = new LinkedList();
		final RowSet rowSet = new RowSet();
=======
		final List headers = new LinkedList();
		final List nonMetadataColumnIndicies = new LinkedList();
		final Map modeledColumns = Maps.newHashMap();
		// Get the rows for this query from the database.
		NamedParameterJdbcTemplate namedTemplate = new NamedParameterJdbcTemplate(this.template);
		List rows = namedTemplate.query(query.getOutputSQL(), new MapSqlParameterSource(query.getParameters()), new RowMapper() {
			@Override
			public Row mapRow(ResultSet rs, int rowNum) throws SQLException {
				ResultSetMetaData metadata = rs.getMetaData();
				if (headers.isEmpty()) {
					// Read the headers from the result set
					populateHeadersFromResultsSet(headers, nonMetadataColumnIndicies, query, modeledColumns, metadata);
				}
				// Read the results into a new list
				row.setValues(values);
				if (!query.isAggregatedResult()) {
					// Non-aggregate queries include two extra columns,
					// row id and row version.
					row.setRowId(rs.getLong(ROW_ID));
					row.setVersionNumber(rs.getLong(ROW_VERSION));
				}
				// fill the value list
				for (Integer index : nonMetadataColumnIndicies) {
					String value = rs.getString(index);
					ColumnModel columnModel = modeledColumns.get(index);
					if (columnModel != null) {
						if (columnModel.getColumnType() == ColumnType.BOOLEAN) {
							if ("0".equals(value)) {
								value = "false";
							} else if ("1".equals(value)) {
								value = "true";
							}
						}
					}
					values.add(value);
				}
				return row;
			}
		});
		RowSet rowSet = new RowSet();
		rowSet.setHeaders(headers);
>>>>>>> 432753135e0a3c57c3481899309549bfb4b22369
		rowSet.setRows(rows);
		// Stream over the results and save the results in a a list
		queryAsStream(query, new RowAndHeaderHandler() {
Solution content
	public RowSet query(final SqlQuery query) {
		if (query == null)
			throw new IllegalArgumentException("SqlQuery cannot be null");
//<<<<<<< HEAD
		
		final List rows = new LinkedList();
		final RowSet rowSet = new RowSet();
//=======
//		final List headers = new LinkedList();
//		final List nonMetadataColumnIndicies = new LinkedList();
//		final Map modeledColumns = Maps.newHashMap();
//		// Get the rows for this query from the database.
//		NamedParameterJdbcTemplate namedTemplate = new NamedParameterJdbcTemplate(this.template);
//		List rows = namedTemplate.query(query.getOutputSQL(), new MapSqlParameterSource(query.getParameters()), new RowMapper() {
//			@Override
//			public Row mapRow(ResultSet rs, int rowNum) throws SQLException {
//				ResultSetMetaData metadata = rs.getMetaData();
//				if (headers.isEmpty()) {
//					// Read the headers from the result set
//					populateHeadersFromResultsSet(headers, nonMetadataColumnIndicies, query, modeledColumns, metadata);
//				}
//				// Read the results into a new list
//				List values = new LinkedList();
//				Row row = new Row();
//				row.setValues(values);
//				if (!query.isAggregatedResult()) {
//					// Non-aggregate queries include two extra columns,
//					// row id and row version.
//					row.setRowId(rs.getLong(ROW_ID));
//					row.setVersionNumber(rs.getLong(ROW_VERSION));
//				}
//				// fill the value list
//				for (Integer index : nonMetadataColumnIndicies) {
//					String value = rs.getString(index);
//					ColumnModel columnModel = modeledColumns.get(index);
//					if (columnModel != null) {
//						if (columnModel.getColumnType() == ColumnType.BOOLEAN) {
//							if ("0".equals(value)) {
//								value = "false";
//							} else if ("1".equals(value)) {
//								value = "true";
//							}
//						}
//					}
//					values.add(value);
//				}
//				return row;
//			}
//		});
//		RowSet rowSet = new RowSet();
//		rowSet.setHeaders(headers);
//>>>>>>> develop
		rowSet.setRows(rows);
		// Stream over the results and save the results in a a list
		queryAsStream(query, new RowAndHeaderHandler() {
File
TableIndexDAOImpl.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content
import org.sagebionetworks.repo.model.InvalidModelException;
import org.sagebionetworks.repo.model.UnauthorizedException;
import org.sagebionetworks.repo.model.UserInfo;
<<<<<<< HEAD
import org.sagebionetworks.repo.model.dbo.dao.table.CSVToRowIterator;
=======
import org.sagebionetworks.repo.model.dao.table.TableRowCache;
>>>>>>> 432753135e0a3c57c3481899309549bfb4b22369
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelTestUtils;
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelUtils;
import org.sagebionetworks.repo.model.table.AsynchDownloadResponseBody;
Solution content
import org.sagebionetworks.repo.model.InvalidModelException;
import org.sagebionetworks.repo.model.UnauthorizedException;
import org.sagebionetworks.repo.model.UserInfo;
import org.sagebionetworks.repo.model.dbo.dao.table.CSVToRowIterator;
import org.sagebionetworks.repo.model.dao.table.TableRowCache;
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelTestUtils;
import org.sagebionetworks.repo.model.dbo.dao.table.TableModelUtils;
import org.sagebionetworks.repo.model.table.AsynchDownloadResponseBody;
File
TableWorkerIntegrationTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content
		// Create one column of each type
		List columnModels = TableModelTestUtils.createOneOfEachType();
		schema = new LinkedList();
<<<<<<< HEAD
		for(ColumnModel cm: temp){
=======
		for(ColumnModel cm: columnModels){
			// Skip strings
			if(cm.getColumnType() == ColumnType.STRING) continue;
>>>>>>> 432753135e0a3c57c3481899309549bfb4b22369
			cm = columnManager.createColumnModel(adminUserInfo, cm);
			schema.add(cm);
		}
Solution content
		// Create one column of each type
		List columnModels = TableModelTestUtils.createOneOfEachType();
		schema = new LinkedList();
		for(ColumnModel cm: columnModels){
			cm = columnManager.createColumnModel(adminUserInfo, cm);
			schema.add(cm);
		}
File
TableWorkerIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Comment
For statement
If statement