asterixdb

Clone Tools
  • last updated 29 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fix for issue 677

Merge branch 'master' into westmann/locks

32 bits are not enough for LockManagerStats

no allocation of job slot during unlock

recover_after_abort added

do not keep the monitor on jobArenaMgr unnecessarily

rename LoadFromFileStatement to LoadStatement

    • -2
    • +2
    /asterix-algebra/src/main/javacc/AQLPlus.jj
Merge branch 'peili/crash_recovery_tests'

formatting

reformatting

  1. … 4 more files in changeset.
reformatting

added test case for generic socket based feed adaptor

    • -0
    • +100
    /asterix-app/data/twitter/tw_messages_100.adm
removing calls to deleted methods

restoring default values for heartbeat_period and max_heartbeat_elapsed, temporarily changed for fault tolerance experiments

default secondary index commmented

put some detailed logging behind a DEBUG_MODE guard small cleanup

add DummyLockManager

Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:

asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java

asterix-app/src/test/resources/metadata/results/basic/meta17/meta17.1.adm

asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm

asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java

asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/ILockManager.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataManager.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java

  1. … 4 more files in changeset.
Merge branch 'master' into zheilbron/hyracks_msr_demo

Conflicts:

hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/lifecycle/LifeCycleComponentManager.java

add the dyanmic optimization skeleton

Merge branch 'master' into raman/master_feeds

removed unnecessary fields in JobInfo

fixed an abort issue appeared from RecoveryIT test

all refined expect secondary indices

  1. … 27 more files in changeset.
always lock the whole dataset in PrimaryIndexSearchOperationCallback manage the dataset lock cache in the lock calls on the datset itself

fix driver logging

log the right counters

let pregelix driver print perf. counter

move request counters into separate class comment out some detailed logging

fix jobgen