asterixdb

Clone Tools
  • last updated 28 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
dml recovery added

fix NPE when no custom aggregator is set

api for specifying update state for activate() and voteToHalt()

allow global aggregators to be specified in xml

explicitly setting the aggregator in the PregelixJob constructors would

override any values read in from the conf's resources.

Instead, this commit doesn't set the conf explicitly and instead

specifies an array of aggregator class names which will always be in

place when `getGlobalAggregatorClasses` is called.

reenable feed jobspec alteration + logging to metadata (bug filed)

clean up azure adapters

Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/ConcurrentLockManager.java

Merge branch 'master' into zheilbron/hyracks_msr_demo

Conflicts:

hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java

remove commented, unused import

change unary function type computer to support ANY type

merge master

All recover_after_abort recovery_ddl test cases added

Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:

asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/RemoveUnusedOneToOneEquiJoinRule.java

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

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

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

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

asterix-app/src/test/resources/runtimets/testsuite.xml

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

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

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/ConcurrentLockManager.java

ddl added

Merge branch 'master' of https://code.google.com/p/hyracks

add APT for retrieving slave counters

Merge branch 'master' into westmann/locks

before dml

Merge branch 'master' into zheilbron/hyracks_msr_demo

merged from master to kisskys/master_fix_issue_510

dealing with empty counter

changes to fix issue 510

1) null check in feed frame writer 2) corrected path in feed ingestion test

    • -12
    • +0
    /asterix-installer/data/twitter/obamatweets.adm
merge from master

removed repetitive comment

minor changes to pull based twitter adapter

Merge branch 'raman/master_feeds' of https://code.google.com/p/hyracks into raman/master_feeds

renabling surefire plugin

added an additional test for feed ingestion

    • -0
    • +12
    /asterix-installer/data/twitter/obamatweets.adm
Merge branch 'master' into westmann/locks