Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alias are not recognize and create new column in metadata producing error in stream #361

Merged
merged 2 commits into from
Nov 17, 2016
Merged

Alias are not recognize and create new column in metadata producing error in stream #361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781883d
Alias are not recognize and create new column in metadata
sguan-actuate Nov 15, 2016
0e2b34e
included comments for change
sguan-actuate Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 107 additions & 105 deletions ....birt.data/src/org/eclipse/birt/data/engine/executor/DataSetCacheObjectWithDummyData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,105 +1,107 @@
package org.eclipse.birt.data.engine.executor;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import org.eclipse.birt.core.data.DataType;
import org.eclipse.birt.data.engine.api.IBaseDataSetDesign;
import org.eclipse.birt.data.engine.api.IColumnDefinition;
import org.eclipse.birt.data.engine.api.IComputedColumn;
import org.eclipse.birt.data.engine.core.DataException;
import org.eclipse.birt.data.engine.odi.IResultClass;


public class DataSetCacheObjectWithDummyData implements IDataSetCacheObject
{

private IResultClass resultClass;
private IDataSetCacheObject base;

public DataSetCacheObjectWithDummyData( IBaseDataSetDesign dataSetDesign, IDataSetCacheObject base ) throws DataException
{
this.base = base;
this.resultClass = this.populateResultClass( dataSetDesign, base.getResultClass( ) );
}

public boolean isCachedDataReusable( int requiredCapability )
{
return this.base.isCachedDataReusable( requiredCapability );
}

public boolean needUpdateCache( int requiredCapability )
{
return this.base.needUpdateCache( requiredCapability );
}

public IResultClass getResultClass( ) throws DataException
{
return this.resultClass;
}

public void release( )
{
this.base.release( );
}

public IDataSetCacheObject getSourceDataSetCacheObject( )
{
return this.base;
}

private IResultClass populateResultClass( IBaseDataSetDesign dataSetDesign, IResultClass baseResultClass ) throws DataException
{
List resultHints = dataSetDesign.getResultSetHints( );
List computedColumns = dataSetDesign.getComputedColumns();
List columnsList = new ArrayList( );
for( int i = 1; i <= baseResultClass.getFieldCount( ); i++ )
{
columnsList.add( baseResultClass.getFieldMetaData( i ) );
}

Iterator it = resultHints.iterator( );
for ( int j = 0; it.hasNext( ); j++ )
{
IColumnDefinition columnDefn = (IColumnDefinition) it.next( );

if( baseResultClass.getFieldIndex( columnDefn.getColumnName( ) ) != -1 )
continue;

ResultFieldMetadata columnMetaData = new ResultFieldMetadata( j + 1,
columnDefn.getColumnName( ),
columnDefn.getDisplayName( ),
DataType.getClass( columnDefn.getDataType( ) ),
null /* nativeTypeName */,
true, columnDefn.getAnalysisType( ),
columnDefn.getAnalysisColumn( ),
columnDefn.isIndexColumn( ),
columnDefn.isCompressedColumn( ) );
columnsList.add( columnMetaData );
columnMetaData.setAlias( columnDefn.getAlias( ) );
}

// Add computed columns
int count = columnsList.size();
it = computedColumns.iterator();
for ( int j = resultHints.size(); it.hasNext( ); j++ )
{
IComputedColumn compColumn = (IComputedColumn)it.next();
if( baseResultClass.getFieldIndex( compColumn.getName( ) ) != -1 )
continue;
ResultFieldMetadata columnMetaData = new ResultFieldMetadata(
++count,
compColumn.getName(),
compColumn.getName(),
DataType.getClass( compColumn.getDataType( ) ),
null /* nativeTypeName */,
true, -1 );
columnsList.add( columnMetaData );
}

return new ResultClass( columnsList );
}
}
package org.eclipse.birt.data.engine.executor;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import org.eclipse.birt.core.data.DataType;
import org.eclipse.birt.data.engine.api.IBaseDataSetDesign;
import org.eclipse.birt.data.engine.api.IColumnDefinition;
import org.eclipse.birt.data.engine.api.IComputedColumn;
import org.eclipse.birt.data.engine.core.DataException;
import org.eclipse.birt.data.engine.odi.IResultClass;


public class DataSetCacheObjectWithDummyData implements IDataSetCacheObject
{

private IResultClass resultClass;
private IDataSetCacheObject base;

public DataSetCacheObjectWithDummyData( IBaseDataSetDesign dataSetDesign, IDataSetCacheObject base ) throws DataException
{
this.base = base;
this.resultClass = this.populateResultClass( dataSetDesign, base.getResultClass( ) );
}

public boolean isCachedDataReusable( int requiredCapability )
{
return this.base.isCachedDataReusable( requiredCapability );
}

public boolean needUpdateCache( int requiredCapability )
{
return this.base.needUpdateCache( requiredCapability );
}

public IResultClass getResultClass( ) throws DataException
{
return this.resultClass;
}

public void release( )
{
this.base.release( );
}

public IDataSetCacheObject getSourceDataSetCacheObject( )
{
return this.base;
}

private IResultClass populateResultClass( IBaseDataSetDesign dataSetDesign, IResultClass baseResultClass ) throws DataException
{
List resultHints = dataSetDesign.getResultSetHints( );
List computedColumns = dataSetDesign.getComputedColumns();
List columnsList = new ArrayList( );
for( int i = 1; i <= baseResultClass.getFieldCount( ); i++ )
{
columnsList.add( baseResultClass.getFieldMetaData( i ) );
}

Iterator it = resultHints.iterator( );
for ( int j = 0; it.hasNext( ); j++ )
{
IColumnDefinition columnDefn = (IColumnDefinition) it.next( );
// data object with alias is retrieve as metadata on base
// add check on columnDefn alias name
if( baseResultClass.getFieldIndex( columnDefn.getColumnName( ) ) != -1 ||
baseResultClass.getFieldIndex( columnDefn.getAlias( ) ) != -1 )
continue;

ResultFieldMetadata columnMetaData = new ResultFieldMetadata( j + 1,
columnDefn.getColumnName( ),
columnDefn.getDisplayName( ),
DataType.getClass( columnDefn.getDataType( ) ),
null /* nativeTypeName */,
true, columnDefn.getAnalysisType( ),
columnDefn.getAnalysisColumn( ),
columnDefn.isIndexColumn( ),
columnDefn.isCompressedColumn( ) );
columnsList.add( columnMetaData );
columnMetaData.setAlias( columnDefn.getAlias( ) );
}

// Add computed columns
int count = columnsList.size();
it = computedColumns.iterator();
for ( int j = resultHints.size(); it.hasNext( ); j++ )
{
IComputedColumn compColumn = (IComputedColumn)it.next();
if( baseResultClass.getFieldIndex( compColumn.getName( ) ) != -1 )
continue;
ResultFieldMetadata columnMetaData = new ResultFieldMetadata(
++count,
compColumn.getName(),
compColumn.getName(),
DataType.getClass( compColumn.getDataType( ) ),
null /* nativeTypeName */,
true, -1 );
columnsList.add( columnMetaData );
}

return new ResultClass( columnsList );
}
}