database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Merge branch 'develop' into join-abort-fix

Browse Source
This commit is contained in:
Patrick LeBlanc
2020-01-08 15:19:12 -06:00
committed by GitHub
parent 04807c3ef8 8e6fde3b71
commit a3409e1a94
24 changed files with 85 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbcon/joblist/tuplehashjoin.cpp
View File

@@ -138,6 +138,7 @@ TupleHashJoinStep::~TupleHashJoinStep()
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit);
}
//cout << "deallocated THJS, UM memory available: " << resourceManager.availableMemory() << endl;
}

1
dbcon/joblist/tupleunion.cpp
View File

@@ -94,7 +94,6 @@ TupleUnion::TupleUnion(CalpontSystemCatalog::OID tableOID, const JobInfo& jobInf
outputIt(-1),
memUsage(0),
rm(jobInfo.rm),
allocator(64 * 1024 * 1024 + 1),
runnersDone(0),
distinctCount(0),
distinctDone(0),

1
dbcon/mysql/columnstore.cnf
View File

@@ -16,6 +16,7 @@ plugin-load-add=ha_columnstore.so
# Required for Schema Sync
#server-id = 1
#log_bin
# Uncomment for this UM to apply slave DML on ColumnStore tables
#columnstore_replication_slave=ON