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

V2connector #458

Open
wants to merge 5 commits into
base: snappy/master
Choose a base branch
from
Open

V2connector #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8cfc97
Changes compatible to for v2 to call call_table_scan
PradeepSurale Jan 10, 2019
ed2f1bb
Commented the free up the blob
PradeepSurale Jan 10, 2019
c94e0e8
Merge branch 'snappy/master' of https://github.com/SnappyDataInc/snap…
PradeepSurale Jan 16, 2019
dde179e
Code alignment
PradeepSurale Jan 16, 2019
549d656
Merge branch 'snappy/master' of https://github.com/SnappyDataInc/snap…
PradeepSurale Feb 18, 2019
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
4 changes: 2 additions & 2 deletions gemfire-core/src/main/java/com/gemstone/gemfire/internal/snappy/CallbackFactoryProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public String columnBatchTableName(String tableName) {

@Override
public CloseableIterator<ColumnTableEntry> columnTableScan(
String columnTable, int[] projection, byte[] serializedFilters,
Set<Integer> bucketIds) throws SQLException {
String qualifiedTable, int[] projection, byte[] serializedFilters,
Set<Integer> bucketIds, boolean useKryoSerializer) throws SQLException {
throw new UnsupportedOperationException("unexpected invocation for "
+ toString());
}
Expand Down
2 changes: 1 addition & 1 deletion gemfire-core/src/main/java/com/gemstone/gemfire/internal/snappy/StoreCallbacks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Set<Object> createColumnBatch(BucketRegion region, long batchID,
*/
CloseableIterator<ColumnTableEntry> columnTableScan(String qualifiedTable,
int[] projection, byte[] serializedFilters,
Set<Integer> bucketIds) throws SQLException;
Set<Integer> bucketIds, boolean useKryoSerializer) throws SQLException;

void registerCatalogSchemaChange();

Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/com/pivotal/gemfirexd/internal/engine/ddl/catalog/GfxdSystemProcedures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2960,7 +2960,7 @@ public static void GET_COLUMN_TABLE_SCHEMA(String schema, String table,
};

public static void COLUMN_TABLE_SCAN(String columnTable, String projection,
Blob filters, ResultSet[] result) throws SQLException {
Blob filters, Boolean useKryoSerializer, ResultSet[] result) throws SQLException {
try {
// split the projection into column indexes (1-based)
final TIntArrayList columnsList = new TIntArrayList(4);
Expand All @@ -2976,12 +2976,12 @@ public static void COLUMN_TABLE_SCAN(String columnTable, String projection,
byte[] batchFilters = null;
if (filters != null) {
batchFilters = filters.getBytes(1, (int)filters.length());
filters.free();
// filters.free();
}
Set<Integer> bucketIds = lcc.getBucketIdsForLocalExecution();
final CloseableIterator<ColumnTableEntry> iter =
CallbackFactoryProvider.getStoreCallbacks().columnTableScan(
columnTable, columns, batchFilters, bucketIds);
columnTable, columns, batchFilters, bucketIds, useKryoSerializer);
if (GemFireXDUtils.TraceExecution) {
SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_EXECUTION,
"COLUMN_TABLE_SCAN table=" + columnTable +
Expand Down
5 changes: 3 additions & 2 deletions ...ore/src/main/java/com/pivotal/gemfirexd/internal/impl/sql/catalog/GfxdDataDictionary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,11 +2006,12 @@ private void createGfxdSystemProcedures(TransactionController tc,
}
{
// COLUMN_TABLE_SCAN(String,String,String,Blob,ResultSet[])
String[] arg_names = new String[] { "TABLE", "PROJECTION", "FILTERS" };
String[] arg_names = new String[] { "TABLE", "PROJECTION", "FILTERS", "USE_KRYO_SERIALIZER" };
TypeDescriptor[] arg_types = new TypeDescriptor[] {
DataTypeDescriptor.getCatalogType(Types.VARCHAR),
DataTypeDescriptor.getCatalogType(Types.VARCHAR),
DataTypeDescriptor.getCatalogType(Types.BLOB)
DataTypeDescriptor.getCatalogType(Types.BLOB),
DataTypeDescriptor.getCatalogType(Types.BOOLEAN)
};
super.createSystemProcedureOrFunction("COLUMN_TABLE_SCAN", sysUUID,
arg_names, arg_types, 0, 1, RoutineAliasInfo.READS_SQL_DATA, null,
Expand Down