Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fix for issue 712

checkpoint

  1. … 24 more files in changeset.
Merge remote-tracking branch 'origin/raman/master_feeds_merge' into zheilbron/asterix_msr_demo

Conflicts:

.gitignore

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

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

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

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java

asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java

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

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

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

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

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

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

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

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

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

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02/cross-dv02.1.adm

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04/cross-dv04.1.adm

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19/cross-dv19.1.adm

asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23/udf23.1.adm

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/FeedDetailsDecl.java

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/InternalDetailsDecl.java

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/visitor/AQLPrintVisitor.java

asterix-aql/src/main/javacc/AQL.jj

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

asterix-external-data/src/main/java/edu/uci/ics/asterix/external/dataset/adapter/FileSystemBasedAdapter.java

asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java

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

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataRecordTypes.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/DatasetDataSource.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/InternalDatasetDetails.java

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

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedMetaOperatorDescriptor.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedUtil.java

asterix-om/src/main/java/edu/uci/ics/asterix/om/functions/AsterixExternalFunctionInfo.java

asterix-om/src/main/java/edu/uci/ics/asterix/om/util/AsterixAppContextInfo.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/LogManager.java

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

  1. … 53 more files in changeset.
cosmetic changes

    • -12
    • +12
    ./edu/uci/ics/asterix/event/api/NodeInfo.java
  1. … 205 more files in changeset.
modified strategy to choose a substitute node in event of failure

  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/asterix_msr_demo

Conflicts:

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/ConnectFeedStatement.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedUtil.java

  1. … 8 more files in changeset.
minor changes to feed console

  1. … 7 more files in changeset.
merge from zheilbron/asterix_msr (checkpoint 3)

  1. … 3 more files in changeset.
fault-tolerance checkpoint

  1. … 34 more files in changeset.
added basic feeds robustness test; testing behavior upon a cluster restart

  1. … 24 more files in changeset.
checkpoint

  1. … 8 more files in changeset.
checkpoint

  1. … 14 more files in changeset.
added test case for fault-tolerance

  1. … 12 more files in changeset.
checkpoint

  1. … 54 more files in changeset.
merged raman/asterix_lsm_stabilization_udfs

  1. … 35 more files in changeset.
checkpoint

  1. … 20 more files in changeset.
merge from master

  1. … 47 more files in changeset.
checkpoint post merge from master

  1. … 26 more files in changeset.
completed merge from master

  1. … 39 more files in changeset.
checkpoint

  1. … 18 more files in changeset.
merge from master

    • -1
    • +1
    ./edu/uci/ics/asterix/event/model/ProcessInfo.java
  1. … 135 more files in changeset.
add/update license headers

  1. … 1224 more files in changeset.
Merge master into raman/asterix_lsm_stabilization_coredump.

  1. … 16 more files in changeset.
checkpoint

  1. … 14 more files in changeset.
saving state

  1. … 11 more files in changeset.
checkpoint

  1. … 3 more files in changeset.
saving state

    • -0
    • +25
    ./edu/uci/ics/asterix/event/error/EventException.java
    • -0
    • +89
    ./edu/uci/ics/asterix/event/error/OutputHandler.java
    • -0
    • +126
    ./edu/uci/ics/asterix/event/error/VerificationUtil.java
    • -0
    • +190
    ./edu/uci/ics/asterix/event/model/AsterixInstance.java
    • -0
    • +53
    ./edu/uci/ics/asterix/event/model/AsterixRuntimeState.java
    • -0
    • +68
    ./edu/uci/ics/asterix/event/model/BackupInfo.java
    • -0
    • +33
    ./edu/uci/ics/asterix/event/model/EventList.java
    • -0
    • +54
    ./edu/uci/ics/asterix/event/model/ProcessInfo.java
    • -0
    • +63
    ./edu/uci/ics/asterix/event/service/AsterixEventService.java
    • -0
    • +495
    ./edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java
  1. … 94 more files in changeset.
checkpoit

  1. … 106 more files in changeset.
removing unused imports

  1. … 1 more file in changeset.
merge from master

  1. … 26 more files in changeset.