| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
this.executor_threads = new Thread[num_partitions];
// Get the hasher we will use for this HStoreSite
LOG.info("Using hasher class: " + hstore_conf.global.hasherClass );
this.hasher = ClassUtil.newInstance(hstore_conf.global.hasherClass,
=======
this.hasher = ClassUtil.newInstance(hstore_conf.global.hasher_class,
>>>>>>> 9f5d4501defd83a231a9abb1b85434fcaeed61ed
new Object[]{ this.catalogContext, num_partitions },
new Class>[]{ CatalogContext.class, int.class });
this.p_estimator = new PartitionEstimator(this.catalogContext, this.hasher); |
| Solution content |
|---|
this.executor_threads = new Thread[num_partitions];
// Get the hasher we will use for this HStoreSite
LOG.info("Using hasher class: " + hstore_conf.global.hasherClass );
this.hasher = ClassUtil.newInstance(hstore_conf.global.hasherClass,
new Object[]{ this.catalogContext, num_partitions },
new Class>[]{ CatalogContext.class, int.class });
this.p_estimator = new PartitionEstimator(this.catalogContext, this.hasher); |
| File |
|---|
| HStoreSite.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |