modified catalog and java code to include multiple partitioning params